Minor cleanup.

This commit fixes a couple of comments and cleans up a couple of things
golint complained about.