diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h b/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
index 3dc876fd471557539e6ec075941109107cf8957a..e302a160a27dbc123a458a28c8beb4a0b56d70fa 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
@@ -35,9 +35,10 @@ namespace DataObjects {
 */
 class DLLExport MDFramesToSpecialCoordinateSystem {
 public:
-  MDFramesToSpecialCoordinateSystem ();
-  ~MDFramesToSpecialCoordinateSystem ();
-  boost::optional<Mantid::Kernel::SpecialCoordinateSystem> operator()(const Mantid::API::IMDWorkspace* workspace) const;
+  MDFramesToSpecialCoordinateSystem();
+  ~MDFramesToSpecialCoordinateSystem();
+  boost::optional<Mantid::Kernel::SpecialCoordinateSystem>
+  operator()(const Mantid::API::IMDWorkspace *workspace) const;
 
 private:
   Mantid::Kernel::SpecialCoordinateSystem extractCoordinateSystem(
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
index 9b2234b52679aaeec91469ab7ab27d8f377197c4..35f424eecc120c80cf85a1f0f6f7d9f15804d563 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
@@ -41,7 +41,8 @@ public:
   virtual const Mantid::Kernel::MDUnit &getMDUnit() const = 0;
   virtual bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const = 0;
   virtual std::string name() const = 0;
-  virtual Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const= 0;
+  virtual Mantid::Kernel::SpecialCoordinateSystem
+  equivalientSpecialCoordinateSystem() const = 0;
   virtual MDFrame *clone() const = 0;
   virtual ~MDFrame() {}
 };
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
index bf09984478c88739e97cc4513a98c2b6e96cc3b9..d39e786edbe6a90181c8f8014388e78dcdba2b6c 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
@@ -108,7 +108,6 @@ public:
   bool canInterpret(const MDFrameArgument &argument) const;
 };
 
-
 /// Make a complete factory chain
 MDFrameFactory_uptr MANTID_GEOMETRY_DLL makeMDFrameFactoryChain();
 
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
index e4876d85455da93a2d2c5305058a3c9a90e0e971..b1f79d2c1cb41646d1d8b82938142751a5cdc8d4 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
@@ -34,9 +34,8 @@ public:
   MDHistoDimension(std::string name, std::string ID,
                    const Kernel::UnitLabel &units, coord_t min, coord_t max,
                    size_t numBins)
-      : m_name(name), m_dimensionId(ID),
-        m_frame(new UnknownFrame(units)), m_min(min),
-        m_max(max), m_numBins(numBins),
+      : m_name(name), m_dimensionId(ID), m_frame(new UnknownFrame(units)),
+        m_min(min), m_max(max), m_numBins(numBins),
         m_binWidth((max - min) / static_cast<coord_t>(numBins)) {
     if (max < min) {
       throw std::invalid_argument("Error making MDHistoDimension. Cannot have "
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
index c3427e7983827a34a92284c32a171f0e3b548bf9..2500e39c6f7de98158dfc38f4f65eb2e928e3298 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
@@ -40,13 +40,15 @@ public:
   UnknownFrame(const Kernel::UnitLabel &unit);
   virtual ~UnknownFrame();
   std::string name() const;
-  bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const ;
+  bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
   Mantid::Kernel::UnitLabel getUnitLabel() const;
   const Mantid::Kernel::MDUnit &getMDUnit() const;
-  Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const;
+  Mantid::Kernel::SpecialCoordinateSystem
+  equivalientSpecialCoordinateSystem() const;
   UnknownFrame *clone() const;
   // Type name
   static const std::string UnknownFrameName;
+
 private:
   /// Label unit
   const std::unique_ptr<Mantid::Kernel::MDUnit> m_unit;
diff --git a/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp b/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
index 5cc6910e079fb51d5120f71b51764f6f89e0f16b..2726cddd92ce9f6389b68c8c1ae144ace1ad2be5 100644
--- a/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
@@ -65,8 +65,7 @@ bool HKLFrameFactory::canInterpret(const MDFrameArgument &argument) const {
   return argument.frameString == HKL::HKLName && compatibleUnit;
 }
 
-
-UnknownFrame*
+UnknownFrame *
 UnknownFrameFactory::createRaw(const MDFrameArgument &argument) const {
   using namespace Mantid::Kernel;
 
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
index d488cc726753782210081b3c98a5ee17bd6e3e7b..184efffe6ee9c0e8fd0945109f78f93c2077a2a8 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
@@ -215,7 +215,8 @@ makeAnyMDEWWithFrames(size_t splitInto, coord_t min, coord_t max,
   auto out = createOutputWorkspace<MDE, nd>(splitInto);
 
   // Add standard dimensions
-  addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat, axisIdFormat);
+  addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat,
+                                     axisIdFormat);
 
   // Add data
   addData<MDE, nd>(out, splitInto, min, max, numEventsPerBox, wsName);