Bug fix + cleanup

Laura A DeCicco requested to merge ldecicco-USGS:master into master Oct 25, 2017