gofmt formatting improvements