Refactor nhgis import