fix some golint warnings