diff --git a/src/Learning/MODL/CMakeLists.txt b/src/Learning/MODL/CMakeLists.txt
index 8389cf023..3369f818e 100644
--- a/src/Learning/MODL/CMakeLists.txt
+++ b/src/Learning/MODL/CMakeLists.txt
@@ -1,6 +1,8 @@
 file(GLOB cppfiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-# MODL executable On Fedora, binaries built with mpi must be suffixed by _mpich (in stored ${MPI_SUFFIX})
+# Add MODL executable
+#
+# On Fedora: binaries built with MPI must suffixed by "_mpich" (stored in ${MPI_SUFFIX})
 add_executable(MODL${MPI_SUFFIX} ${cppfiles} MODL.rc)
 target_link_libraries(MODL${MPI_SUFFIX} PUBLIC DTForest KMDRRuleLibrary KWLearningProblem)
 set_khiops_options(MODL${MPI_SUFFIX})
@@ -8,7 +10,7 @@ if(MPI)
   target_link_libraries(MODL${MPI_SUFFIX} PUBLIC PLMPI)
 endif()
 
-# MODL_SO (shared library)
+# Add MODL_SO shared library
 add_library(MODL_SO SHARED ${cppfiles})
 target_link_libraries(MODL_SO PUBLIC DTForest KMDRRuleLibrary KWLearningProblem)
 if(MPI)
diff --git a/src/Learning/MODL_Coclustering/CMakeLists.txt b/src/Learning/MODL_Coclustering/CMakeLists.txt
index 97cb92dd5..bf854e8ec 100644
--- a/src/Learning/MODL_Coclustering/CMakeLists.txt
+++ b/src/Learning/MODL_Coclustering/CMakeLists.txt
@@ -1,15 +1,13 @@
 file(GLOB cppfiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-# on fedora, binaries built with mpi must ended by _mpich suffix
+# Add MODL_Coclustering executable
+#
+# On Fedora: binaries built with MPI must suffixed by "_mpich" (stored in ${MPI_SUFFIX})
 add_executable(MODL_Coclustering${MPI_SUFFIX} ${cppfiles} MODL_Coclustering.rc)
-set_khiops_options(MODL_Coclustering${MPI_SUFFIX})
-
 target_link_libraries(MODL_Coclustering${MPI_SUFFIX} PUBLIC KMDRRuleLibrary KWLearningProblem)
+set_khiops_options(MODL_Coclustering${MPI_SUFFIX})
 
-if(MSVC)
-  target_link_options(MODL_Coclustering${MPI_SUFFIX} PUBLIC "/INCREMENTAL")
-endif()
-
+# Add MODL_Coclustering_SO shared library
 add_library(MODL_Coclustering_SO SHARED ${cppfiles})
 target_link_libraries(MODL_Coclustering_SO PUBLIC KMDRRuleLibrary KWLearningProblem)
 set_target_properties(