Refactoring, part 15.