Refactor EventReceiver into EventHandler