Cleanup

This fixes the complaints of `go vet` and `gofmt`.