Ran gofmt on all go files. No substantive changes.
Code cleanup, go vet