Big mother of refactorings, part 2