Simplification.
More refactoring.