go vet fix
golint fixes