Refactor 1 - Event

Removed super()