Small Import Refactoring