diff --git a/Framework/Algorithms/src/Rebin2D.cpp b/Framework/Algorithms/src/Rebin2D.cpp
index 1e8edf6919f5f437e60c8a955522d98cd61f89d1..f1a38bd712b34dd0db9fb87f34706c422c88e7db 100644
--- a/Framework/Algorithms/src/Rebin2D.cpp
+++ b/Framework/Algorithms/src/Rebin2D.cpp
@@ -15,7 +15,6 @@
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/VectorHelper.h"
 
-
 namespace Mantid {
 namespace Algorithms {
 
diff --git a/Framework/Algorithms/src/ResampleX.cpp b/Framework/Algorithms/src/ResampleX.cpp
index 6e2741a75ac990d940ca322d218c8dd476fa6397..f59588bf5b15015512618061bcad2f76bfac17bf 100644
--- a/Framework/Algorithms/src/ResampleX.cpp
+++ b/Framework/Algorithms/src/ResampleX.cpp
@@ -6,7 +6,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/VectorHelper.h"
 
-
 #include <sstream>
 
 namespace Mantid {
diff --git a/Framework/Algorithms/src/Stitch1D.cpp b/Framework/Algorithms/src/Stitch1D.cpp
index 55226f5a4a7aaf1fd6b270bdf7584235e8aa51c0..962fd45b7634ebba4519b190d423d96ca4ae238a 100644
--- a/Framework/Algorithms/src/Stitch1D.cpp
+++ b/Framework/Algorithms/src/Stitch1D.cpp
@@ -573,8 +573,7 @@ void Stitch1D::exec() {
     }
     scaleFactor = ratio->readY(0).front();
     errorScaleFactor = ratio->readE(0).front();
-    if (scaleFactor < 1e-2 || scaleFactor > 1e2 ||
-        std::isnan(scaleFactor)) {
+    if (scaleFactor < 1e-2 || scaleFactor > 1e2 || std::isnan(scaleFactor)) {
       std::stringstream messageBuffer;
       messageBuffer << "Stitch1D calculated scale factor is: " << scaleFactor
                     << ". Check that in both input workspaces the integrated "
diff --git a/Framework/Algorithms/test/PDFFourierTransformTest.h b/Framework/Algorithms/test/PDFFourierTransformTest.h
index 3e5de969f913d9794418e2c1f9ff39f7eea2ec5b..f50088bedd486fd8fe1ca9b1ff9f82383828201b 100644
--- a/Framework/Algorithms/test/PDFFourierTransformTest.h
+++ b/Framework/Algorithms/test/PDFFourierTransformTest.h
@@ -116,7 +116,8 @@ public:
     TS_ASSERT_DELTA(R[249], 2.5, 0.0001);
     // make sure that nan didn' slip in
     TS_ASSERT(std::find_if(GofR.begin(), GofR.end(),
-                           static_cast<bool (*)(double)>(std::isnan)) == GofR.end());
+                           static_cast<bool (*)(double)>(std::isnan)) ==
+              GofR.end());
   }
 
   void test_filter() {
diff --git a/Framework/Algorithms/test/Stitch1DTest.h b/Framework/Algorithms/test/Stitch1DTest.h
index d1094836d2e180630f97f3d4433adb12855987ef..040417fc8fcd700355f8277c6f085247cbc63ccb 100644
--- a/Framework/Algorithms/test/Stitch1DTest.h
+++ b/Framework/Algorithms/test/Stitch1DTest.h
@@ -626,8 +626,7 @@ public:
 
     double scaleFactor = ret.get<1>();
 
-    TSM_ASSERT("ScaleFactor should not be NAN",
-               !std::isnan(scaleFactor));
+    TSM_ASSERT("ScaleFactor should not be NAN", !std::isnan(scaleFactor));
   }
 
   void test_patch_inf_y_value_for_scaling() {
@@ -656,8 +655,7 @@ public:
 
     double scaleFactor = ret.get<1>();
 
-    TSM_ASSERT("ScaleFactor should not be Infinity",
-               !std::isinf(scaleFactor));
+    TSM_ASSERT("ScaleFactor should not be Infinity", !std::isinf(scaleFactor));
   }
 
   void test_reset_nans() {
@@ -687,8 +685,7 @@ public:
     MatrixWorkspace_sptr outWs = ret.get<0>();
     double scaleFactor = ret.get<1>();
 
-    TSM_ASSERT("ScaleFactor should not be Infinity",
-               !std::isinf(scaleFactor));
+    TSM_ASSERT("ScaleFactor should not be Infinity", !std::isinf(scaleFactor));
 
     auto outY = outWs->readY(0);
     TSM_ASSERT("Nans should be put back", std::isnan(outY[0]));
diff --git a/Framework/CurveFitting/src/FitMW.cpp b/Framework/CurveFitting/src/FitMW.cpp
index 2fc16c200b3fd31ef8a89f37c58845a169e758a4..32e1cde460f53d1563e531394fcde0305ffa3ffc 100644
--- a/Framework/CurveFitting/src/FitMW.cpp
+++ b/Framework/CurveFitting/src/FitMW.cpp
@@ -187,7 +187,7 @@ void FitMW::createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
     {
       if (!m_ignoreInvalidData)
         throw std::runtime_error("Infinte number or NaN found in input data.");
-      y = 0.0; // leaving inf or nan would break the fit
+      y = 0.0;                        // leaving inf or nan would break the fit
     } else if (!std::isfinite(error)) // nan or inf error
     {
       if (!m_ignoreInvalidData)
diff --git a/Framework/CurveFitting/src/HistogramDomainCreator.cpp b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
index 4eee8eb2ec5e1a34f68179acae248a76e2fcd4d0..0b146233787b39863f773204a041a65770c72c79 100644
--- a/Framework/CurveFitting/src/HistogramDomainCreator.cpp
+++ b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
@@ -88,7 +88,7 @@ void HistogramDomainCreator::createDomain(
     {
       if (!m_ignoreInvalidData)
         throw std::runtime_error("Infinte number or NaN found in input data.");
-      y = 0.0; // leaving inf or nan would break the fit
+      y = 0.0;                        // leaving inf or nan would break the fit
     } else if (!std::isfinite(error)) // nan or inf error
     {
       if (!m_ignoreInvalidData)
diff --git a/MantidQt/MantidWidgets/src/InstrumentView/RotationSurface.cpp b/MantidQt/MantidWidgets/src/InstrumentView/RotationSurface.cpp
index 355776936ad0a87dc9421370b70f47e18d44a931..3efd92014dfb5a5a8fabf494fe699b9a3789bec6 100644
--- a/MantidQt/MantidWidgets/src/InstrumentView/RotationSurface.cpp
+++ b/MantidQt/MantidWidgets/src/InstrumentView/RotationSurface.cpp
@@ -166,7 +166,7 @@ void RotationSurface::init() {
                           }
                           du = m_width_max;
                         }
-                        if (m_height_max > dv && std::isfinite( m_height_max)) {
+                        if (m_height_max > dv && std::isfinite(m_height_max)) {
                           if (dv > 0 && !(dV >= m_height_max)) {
                             m_height_max = dV;
                           }