Added the event listener objects and cleaned up a few other pieces throughout