Refactoring in 2 steps