Refactor EditingEventHandler