Event Overhaul & Code Style Improvements