Refactoring import