Improve the names of the arguments and variables. And ensure that all listeners are removed at the end.