Minor Cleanup in Importer