Linting

This fixes a couple of complaints from `go vet` and `go fmt`.