gofmt, style improvements