diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
index 805130499c34717ecfcedbca251969da19ff2428..486756882e079b13b58a46d953c7e93d43bb2237 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
@@ -147,7 +147,8 @@ private:
   double m_lambdaFixed; ///< The wavelength corresponding to the fixed energy,
   /// if provided
 
-  using expfunction = double (*)(double); ///< Typedef pointer to exponential function
+  using expfunction =
+      double (*)(double);  ///< Typedef pointer to exponential function
   expfunction EXPONENTIAL; ///< Pointer to exponential function
 };
 
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h b/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
index 6fda6c1cf0fd7f95696af5e00acf55dc76c2ec65..d3d22f26abca4c34535361e6c8b5860e6ab7dc2f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
@@ -96,7 +96,7 @@ private:
   /// An addition table is a list of pairs: First int = workspace index in the
   /// EW being added, Second int = workspace index to which it will be added in
   /// the OUTPUT EW. -1 if it should add a new entry at the end.
-  using AdditionTable = std::vector<std::pair<int, int> >;
+  using AdditionTable = std::vector<std::pair<int, int>>;
   /// Copy the history from the input workspaces to the output workspaces
   template <typename Container>
   void copyHistoryFromInputWorkspaces(const Container &workspaces) {
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
index 70c95c765da1825d796bfc30f0cca7b2132709b7..11505f00e7c90f8a3280013bdbcf4936a0debbfa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
@@ -98,7 +98,7 @@ public:
 private:
   /// Map containing the detector entries found in the *.cal file. The key is
   /// the udet number, the value of is a pair of <group,selected>.
-  using calmap = std::unordered_map<int, std::pair<int, int> >;
+  using calmap = std::unordered_map<int, std::pair<int, int>>;
   /// Initialisation code
   void init() override;
   /// Execution code
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
index 183ec88c50d8bb64e7c36fa4e3962d11baf70a42..973bd63c7cc8a34fd8b42037856129deedade364 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
@@ -49,7 +49,7 @@ public:
 private:
   /// Helper typedef. For storing indexes of special values per spectra per
   /// workspace.
-  using SpecialTypeIndexes = std::vector<std::vector<size_t> >;
+  using SpecialTypeIndexes = std::vector<std::vector<size_t>>;
   /// Overwrites Algorithm method.
   void init() override;
   /// Overwrites Algorithm method.
diff --git a/Framework/Algorithms/src/CreatePSDBleedMask.cpp b/Framework/Algorithms/src/CreatePSDBleedMask.cpp
index 91c76baf564d3bbd13b8da63f194ab17cb10e869..cbbe9f8f9bde7bde09581f199b0aa6423ca4cb5d 100644
--- a/Framework/Algorithms/src/CreatePSDBleedMask.cpp
+++ b/Framework/Algorithms/src/CreatePSDBleedMask.cpp
@@ -94,7 +94,7 @@ void CreatePSDBleedMask::exec() {
   const int numSpectra =
       static_cast<int>(inputWorkspace->getNumberHistograms());
   // Keep track of a map of tubes to lists of indices
-  using TubeIndex = std::map<Geometry::ComponentID, std::vector<int> >;
+  using TubeIndex = std::map<Geometry::ComponentID, std::vector<int>>;
   TubeIndex tubeMap;
 
   API::Progress progress(this, 0.0, 1.0, numSpectra);
diff --git a/Framework/Algorithms/src/PerformIndexOperations.cpp b/Framework/Algorithms/src/PerformIndexOperations.cpp
index 55c225f3d526609aa252d54a6b92cabcee7ffa70..b00698a069e3c1f70b918a1b321861d9a0ed1baf 100644
--- a/Framework/Algorithms/src/PerformIndexOperations.cpp
+++ b/Framework/Algorithms/src/PerformIndexOperations.cpp
@@ -45,7 +45,7 @@ public:
 };
 
 /// Helper typedef
-using VecCommands = std::vector<boost::shared_ptr<Command> >;
+using VecCommands = std::vector<boost::shared_ptr<Command>>;
 
 /**
  * Command yielding no result.
@@ -140,7 +140,7 @@ public:
 };
 
 /// Helper typedef for vector of command parsers
-using VecCommandParsers = std::vector<boost::shared_ptr<CommandParser> >;
+using VecCommandParsers = std::vector<boost::shared_ptr<CommandParser>>;
 
 /**
  * Command parser base class for common concrete command parser types.
diff --git a/Framework/Algorithms/src/SofQWPolygon.cpp b/Framework/Algorithms/src/SofQWPolygon.cpp
index 75d0c160cd60f88fed0d2891f021fa284ae7925a..7dd7a6dede9a8d5ac629de6b5e6d02fa3479e9a9 100644
--- a/Framework/Algorithms/src/SofQWPolygon.cpp
+++ b/Framework/Algorithms/src/SofQWPolygon.cpp
@@ -63,7 +63,8 @@ void SofQWPolygon::exec() {
 
   // Select the calculate Q method based on the mode
   // rather than doing this repeatedly in the loop
-  using QCalculation = double (SofQWPolygon::*)(double, double, double, double) const;
+  using QCalculation =
+      double (SofQWPolygon::*)(double, double, double, double) const;
   QCalculation qCalculator;
   if (m_EmodeProperties.m_emode == 1) {
     qCalculator = &SofQWPolygon::calculateDirectQ;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
index 2637ec6f143896e8f0882bf1ae0a8cf27d3e3f05..e7f551b27e82efca7bec961be4fd87dab75718e7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
@@ -109,7 +109,8 @@ public:
   virtual bool threadSafe() const;
 };
 
-using EventWorkspaceCollection_sptr = boost::shared_ptr<EventWorkspaceCollection>;
+using EventWorkspaceCollection_sptr =
+    boost::shared_ptr<EventWorkspaceCollection>;
 using EventWorkspaceCollection_uptr = std::unique_ptr<EventWorkspaceCollection>;
 
 } // namespace DataHandling