even more golint cleanups