diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 818be391528..746bda90a0a 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -224,8 +224,7 @@ class ServerBuilder {
       grpc_compression_algorithm algorithm);
 
   /// Set the attached buffer pool for this server
-  ServerBuilder& SetResourceQuota(
-      const grpc::ResourceQuota& resource_quota);
+  ServerBuilder& SetResourceQuota(const grpc::ResourceQuota& resource_quota);
 
   ServerBuilder& SetOption(std::unique_ptr<grpc::ServerBuilderOption> option);
 
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 95f929e9f15..f42bace5fe9 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -68,8 +68,8 @@ ServerBuilder::~ServerBuilder() {
   }
 }
 
-std::unique_ptr<grpc_impl::ServerCompletionQueue> ServerBuilder::AddCompletionQueue(
-    bool is_frequently_polled) {
+std::unique_ptr<grpc_impl::ServerCompletionQueue>
+ServerBuilder::AddCompletionQueue(bool is_frequently_polled) {
   grpc_impl::ServerCompletionQueue* cq = new grpc_impl::ServerCompletionQueue(
       GRPC_CQ_NEXT,
       is_frequently_polled ? GRPC_CQ_DEFAULT_POLLING : GRPC_CQ_NON_LISTENING,
@@ -289,9 +289,11 @@ std::unique_ptr<grpc::Server> ServerBuilder::BuildAndStart() {
   // This is different from the completion queues added to the server via
   // ServerBuilder's AddCompletionQueue() method (those completion queues
   // are in 'cqs_' member variable of ServerBuilder object)
-  std::shared_ptr<std::vector<std::unique_ptr<grpc_impl::ServerCompletionQueue>>>
-      sync_server_cqs(std::make_shared<
-                      std::vector<std::unique_ptr<grpc_impl::ServerCompletionQueue>>>());
+  std::shared_ptr<
+      std::vector<std::unique_ptr<grpc_impl::ServerCompletionQueue>>>
+      sync_server_cqs(
+          std::make_shared<std::vector<
+              std::unique_ptr<grpc_impl::ServerCompletionQueue>>>());
 
   bool has_frequently_polled_cqs = false;
   for (const auto& cq : cqs_) {
@@ -319,8 +321,8 @@ std::unique_ptr<grpc::Server> ServerBuilder::BuildAndStart() {
 
     // Create completion queues to listen to incoming rpc requests
     for (int i = 0; i < sync_server_settings_.num_cqs; i++) {
-      sync_server_cqs->emplace_back(
-          new grpc_impl::ServerCompletionQueue(GRPC_CQ_NEXT, polling_type, nullptr));
+      sync_server_cqs->emplace_back(new grpc_impl::ServerCompletionQueue(
+          GRPC_CQ_NEXT, polling_type, nullptr));
     }
   }