Refactoring imports