diff --git a/Arrangement_on_surface_2/benchmark/Arrangement_on_surface_2/lexical_cast.hpp b/Arrangement_on_surface_2/benchmark/Arrangement_on_surface_2/lexical_cast.hpp
index 79d885905ef..d16d9e378a8 100644
--- a/Arrangement_on_surface_2/benchmark/Arrangement_on_surface_2/lexical_cast.hpp
+++ b/Arrangement_on_surface_2/benchmark/Arrangement_on_surface_2/lexical_cast.hpp
@@ -1,7 +1,7 @@
 #ifndef LEXICAL_CAST_HPP
 #define LEXICAL_CAST_HPP
 
-/*! This files provides lexical casts from std::string to any one of the number
+/*! This file provides lexical casts from std::string to any one of the number
  * types we intend to use in the benchmark, and a lexical cast does not exist.
  * It is inspired by boost::lexical_cast
  */
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_configuration.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_configuration.h
index dfd25a01536..2a4baa7609b 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_configuration.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_configuration.h
@@ -1,7 +1,7 @@
 #ifndef CGAL_TEST_CONFIGURATION_H
 #define CGAL_TEST_CONFIGURATION_H
 
-/*! This files contains define statements, include statement, and typedef
+/*! This file contains define statements, include statement, and typedef
  * of the number types, kernel, and traits used.
  *
  */
diff --git a/BGL/examples/BGL_graphcut/CMakeLists.txt b/BGL/examples/BGL_graphcut/CMakeLists.txt
index dc8be80ed63..af873296cab 100644
--- a/BGL/examples/BGL_graphcut/CMakeLists.txt
+++ b/BGL/examples/BGL_graphcut/CMakeLists.txt
@@ -9,5 +9,4 @@ project(BGL_graphcut_Examples)
 find_package(CGAL REQUIRED)
 
 create_single_source_cgal_program("alpha_expansion_example.cpp")
-create_single_source_cgal_program(
-  "face_selection_borders_regularization_example.cpp")
+create_single_source_cgal_program("face_selection_borders_regularization_example.cpp")
diff --git a/Generalized_map/test/Generalized_map/CMakeLists.txt b/Generalized_map/test/Generalized_map/CMakeLists.txt
index 4cebd95827c..642815d6c08 100644
--- a/Generalized_map/test/Generalized_map/CMakeLists.txt
+++ b/Generalized_map/test/Generalized_map/CMakeLists.txt
@@ -7,9 +7,10 @@ project(Generalized_map_Tests)
 # CGAL and its components
 find_package(CGAL REQUIRED)
 
-
-set(hfiles Generalized_map_2_test.h Generalized_map_3_test.h
-  Generalized_map_4_test.h GMap_test_insertions.h)
+set(hfiles Generalized_map_2_test.h
+           Generalized_map_3_test.h
+           Generalized_map_4_test.h
+           GMap_test_insertions.h)
 
 create_single_source_cgal_program("Generalized_map_test.cpp" ${hfiles})
 
diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
index fc6be4f65ec..a2ca12fbc65 100644
--- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
+++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
@@ -24,5 +24,4 @@ target_link_libraries(heat_method_polyhedron PUBLIC CGAL::Eigen3_support)
 create_single_source_cgal_program("heat_method_surface_mesh.cpp")
 target_link_libraries(heat_method_surface_mesh PUBLIC CGAL::Eigen3_support)
 create_single_source_cgal_program("heat_method_surface_mesh_direct.cpp")
-target_link_libraries(heat_method_surface_mesh_direct
-                      PUBLIC CGAL::Eigen3_support)
+target_link_libraries(heat_method_surface_mesh_direct PUBLIC CGAL::Eigen3_support)
diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in
index 769d18ab80d..9782812a2e3 100644
--- a/Installation/cmake/modules/CGALConfig_binary.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in
@@ -1,5 +1,5 @@
 #
-# This files contains definitions needed to use CGAL in a program.
+# This file contains definitions needed to use CGAL in a program.
 # DO NOT EDIT THIS. The definitons have been generated by CMake at configuration time.
 # This file is loaded by cmake via the command "find_package(CGAL)"
 #
diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in
index ade24452f95..4d840a8a68c 100644
--- a/Installation/cmake/modules/CGALConfig_install.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_install.cmake.in
@@ -1,5 +1,5 @@
 #
-# This files contains definitions needed to use CGAL in a program.
+# This file contains definitions needed to use CGAL in a program.
 # DO NOT EDIT THIS. The definitons have been generated by CMake at configuration time.
 # This file is loaded by cmake via the command "find_package(CGAL)"
 #
diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
index 6cc009ec9aa..8cc470d2673 100644
--- a/Installation/cmake/modules/CGAL_Macros.cmake
+++ b/Installation/cmake/modules/CGAL_Macros.cmake
@@ -360,7 +360,7 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
       VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}"
       COMPATIBILITY SameMajorVersion)
 
