Refactoring, 1st tier: