importer working but needs some cleaning