diff --git a/.clang-format b/.clang-format
index 2187512295d8fe5672fbf31fdd60cdc0559efdcc..8e72a98b0d2d8c0c2ca66d6e4369fcbe427dab4e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -15,7 +15,6 @@ InsertNewlineAtEOF: true
 PackConstructorInitializers: NextLine
 PPIndentWidth: 1
 PointerAlignment: Left
-RemoveSemicolon: true
 SpaceAfterTemplateKeyword: false
 SpaceBeforeParens: ControlStatements
 SpaceBeforeCpp11BracedList: true
diff --git a/src/ModelTree.cc b/src/ModelTree.cc
index c900811e15be04d5c37efbcbe7196813979a63bd..83ea85317fe9818069651938a4289d0567a370e1 100644
--- a/src/ModelTree.cc
+++ b/src/ModelTree.cc
@@ -1385,8 +1385,7 @@ ModelTree::writeLatexModelFile(const string& mod_basename, const string& latex_b
       content_output << endl << R"(\end{dmath})" << endl;
     }
 
-  output << R"(\include{)" << latex_basename + "_content"
-         << "}" << endl
+  output << R"(\include{)" << latex_basename + "_content" << "}" << endl
          << R"(\end{document})" << endl;
 
   output.close();
diff --git a/src/ModelTree.hh b/src/ModelTree.hh
index 4642f8d667a30ef92d430c34275e8d2dfc1d24c7..8733d9afca601e9217004d297e0b5f8150acff6f 100644
--- a/src/ModelTree.hh
+++ b/src/ModelTree.hh
@@ -1001,9 +1001,8 @@ ModelTree::writeModelCFile(const string& basename, const string& mexext,
 
   const filesystem::path model_src_dir {filesystem::path {basename} / "model" / "src"};
 
-  auto [d_output, tt_output] = writeModelFileHelper < dynamic
-                                   ? ExprNodeOutputType::CDynamicModel
-                                   : ExprNodeOutputType::CStaticModel > ();
+  auto [d_output, tt_output] = writeModelFileHelper<dynamic ? ExprNodeOutputType::CDynamicModel
+                                                            : ExprNodeOutputType::CStaticModel>();
   vector<filesystem::path> header_files, object_files;
 
   // TODO: when C++20 support is complete, mark the following strings constexpr
@@ -2410,9 +2409,9 @@ template<bool dynamic>
 void
 ModelTree::writeSparseModelJuliaFiles(const string& basename) const
 {
-  auto [d_sparse_output, tt_sparse_output] = writeModelFileHelper < dynamic
-                                                 ? ExprNodeOutputType::juliaSparseDynamicModel
-                                                 : ExprNodeOutputType::juliaSparseStaticModel > ();
+  auto [d_sparse_output, tt_sparse_output]
+      = writeModelFileHelper<dynamic ? ExprNodeOutputType::juliaSparseDynamicModel
+                                     : ExprNodeOutputType::juliaSparseStaticModel>();
 
   filesystem::path julia_dir {filesystem::path {basename} / "model" / "julia"};
   // TODO: when C++20 support is complete, mark the following strings constexpr
diff --git a/src/Shocks.hh b/src/Shocks.hh
index 9378f246dcf947f3448ae26f3a6dcc8603bfd64f..b55c9936dd80372dd787f38e78669a49e18cd6e8 100644
--- a/src/Shocks.hh
+++ b/src/Shocks.hh
@@ -37,7 +37,7 @@ public:
   using det_shocks_t = map<int, vector<tuple<int, int, expr_t>>>;
   enum class ShockType
   {
-    level, // The value is the level of the exogenous (“values” statement in “shocks”)
+    level,               // The value is the level of the exogenous (“values” statement in “shocks”)
     multiplySteadyState, // The value is the ratio of the exogenous over its (terminal) steady state
                          // (“values” statement in “mshocks”)
     multiplyInitialSteadyState // The value is the ratio of the exogenous over its initial steady
@@ -128,8 +128,8 @@ public:
   enum class LearntShockType
   {
     level, // The value is the level of the exogenous (“values” statement in “shocks(learnt_in=…)”)
-    add,      // The value is the additive change of the exogenous compared to previous information
-              // period (“add” statement in “shocks(learnt_in=…)”)
+    add,   // The value is the additive change of the exogenous compared to previous information
+           // period (“add” statement in “shocks(learnt_in=…)”)
     multiply, // The value is the multiplicative change of the exogenous compared to previous
               // information period (“multiply” statement in “shocks(learnt_in=…)”)
     multiplySteadyState, // The value is the ratio of the exogenous over its (terminal) steady state