diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
index 35f954418..69e9542e5 100644
--- a/meta/FlexibleSUSY.m
+++ b/meta/FlexibleSUSY.m
@@ -1021,9 +1021,9 @@ corresponding tadpole is real or imaginary (only in models with CP
            WriteOut`ReplaceInFiles[files,
                        { "@alphaS1Lmatching@"        -> IndentText[IndentText[WrapLines[alphaS1Lmatching]]],
                          "@alphaEM1Lmatching@"       -> IndentText[IndentText[WrapLines[alphaEM1Lmatching]]],
-                         "@setRunningUpQuarkMasses@" -> IndentText[IndentText[setRunningUpQuarkMasses]],
-                         "@setRunningDownQuarkMasses@" -> IndentText[IndentText[setRunningDownQuarkMasses]],
-                         "@setRunningDownLeptonMasses@" -> IndentText[IndentText[setRunningDownLeptonMasses]],
+                         "@setRunningUpQuarkMasses@" -> IndentText[setRunningUpQuarkMasses],
+                         "@setRunningDownQuarkMasses@" -> IndentText[setRunningDownQuarkMasses],
+                         "@setRunningDownLeptonMasses@" -> IndentText[setRunningDownLeptonMasses],
                          "@setYukawas@"              -> IndentText[WrapLines[setYukawas]],
                          "@applyUserMatching@"       -> IndentText[IndentText[WrapLines[userMatching]]],
                          "@callAllSMPoleMassFunctions@" -> IndentText[callAllSMPoleMassFunctions],
diff --git a/templates/standard_model_matching.cpp.in b/templates/standard_model_matching.cpp.in
index 42212c08f..9b59db37d 100644
--- a/templates/standard_model_matching.cpp.in
+++ b/templates/standard_model_matching.cpp.in
@@ -233,10 +233,11 @@ namespace {
 
 double calculate_delta_alpha_em(double alpha_em, const @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
 {
-   const double currentScale = model.get_scale();
    double delta_alpha_em = 0.;
 
    if (loop_order > 0) {
+      const double currentScale = model.get_scale();
+
 @alphaEM1Lmatching@
    }
 
@@ -245,93 +246,66 @@ double calculate_delta_alpha_em(double alpha_em, const @ModelName@_mass_eigensta
 
 double calculate_delta_alpha_s(double alpha_s, const @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
 {
-   const double currentScale = model.get_scale();
    double delta_alpha_s = 0.;
 
    if (loop_order > 0) {
+      const double currentScale = model.get_scale();
+
 @alphaS1Lmatching@
    }
 
    return delta_alpha_s;
 }
 
-Eigen::Matrix<double,3,3> calculate_MFu_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
+Eigen::Matrix<double,3,3> calculate_MFu_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model)
 {
    Eigen::Matrix<double,3,3> upQuarksDRbar = ZEROMATRIX(3,3);
 
-   if (loop_order == 0) {
-      upQuarksDRbar.diagonal() = sm.get_MFu();
-   } else {
 @setRunningUpQuarkMasses@
-   }
 
    return upQuarksDRbar;
 }
 
-Eigen::Matrix<double,3,3> calculate_MFd_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
+Eigen::Matrix<double,3,3> calculate_MFd_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model)
 {
    Eigen::Matrix<double,3,3> downQuarksDRbar = ZEROMATRIX(3,3);
 
-   if (loop_order == 0) {
-      downQuarksDRbar.diagonal() = sm.get_MFd();
-   } else {
 @setRunningDownQuarkMasses@
-   }
 
    return downQuarksDRbar;
 }
 
-Eigen::Matrix<double,3,3> calculate_MFe_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
+Eigen::Matrix<double,3,3> calculate_MFe_DRbar(const Standard_model& sm, const @ModelName@_mass_eigenstates& model)
 {
    Eigen::Matrix<double,3,3> downLeptonsDRbar = ZEROMATRIX(3,3);
 
-   if (loop_order == 0) {
-      downLeptonsDRbar.diagonal() = sm.get_MFe();
-   } else {
 @setRunningDownLeptonMasses@
-   }
 
    return downLeptonsDRbar;
 }
 
-double calculate_MW_DRbar(const Standard_model& sm, @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
+double calculate_MW_DRbar(const Standard_model& sm, @ModelName@_mass_eigenstates& model)
 {
-   double mw = 0.;
+   const double mw2 = Sqr(sm.get_physical().MVWp) - Sqr(model.get_physical().M@VectorW_0@) + Sqr(model.get_M@VectorW(0)@);
 
-   if (loop_order == 0) {
-      mw = sm.get_MVWp();
-   } else {
-      const double mw2 = Sqr(sm.get_physical().MVWp) - Sqr(model.get_physical().M@VectorW_0@) + Sqr(model.get_M@VectorW(0)@);
-
-      if (mw2 < 0.)
-         model.get_problems().flag_running_tachyon(@ModelName@_info::@VectorW@);
-      else
-         model.get_problems().unflag_running_tachyon(@ModelName@_info::@VectorW@);
-
-      mw = AbsSqrt(mw2);
-   }
+   if (mw2 < 0.)
+      model.get_problems().flag_running_tachyon(@ModelName@_info::@VectorW@);
+   else
+      model.get_problems().unflag_running_tachyon(@ModelName@_info::@VectorW@);
 
-   return mw;
+   return AbsSqrt(mw2);
 }
 
-double calculate_MZ_DRbar(const Standard_model& sm, @ModelName@_mass_eigenstates& model, unsigned loop_order = 1)
+double calculate_MZ_DRbar(const Standard_model& sm, @ModelName@_mass_eigenstates& model)
 {
-   double mz = 0.;
+   const double mz2 = Sqr(sm.get_physical().MVZ) - Sqr(model.get_physical().M@VectorZ_0@) + Sqr(model.get_M@VectorZ(0)@);
 
-   if (loop_order == 0) {
-      mz = sm.get_MVZ();
-   } else {
-      const double mz2 = Sqr(sm.get_physical().MVZ) - Sqr(model.get_physical().M@VectorZ_0@) + Sqr(model.get_M@VectorZ(0)@);
-
-      if (mz2 < 0.)
-         model.get_problems().flag_running_tachyon(@ModelName@_info::@VectorZ@);
-      else
-         model.get_problems().unflag_running_tachyon(@ModelName@_info::@VectorZ@);
-
-      mz = AbsSqrt(mz2);
-   }
+   if (mz2 < 0.)
+      model.get_problems().flag_running_tachyon(@ModelName@_info::@VectorZ@);
+   else
+      model.get_problems().unflag_running_tachyon(@ModelName@_info::@VectorZ@);
 
-   return mz;
+   return AbsSqrt(mz2);
 }
 
 } // anonymous namespace