diff --git a/include/clad/Differentiator/DiffPlanner.h b/include/clad/Differentiator/DiffPlanner.h
index f3da627bd..aabff5210 100644
--- a/include/clad/Differentiator/DiffPlanner.h
+++ b/include/clad/Differentiator/DiffPlanner.h
@@ -7,8 +7,8 @@
 #include "clad/Differentiator/DynamicGraph.h"
 #include "clad/Differentiator/ParseDiffArgsTypes.h"
 
-#include <set>
 #include <iterator>
+#include <set>
 namespace clang {
 class CallExpr;
 class CompilerInstance;
diff --git a/lib/Differentiator/ActivityAnalyzer.cpp b/lib/Differentiator/ActivityAnalyzer.cpp
index d7db58d4e..613315c2b 100644
--- a/lib/Differentiator/ActivityAnalyzer.cpp
+++ b/lib/Differentiator/ActivityAnalyzer.cpp
@@ -49,9 +49,8 @@ void VariedAnalyzer::VisitCFGBlock(const CFGBlock& block) {
       continue;
     auto& succData = m_BlockData[succ->getBlockID()];
 
-    if (!succData) {
+    if (!succData)
       succData = new VarsData(*m_BlockData[block.getBlockID()]);
-    }
     bool m_shouldPushSucc = true;
     if (succ->getBlockID() > block.getBlockID()) {
       if (m_LoopMem == *m_BlockData[block.getBlockID()])
@@ -116,21 +115,21 @@ bool VariedAnalyzer::VisitConditionalOperator(ConditionalOperator* CO) {
 }
 
 bool VariedAnalyzer::VisitCallExpr(CallExpr* CE) {
-  FunctionDecl* FD = CE->getDirectCallee(); 
+  FunctionDecl* FD = CE->getDirectCallee();
   bool noHiddenParam = (CE->getNumArgs() == FD->getNumParams());
   std::set<const clang::VarDecl*> variedParam;
-  if(noHiddenParam){
-    MutableArrayRef<ParmVarDecl *> FDparam = FD->parameters();
-    for (std::size_t i = 0, e = CE->getNumArgs(); i != e; ++i){
+  if (noHiddenParam) {
+    MutableArrayRef<ParmVarDecl*> FDparam = FD->parameters();
+    for (std::size_t i = 0, e = CE->getNumArgs(); i != e; ++i) {
       clang::Expr* par = CE->getArg(i);
       TraverseStmt(par);
-      if(m_Varied == true){
+      if (m_Varied == true) {
         m_VariedDecls.insert(FDparam[i]);
         m_Varied = false;
       }
     }
   }
-  return true; 
+  return true;
 }
 
 bool VariedAnalyzer::VisitDeclStmt(DeclStmt* DS) {
diff --git a/lib/Differentiator/ReverseModeVisitor.cpp b/lib/Differentiator/ReverseModeVisitor.cpp
index 534232339..aeec0c615 100644
--- a/lib/Differentiator/ReverseModeVisitor.cpp
+++ b/lib/Differentiator/ReverseModeVisitor.cpp
@@ -1737,7 +1737,8 @@ Expr* getArraySizeExpr(const ArrayType* AT, ASTContext& context,
       // We do not need to create result arg for arguments passed by reference
       // because the derivatives of arguments passed by reference are directly
       // modified by the derived callee function.
-      if (utils::IsReferenceOrPointerArg(arg) || !m_DiffReq.shouldHaveAdjoint(PVD)) {
+      if (utils::IsReferenceOrPointerArg(arg) ||
+          !m_DiffReq.shouldHaveAdjoint(PVD)) {
         argDiff = Visit(arg);
         CallArgDx.push_back(argDiff.getExpr_dx());
       } else {
@@ -1950,7 +1951,8 @@ Expr* getArraySizeExpr(const ArrayType* AT, ASTContext& context,
         // Silence diag outputs in nested derivation process.
         pullbackRequest.VerboseDiags = false;
         pullbackRequest.EnableTBRAnalysis = m_DiffReq.EnableTBRAnalysis;
-        pullbackRequest.EnableActivityAnalysis = m_DiffReq.EnableActivityAnalysis;
+        pullbackRequest.EnableActivityAnalysis =
+            m_DiffReq.EnableActivityAnalysis;
         bool isaMethod = isa<CXXMethodDecl>(FD);
         for (size_t i = 0, e = FD->getNumParams(); i < e; ++i)
           if (MD && isLambdaCallOperator(MD)) {
@@ -2107,7 +2109,7 @@ Expr* getArraySizeExpr(const ArrayType* AT, ASTContext& context,
         const Expr* arg = CE->getArg(i);
         StmtDiff argDiff = Visit(arg);
         // Has to be removed once nondifferentiable arguments are handeled
-        if(argDiff.getStmt_dx())
+        if (argDiff.getStmt_dx())
           CallArgs.push_back(argDiff.getExpr_dx());
         else
           CallArgs.push_back(getZeroInit(arg->getType()));