Refactor event listener registration/deregistration