cleaned Importer loops slightly