diff --git a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
index c4f556f5418c5d081e3d380275c8803f1e62e710..3cfb457263c0dda18b556ad8dc8f68b53960ad1b 100644
--- a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
+++ b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
@@ -48,7 +48,7 @@ SaveToSNSHistogramNexus::SaveToSNSHistogramNexus()
 void SaveToSNSHistogramNexus::init() {
   // Declare required parameters, filename with ext {.nx,.nx5,xml} and input
   // workspac
-  std::initializer_list<std::string> exts = { ".nxs" };
+  std::initializer_list<std::string> exts = {".nxs"};
 
   declareProperty(
       new FileProperty("InputFilename", "", FileProperty::Load, exts),
diff --git a/Framework/DataHandling/src/SetScalingPSD.cpp b/Framework/DataHandling/src/SetScalingPSD.cpp
index a074b5aa6196bb377522088598b5f462070215d8..70426f72bb812c06010e63c3b08dcc7e76944097 100644
--- a/Framework/DataHandling/src/SetScalingPSD.cpp
+++ b/Framework/DataHandling/src/SetScalingPSD.cpp
@@ -32,7 +32,8 @@ SetScalingPSD::SetScalingPSD() : Algorithm(), m_scalingOption(0) {}
 void SetScalingPSD::init() {
   // Declare required input parameters for algorithm
   declareProperty(
-	  new FileProperty("ScalingFilename", "", FileProperty::Load, {".sca", ".raw"}),
+      new FileProperty("ScalingFilename", "", FileProperty::Load,
+                       {".sca", ".raw"}),
       "The name of the scaling calibrations file to read, including its\n"
       "full or relative path. The file extension must be either .sca or\n"
       ".raw (filenames are case sensitive on linux)");
diff --git a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
index d7274debee69fe94883234a812522b86b71053aa..2a6f7be6f7b4e23fb5542416c6b0d1bc3c3335c0 100644
--- a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
+++ b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -44,7 +44,8 @@ void UpdateInstrumentFromFile::init() {
       new WorkspaceProperty<MatrixWorkspace>("Workspace", "Anonymous",
                                              Direction::InOut),
       "The name of the workspace in which to store the imported instrument");
-  declareProperty(new FileProperty("Filename", "", FileProperty::Load, {".raw", ".nxs", ".s*"}),
+  declareProperty(new FileProperty("Filename", "", FileProperty::Load,
+                                   {".raw", ".nxs", ".s*"}),
                   "The filename of the input file.\n"
                   "Currently supports RAW, ISIS NeXus, DAT & multi-column (at "
                   "least 2) ascii files");
diff --git a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index edc216332db8d3ac902eb7b3a1696563a2390fff..129dbe5e18102fb1b7d4243997edb1b845dc2d72 100644
--- a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -86,7 +86,7 @@ void CreateMDWorkspace::init() {
                                                    Direction::Output),
                   "Name of the output MDEventWorkspace.");
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+      new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
       "Optional: to use a file as the back end, give the path to the file to "
       "save.");
 
diff --git a/Framework/MDAlgorithms/src/LoadMD.cpp b/Framework/MDAlgorithms/src/LoadMD.cpp
index c2119976360ce175d82bfe017b831c60109687de..81158d0064b724131d98aaefcbdff284b8e03bb6 100644
--- a/Framework/MDAlgorithms/src/LoadMD.cpp
+++ b/Framework/MDAlgorithms/src/LoadMD.cpp
@@ -82,7 +82,7 @@ int LoadMD::confidence(Kernel::NexusDescriptor &descriptor) const {
 */
 void LoadMD::init() {
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::Load, {".nxs"}),
+      new FileProperty("Filename", "", FileProperty::Load, {".nxs"}),
       "The name of the Nexus file to load, as a full or relative path");
 
   declareProperty(new Kernel::PropertyWithValue<bool>("MetadataOnly", false),
diff --git a/Framework/MDAlgorithms/src/SaveIsawQvector.cpp b/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
index 1535e1a53dcfe867f784ee7612a26e95fca4cd80..eea9d5a7e2d466670e93338649da04d4df341de2 100644
--- a/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
+++ b/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
@@ -66,7 +66,7 @@ void SaveIsawQvector::init() {
                   "An input EventWorkspace with units along X-axis and defined "
                   "instrument with defined sample");
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::OptionalSave, {".bin"}),
+      new FileProperty("Filename", "", FileProperty::OptionalSave, {".bin"}),
       "Optional path to an hkl file to save.  Vectors returned if no file "
       "requested.");
   declareProperty("RightHanded", true, "Save the Q-vector as k_f - k_i");
diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
index 9b011f0004014c8e7e940bfdd18400053efcbf9d..bd5e60bef7f82d7c333afe0df843260b5612a576 100644
--- a/Framework/MDAlgorithms/src/SaveMD.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -54,7 +54,7 @@ void SaveMD::init() {
                   "An input MDEventWorkspace or MDHistoWorkspace.");
 
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+      new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
       "The name of the Nexus file to write, as a full or relative path.\n"
       "Optional if UpdateFileBackEnd is checked.");
   // Filename is NOT used if UpdateFileBackEnd
diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
index dca81ab0fbe0c37d8c827d8fb0d122d0a1e99d58..3cf980d9286fd7348ae528bf989911cc1216eb30 100644
--- a/Framework/MDAlgorithms/src/SaveMD2.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -55,7 +55,7 @@ void SaveMD2::init() {
                   "An input MDEventWorkspace or MDHistoWorkspace.");
 
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+      new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
       "The name of the Nexus file to write, as a full or relative path.\n"
       "Optional if UpdateFileBackEnd is checked.");
   // Filename is NOT used if UpdateFileBackEnd
diff --git a/Framework/MDAlgorithms/src/SaveZODS.cpp b/Framework/MDAlgorithms/src/SaveZODS.cpp
index 8ee077f76144d427c6f2c35af8d36bfb3e4b9fac..27741dad717e43fcedd267184ef92ee05e2f2bc2 100644
--- a/Framework/MDAlgorithms/src/SaveZODS.cpp
+++ b/Framework/MDAlgorithms/src/SaveZODS.cpp
@@ -49,7 +49,7 @@ void SaveZODS::init() {
                   "An input MDHistoWorkspace in HKL space.");
 
   declareProperty(
-	  new FileProperty("Filename", "", FileProperty::Save, {".h5"}),
+      new FileProperty("Filename", "", FileProperty::Save, {".h5"}),
       "The name of the HDF5 file to write, as a full or relative path.");
 }
 
diff --git a/Framework/MDAlgorithms/src/SliceMD.cpp b/Framework/MDAlgorithms/src/SliceMD.cpp
index 93d6fab5b047a7b2e455394bc9fe84ed46ef705f..de1249cd284eda22b8c9f65e32c4f7aeab09913c 100644
--- a/Framework/MDAlgorithms/src/SliceMD.cpp
+++ b/Framework/MDAlgorithms/src/SliceMD.cpp
@@ -49,7 +49,8 @@ void SliceMD::init() {
                   "Name of the output MDEventWorkspace.");
 
   declareProperty(
-	  new FileProperty("OutputFilename", "", FileProperty::OptionalSave, {".nxs"}),
+      new FileProperty("OutputFilename", "", FileProperty::OptionalSave,
+                       {".nxs"}),
       "Optional: Specify a NeXus file to write if you want the output "
       "workspace to be file-backed.");
 
