Tweak style per golint feedback

I ran [golint](https://github.com/golang/lint) and fixed the things it complained about.