diff --git a/Framework/Crystal/src/FindUBUsingFFT.cpp b/Framework/Crystal/src/FindUBUsingFFT.cpp
index e740effeee6b3374322717d5ab6e733726bb827a..29789fa0b20e0997df05bfb5a74742f1b492d449 100644
--- a/Framework/Crystal/src/FindUBUsingFFT.cpp
+++ b/Framework/Crystal/src/FindUBUsingFFT.cpp
@@ -26,11 +26,11 @@ const std::string FindUBUsingFFT::category() const {
 /** Initialize the algorithm's properties.
  */
 void FindUBUsingFFT::init() {
-  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
+  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
                             "PeaksWorkspace", "", Direction::InOut),
                         "Input Peaks Workspace");
 
-  auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
+  auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
 
   // use negative values, force user to input all parameters
diff --git a/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp b/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
index 1c3e1d2e19a34266012cfc60d5012b2872715887..ad66e4717909448bbd1146a4c35f1cebc92b1131 100644
--- a/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
+++ b/Framework/Crystal/src/FindUBUsingIndexedPeaks.cpp
@@ -19,10 +19,10 @@ using namespace Mantid::Geometry;
 /** Initialize the algorithm's properties.
  */
 void FindUBUsingIndexedPeaks::init() {
-  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
+  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
                             "PeaksWorkspace", "", Direction::InOut),
                         "Input Peaks Workspace");
-  auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
+  auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
   this->declareProperty("Tolerance", 0.1, mustBePositive,
                         "Indexing Tolerance (0.1)");
diff --git a/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp b/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
index dbfa9256719ae461720a17131742602d1484c7b6..d7708ab5e4904ff855ebdfde72104fc37caa3c5b 100644
--- a/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
+++ b/Framework/Crystal/src/FindUBUsingLatticeParameters.cpp
@@ -18,17 +18,17 @@ using namespace Mantid::Geometry;
 /** Initialize the algorithm's properties.
  */
 void FindUBUsingLatticeParameters::init() {
-  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
+  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
                             "PeaksWorkspace", "", Direction::InOut),
                         "Input Peaks Workspace");
 
-  auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
+  auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
 
-  auto moreThan2Int = boost::make_shared<BoundedValidator<int> >();
+  auto moreThan2Int = boost::make_shared<BoundedValidator<int>>();
   moreThan2Int->setLower(2);
 
-  auto reasonable_angle = boost::make_shared<BoundedValidator<double> >();
+  auto reasonable_angle = boost::make_shared<BoundedValidator<double>>();
   reasonable_angle->setLower(5.0);
   reasonable_angle->setUpper(175.0);
 
diff --git a/Framework/Crystal/src/FindUBUsingMinMaxD.cpp b/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
index 426579377375911659dbd9c7b407b52c890de52c..321a8629e1fd648fe9642bfd4ffd8901c627c62e 100644
--- a/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
+++ b/Framework/Crystal/src/FindUBUsingMinMaxD.cpp
@@ -35,32 +35,32 @@ const std::string FindUBUsingMinMaxD::category() const {
 /** Initialize the algorithm's properties.
  */
 void FindUBUsingMinMaxD::init() {
-  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
+  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
                             "PeaksWorkspace", "", Direction::InOut),
                         "Input Peaks Workspace");
 
-  auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
+  auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
 
-  auto atLeast3Int = boost::make_shared<BoundedValidator<int> >();
+  auto atLeast3Int = boost::make_shared<BoundedValidator<int>>();
   atLeast3Int->setLower(3);
 
   // use negative values, force user to input all parameters
-  this->declareProperty(make_unique<PropertyWithValue<double> >(
+  this->declareProperty(make_unique<PropertyWithValue<double>>(
                             "MinD", -1.0, mustBePositive, Direction::Input),
                         "Lower Bound on Lattice Parameters a, b, c");
 
-  this->declareProperty(make_unique<PropertyWithValue<double> >(
+  this->declareProperty(make_unique<PropertyWithValue<double>>(
                             "MaxD", -1.0, mustBePositive, Direction::Input),
                         "Upper Bound on Lattice Parameters a, b, c");
 
-  this->declareProperty(make_unique<PropertyWithValue<int> >(
+  this->declareProperty(make_unique<PropertyWithValue<int>>(
                             "NumInitial", 20, atLeast3Int, Direction::Input),
                         "Number of Peaks to Use on First Pass(20)");
 
   this->declareProperty(
-      make_unique<PropertyWithValue<double> >("Tolerance", 0.15, mustBePositive,
-                                              Direction::Input),
+      make_unique<PropertyWithValue<double>>("Tolerance", 0.15, mustBePositive,
+                                             Direction::Input),
       "Indexing Tolerance (0.15)");
 }
 
diff --git a/Framework/Crystal/src/IndexPeaks.cpp b/Framework/Crystal/src/IndexPeaks.cpp
index bdb750ecec31125da115ecab61456781df3e7f7b..b8d2ac77c38d1afa250496ee816f65dfc259df20 100644
--- a/Framework/Crystal/src/IndexPeaks.cpp
+++ b/Framework/Crystal/src/IndexPeaks.cpp
@@ -18,23 +18,23 @@ using namespace Mantid::Geometry;
 /** Initialize the algorithm's properties.
  */
 void IndexPeaks::init() {
-  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
+  this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
                             "PeaksWorkspace", "", Direction::InOut),
                         "Input Peaks Workspace");
 
-  auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
+  auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
 
   this->declareProperty(
-      make_unique<PropertyWithValue<double> >("Tolerance", 0.15, mustBePositive,
-                                              Direction::Input),
+      make_unique<PropertyWithValue<double>>("Tolerance", 0.15, mustBePositive,
+                                             Direction::Input),
       "Indexing Tolerance (0.15)");
 
   this->declareProperty(
-      make_unique<PropertyWithValue<int> >("NumIndexed", 0, Direction::Output),
+      make_unique<PropertyWithValue<int>>("NumIndexed", 0, Direction::Output),
       "Gets set with the number of indexed peaks.");
 
-  this->declareProperty(make_unique<PropertyWithValue<double> >(
+  this->declareProperty(make_unique<PropertyWithValue<double>>(
                             "AverageError", 0.0, Direction::Output),
                         "Gets set with the average HKL indexing error.");
 
@@ -140,9 +140,8 @@ void IndexPeaks::exec() {
       {                              // which is usually sufficient
         try {
           IndexingUtils::Optimize_UB(tempUB, miller_indices, q_vectors);
-        }
-        catch (...) // If there is any problem, such as too few
-        {           // independent peaks, just use the original UB
+        } catch (...) // If there is any problem, such as too few
+        {             // independent peaks, just use the original UB
           tempUB = UB;
           done = true;
         }