Refactoring, part 3.
Refactoring, part 4.