Fix typo
Refactor to separate Emitter base class