diff --git a/include/preprocess/estimate_L_smooth_parameter.hpp b/include/preprocess/estimate_L_smooth_parameter.hpp
index 180f20947..340ece756 100644
--- a/include/preprocess/estimate_L_smooth_parameter.hpp
+++ b/include/preprocess/estimate_L_smooth_parameter.hpp
@@ -21,7 +21,7 @@ template
     typename NegativeGradientFunctor,
     typename RandomNumberGenerator
 >
-double estimate_L_smooth(Polytope &P, Point &p, unsigned int const& walk_length, 
+double estimate_L_smooth(Polytope &P, Point &p, unsigned int const& walk_length,
                          NegativeGradientFunctor F, RandomNumberGenerator &rng)
 {
     typedef typename Point::FT NT;
@@ -44,11 +44,11 @@ double estimate_L_smooth(Polytope &P, Point &p, unsigned int const& walk_length,
     RandomWalk walk(P, p, rng);
     for (unsigned int i=0; i<rnum; ++i)
     {
-        walk.template apply(P, p, walk_length, rng);
+        walk.apply(P, p, walk_length, rng);
         randPoints[0] = p;
         listOfPoints.push_back(randPoints);
     }
-    
+
     NT L = std::numeric_limits<NT>::lowest(), Ltemp;
 
     for (auto pit=listOfPoints.begin(); pit!=(listOfPoints.end()-1); ++pit)
diff --git a/include/sampling/mmcs.hpp b/include/sampling/mmcs.hpp
index 07529ad6d..02791535b 100644
--- a/include/sampling/mmcs.hpp
+++ b/include/sampling/mmcs.hpp
@@ -81,7 +81,7 @@ bool perform_mmcs_step(Polytope &P,
         walk.template get_starting_point(P, p, q, 10, rng);
         for (int i = 0; i < window; i++)
         {
-            walk.template apply(P, q, walk_length, rng);
+            walk.apply(P, q, walk_length, rng);
             winPoints.col(i) = q.getCoefficients();
         }
         estimator.update_estimator(winPoints);
diff --git a/include/sampling/parallel_mmcs.hpp b/include/sampling/parallel_mmcs.hpp
index a8308f4ce..da22e8f6e 100644
--- a/include/sampling/parallel_mmcs.hpp
+++ b/include/sampling/parallel_mmcs.hpp
@@ -126,7 +126,7 @@ bool perform_parallel_mmcs_step(Polytope &P,
             walk.template get_starting_point(P, p, thread_random_walk_parameters, 10, rng);
             for (int i = 0; i < window; i++)
             {
-                walk.template apply(P, thread_random_walk_parameters, walk_length, rng);
+                walk.apply(P, thread_random_walk_parameters, walk_length, rng);
                 winPoints_per_thread[thread_index].col(i) = thread_random_walk_parameters.p.getCoefficients();
             }
 
diff --git a/include/sampling/random_point_generators.hpp b/include/sampling/random_point_generators.hpp
index e60181969..998d8dafc 100644
--- a/include/sampling/random_point_generators.hpp
+++ b/include/sampling/random_point_generators.hpp
@@ -35,7 +35,7 @@ struct RandomPointGenerator
         Walk walk(P, p, rng, parameters);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, walk_length, rng);
+            walk.apply(P, p, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -59,7 +59,7 @@ struct RandomPointGenerator
         Walk walk(P, p, rng);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, walk_length, rng);
+            walk.apply(P, p, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -95,7 +95,7 @@ struct MultivariateGaussianRandomPointGenerator
         Walk walk(P, p, E, rng, parameters);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, walk_length, rng);
+            walk.apply(P, p, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -121,7 +121,7 @@ struct MultivariateGaussianRandomPointGenerator
         Walk walk(P, p, E, rng);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, walk_length, rng);
+            walk.apply(P, p, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -155,7 +155,7 @@ struct GaussianRandomPointGenerator
         Walk walk(P, p, a_i, rng);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, a_i, walk_length, rng);
+            walk.apply(P, p, a_i, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -184,7 +184,7 @@ struct GaussianRandomPointGenerator
 
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, a_i, walk_length, rng);
+            walk.apply(P, p, a_i, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }
@@ -215,7 +215,7 @@ struct BoundaryRandomPointGenerator
         Point p1(P.dimension()), p2(P.dimension());
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p1, p2, walk_length, rng);
+            walk.apply(P, p1, p2, walk_length, rng);
             policy.apply(randPoints, p1);
             policy.apply(randPoints, p2);
         }
@@ -344,7 +344,7 @@ struct ExponentialRandomPointGenerator
         bool success;
         for (unsigned int i=0; i<rnum; ++i)
         {
-            success = walk.template apply(P, p, walk_length, rng);
+            success = walk.apply(P, p, walk_length, rng);
             if (!success) {
                 //return;
                 throw std::range_error("A generated point is outside polytope");
@@ -379,7 +379,7 @@ struct ExponentialRandomPointGenerator
 
         for (unsigned int i=0; i<rnum; ++i)
         {
-            success = walk.template apply(P, p, walk_length, rng);
+            success = walk.apply(P, p, walk_length, rng);
             if (!success) {
                 //return;
                 throw std::range_error("A generated point is outside polytope");
diff --git a/include/sampling/random_point_generators_multithread.hpp b/include/sampling/random_point_generators_multithread.hpp
index 3e04a9b39..a4872fd7d 100644
--- a/include/sampling/random_point_generators_multithread.hpp
+++ b/include/sampling/random_point_generators_multithread.hpp
@@ -19,7 +19,7 @@ template <typename GenericWalk>
 struct policy_storing
 {
     template <typename WalkPolicy, typename PointList, typename ThreadParameters>
-    static void store(WalkPolicy &policy, PointList &randPoints, ThreadParameters &thread_random_walk_parameters) 
+    static void store(WalkPolicy &policy, PointList &randPoints, ThreadParameters &thread_random_walk_parameters)
     {
         policy.apply(randPoints, thread_random_walk_parameters.p);
     }
@@ -30,7 +30,7 @@ template <>
 struct policy_storing<BRDHRWalk_multithread>
 {
     template <typename WalkPolicy, typename PointList, typename ThreadParameters>
-    static void store(WalkPolicy &policy, PointList &randPoints, ThreadParameters &thread_random_walk_parameters) 
+    static void store(WalkPolicy &policy, PointList &randPoints, ThreadParameters &thread_random_walk_parameters)
     {
         policy.apply(randPoints, thread_random_walk_parameters.p1);
         policy.apply(randPoints, thread_random_walk_parameters.p2);
@@ -38,7 +38,7 @@ struct policy_storing<BRDHRWalk_multithread>
 };
 
 template <>
-struct policy_storing<BCDHRWalk_multithread> : policy_storing<BRDHRWalk_multithread> 
+struct policy_storing<BCDHRWalk_multithread> : policy_storing<BRDHRWalk_multithread>
 {};
 
 
@@ -72,7 +72,7 @@ struct RandomPointGeneratorMultiThread
 
         omp_set_num_threads(num_threads);
         unsigned int d = P.dimension(), m = P.num_of_hyperplanes();
-        
+
         std::vector<int> num_points_per_thread(rnum%num_threads, rnum/num_threads+1);
         std::vector<int> a(num_threads - rnum%num_threads, rnum/num_threads);
         num_points_per_thread.insert(num_points_per_thread.end(), a.begin(), a.end());
@@ -88,7 +88,7 @@ struct RandomPointGeneratorMultiThread
 
             for (unsigned int it = 0; it < num_points_per_thread[thread_index]; it++)
             {
-                walk.template apply(P, thread_random_walk_parameters, walk_length, rng);
+                walk.apply(P, thread_random_walk_parameters, walk_length, rng);
                 #pragma omp critical
                 {
                     policy_storing<Walk>::template store(policy, randPoints, thread_random_walk_parameters);
@@ -135,7 +135,7 @@ struct RandomPointGeneratorMultiThread
 
             for (unsigned int it = 0; it < num_points_per_thread[thread_index]; it++)
             {
-                walk.template apply(P, thread_random_walk_parameters, walk_length, rng);
+                walk.apply(P, thread_random_walk_parameters, walk_length, rng);
                 #pragma omp critical
                 {
                     policy_storing<Walk>::template store(policy, randPoints, thread_random_walk_parameters);
@@ -178,7 +178,7 @@ struct GaussianPointGeneratorMultiThread
 
         omp_set_num_threads(num_threads);
         unsigned int d = P.dimension(), m = P.num_of_hyperplanes();
-        
+
         std::vector<int> num_points_per_thread(rnum%num_threads, rnum/num_threads+1);
         std::vector<int> a(num_threads - rnum%num_threads, rnum/num_threads);
         num_points_per_thread.insert(num_points_per_thread.end(), a.begin(), a.end());
@@ -194,7 +194,7 @@ struct GaussianPointGeneratorMultiThread
 
             for (unsigned int it = 0; it < num_points_per_thread[thread_index]; it++)
             {
-                walk.template apply(P, thread_random_walk_parameters, a_i, walk_length, rng);
+                walk.apply(P, thread_random_walk_parameters, a_i, walk_length, rng);
                 #pragma omp critical
                 {
                     policy_storing<Walk>::template store(policy, randPoints, thread_random_walk_parameters);
@@ -226,7 +226,7 @@ struct GaussianPointGeneratorMultiThread
 
         omp_set_num_threads(num_threads);
         unsigned int d = P.dimension(), m = P.num_of_hyperplanes();
-        
+
         std::vector<int> num_points_per_thread(rnum%num_threads, rnum/num_threads+1);
         std::vector<int> a(num_threads - rnum%num_threads, rnum/num_threads);
         num_points_per_thread.insert(num_points_per_thread.end(), a.begin(), a.end());
@@ -242,7 +242,7 @@ struct GaussianPointGeneratorMultiThread
 
             for (unsigned int it = 0; it < num_points_per_thread[thread_index]; it++)
             {
-                walk.template apply(P, thread_random_walk_parameters, a_i, walk_length, rng);
+                walk.apply(P, thread_random_walk_parameters, a_i, walk_length, rng);
                 #pragma omp critical
                 {
                     policy_storing<Walk>::template store(policy, randPoints, thread_random_walk_parameters);
diff --git a/include/volume/volume_cooling_balls.hpp b/include/volume/volume_cooling_balls.hpp
index d90604fa4..7f3d00d53 100644
--- a/include/volume/volume_cooling_balls.hpp
+++ b/include/volume/volume_cooling_balls.hpp
@@ -466,7 +466,7 @@ NT estimate_ratio(PolyBall1 &Pb1,
 
     do
     {
-        walk.template apply(Pb1, p, walk_length, rng);
+        walk.apply(Pb1, p, walk_length, rng);
     } while(!estimate_ratio_generic(Pb2, p, error, ratio_parameters));
 
     return NT(ratio_parameters.count_in) / NT(ratio_parameters.tot_count);
@@ -674,14 +674,14 @@ NT estimate_ratio_interval(PolyBall1 &Pb1,
 
     for (int i = 0; i < ratio_parameters.W; ++i)
     {
-        walk.template apply(Pb1, p, walk_length, rng);
+        walk.apply(Pb1, p, walk_length, rng);
         full_sliding_window(Pb2, p, ratio_parameters);
     }
 
     ratio_parameters.mean = ratio_parameters.sum / NT(ratio_parameters.W);
 
     do {
-        walk.template apply(Pb1, p, walk_length, rng);
+        walk.apply(Pb1, p, walk_length, rng);
     } while (!estimate_ratio_interval_generic(Pb2, p, error, zp, ratio_parameters));
 
     return NT(ratio_parameters.count_in) / NT(ratio_parameters.tot_count);
diff --git a/include/volume/volume_cooling_gaussians.hpp b/include/volume/volume_cooling_gaussians.hpp
index ca06ce315..62835bd84 100644
--- a/include/volume/volume_cooling_gaussians.hpp
+++ b/include/volume/volume_cooling_gaussians.hpp
@@ -241,7 +241,7 @@ void compute_annealing_schedule(Polytope& P,
         // Compute some ratios to decide if this is the last gaussian
         for (unsigned  int j = 0; j < steps; j++)
         {
-            walk.template apply(P, p, a_vals[it], walk_length, rng);
+            walk.apply(P, p, a_vals[it], walk_length, rng);
             curr_its += 1.0;
             curr_fn += eval_exp(p, next_a) / eval_exp(p, a_vals[it]);
         }
@@ -398,7 +398,7 @@ double volume_cooling_gaussians(Polytope& Pin,
 
         while (!done || (*itsIt)<min_steps)
         {
-            walk.template apply(P, p, *avalsIt, walk_length, rng);
+            walk.apply(P, p, *avalsIt, walk_length, rng);
 
             *itsIt = *itsIt + 1.0;
             *fnIt = *fnIt + eval_exp(p,*(avalsIt+1)) / eval_exp(p,*avalsIt);