More refactoring with the imports.