More refactoring, and cleaner applying of strategies