Fix formatting, change @Subscribe to @EventHandler, and revert last commit