more cleanup of event module to match PSR2 standards