Refactored/renamed strategies