-    # There is also a version of CGALConfig.cmake that is prepared in case CGAL in installed in CMAKE_INSTALL_PREFIX.
+    # There is also a version of CGALConfig.cmake that is prepared in case CGAL is installed in CMAKE_INSTALL_PREFIX.
     configure_file("${CGAL_MODULES_DIR}/CGALConfig_install.cmake.in" "${CMAKE_BINARY_DIR}/config/CGALConfig.cmake" @ONLY)
 
     #write prefix exceptions
diff --git a/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h b/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h
index 544f8fb8790..004f53bd9c1 100644
--- a/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h
+++ b/Number_types/include/CGAL/Sqrt_extension/convert_to_bfi.h
@@ -10,7 +10,7 @@
 //
 // Author(s)     : Michael Hemmer   <hemmer@mpi-inf.mpg.de>
 
-// This files adds an optional static cache to convert_to_bfi for Sqrt_extension
+// This file adds an optional static cache to convert_to_bfi for Sqrt_extension
 
 #ifndef CGAL_SQRT_EXTENSION_CONVERT_TO_BFI_H
 #define CGAL_SQRT_EXTENSION_CONVERT_TO_BFI_H
diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
index 97f9a323685..8c8dbb8a6e2 100644
--- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
+++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
@@ -17,7 +17,6 @@ create_single_source_cgal_program("obb_example.cpp")
 create_single_source_cgal_program("obb_with_point_maps_example.cpp")
 create_single_source_cgal_program("rotated_aabb_tree_example.cpp")
 
-foreach(target obb_example obb_with_point_maps_example
-               rotated_aabb_tree_example)
+foreach(target obb_example obb_with_point_maps_example rotated_aabb_tree_example)
   target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
 endforeach()
diff --git a/Point_set_3/examples/Point_set_3/CMakeLists.txt b/Point_set_3/examples/Point_set_3/CMakeLists.txt
index 1699f75d099..b26633c293a 100644
--- a/Point_set_3/examples/Point_set_3/CMakeLists.txt
+++ b/Point_set_3/examples/Point_set_3/CMakeLists.txt
@@ -13,8 +13,7 @@ create_single_source_cgal_program("point_set_read_xyz.cpp")
 create_single_source_cgal_program("point_set_advanced.cpp")
 
 set(needed_cxx_features cxx_rvalue_references cxx_variadic_templates)
-create_single_source_cgal_program("point_set_read_ply.cpp" CXX_FEATURES
-                                  ${needed_cxx_features})
+create_single_source_cgal_program("point_set_read_ply.cpp" CXX_FEATURES ${needed_cxx_features})
 
 find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
index 8766b4c40ca..3f5583bb8b8 100644
--- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
+++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
@@ -55,8 +55,7 @@ if(TARGET CGAL::Eigen3_support)
   target_link_libraries(normal_estimation_test PUBLIC CGAL::Eigen3_support)
 
   create_single_source_cgal_program("hierarchy_simplification_test.cpp")
-  target_link_libraries(hierarchy_simplification_test
-                        PUBLIC CGAL::Eigen3_support)
+  target_link_libraries(hierarchy_simplification_test PUBLIC CGAL::Eigen3_support)
 
   create_single_source_cgal_program("smoothing_test.cpp")
   target_link_libraries(smoothing_test PUBLIC CGAL::Eigen3_support)
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
index b7328227479..d3fc45f270e 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
@@ -97,8 +97,7 @@ if(TARGET CGAL::TBB_support)
   target_link_libraries(test_hausdorff_bounded_error_distance PUBLIC CGAL::TBB_support)
   target_link_libraries(test_pmp_distance PUBLIC CGAL::TBB_support)
   target_link_libraries(orient_polygon_soup_test PUBLIC CGAL::TBB_support)
-  target_link_libraries(self_intersection_surface_mesh_test
-                        PUBLIC CGAL::TBB_support)
+  target_link_libraries(self_intersection_surface_mesh_test PUBLIC CGAL::TBB_support)
 else()
   message(STATUS "NOTICE: Intel TBB was not found. Tests will use sequential code.")
 endif()
diff --git a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
index b4984c15043..78198bdec86 100644
--- a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
+++ b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
@@ -27,12 +27,9 @@ if(NOT TARGET CGAL::SCIP_support)
 endif()
 
 create_single_source_cgal_program("polygonal_surface_reconstruction_test.cpp")
-target_link_libraries(polygonal_surface_reconstruction_test
-                      PUBLIC CGAL::Eigen3_support)
+target_link_libraries(polygonal_surface_reconstruction_test PUBLIC CGAL::Eigen3_support)
 if(TARGET CGAL::SCIP_support)
-  target_link_libraries(polygonal_surface_reconstruction_test
-                        PUBLIC CGAL::SCIP_support)
+  target_link_libraries(polygonal_surface_reconstruction_test PUBLIC CGAL::SCIP_support)
 else()
