Clean up code
Simplify event