Normalized the definition of the eventsHandler
Finished definition
Normalized events handling