diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h
index 9dbefc4228e..70d3fbd7d26 100644
--- a/BGL/include/CGAL/boost/graph/named_params_helper.h
+++ b/BGL/include/CGAL/boost/graph/named_params_helper.h
@@ -112,36 +112,36 @@ namespace CGAL {
 
   namespace Polygon_mesh_processing
   {
-  
-    template<typename PolygonMesh, typename NamedParameters>
-    class GetVertexPointMap
-    {
-      typedef typename property_map_selector<PolygonMesh, boost::vertex_point_t>::const_type
-      DefaultVPMap_const;
-      typedef typename property_map_selector<PolygonMesh, boost::vertex_point_t>::type
-      DefaultVPMap;
-    public:
-      typedef typename boost::lookup_named_param_def<
+
+  template<typename PolygonMesh, typename NamedParameters>
+  class GetVertexPointMap
+  {
+    typedef typename property_map_selector<PolygonMesh, boost::vertex_point_t>::const_type
+    DefaultVPMap_const;
+    typedef typename property_map_selector<PolygonMesh, boost::vertex_point_t>::type
+    DefaultVPMap;
+  public:
+    typedef typename boost::lookup_named_param_def<
+    internal_np::vertex_point_t,
+    NamedParameters,
+    DefaultVPMap
+    > ::type  type;
+    typedef typename boost::lookup_named_param_def<
       internal_np::vertex_point_t,
       NamedParameters,
-      DefaultVPMap
-      > ::type  type;
-      typedef typename boost::lookup_named_param_def<
-        internal_np::vertex_point_t,
-        NamedParameters,
-        DefaultVPMap_const
-        > ::type  const_type;
-    };
+      DefaultVPMap_const
+      > ::type  const_type;
+  };
 
-    template<typename PolygonMesh, typename NamedParameters>
-    class GetK
-    {
-      typedef typename boost::property_traits<
-        typename GetVertexPointMap<PolygonMesh, NamedParameters>::type
-        >::value_type Point;
-    public:
-      typedef typename CGAL::Kernel_traits<Point>::Kernel Kernel;
-    };
+  template<typename PolygonMesh, typename NamedParameters>
+  class GetK
+  {
+    typedef typename boost::property_traits<
+      typename GetVertexPointMap<PolygonMesh, NamedParameters>::type
+      >::value_type Point;
+  public:
+    typedef typename CGAL::Kernel_traits<Point>::Kernel Kernel;
+  };
 
   template<typename PolygonMesh,
            typename NamedParametersGT = cgal_bgl_named_params<bool, internal_np::all_default_t>,
@@ -165,60 +165,61 @@ namespace CGAL {
     > ::type  type;
   };
 
-    template<typename PolygonMesh, typename NamedParameters>
-    class GetFaceIndexMap
-    {
-      typedef typename property_map_selector<PolygonMesh, boost::face_index_t>::type DefaultMap;
-      typedef typename property_map_selector<PolygonMesh, boost::face_index_t>::const_type DefaultMap_const;
-    public:
-      typedef typename boost::lookup_named_param_def <
+  template<typename PolygonMesh, typename NamedParameters>
+  class GetFaceIndexMap
+  {
+    typedef typename property_map_selector<PolygonMesh, boost::face_index_t>::type DefaultMap;
+    typedef typename property_map_selector<PolygonMesh, boost::face_index_t>::const_type DefaultMap_const;
+  public:
+    typedef typename boost::lookup_named_param_def <
+    internal_np::face_index_t,
+    NamedParameters,
+    DefaultMap
+    > ::type  type;
+    typedef typename boost::lookup_named_param_def <
       internal_np::face_index_t,
       NamedParameters,
-      DefaultMap
-      > ::type  type;
-      typedef typename boost::lookup_named_param_def <
-        internal_np::face_index_t,
-        NamedParameters,
-        DefaultMap_const
-        > ::type  const_type;
-      typedef typename boost::is_same<type, DefaultMap>::type Is_internal_map;
-      typedef typename boost::is_same<const_type, DefaultMap_const>::type Is_internal_map_const;
+      DefaultMap_const
+      > ::type  const_type;
+    typedef typename boost::is_same<type, DefaultMap>::type Is_internal_map;
+    typedef typename boost::is_same<const_type, DefaultMap_const>::type Is_internal_map_const;
+  };
+
+  template<typename PolygonMesh, typename NamedParameters>
+  class GetVertexIndexMap
+  {
+    typedef typename property_map_selector<PolygonMesh, boost::vertex_index_t>::type DefaultMap;
+  public:
+    typedef typename boost::lookup_named_param_def <
+    internal_np::vertex_index_t,
+    NamedParameters,
+    DefaultMap
+    > ::type  type;
+  };
+
+  template<typename PolygonMesh, typename NamedParameters>
+  class GetFaceNormalMap
+  {
+    struct DummyNormalPmap
+    {
+      typedef typename boost::graph_traits<PolygonMesh>::face_descriptor key_type;
+      typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type::Vector_3 value_type;
+      typedef value_type reference;
+      typedef boost::readable_property_map_tag category;
+
+      typedef DummyNormalPmap Self;
+      friend reference get(const Self&, const key_type&) { return CGAL::NULL_VECTOR; }
     };
 
-    template<typename PolygonMesh, typename NamedParameters>
-    class GetVertexIndexMap
-    {
-      typedef typename property_map_selector<PolygonMesh, boost::vertex_index_t>::type DefaultMap;
-    public:
-      typedef typename boost::lookup_named_param_def <
-      internal_np::vertex_index_t,
+  public:
+    typedef DummyNormalPmap NoMap;
+    typedef typename boost::lookup_named_param_def <
+      internal_np::face_normal_t,
       NamedParameters,
-      DefaultMap
+      DummyNormalPmap//default
       > ::type  type;
-    };
+  };
 
-    template<typename PolygonMesh, typename NamedParameters>
-    class GetFaceNormalMap
-    {
-      struct DummyNormalPmap
-      {
-        typedef typename boost::graph_traits<PolygonMesh>::face_descriptor key_type;
-        typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type::Vector_3 value_type;
-        typedef value_type reference;
-        typedef boost::readable_property_map_tag category;
-
-        typedef DummyNormalPmap Self;
-        friend reference get(const Self&, const key_type&) { return CGAL::NULL_VECTOR; }
-      };
-
-    public:
-      typedef DummyNormalPmap NoMap;
-      typedef typename boost::lookup_named_param_def <
-        internal_np::face_normal_t,
-        NamedParameters,
-        DummyNormalPmap//default
-        > ::type  type;
-    };
   } // namespace Polygon_mesh_processing
 
   namespace Point_set_processing_3