incorporate golint feedback
Merge branch 'incorporate_golint_feedback'

Update docs, rename variables to match Go style.
Thanks golint!