Step 3/10 - Start fixing and cleaning modules

Module: events.js