diff --git a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
index 7fbc3e0790b56deb064b4b64d24cc31dc9ee1011..3986f16cbd41deb37edc7fc0921f10f3203a3c86 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
@@ -412,10 +412,11 @@ private:
 
   using column_it = std::vector<
       boost::shared_ptr<API::Column>>::iterator; ///< Column iterator
+
+  ///< Column const iterator
   using column_const_it =
-      std::vector<boost::shared_ptr<API::Column>>::const_iterator; ///< Column
-                                                                   ///const
-                                                                   ///iterator
+      std::vector<boost::shared_ptr<API::Column>>::const_iterator;
+                                                                  
   /// Shared pointers to the columns.
   std::vector<boost::shared_ptr<API::Column>> m_columns;
   /// row count
@@ -432,5 +433,5 @@ using TableWorkspace_sptr = boost::shared_ptr<TableWorkspace>;
 using TableWorkspace_const_sptr = boost::shared_ptr<const TableWorkspace>;
 
 } // namespace DataObjects
-} // Namespace Mantid
+
 #endif /*MANTID_DATAOBJECTS_TABLEWORKSPACE_H_*/
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
index a017602c9869beaf9e8b2ac418da68d96f7a7af2..b8f981f5a70ba51616ece5957f3acc229080f4a2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
@@ -42,12 +42,11 @@ class MANTID_GEOMETRY_DLL SurfaceFactory {
 private:
   // workaround because gcc 4.4 cannot have std::unique_ptr inside a std::map.
   // http://stackoverflow.com/questions/7342703/gcc-4-4-4-5-unique-ptr-not-work-for-unordered-set-unordered-map
+  
+  ///< Storage of surface pointers.
   using MapType =
-      std::vector<std::pair<std::string, std::unique_ptr<Surface>>>; ///<
-                                                                     ///Storage
-                                                                     ///of
-                                                                     ///surface
-                                                                     ///pointers
+      std::vector<std::pair<std::string, std::unique_ptr<Surface>>>;
+
   static SurfaceFactory *FOBJ; ///< Effective "this"
 
   MapType SGrid;                  ///< The tally stack