refactor(EventHandler) a few optimisations