Refactoring, part 13.