Cleanup and renaming variables more intiutively.
Merge pull request #29 from cschroed-usgs/WATERSMART-109

Cleanup and renaming variables more intiutively.