Cleaned up importer code.