Gofmt a few things

Getting enthusiastic about `gofmt`