More refactoring.
Refactoring.