diff --git a/Applications/DataHolderLib/BoundaryCondition.cpp b/Applications/DataHolderLib/BoundaryCondition.cpp
index c5b4abbae49fc9123c6c9276baaa109e54acaa38..06d5ecd2f954a19b9d67e350019e974182ae48fd 100644
--- a/Applications/DataHolderLib/BoundaryCondition.cpp
+++ b/Applications/DataHolderLib/BoundaryCondition.cpp
@@ -28,11 +28,11 @@ BoundaryCondition::ConditionType BoundaryCondition::convertStringToType(
     {
         return ConditionType::DIRICHLET;
     }
-    else if (str == "Neumann")
+    if (str == "Neumann")
     {
         return ConditionType::NEUMANN;
     }
-    else if (str == "Robin")
+    if (str == "Robin")
     {
         return ConditionType::ROBIN;
     }
@@ -46,11 +46,11 @@ std::string BoundaryCondition::convertTypeToString(ConditionType type)
     {
         return "Dirichlet";
     }
-    else if (type == ConditionType::NEUMANN)
+    if (type == ConditionType::NEUMANN)
     {
         return "Neumann";
     }
-    else if (type == ConditionType::ROBIN)
+    if (type == ConditionType::ROBIN)
     {
         return "Robin";
     }
diff --git a/MaterialLib/Fluid/Density/LinearConcentrationAndPressureDependentDensity.h b/MaterialLib/Fluid/Density/LinearConcentrationAndPressureDependentDensity.h
index 963be12861fd91fd9527279fe11c36b76e8ee59e..dbf8f02b8b24d55c32ceffb8164dd023fa11f6e1 100644
--- a/MaterialLib/Fluid/Density/LinearConcentrationAndPressureDependentDensity.h
+++ b/MaterialLib/Fluid/Density/LinearConcentrationAndPressureDependentDensity.h
@@ -93,10 +93,7 @@ public:
             return _reference_density *
                    _fluid_density_pressure_difference_ratio;
         }
-        else
-        {
-            return 0;
-        }
+        return 0;
     }
 
 private:
diff --git a/MathLib/KelvinVector.cpp b/MathLib/KelvinVector.cpp
index 49fba2c3897ebf7e27d2829b7380b735b1448f02..575b03344031bebf6ca917ccd6c46cab4c623efe 100644
--- a/MathLib/KelvinVector.cpp
+++ b/MathLib/KelvinVector.cpp
@@ -173,13 +173,10 @@ kelvinVectorToSymmetricTensor(Eigen::Matrix<double,
     {
         return kelvinVectorToSymmetricTensor<6>(v);
     }
-    else
-    {
-        OGS_FATAL(
-            "Kelvin vector to tensor conversion expected an input vector of "
-            "size 4 or 6, but a vector of size %d was given.",
-            v.size());
-    }
+    OGS_FATAL(
+        "Kelvin vector to tensor conversion expected an input vector of size 4 "
+        "or 6, but a vector of size %d was given.",
+        v.size());
 }
 }  // namespace KelvinVector
 }  // namespace MathLib
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index 36172c27fcfcf04cf1a479409ef8329d163ab79b..e682adc78a24a65c13a53a040c2cb12a41da1e0d 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -190,7 +190,7 @@ public:
         {
             return setEpsilon(values);
         }
-        else if (name == "epsilon_m_ip")
+        if (name == "epsilon_m_ip")
         {
             return setEpsilonMechanical(values);
         }