diff --git a/include/boost/geometry/algorithms/buffer.hpp b/include/boost/geometry/algorithms/buffer.hpp
index 74523f11c..453b14873 100644
--- a/include/boost/geometry/algorithms/buffer.hpp
+++ b/include/boost/geometry/algorithms/buffer.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2021.
+// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -245,11 +245,11 @@ inline void buffer(GeometryIn const& geometry_in,
     typename strategies::relate::services::default_strategy
         <
             GeometryIn, GeometryIn
-        >::type strategy;
+        >::type strategies;
 
     rescale_policy_type rescale_policy
             = boost::geometry::get_rescale_policy<rescale_policy_type>(
-                box, strategy);
+                box, strategies);
 
     detail::buffer::buffer_inserter<polygon_type>(geometry_in,
                 range::back_inserter(geometry_out),
@@ -258,7 +258,7 @@ inline void buffer(GeometryIn const& geometry_in,
                 join_strategy,
                 end_strategy,
                 point_strategy,
-                strategy,
+                strategies,
                 rescale_policy);
 }
 
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
index 86318d76e..aefa6e7a6 100644
--- a/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+++ b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2012-2020 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2021.
+// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -921,7 +921,7 @@ template
     typename JoinStrategy,
     typename EndStrategy,
     typename PointStrategy,
-    typename Strategy,
+    typename Strategies,
     typename RobustPolicy,
     typename VisitPiecesPolicy
 >
@@ -931,7 +931,7 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         JoinStrategy const& join_strategy,
         EndStrategy const& end_strategy,
         PointStrategy const& point_strategy,
-        Strategy const& strategy,
+        Strategies const& strategies,
         RobustPolicy const& robust_policy,
         VisitPiecesPolicy& visit_pieces_policy
     )
@@ -941,11 +941,11 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
     typedef detail::buffer::buffered_piece_collection
     <
         typename geometry::ring_type<GeometryOutput>::type,
-        Strategy,
+        Strategies,
         DistanceStrategy,
         RobustPolicy
     > collection_type;
-    collection_type collection(strategy, distance_strategy, robust_policy);
+    collection_type collection(strategies, distance_strategy, robust_policy);
     collection_type const& const_collection = collection;
 
     bool const areal = util::is_areal<GeometryInput>::value;
@@ -962,7 +962,7 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         >::apply(geometry_input, collection,
             distance_strategy, side_strategy, join_strategy,
             end_strategy, point_strategy,
-            robust_policy, strategy.side()); // pass strategy?
+            robust_policy, strategies.side()); // pass strategies?
 
     collection.get_turns();
     if (BOOST_GEOMETRY_CONDITION(areal))
@@ -1029,7 +1029,7 @@ template
     typename JoinStrategy,
     typename EndStrategy,
     typename PointStrategy,
-    typename Strategy,
+    typename Strategies,
     typename RobustPolicy
 >
 inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator out,
@@ -1038,14 +1038,14 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         JoinStrategy const& join_strategy,
         EndStrategy const& end_strategy,
         PointStrategy const& point_strategy,
-        Strategy const& strategy,
+        Strategies const& strategies,
         RobustPolicy const& robust_policy)
 {
     detail::buffer::visit_pieces_default_policy visitor;
     buffer_inserter<GeometryOutput>(geometry_input, out,
         distance_strategy, side_strategy, join_strategy,
         end_strategy, point_strategy,
-        strategy, robust_policy, visitor);
+        strategies, robust_policy, visitor);
 }
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
index a7f600e43..6c852bd65 100644
--- a/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
+++ b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
@@ -3,8 +3,8 @@
 // Copyright (c) 2012-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2016-2020.
-// Modifications copyright (c) 2016-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2021.
+// Modifications copyright (c) 2016-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -1027,16 +1027,13 @@ struct buffered_piece_collection
             {
                 continue;
             }
-            if (detail::disjoint::disjoint_point_box(point,
-                                                     original.m_box,
-                                                     m_strategy))
+            if (detail::disjoint::disjoint_point_box(point, original.m_box,m_strategy))
             {
                 continue;
             }
 
             int const geometry_code
