Flip the event handlers
Cleanups