go fmt.

result of `gofmt -s -w .`.
Merge remote-tracking branch 'andrewmendina/gofmt'