Refactor event handlers to event relayers