refactoring importer