diff --git a/Framework/Algorithms/src/FindPeakBackground.cpp b/Framework/Algorithms/src/FindPeakBackground.cpp
index 8884e017d58c4ba64246a68f03f15e22e53c3d0d..04408b05d9d0c5ba46cfb45b2dac572c52aebedc 100644
--- a/Framework/Algorithms/src/FindPeakBackground.cpp
+++ b/Framework/Algorithms/src/FindPeakBackground.cpp
@@ -157,9 +157,9 @@ void FindPeakBackground::exec() {
     Statistics stats = getStatistics(maskedY);
     Ymean = stats.mean;
     Yvariance = stats.standard_deviation * stats.standard_deviation;
-    Ysigma = std::sqrt((moment4(maskedY, xn, Ymean) -
-                        (xn - 3.0) / (xn - 1.0) * Yvariance) /
-                       xn);
+    Ysigma = std::sqrt(
+        (moment4(maskedY, xn, Ymean) - (xn - 3.0) / (xn - 1.0) * Yvariance) /
+        xn);
     MantidVec::const_iterator it =
         std::max_element(maskedY.begin(), maskedY.end());
     const size_t pos = it - maskedY.begin();
diff --git a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
index 4ccf36c181713ade97f6829c869b01ed826bdb29..2fe6fdbe508ed8594634eede49bbbdc1189c94e0 100644
--- a/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
+++ b/Framework/CurveFitting/src/Algorithms/RefinePowderInstrumentParameters.cpp
@@ -349,8 +349,8 @@ void RefinePowderInstrumentParameters::fitInstrumentParameters() {
   // 6. Pretty screen output
   stringstream dbss;
   dbss << "************ Fit Parameter Result *************" << std::endl;
-  for (paramiter = m_FuncParameters.begin(); paramiter != m_FuncParameters.end();
-       ++paramiter) {
+  for (paramiter = m_FuncParameters.begin();
+       paramiter != m_FuncParameters.end(); ++paramiter) {
     std::string parname = paramiter->first;
     double inpparvalue = m_OrigParameters[parname];
     double parvalue = paramiter->second;
@@ -473,10 +473,11 @@ void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
 
   stringstream dbss;
   for (size_t i = 0; i < m_PeakFunctionParameterNames.size(); ++i) {
-    dbss << setw(20) << m_PeakFunctionParameterNames[i] << ": Min = " << setw(15)
-         << setprecision(6) << lowerbounds[i] << ", Max = " << setw(15)
-         << setprecision(6) << upperbounds[i] << ", Step Size = " << setw(15)
-         << setprecision(6) << stepsizes[i] << endl;
+    dbss << setw(20) << m_PeakFunctionParameterNames[i]
+         << ": Min = " << setw(15) << setprecision(6) << lowerbounds[i]
+         << ", Max = " << setw(15) << setprecision(6) << upperbounds[i]
+         << ", Step Size = " << setw(15) << setprecision(6) << stepsizes[i]
+         << endl;
   }
   g_log.notice() << "Monte Carlo Parameters: " << endl
                  << dbss.str();
@@ -510,7 +511,7 @@ void RefinePowderInstrumentParameters::refineInstrumentParametersMC(
     // a. Set the function with the
     for (size_t j = 0; j < m_PeakFunctionParameterNames.size(); ++j) {
       m_Function->setParameter(m_PeakFunctionParameterNames[j],
-                              m_BestFitParameters[i].second[j]);
+                               m_BestFitParameters[i].second[j]);
     }
 
     // b. Calculate
@@ -946,8 +947,8 @@ void RefinePowderInstrumentParameters::genPeaksFromTable(
 
     m_PeakErrors.insert(make_pair(hkl, chi2));
 
-    g_log.information() << "[Generatem_Peaks] Peak " << ir << " HKL = [" << hkl[0]
-                        << ", " << hkl[1] << ", " << hkl[2]
+    g_log.information() << "[Generatem_Peaks] Peak " << ir << " HKL = ["
+                        << hkl[0] << ", " << hkl[1] << ", " << hkl[2]
                         << "], Input Center = " << setw(10) << setprecision(6)
                         << newpeak.centre() << endl;
 
diff --git a/Framework/ICat/src/GSoap/stdsoap2.cpp b/Framework/ICat/src/GSoap/stdsoap2.cpp
index 78c5d975fe5f612616f50e8be4e5fb32dc381ceb..7a966fb7a437dd7c1b35655b223446dc0506e1f8 100644
--- a/Framework/ICat/src/GSoap/stdsoap2.cpp
+++ b/Framework/ICat/src/GSoap/stdsoap2.cpp
@@ -8191,7 +8191,7 @@ void *SOAP_FMAC2 soap_id_lookup(struct soap *soap, const char *id, void **p,
         void **tmp = (void **)soap_malloc(soap, sizeof(void *));
         if (!tmp)
           return NULL;
-        *r = (void*)tmp;
+        *r = (void *)tmp;
 
         s = *q;
         *q = *r;
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index a81ed00b7ac3bc8a63376c7f4c1368e44accebb3..372e9b1ad95a59e2852b7522d4b4e3602fc6a41b 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -126,7 +126,8 @@ Integrate3DEvents::ellipseIntegrateEvents(
 
   auto pos = m_event_lists.find(hkl_key);
   if (m_event_lists.end() == pos)
-    return boost::make_shared<NoShape>();;
+    return boost::make_shared<NoShape>();
+  ;
 
   std::vector<std::pair<double, V3D>> &some_events = pos->second;