Cleanup from isuftin's code review.
Merge pull request #27 from cschroed-usgs/WATERSMART-117

Cleanup from isuftin's code review.