more golint updates