[REFACTOR] Move StrategyHelpers into Strategy