Cleaned importer code