Refactoring, part 5