Use a shorthand for event listeners; Clean up a few things