Re gofmt with defaults to make merge easier