refactor: lessons learned from new key emitter applied to strategy