changed things to make `go vet` happier