Refactoring of Event Listener
Refactoring of Event Listener