Changes

Removed delegation
Removed need of selector on events