fixed and cleaned importer