Refactoring EventBus