golint

This PR updates the code post-golint.