Refactor event listeners
Merge pull request #27 from rogerz/event-listener

Refactor event listeners