diff --git a/Framework/Algorithms/src/ConvertUnits.cpp b/Framework/Algorithms/src/ConvertUnits.cpp
index 28260116b67859b068ed3b5702eb74128737699c..618c6347f7527d1ff30513f97d5f57f8ec998597 100644
--- a/Framework/Algorithms/src/ConvertUnits.cpp
+++ b/Framework/Algorithms/src/ConvertUnits.cpp
@@ -124,8 +124,7 @@ void ConvertUnits::exec() {
   if (inputWS->x(0).size() < 2) {
     std::stringstream msg;
     msg << "Input workspace has invalid X axis binning parameters. Should have "
-           "at least 2 values. Found "
-        << inputWS->x(0).size() << ".";
+           "at least 2 values. Found " << inputWS->x(0).size() << ".";
     throw std::runtime_error(msg.str());
   }
   if (inputWS->x(0).front() > inputWS->x(0).back() ||
@@ -472,8 +471,8 @@ void ConvertUnits::convertViaTOF(Kernel::Unit_const_sptr fromUnit,
 
       // EventWorkspace part, modifying the EventLists.
       if (m_inputEvents) {
-        eventWS->getSpectrum(i).convertUnitsViaTof(localFromUnit,
-                                                   localOutputUnit);
+        eventWS->getSpectrum(i)
+            .convertUnitsViaTof(localFromUnit, localOutputUnit);
 
         //        std::vector<double> tofs;
         //        eventWS->getSpectrum(i).getTofs(tofs);
diff --git a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
index 1dc138c165ccdb8fda1b7399a4c2ae9cb0836a72..ea1ad38fc54e9184607ffb5c1919f94b3d3efddc 100644
--- a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+++ b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
@@ -128,8 +128,7 @@ void ConvertUnitsUsingDetectorTable::exec() {
   if (inputWS->x(0).size() < 2) {
     std::stringstream msg;
     msg << "Input workspace has invalid X axis binning parameters. Should have "
-           "at least 2 values. Found "
-        << inputWS->x(0).size() << ".";
+           "at least 2 values. Found " << inputWS->x(0).size() << ".";
     throw std::runtime_error(msg.str());
   }
   if (inputWS->x(0).front() > inputWS->x(0).back() ||
@@ -370,8 +369,8 @@ void ConvertUnitsUsingDetectorTable::convertViaTOF(
 
         // EventWorkspace part, modifying the EventLists.
         if (m_inputEvents) {
-          eventWS->getSpectrum(wsid).convertUnitsViaTof(localFromUnit,
-                                                        localOutputUnit);
+          eventWS->getSpectrum(wsid)
+              .convertUnitsViaTof(localFromUnit, localOutputUnit);
         }
         // Clear unit memory
         delete localFromUnit;
diff --git a/Framework/Algorithms/src/CorrectFlightPaths.cpp b/Framework/Algorithms/src/CorrectFlightPaths.cpp
index ecf3326a7ec64ffdf621fa06f4d5b0339d622f90..9b3194e97f22f70087ec1327521c2f6a0095e851 100644
--- a/Framework/Algorithms/src/CorrectFlightPaths.cpp
+++ b/Framework/Algorithms/src/CorrectFlightPaths.cpp
@@ -116,7 +116,7 @@ void CorrectFlightPaths::exec() {
     auto edges = m_outputWS->binEdges(i);
     auto &X = m_outputWS->mutableX(i);
 
-	m_outputWS->mutableX(i) += -deltaTOF;
+    m_outputWS->mutableX(i) += -deltaTOF;
 
     prog.report("Aligning elastic line...");
     PARALLEL_END_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/CreateWorkspace.cpp b/Framework/Algorithms/src/CreateWorkspace.cpp
index 6e137019c8c74f6062d65fad547baefaa0a80848..7758b7d839840cce8d2e4d6b84f0c4868f2ee6ae 100644
--- a/Framework/Algorithms/src/CreateWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateWorkspace.cpp
@@ -172,15 +172,15 @@ void CreateWorkspace::exec() {
     if (commonX) {
       outputWS->setSharedX(i, XValues);
     } else {
-      outputWS->mutableX(i).assign(dataX.begin() + xStart,
-                                   dataX.begin() + xEnd);
+      outputWS->mutableX(i)
+          .assign(dataX.begin() + xStart, dataX.begin() + xEnd);
     }
 
     outputWS->mutableY(i).assign(dataY.begin() + yStart, dataY.begin() + yEnd);
 
     if (dataE_provided)
-      outputWS->mutableE(i).assign(dataE.begin() + yStart,
-                                   dataE.begin() + yEnd);
+      outputWS->mutableE(i)
+          .assign(dataE.begin() + yStart, dataE.begin() + yEnd);
 
     progress.report();
     PARALLEL_END_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/ExtractSpectra.cpp b/Framework/Algorithms/src/ExtractSpectra.cpp
index c66f64083547ee6f81d59c361d24535a062b4051..d151a6a433016d5e84a5aabcc6bb5727e5086da7 100644
--- a/Framework/Algorithms/src/ExtractSpectra.cpp
+++ b/Framework/Algorithms/src/ExtractSpectra.cpp
@@ -164,11 +164,11 @@ void ExtractSpectra::execHistogram() {
     }
 
     auto &oldY = m_inputWorkspace->y(i);
-    outputWorkspace->mutableY(j).assign(oldY.begin() + m_minX,
-                                        oldY.begin() + (m_maxX - m_histogram));
+    outputWorkspace->mutableY(j)
+        .assign(oldY.begin() + m_minX, oldY.begin() + (m_maxX - m_histogram));
     auto &oldE = m_inputWorkspace->e(i);
-    outputWorkspace->mutableE(j).assign(oldE.begin() + m_minX,
-                                        oldE.begin() + (m_maxX - m_histogram));
+    outputWorkspace->mutableE(j)
+        .assign(oldE.begin() + m_minX, oldE.begin() + (m_maxX - m_histogram));
 
     // copy over the axis entry for each spectrum, regardless of the type of
     // axes present
diff --git a/Framework/HistogramData/inc/MantidHistogramData/FixedLengthVector.h b/Framework/HistogramData/inc/MantidHistogramData/FixedLengthVector.h
index 6de80eadd8e18d4996b3b36b4a93baf35e415b6d..c6ccab801230c0e40d9e9faffbcb2205f3c6768a 100644
--- a/Framework/HistogramData/inc/MantidHistogramData/FixedLengthVector.h
+++ b/Framework/HistogramData/inc/MantidHistogramData/FixedLengthVector.h
@@ -52,7 +52,8 @@ public:
   FixedLengthVector(const std::vector<double> &other) : m_data(other) {}
   FixedLengthVector(std::vector<double> &&other) : m_data(std::move(other)) {}
   template <class InputIt>
-  FixedLengthVector(InputIt first, InputIt last) : m_data(first, last) {}
+  FixedLengthVector(InputIt first, InputIt last)
+      : m_data(first, last) {}
   template <class InputIt> void assign(InputIt first, InputIt last) & {
     checkAssignmentSize(static_cast<size_t>(std::distance(first, last)));
     m_data.assign(first, last);