Refactoring, part 5.
Refactoring, part 6.