Would it make sense to move EventBus to its own file?