[Axel - to read] Improved code quality of events.js.