More EventBus refactoring