[Refactoring] Fixed sort-imports refactoring