Strategy refactoring