Clean up a bunch.
gofmt