golint

Implemented a few suggestions by golint <github.com/golang/golint>