Refactoring complete

- changed handle event names
- added a more concise event handlers
update