Minor refactoring in import