go vet cleanups