Improve EventBus code