Fixed up the style of add and remove event listeners.