Cleaning up some code in the Importer classes