diff --git a/Framework/SINQ/src/LoadFlexiNexus.cpp b/Framework/SINQ/src/LoadFlexiNexus.cpp
index 127093ba27dbe0f5d9ee16b4607b9f29400fedff..8ee09c83098b6ecf9c8ab7f4862ffdc8c12825d7 100644
--- a/Framework/SINQ/src/LoadFlexiNexus.cpp
+++ b/Framework/SINQ/src/LoadFlexiNexus.cpp
@@ -24,9 +24,11 @@ using namespace ::NeXus;
 
 void LoadFlexiNexus::init() {
 
-  declareProperty(new FileProperty("Filename", "", FileProperty::Load, {".hdf", ".h5", ""}),
-                  "A NeXus file");
-  declareProperty(new FileProperty("Dictionary", "", FileProperty::Load, {".txt", ".dic", ""}),
+  declareProperty(
+      new FileProperty("Filename", "", FileProperty::Load, {".hdf", ".h5", ""}),
+      "A NeXus file");
+  declareProperty(new FileProperty("Dictionary", "", FileProperty::Load,
+                                   {".txt", ".dic", ""}),
                   "A Dictionary for controlling NeXus loading");
   declareProperty(new WorkspaceProperty<Workspace>("OutputWorkspace", "",
                                                    Direction::Output));
diff --git a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
index 0e98ca3e633fd7c9e0b5208639a05bf3744d73bb..e2063635a640b5de2a67e1e0e96be1ebb324f63b 100644
--- a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+++ b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -72,7 +72,8 @@ void AlignAndFocusPowder::init() {
   //   "The name of the workspace containing the filtered low resolution TOF
   //   data.");
   declareProperty(
-	  new FileProperty("CalFileName", "", FileProperty::OptionalLoad, {".h5", ".hd5", ".hdf", ".cal"}),
+      new FileProperty("CalFileName", "", FileProperty::OptionalLoad,
+                       {".h5", ".hd5", ".hdf", ".cal"}),
       "The name of the CalFile with offset, masking, and grouping data");
   declareProperty(
       new WorkspaceProperty<GroupingWorkspace>(
diff --git a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
index 6a435f46fe58ea2abf8a8cf4dc4e7acc8258dad6..f7dfea80775c672fa2f95d6ec34dce2af6816b12 100644
--- a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
@@ -25,9 +25,9 @@ using namespace Geometry;
 using namespace DataObjects;
 
 void SANSBeamFinder::init() {
-  declareProperty(
-	  new API::FileProperty("Filename", "", API::FileProperty::Load, {"_event.nxs", ".xml"}),
-      "Data filed used to find beam center");
+  declareProperty(new API::FileProperty("Filename", "", API::FileProperty::Load,
+                                        {"_event.nxs", ".xml"}),
+                  "Data filed used to find beam center");
 
   declareProperty("BeamCenterX", EMPTY_DBL(),
                   "Beam position in X pixel coordinates");
diff --git a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
index 2c1c73cd5ce403a599934bdbbbc357b7cf321811..522618d464ffe853733305ae93e9f723253a3d1b 100644
--- a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
@@ -33,15 +33,15 @@ using namespace DataObjects;
 void SANSSensitivityCorrection::init() {
   declareProperty(new WorkspaceProperty<>(
       "InputWorkspace", "", Direction::Input, PropertyMode::Optional));
-  declareProperty(
-	  new API::FileProperty("Filename", "", API::FileProperty::Load, {"_event.nxs", ".xml"}),
-      "Flood field or sensitivity file.");
+  declareProperty(new API::FileProperty("Filename", "", API::FileProperty::Load,
+                                        {"_event.nxs", ".xml"}),
+                  "Flood field or sensitivity file.");
   declareProperty("UseSampleDC", true, "If true, the dark current subtracted "
                                        "from the sample data will also be "
                                        "subtracted from the flood field.");
   declareProperty(new API::FileProperty("DarkCurrentFile", "",
                                         API::FileProperty::OptionalLoad,
-										{"_event.nxs", ".xml"}),
+                                        {"_event.nxs", ".xml"}),
                   "The name of the input file to load as dark current.");
 
   auto positiveDouble = boost::make_shared<BoundedValidator<double>>();