Style fixes with golint.
Fixing coding style comments raised by golint.