Extra clean up and clang formatting

Framework/Algorithms/inc/MantidAlgorithms/CalculateCarpenterSampleCorrection.h

@@ -81,8 +81,7 @@ private:
   createOutputWorkspace(const MatrixWorkspace_sptr &inputWS,
                         const std::string) const;
   void deleteWorkspace(MatrixWorkspace_sptr workspace);
-  MatrixWorkspace_sptr
-  setUncertainties(MatrixWorkspace_sptr workspace);
+  MatrixWorkspace_sptr setUncertainties(MatrixWorkspace_sptr workspace);
 };
 
 } // namespace Algorithm

Framework/Algorithms/src/CarpenterSampleCorrection.cpp

@@ -17,7 +17,6 @@ using namespace API;
 using Mantid::DataObjects::EventWorkspace;
 using Mantid::DataObjects::EventWorkspace_sptr;
 using std::vector;
-//using namespace Mantid::PhysicalConstants;
 using namespace Geometry;
 
 const std::string CarpenterSampleCorrection::name() const {