Refactored StrategyRunner