Refactoring, part 7