Tidied up with Gofmt

I've run `gofmt` over the code which has tidied up some of the formatting and whitespace