Cleaning up the event listeners a little bit.