diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
index 7161f772b47..a474c7b19e4 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
@@ -156,8 +156,6 @@ A simple example can be found in `Polygon_mesh_processing/shape_smoothing_exampl
 (b) Shape smoothing of the devil using the mean curvature flow with a time step equal to 0.5. The result is conformally equivalent to the original mesh.
 \cgalFigureEnd
 
-
-
 \subsection MeshingExamples Meshing Examples
 
 \subsubsection MeshingExample_1 Refine and Fair a Region on a Triangle Mesh
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h
index 1a1bf483b8c..49156789d68 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h
@@ -180,7 +180,9 @@ public:
     // calls compute once to factorize with the preconditioner
     if(!solver.factor(A, D))
     {
+#ifdef CGAL_PMP_SMOOTHING_VERBOSE
       std::cerr << "Could not factorize linear system with preconditioner." << std::endl;
+#endif
       return false;
     }
 
@@ -188,7 +190,9 @@ public:
        !solver.linear_solver(by, Xy) ||
        !solver.linear_solver(bz, Xz))
     {
+#ifdef CGAL_PMP_SMOOTHING_VERBOSE
       std::cerr << "Could not solve linear system." << std::endl;
+#endif
       return false;
     }
 
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h
index 1ea0386ee74..86fe67aa125 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h
@@ -34,8 +34,10 @@
 #include <CGAL/utility.h>
 #include <CGAL/property_map.h>
 
+#ifdef CGAL_PMP_SMOOTHING_OUTPUT_INTERMEDIARY_STEPS
 #include <fstream>
 #include <sstream>
+#endif
 
 namespace CGAL {
 namespace Polygon_mesh_processing {
@@ -74,7 +76,7 @@ namespace Polygon_mesh_processing {
 *    sequence of the smoothing iterations performed. Each iteration is performed
 *    with the given time step.
 *  \cgalParamEnd
-* \cgalParamBegin{sparse_linear_solver} an instance of the sparse linear solver used for smoothing \cgalParamEnd
+*  \cgalParamBegin{sparse_linear_solver} an instance of the sparse linear solver used for smoothing \cgalParamEnd
 *  \cgalParamEnd
 * \cgalNamedParamsEnd
 *
@@ -153,7 +155,7 @@ void smooth_along_curvature_flow(const FaceRange& faces,
   for(std::size_t iter=0; iter<nb_iterations; ++iter)
   {
 #ifdef CGAL_PMP_SMOOTHING_VERBOSE
-    std::cout << "iteration #" << i << std::endl;
+    std::cout << "iteration #" << iter << std::endl;
 #endif
 
     smoother.setup_system(A, bx, by, bz, stiffness, time);
@@ -163,10 +165,9 @@ void smooth_along_curvature_flow(const FaceRange& faces,
     else
       break;
 
-#ifdef CGAL_PMP_SMOOTHING_VERBOSE
-    // @tmp (clean fstream sstream includes too)
+#ifdef CGAL_PMP_SMOOTHING_OUTPUT_INTERMEDIARY_STEPS
     std::stringstream oss;
-    oss << "intermediate_" << iter << ".off" << std::ends;
+    oss << "smoothed_mesh_step_" << iter << ".off" << std::ends;
     std::ofstream out(oss.str().c_str());
     out.precision(17);
     out << tmesh;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
index d2856820d70..b8e80e1b607 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
@@ -211,7 +211,6 @@ int main(int, char**)
   set_halfedgeds_items_id(pl_mesh_devil);
   set_halfedgeds_items_id(pl_mesh_pyramid);
 
-  test_demo_helpers<Mesh_with_id>(pl_mesh_devil);
   test_curvature_flow_time_step<Mesh_with_id>(pl_mesh_devil);
   test_curvature_flow<Mesh_with_id>(pl_mesh_pyramid);
   test_implicit_constrained_pyramid<Mesh_with_id>(pl_mesh_pyramid);