More style cleanups

Laura A DeCicco requested to merge ldecicco-USGS:master into master May 02, 2017