Importer/exporter cleanup
Minor code cleanup