Tidy up with gofmt