Refactoring sort imports