Big mother of refactorings, part 1