Tidy code slightly

I find this version slightly nicer.
gofmt
gofmt