-  target_link_libraries(polygonal_surface_reconstruction_test
-                        PUBLIC CGAL::GLPK_support)
+  target_link_libraries(polygonal_surface_reconstruction_test PUBLIC CGAL::GLPK_support)
 endif()
diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt
index a15bb212d96..563deff8f5c 100644
--- a/Polyhedron/demo/Polyhedron/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt
@@ -29,20 +29,18 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 include_directories(BEFORE ./ ./include ./CGAL_demo)
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}")
 
-# Find CGAL
-
 option(POLYHEDRON_QTSCRIPT_DEBUGGER
        "Activate the use of Qt Script Debugger in Polyhedron_3 demo" OFF)
 
+# Find CGAL
 find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5 ImageIO)
 set_package_properties(CGAL PROPERTIES TYPE REQUIRED)
 include(${CGAL_USE_FILE})
-# Find Qt5 itself
 
-find_package(
-  Qt5 QUIET
-  COMPONENTS OpenGL Script Widgets
-  OPTIONAL_COMPONENTS ScriptTools WebSockets Network)
+# Find Qt5 itself
+find_package(Qt5 QUIET
+             COMPONENTS OpenGL Script Widgets
+             OPTIONAL_COMPONENTS ScriptTools WebSockets Network)
 
 set_package_properties(
   Qt5 PROPERTIES
@@ -162,7 +160,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
   # AUXILIARY LIBRARIES
 
-  # put s (which are shared libraries) at the same location as
+  # put plugins (which are shared libraries) at the same location as
   # executable files
   set(CGAL_POLYHEDRON_DEMO_PLUGINS_DIR "${RUNTIME_OUTPUT_PATH}")
   set(LIBRARY_OUTPUT_PATH "${CGAL_POLYHEDRON_DEMO_PLUGINS_DIR}")
diff --git a/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt b/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt
index 7ee0eaa3b49..5f5008878f6 100644
--- a/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt
+++ b/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt
@@ -7,7 +7,5 @@ project(Set_movable_separability_2_Examples)
 find_package(CGAL REQUIRED)
 
 create_single_source_cgal_program("top_edges_single_mold_trans_cast.cpp")
-create_single_source_cgal_program(
-  "is_pullout_direction_single_mold_trans_cast.cpp")
-create_single_source_cgal_program(
-  "pullout_directions_single_mold_trans_cast.cpp")
+create_single_source_cgal_program("is_pullout_direction_single_mold_trans_cast.cpp")
+create_single_source_cgal_program("pullout_directions_single_mold_trans_cast.cpp")
diff --git a/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt b/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
index 9de592b8f8a..6ad0b25d29e 100644
--- a/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
+++ b/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
@@ -11,12 +11,7 @@ find_package(CGAL REQUIRED COMPONENTS Core)
 find_package(OSQP QUIET)
 include(CGAL_OSQP_support)
 if(TARGET CGAL::OSQP_support)
-  message(STATUS "Found OSQP")
-
-  set(osqp_targets
-  benchmark_contours
-  benchmark_qp_segments)
-
+  set(osqp_targets benchmark_contours benchmark_qp_segments)
   foreach(osqp_target ${osqp_targets})
     create_single_source_cgal_program("${osqp_target}.cpp")
     if(TARGET ${osqp_target})
diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
index b09f63d1cd8..7c2d1fb9dc8 100644
--- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
@@ -17,8 +17,7 @@ if(TARGET CGAL::Eigen3_support)
   # ------------------------------------------------------------------
 
   set(SuiteSparse_USE_LAPACK_BLAS ON)
-  find_package(SuiteSparse QUIET NO_MODULE
-  )# 1st: Try to locate the *config.cmake file.
+  find_package(SuiteSparse QUIET NO_MODULE)# 1st: Try to locate the *config.cmake file.
   if(NOT SuiteSparse_FOUND)
     set(SuiteSparse_VERBOSE ON)
     find_package(SuiteSparse QUIET) # 2nd: Use FindSuiteSparse.cmake module
diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
index 81d75a3ce49..bf1a08432cd 100644
--- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
@@ -10,8 +10,7 @@ find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("extensive_parameterization_test.cpp")
-  target_link_libraries(extensive_parameterization_test
-                        PUBLIC CGAL::Eigen3_support)
+  target_link_libraries(extensive_parameterization_test PUBLIC CGAL::Eigen3_support)
 else()
   message("NOTICE: The tests require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
index 15fc236f473..d142ca17989 100644
--- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
@@ -81,7 +81,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(T3_demo)
 
-else(Qt5_FOUND)
+else(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
   set(TRIANGULATION_3_MISSING_DEPS "")
 
@@ -96,6 +96,4 @@ else(Qt5_FOUND)
 
   message("NOTICE: This demo requires ${TRIANGULATION_3_MISSING_DEPS}, and will not be compiled.")
 
-endif(
-  CGAL_Qt5_FOUND
-  AND Qt5_FOUND)
+endif(CGAL_Qt5_FOUND AND Qt5_FOUND)