Small refactor to clean up event bindings

I just thought that part could be simplified!