Tidied up eventsModule file