diff --git a/Framework/API/src/ExperimentInfo.cpp b/Framework/API/src/ExperimentInfo.cpp
index 7f5f9dc95975d504181eeae63433b59e22333b8d..3ddd52bfdf0bbefe09fb0864bbf10fd4f1ba0e93 100644
--- a/Framework/API/src/ExperimentInfo.cpp
+++ b/Framework/API/src/ExperimentInfo.cpp
@@ -1149,7 +1149,7 @@ void ExperimentInfo::readParameterMap(const std::string &parameterStr) {
     // if( comp_name == prev_name ) continue; this blocks reading in different
     // parameters of the same component. RNT
     // prev_name = comp_name;
-    const Geometry::IComponent *comp = nullptr;
+    const Geometry::IComponent *comp = NULL;
     if (comp_name.find("detID:") != std::string::npos) {
       int detID = atoi(comp_name.substr(6).c_str());
       comp = instr->getDetector(detID).get();
diff --git a/Framework/API/src/WorkspaceOpOverloads.cpp b/Framework/API/src/WorkspaceOpOverloads.cpp
index b333686ed2b0c22b56f39c90f3b41193af494518..f29bca1ca5fe27a3bd029a203c5169e2eb8c3897 100644
--- a/Framework/API/src/WorkspaceOpOverloads.cpp
+++ b/Framework/API/src/WorkspaceOpOverloads.cpp
@@ -76,9 +76,8 @@ ResultType executeBinaryOperation(const std::string &algorithmName,
   if (child) {
     return alg->getProperty("OutputWorkspace");
   } else {
-    API::Workspace_sptr result =
-        API::AnalysisDataService::Instance().retrieve(
-            alg->getPropertyValue("OutputWorkspace"));
+    API::Workspace_sptr result = API::AnalysisDataService::Instance().retrieve(
+        alg->getPropertyValue("OutputWorkspace"));
     return boost::dynamic_pointer_cast<typename ResultType::element_type>(
         result);
   }
@@ -511,7 +510,8 @@ bool WorkspaceHelpers::matchingBins(const MatrixWorkspace_const_sptr ws1,
           return false;
       }
     } else if (std::abs(firstWSLoop - secondWSLoop) /
-                   std::max<double>(std::abs(firstWSLoop), std::abs(secondWSLoop)) >
+                   std::max<double>(std::abs(firstWSLoop),
+                                    std::abs(secondWSLoop)) >
                1.0E-7)
       return false;
   }
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index d65a6070081eee4ce1ef8ee0175de86a6f7937ba..8a499988135764aab495cdd5a00cc597532619eb 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -168,11 +168,10 @@ void CorelliCrossCorrelate::exec() {
   // Determine period from chopper frequency.
   auto motorSpeed = dynamic_cast<TimeSeriesProperty<double> *>(
       inputWS->run().getProperty("BL9:Chop:Skf4:MotorSpeed"));
-  if (!motorSpeed)
-  {
+  if (!motorSpeed) {
     throw Exception::NotFoundError(
-      "Could not find a log value for the motor speed",
-      "BL9:Chop:Skf4:MotorSpeed");
+        "Could not find a log value for the motor speed",
+        "BL9:Chop:Skf4:MotorSpeed");
   }
   double period = 1e9 / static_cast<double>(motorSpeed->timeAverageValue());
   g_log.information() << "Frequency = " << 1e9 / period
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
index 2977bb77d42aa3f9af6626005966e7d6078c856b..21d6e9af3d6c32ae3b6a07aa2cd14487ad0aac60 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
@@ -341,7 +341,7 @@ void LeBailFit::exec() {
   case FIT:
     // LeBail Fit
     g_log.notice() << "Function: Do LeBail Fit ==> Monte Carlo.\n";
-    //fall through
+  // fall through
   case MONTECARLO:
     // Monte carlo Le Bail refinement
     g_log.notice("Function: Do LeBail Fit By Monte Carlo Random Walk.");
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 0afb9419bd2e7c49d6ed18379cc2c65c0ba4ed94..8dfbd6d9421904169c2016b3f5f11279c626469a 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -528,7 +528,7 @@ EventList &EventList::operator-=(const EventList &more_events) {
     this->clearData();
     return *this;
   }
-   
+
   // We'll let the -= operator for the given vector of event lists handle it
   switch (this->getEventType()) {
   case TOF:
diff --git a/Framework/MDAlgorithms/src/FindPeaksMD.cpp b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
index 988f5b7f2976b2c95365d6eaf9fb091890856e2f..ba70dd4bedd2239fcf40c699cdac43d92045abe3 100644
--- a/Framework/MDAlgorithms/src/FindPeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
@@ -221,9 +221,9 @@ FindPeaksMD::createPeak(const Mantid::Kernel::V3D &Q, const double binCount) {
   } else if (dimType == QSAMPLE) {
     // Build using the Q-sample-frame constructor
     p = boost::make_shared<Peak>(inst, Q, m_goniometer);
-  } else  {
+  } else {
     throw std::invalid_argument(
-      "Cannot Integrate peaks unless the dimension is QLAB or QSAMPLE");
+        "Cannot Integrate peaks unless the dimension is QLAB or QSAMPLE");
   }
 
   try { // Look for a detector