Refactoring, stage 1