Refactoring, part 6
Refactoring, part 7