Refactoring event handlers
Completing  event handlers refactoring