Refactoring ChannelEventHandler