Moved event handlers into their own listener classes