Refactoring towards Strategy, step by step