Updated refactoring to remove state from strategies. Performance upgrade.