-                = detail::within::point_in_geometry(point, original.m_ring,
-                                                    m_strategy);
+                = detail::within::point_in_geometry(point, original.m_ring, m_strategy);
 
             if (geometry_code == -1)
             {
diff --git a/include/boost/geometry/algorithms/detail/covered_by/interface.hpp b/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
index 3d7804adb..d1b4db2a6 100644
--- a/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/covered_by/interface.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2021.
+// Modifications copyright (c) 2013-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -89,7 +89,6 @@ struct covered_by<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::covered_by::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
 
         return covered_by
@@ -108,7 +107,6 @@ struct covered_by<default_strategy, false>
                              Geometry2 const& geometry2,
                              default_strategy)
     {
-        //typedef typename strategies::covered_by::services::default_strategy
         typedef typename strategies::relate::services::default_strategy
             <
                 Geometry1,
diff --git a/include/boost/geometry/algorithms/detail/disjoint/interface.hpp b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
index 0af19dced..b7df7345c 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2021.
+// Modifications copyright (c) 2013-2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -71,7 +71,6 @@ struct disjoint<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::disjoint::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
 
         return dispatch::disjoint
@@ -90,7 +89,6 @@ struct disjoint<default_strategy, false>
                              Geometry2 const& geometry2,
                              default_strategy)
     {
-        //typedef typename strategies::disjoint::services::default_strategy
         typedef typename strategies::relate::services::default_strategy
             <
                 Geometry1, Geometry2
diff --git a/include/boost/geometry/algorithms/detail/equals/interface.hpp b/include/boost/geometry/algorithms/detail/equals/interface.hpp
index 93d8674e5..bd31e8c2c 100644
--- a/include/boost/geometry/algorithms/detail/equals/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/equals/interface.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 // Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2020.
-// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2021.
+// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
@@ -123,7 +123,6 @@ struct equals<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::equals::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
 
         return dispatch::equals
@@ -142,7 +141,6 @@ struct equals<default_strategy, false>
                              Geometry2 const& geometry2,
                              default_strategy)
     {
-        //typedef typename strategies::within::services::default_strategy
         typedef typename strategies::relate::services::default_strategy
             <
                 Geometry1,
diff --git a/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp b/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
index bda208ea7..9faa1df55 100644
--- a/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
+++ b/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry
 
-// Copyright (c) 2020, Oracle and/or its affiliates.
+// Copyright (c) 2020-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -109,10 +109,6 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
             <
                 areal::index, TupledOut
             >::type areal_out_type;
-        //typedef typename geometry::tuples::element
-        //    <
-        //        pointlike::index, TupledOut
-        //    >::type pointlike_out_type;
 
         // NOTE: The same robust_policy is used in each call of
         //   intersection_insert. Is that correct?
diff --git a/include/boost/geometry/algorithms/detail/is_simple/areal.hpp b/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
index 6496591c8..3c716331b 100644
--- a/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
+++ b/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2020, Oracle and/or its affiliates.
+// Copyright (c) 2014-2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -54,8 +54,10 @@ inline bool are_simple_interior_rings(InteriorRings const& interior_rings,
 {
     auto const end = boost::end(interior_rings);
     return std::find_if(boost::begin(interior_rings), end,
-                [&](auto const& r) { return ! is_simple_ring(r, strategy); })
-           == end; // non-simple ring not found
+                        [&](auto const& r)
+                        {
+                            return ! is_simple_ring(r, strategy);
+                        }) == end; // non-simple ring not found
     // allow empty ring
 }
 
diff --git a/include/boost/geometry/algorithms/detail/overlaps/interface.hpp b/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
index 527ec1600..fbe0ffdae 100644
--- a/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/overlaps/interface.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2014-2020.
-// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2021.
+// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -92,7 +92,6 @@ struct overlaps<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::overlaps::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
         return dispatch::overlaps
             <
@@ -110,7 +109,6 @@ struct overlaps<default_strategy, false>
                              Geometry2 const& geometry2,
                              default_strategy)
     {
-        //typedef typename strategies::overlaps::services::default_strategy
         typedef typename strategies::relate::services::default_strategy
             <
                 Geometry1, Geometry2
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
index d2e2734f7..45db3d252 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
@@ -3,8 +3,8 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2020.
-// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2021.
+// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -187,9 +187,9 @@ private :
         // So advance to the "non duplicate next"
         // (the check is defensive, to avoid endless loops)
         std::size_t check = 0;
-        while(! detail::disjoint::disjoint_point_point(
+        while (! detail::disjoint::disjoint_point_point(
                     current_robust_point, next_robust_point, m_strategy)
-            && check++ < m_section.range_count)
+               && check++ < m_section.range_count)
         {
             circular_iterator++;
             geometry::recalculate(next_robust_point, *circular_iterator, m_robust_policy);
diff --git a/include/boost/geometry/algorithms/detail/touches/interface.hpp b/include/boost/geometry/algorithms/detail/touches/interface.hpp
index 4000d79c6..39d997463 100644
--- a/include/boost/geometry/algorithms/detail/touches/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/touches/interface.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2021.
+// Modifications copyright (c) 2013-2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -112,7 +112,6 @@ struct touches<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::touches::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
 
         return dispatch::touches
diff --git a/include/boost/geometry/algorithms/detail/within/interface.hpp b/include/boost/geometry/algorithms/detail/within/interface.hpp
index 362f1dc38..1a10ca84d 100644
--- a/include/boost/geometry/algorithms/detail/within/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/within/interface.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2021.
+// Modifications copyright (c) 2013-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -92,7 +92,6 @@ struct within<Strategy, false>
                              Geometry2 const& geometry2,
                              Strategy const& strategy)
     {
-        //using strategies::within::services::strategy_converter;
         using strategies::relate::services::strategy_converter;
 
         return within
@@ -111,7 +110,6 @@ struct within<default_strategy, false>
                              Geometry2 const& geometry2,
                              default_strategy)
     {
-        //typedef typename strategies::within::services::default_strategy
         typedef typename strategies::relate::services::default_strategy
             <
                 Geometry1,