diff --git a/include/grpc++/impl/codegen/proto_utils.h b/include/grpc++/impl/codegen/proto_utils.h
index 489293d25bc63ff948531f6357883f21c897d010..05321619ac432749f91873648eeb547afa6f340b 100644
--- a/include/grpc++/impl/codegen/proto_utils.h
+++ b/include/grpc++/impl/codegen/proto_utils.h
@@ -75,15 +75,14 @@ class ProtoSerializer : public ProtoSerializerInterface {
   // fails,
   // false is returned and buffer is left unchanged.
   Status SerializeProto(const grpc::protobuf::Message& msg,
-                                grpc_byte_buffer** buffer) override;
+                        grpc_byte_buffer** buffer) override;
 
   // The caller keeps ownership of buffer and msg.
   Status DeserializeProto(grpc_byte_buffer* buffer,
-                                  grpc::protobuf::Message* msg,
-                                  int max_message_size) override;
+                          grpc::protobuf::Message* msg,
+                          int max_message_size) override;
 };
 
-
 template <class T>
 class SerializationTraits<T, typename std::enable_if<std::is_base_of<
                                  grpc::protobuf::Message, T>::value>::type> {
@@ -92,14 +91,16 @@ class SerializationTraits<T, typename std::enable_if<std::is_base_of<
                           grpc_byte_buffer** buffer, bool* own_buffer) {
     *own_buffer = true;
     GPR_ASSERT(g_proto_serializer != nullptr &&
-               "No ProtoSerializer instance registered. Make sure grpc++ is being initialized.");
+               "No ProtoSerializer instance registered. Make sure grpc++ is "
+               "being initialized.");
     return g_proto_serializer->SerializeProto(msg, buffer);
   }
   static Status Deserialize(grpc_byte_buffer* buffer,
                             grpc::protobuf::Message* msg,
                             int max_message_size) {
     GPR_ASSERT(g_proto_serializer != nullptr &&
-               "No ProtoSerializer instance registered. Make sure grpc++ is being initialized.");
+               "No ProtoSerializer instance registered. Make sure grpc++ is "
+               "being initialized.");
     auto status =
         g_proto_serializer->DeserializeProto(buffer, msg, max_message_size);
     grpc_byte_buffer_destroy(buffer);
diff --git a/src/cpp/proto/proto_serializer.cc b/src/cpp/proto/proto_serializer.cc
index 4e46e989aa3b224e7e14c6522db2383f1a3fdc34..5100141dc5f4e17a7d87c0d2e22f8a4600292caa 100644
--- a/src/cpp/proto/proto_serializer.cc
+++ b/src/cpp/proto/proto_serializer.cc
@@ -31,7 +31,8 @@
  *
  */
 
-// TODO(dgq): This file is part of a temporary fix to work around codegen issues related to
+// TODO(dgq): This file is part of a temporary fix to work around codegen issues
+// related to
 // a certain sharp-sounding build system.
 // This whole file will be removed in the future.