more golint cleanups