More refactoring goodness.