diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc
index e73f289299318d2eb87d220e01e5b98745f6d06f..bc0cebf6088e713108fece5592c0ba2a815c16c6 100644
--- a/src/ComputingTasks.cc
+++ b/src/ComputingTasks.cc
@@ -764,8 +764,8 @@ RamseyModelStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsol
   /* Fill in option_order of mod_file_struct
      Since ramsey model needs one further order of derivation (for example, for 1st order
      approximation, it needs 2nd derivatives), we add 1 to the order declared by user */
-  auto it = options_list.num_options.find("order");
-  if (it != options_list.num_options.end())
+  if (auto it = options_list.num_options.find("order");
+      it != options_list.num_options.end())
     {
       int order = stoi(it->second);
       if (order > 2)
@@ -777,13 +777,13 @@ RamseyModelStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsol
     }
 
   // Fill in mod_file_struct.partial_information
-  it = options_list.num_options.find("partial_information");
-  if (it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("partial_information");
+      it != options_list.num_options.end() && it->second == "true")
     mod_file_struct.partial_information = true;
 
   // Option k_order_solver (implicit when order >= 3)
-  it = options_list.num_options.find("k_order_solver");
-  if ((it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("k_order_solver");
+      (it != options_list.num_options.end() && it->second == "true")
       || mod_file_struct.order_option >= 3)
     mod_file_struct.k_order_solver = true;
 }
@@ -922,8 +922,8 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct, WarningConso
   /* Fill in option_order of mod_file_struct
      Since ramsey policy needs one further order of derivation (for example, for 1st order
      approximation, it needs 2nd derivatives), we add 1 to the order declared by user */
-  auto it = options_list.num_options.find("order");
-  if (it != options_list.num_options.end())
+  if (auto it = options_list.num_options.find("order");
+      it != options_list.num_options.end())
     {
       int order = stoi(it->second);
       if (order > 2)
@@ -935,13 +935,13 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct, WarningConso
     }
 
   // Fill in mod_file_struct.partial_information
-  it = options_list.num_options.find("partial_information");
-  if (it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("partial_information");
+      it != options_list.num_options.end() && it->second == "true")
     mod_file_struct.partial_information = true;
 
   // Option k_order_solver (implicit when order >= 3)
-  it = options_list.num_options.find("k_order_solver");
-  if ((it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("k_order_solver");
+      (it != options_list.num_options.end() && it->second == "true")
       || mod_file_struct.order_option >= 3)
     mod_file_struct.k_order_solver = true;
 }
@@ -1045,8 +1045,8 @@ DiscretionaryPolicyStatement::checkPass(ModFileStructure &mod_file_struct, Warni
   /* Fill in option_order of mod_file_struct
      Since discretionary policy needs one further order of derivation (for example, for 1st order
      approximation, it needs 2nd derivatives), we add 1 to the order declared by user */
-  auto it = options_list.num_options.find("order");
-  if (it != options_list.num_options.end())
+  if (auto it = options_list.num_options.find("order");
+      it != options_list.num_options.end())
     {
       int order = stoi(it->second);
       if (order > 1)
@@ -1058,13 +1058,13 @@ DiscretionaryPolicyStatement::checkPass(ModFileStructure &mod_file_struct, Warni
     }
 
   // Fill in mod_file_struct.partial_information
-  it = options_list.num_options.find("partial_information");
-  if (it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("partial_information");
+      it != options_list.num_options.end() && it->second == "true")
     mod_file_struct.partial_information = true;
 
   // Option k_order_solver (implicit when order >= 3)
-  it = options_list.num_options.find("k_order_solver");
-  if ((it != options_list.num_options.end() && it->second == "true")
+  if (auto it = options_list.num_options.find("k_order_solver");
+      (it != options_list.num_options.end() && it->second == "true")
       || mod_file_struct.order_option >= 3)
     mod_file_struct.k_order_solver = true;
 }
diff --git a/src/DataTree.cc b/src/DataTree.cc
index ff7712dcfdc33bb9b179ce76aa36eb21ce217f68..d3ffb1f8a2295903e51307db1a8c0355e1a8e980 100644
--- a/src/DataTree.cc
+++ b/src/DataTree.cc
@@ -174,13 +174,13 @@ DataTree::AddPlus(expr_t iArg1, expr_t iArg2)
   if (iArg1 != Zero && iArg2 != Zero)
     {
       // Simplify x+(-y) in x-y
-      auto uarg2 = dynamic_cast<UnaryOpNode *>(iArg2);
-      if (uarg2 != nullptr && uarg2->op_code == UnaryOpcode::uminus)
+      if (auto uarg2 = dynamic_cast<UnaryOpNode *>(iArg2);
+          uarg2 && uarg2->op_code == UnaryOpcode::uminus)
         return AddMinus(iArg1, uarg2->arg);
 
       // Simplify (-x)+y in y-x
-      auto uarg1 = dynamic_cast<UnaryOpNode *>(iArg1);
-      if (uarg1 != nullptr && uarg1->op_code == UnaryOpcode::uminus)
+      if (auto uarg1 = dynamic_cast<UnaryOpNode *>(iArg1);
+          uarg1 && uarg1->op_code == UnaryOpcode::uminus)
         return AddMinus(iArg2, uarg1->arg);
 
       // To treat commutativity of "+"
@@ -219,8 +219,8 @@ DataTree::AddUMinus(expr_t iArg1)
   if (iArg1 != Zero)
     {
       // Simplify -(-x) in x
-      auto *uarg = dynamic_cast<UnaryOpNode *>(iArg1);
-      if (uarg != nullptr && uarg->op_code == UnaryOpcode::uminus)
+      if (auto uarg = dynamic_cast<UnaryOpNode *>(iArg1);
+          uarg && uarg->op_code == UnaryOpcode::uminus)
         return uarg->arg;
 
       return AddUnaryOp(UnaryOpcode::uminus, iArg1);