diff --git a/ortools/base/logging.cc b/ortools/base/logging.cc
index e7966ddc5f..046df14325 100644
--- a/ortools/base/logging.cc
+++ b/ortools/base/logging.cc
@@ -208,7 +208,7 @@ static void GetHostName(string* hostname) {
     *buf.nodename = '\0';
   }
   *hostname = buf.nodename;
-#else  // _MSC_VER
+#else   // _MSC_VER
   char buf[MAX_COMPUTERNAME_LENGTH + 1];
   DWORD len = MAX_COMPUTERNAME_LENGTH + 1;
   if (GetComputerNameA(buf, &len)) {
@@ -650,7 +650,7 @@ static void ColoredWriteToStderr(LogSeverity severity, const char* message,
   fflush(stderr);
   // Restores the text color.
   SetConsoleTextAttribute(stderr_handle, old_color_attrs);
-#else  // !_MSC_VER
+#else   // !_MSC_VER
   fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color));
   fwrite(message, len, 1, stderr);
   fprintf(stderr, "\033[m");  // Resets the terminal to default.
@@ -1186,7 +1186,7 @@ LogMessage::~LogMessage() {
   } else {
     delete allocated_;
   }
-#else  // !defined(GLOG_THREAD_LOCAL_STORAGE)
+#else   // !defined(GLOG_THREAD_LOCAL_STORAGE)
   delete allocated_;
 #endif  // defined(GLOG_THREAD_LOCAL_STORAGE)
 }
diff --git a/ortools/base/sysinfo.cc b/ortools/base/sysinfo.cc
index 786297e13f..2c6a443fba 100644
--- a/ortools/base/sysinfo.cc
+++ b/ortools/base/sysinfo.cc
@@ -59,14 +59,14 @@ int64 GetProcessMemoryUsage() {
   fclose(pf);
   return size * int64{1024};
 }
-#elif defined(__FreeBSD__)  // FreeBSD
+#elif defined(__FreeBSD__)                        // FreeBSD
 int64 GetProcessMemoryUsage() {
   int who = RUSAGE_SELF;
   struct rusage rusage;
   getrusage(who, &rusage);
   return (int64)(rusage.ru_maxrss * int64{1024});
 }
-#elif defined(_MSC_VER)  // WINDOWS
+#elif defined(_MSC_VER)                           // WINDOWS
 int64 GetProcessMemoryUsage() {
   HANDLE hProcess;
   PROCESS_MEMORY_COUNTERS pmc;
@@ -81,7 +81,7 @@ int64 GetProcessMemoryUsage() {
   }
   return memory;
 }
-#else  // Unknown, returning 0.
+#else                                             // Unknown, returning 0.
 int64 GetProcessMemoryUsage() { return 0; }
 #endif
 
diff --git a/ortools/flatzinc/parser.tab.cc b/ortools/flatzinc/parser.tab.cc
index 18c09d0957..0c346ebded 100644
--- a/ortools/flatzinc/parser.tab.cc
+++ b/ortools/flatzinc/parser.tab.cc
@@ -432,7 +432,7 @@ void* malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #ifndef YYFREE
 #define YYFREE free
 #if !defined free && !defined EXIT_SUCCESS
-void free(void*); /* INFRINGES ON USER NAME SPACE */
+void free(void*);       /* INFRINGES ON USER NAME SPACE */
 #endif
 #endif
 #endif
