Redo EventBus and formatting pass