diff --git a/CMake/GenerateConfigProperties.cpp b/CMake/GenerateConfigProperties.cpp
index 239a5737a5207a1c064e0412d5ffb1d89586ca20..4f60a4ffb166b95981a166b6cb4a85f335ee02fd 100644
--- a/CMake/GenerateConfigProperties.cpp
+++ b/CMake/GenerateConfigProperties.cpp
@@ -34,10 +34,6 @@ PURPOSE.  See the above copyright notices for more information.
 int main(int argc, char* argv[])
 {
    const unsigned int nbParameters = 3;
-//    if (argc != 5)
-//    {
-//       exit(1);
-//    }
 
    std::ofstream os(argv[1]); 
    if (!os)
@@ -47,7 +43,7 @@ int main(int argc, char* argv[])
 
    std::vector <std::string>  paramVector;
    
-   /* write available parameters to a vector */
+   /** write available parameters to a vector */
    for (unsigned int i=0;i<nbParameters;++i)
    {
      if ( argc >= ( i+3 ) )
@@ -61,11 +57,7 @@ int main(int argc, char* argv[])
        paramVector.push_back("");
      }
    }
-   
-//    std::string language(argv[2]);
-//    std::string activateStreaming(argv[3]);
-//    std::string sizeStreaming(argv[4]);
-
+   /** Write parameters to the configuration file*/
    os << "#Auto generated by config-properties \n"
       << "OTB_LANG="
       <<  paramVector[0]