Style fixes

sponsored by [golint](https://github.com/golang/lint)