More refactoring goodness