Refactoring, part 18.