Clearer use of EventEmitter