knocking out a couple more, and a style change.
Merge pull request #8 from dblodgett-usgs/master

knocking out a couple more, and a style change.