refactor importer