diff --git a/ortools/java/com/google/ortools/sat/CpModel.java b/ortools/java/com/google/ortools/sat/CpModel.java
index 26c4a97a9d..c2f7ea9be6 100644
--- a/ortools/java/com/google/ortools/sat/CpModel.java
+++ b/ortools/java/com/google/ortools/sat/CpModel.java
@@ -135,8 +135,7 @@ public final class CpModel {
     Constraint ct = new Constraint(modelBuilder);
     LinearConstraintProto.Builder lin = ct.getBuilder().getLinearBuilder();
     for (int i = 0; i < expr.numElements(); ++i) {
-      lin.addVars(expr.getVariable(i).getIndex());
-      lin.addCoeffs(expr.getCoefficient(i));
+      lin.addVars(expr.getVariable(i).getIndex()).addCoeffs(expr.getCoefficient(i));
     }
     for (long b : domain.flattenedIntervals()) {
       lin.addDomain(b);
@@ -258,8 +257,8 @@ public final class CpModel {
   /** Adds the element constraint: {@code variables[index] == target}. */
   public Constraint addElement(IntVar index, IntVar[] variables, IntVar target) {
     Constraint ct = new Constraint(modelBuilder);
-    ElementConstraintProto.Builder element = ct.getBuilder().getElementBuilder();
-    element.setIndex(index.getIndex());
+    ElementConstraintProto.Builder element =
+        ct.getBuilder().getElementBuilder().setIndex(index.getIndex());
     for (IntVar var : variables) {
       element.addVars(var.getIndex());
     }
@@ -270,8 +269,8 @@ public final class CpModel {
   /** Adds the element constraint: {@code values[index] == target}. */
   public Constraint addElement(IntVar index, long[] values, IntVar target) {
     Constraint ct = new Constraint(modelBuilder);
-    ElementConstraintProto.Builder element = ct.getBuilder().getElementBuilder();
-    element.setIndex(index.getIndex());
+    ElementConstraintProto.Builder element =
+        ct.getBuilder().getElementBuilder().setIndex(index.getIndex());
     for (long v : values) {
       element.addVars(indexFromConstant(v));
     }
@@ -282,8 +281,8 @@ public final class CpModel {
   /** Adds the element constraint: {@code values[index] == target}. */
   public Constraint addElement(IntVar index, int[] values, IntVar target) {
     Constraint ct = new Constraint(modelBuilder);
-    ElementConstraintProto.Builder element = ct.getBuilder().getElementBuilder();
-    element.setIndex(index.getIndex());
+    ElementConstraintProto.Builder element =
+        ct.getBuilder().getElementBuilder().setIndex(index.getIndex());
     for (long v : values) {
       element.addVars(indexFromConstant(v));
     }
@@ -466,9 +465,7 @@ public final class CpModel {
       if (t.length != 3) {
         throw new WrongLength("addAutomaton", "transition does not have length 3");
       }
-      automaton.addTransitionTail(t[0]);
-      automaton.addTransitionLabel(t[1]);
-      automaton.addTransitionHead(t[2]);
+      automaton.addTransitionTail(t[0]).addTransitionLabel(t[1]).addTransitionHead(t[2]);
     }
     return ct;
   }
@@ -536,8 +533,7 @@ public final class CpModel {
     for (long d : demands) {
       reservoir.addDemands(d);
     }
-    reservoir.setMinLevel(minLevel);
-    reservoir.setMaxLevel(maxLevel);
+    reservoir.setMinLevel(minLevel).setMaxLevel(maxLevel);
     return ct;
   }
 
@@ -623,8 +619,8 @@ public final class CpModel {
   /** Adds {@code target == Min(vars)}. */
   public Constraint addMinEquality(IntVar target, IntVar[] vars) {
     Constraint ct = new Constraint(modelBuilder);
-    IntegerArgumentProto.Builder intMin = ct.getBuilder().getIntMinBuilder();
-    intMin.setTarget(target.getIndex());
+    IntegerArgumentProto.Builder intMin =
+        ct.getBuilder().getIntMinBuilder().setTarget(target.getIndex());
     for (IntVar var : vars) {
       intMin.addVars(var.getIndex());
     }
@@ -634,8 +630,8 @@ public final class CpModel {
   /** Adds {@code target == Max(vars)}. */
   public Constraint addMaxEquality(IntVar target, IntVar[] vars) {
     Constraint ct = new Constraint(modelBuilder);
-    IntegerArgumentProto.Builder intMax = ct.getBuilder().getIntMaxBuilder();
-    intMax.setTarget(target.getIndex());
+    IntegerArgumentProto.Builder intMax =
+        ct.getBuilder().getIntMaxBuilder().setTarget(target.getIndex());
     for (IntVar var : vars) {
       intMax.addVars(var.getIndex());
     }
@@ -655,10 +651,11 @@ public final class CpModel {
   /** Adds {@code target == Abs(var)}. */
   public Constraint addAbsEquality(IntVar target, IntVar var) {
     Constraint ct = new Constraint(modelBuilder);
-    IntegerArgumentProto.Builder intMax = ct.getBuilder().getIntMaxBuilder();
-    intMax.setTarget(target.getIndex());
-    intMax.addVars(var.getIndex());
-    intMax.addVars(-var.getIndex() - 1);
+    IntegerArgumentProto.Builder intMax = ct.getBuilder()
+                                              .getIntMaxBuilder()
+                                              .setTarget(target.getIndex())
+                                              .addVars(var.getIndex())
+                                              .addVars(-var.getIndex() - 1);
     return ct;
   }
 
diff --git a/ortools/port/file_nonport.cc b/ortools/port/file_nonport.cc
index e04a3aa3b8..4ff7ffbdb0 100644
--- a/ortools/port/file_nonport.cc
+++ b/ortools/port/file_nonport.cc
@@ -38,12 +38,12 @@ bool PortableTemporaryFile(const char* directory_prefix,
                            std::string* filename_out) {
 #if defined(__linux)
   int32 tid = static_cast<int32>(pthread_self());
-#else  // defined(__linux__)
+#else   // defined(__linux__)
   int32 tid = 123;
 #endif  // defined(__linux__)
 #if !defined(_MSC_VER)
   int32 pid = static_cast<int32>(getpid());
-#else  // _MSC_VER
+#else   // _MSC_VER
   int32 pid = 456;
 #endif  // _MSC_VER
   int64 now = absl::GetCurrentTimeNanos();