Refactoring, Stage 2