Moved all event emitter calls to the same level of abstraction