cleaning up non-comment golint warnings