Refactor strategies