Cleaning up project, debugging duplicate event handlers