refactor strategy creation