Remove commented out code
Categorize more events
Continue organizing events and add corresponding configuration options