Refactoring, part 9