diff --git a/roofit/xroofit/inc/RooFit/xRooFit/Config.h b/roofit/xroofit/inc/RooFit/xRooFit/Config.h
index 759c0677d15bc..c79b4b3924355 100644
--- a/roofit/xroofit/inc/RooFit/xRooFit/Config.h
+++ b/roofit/xroofit/inc/RooFit/xRooFit/Config.h
@@ -23,9 +23,11 @@
 #ifdef XROOFIT_NAMESPACE
 #define BEGIN_XROOFIT_NAMESPACE namespace XROOFIT_NAMESPACE {
 #define END_XROOFIT_NAMESPACE } // namespace XROOFIT_NAMESPACE
+#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
 #else
 #define BEGIN_XROOFIT_NAMESPACE
 #define END_XROOFIT_NAMESPACE
+#define XROOFIT_NAMESPACE_NAME
 #endif
 
 #endif
diff --git a/roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h b/roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h
index 922518e055144..c83b180097f2a 100644
--- a/roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h
+++ b/roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h
@@ -514,13 +514,7 @@ class xRooNLLVar : public std::shared_ptr<RooAbsReal> {
 
 END_XROOFIT_NAMESPACE
 
-#ifndef XROOFIT_NAMESPACE_NAME
-#ifdef XROOFIT_NAMESPACE
-#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
-#else
-#define XROOFIT_NAMESPACE_NAME
-#endif
-#endif
+
 namespace cling {
 std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError *val);
 std::string printValue(const std::map<std::string, XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError> *m);
diff --git a/roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h b/roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h
index ee7c213968ca1..0b8368bd8c4a5 100644
--- a/roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h
+++ b/roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h
@@ -559,13 +559,7 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {
 
 END_XROOFIT_NAMESPACE
 
-#ifndef XROOFIT_NAMESPACE_NAME
-#ifdef XROOFIT_NAMESPACE
-#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
-#else
-#define XROOFIT_NAMESPACE_NAME
-#endif
-#endif
+
 namespace cling {
 std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNode *val);
 }
diff --git a/roofit/xroofit/src/xRooHypoSpace.cxx b/roofit/xroofit/src/xRooHypoSpace.cxx
index e8a0714f4f898..aae34bbd95f73 100644
--- a/roofit/xroofit/src/xRooHypoSpace.cxx
+++ b/roofit/xroofit/src/xRooHypoSpace.cxx
@@ -910,8 +910,8 @@ std::shared_ptr<TGraphErrors> xRooNLLVar::xRooHypoSpace::graph(
          out->GetListOfFunctions()->Add(x, "F");
          x = out->Clone("down");
          x->SetBit(kCanDelete);
-         dynamic_cast<TAttFill*>(x)->SetFillColor(kBlack);
-         dynamic_cast<TAttFill*>(x)->SetFillStyle(nSigma == 2 ? 3005 : 3004);
+         dynamic_cast<TAttFill *>(x)->SetFillColor(kBlack);
+         dynamic_cast<TAttFill *>(x)->SetFillStyle(nSigma == 2 ? 3005 : 3004);
          out->GetListOfFunctions()->Add(x, "F");
       }
       if (sOpt.Contains("ts")) {
@@ -1017,19 +1017,21 @@ std::shared_ptr<TGraphErrors> xRooNLLVar::xRooHypoSpace::graph(
       for (int i = 0; i < out->GetN(); i++) {
          if (i < out->GetN() - nPointsDown) {
             up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) + out->GetErrorY(i) * (above ? 1. : -1.));
-            //down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
+            // down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. :
+            // -1.));
          } else {
-            //up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
+            // up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
             down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) + out->GetErrorY(i) * (above ? 1. : -1.));
          }
       }
       // now go back round in reverse
-      for (int i = out->GetN()-1; i >= 0; i--) {
+      for (int i = out->GetN() - 1; i >= 0; i--) {
          if (i < out->GetN() - nPointsDown) {
             up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
-            //down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
+            // down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. :
+            // -1.));
          } else {
-            //up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
+            // up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
             down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
          }
       }