Small refactoring and cleaning imports.