Cleaned Importer code.