cleaning up the import code