Minor refactoring
Resolve issue with initial positioning of emitter cell