Refactoring.
More refactoring.