more golint fixes