Clean up and modularize event system