ocd
cleaning
fix event handler
moo