diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index 1849353edf7215bceae3508dd140560620da4cab..14c640d71ddc6e4695ea8381544147da332abdc2 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -66,7 +66,7 @@ static void cl_dzasum_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &storev, &uplo, &M, &N, &lda);
     CORE_dzasum(storev, uplo, M, N, A, lda, work);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index 2417e50f46a46fc0b580ebeb54525797bfc6098f..1de17ff6958fa3b306adc7b8cf867c60d5c17bc6 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -65,7 +65,7 @@ static void cl_zaxpy_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &M, &alpha, &incA, &incB);
     CORE_zaxpy(M, alpha, A, incA, B, incB);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index 0483378bff9748d6d9af428a7064e2294e5694d3..d8071d814db42bd8f7b6ec4c0d4c6ecc4c919372 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -86,7 +86,7 @@ static void cl_zbuild_cpu_func(void *descr[], void *cl_arg)
   user_build_callback(row_min, row_max, col_min, col_max, A, ld, user_data);
 
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 56f0e81481d12a25a82d140eee17a25e93b0f6cb..1eefb71ba2d0ae4edd870ed3eef0b3c5a4a7c3f7 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -131,7 +131,7 @@ static void cl_zgeadd_cpu_func(void *descr[], void *cl_arg)
     CORE_zgeadd(trans, M, N, alpha, A, LDA, beta, B, LDB);
     return;
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 8e7dbdcba25a4f7c7b8018c5b32038bb5a547791..fe12b78508ce6b5fbd0a15928647760daf5d8fcf 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -149,7 +149,7 @@ static void cl_zgelqt_cpu_func(void *descr[], void *cl_arg)
     WORK = TAU + max( m, n );
     CORE_zgelqt(m, n, ib, A, lda, T, ldt, TAU, WORK);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 #if defined(CHAMELEON_USE_MAGMA)
 #if !defined(CHAMELEON_SIMULATION)
@@ -194,8 +194,8 @@ static void cl_zgelqt_cuda_func(void *descr[], void *cl_arg)
 
     cudaThreadSynchronize();
 }
-#endif //defined(CHAMELEON_USE_MAGMA)
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* defined(CHAMELEON_USE_MAGMA) */
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 1ff16ebf749a54c4fb01136b5223fca05b184c96..592c9c2c405ea503124b31c3fbb386fc08e215d4 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -54,7 +54,7 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options,
     int rank_changed=0;
     (void)execution_rank;
 
-    // force execution on the rank owning the largest data (tile)
+    /*  force execution on the rank owning the largest data (tile) */
     int threshold;
     char* env = getenv("MORSE_COMM_FACTOR_THRESHOLD");
 
@@ -211,7 +211,7 @@ static void cl_zgemm_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index c375bf281fd0e04cee4833d2ebf90047c4aea061..91f730c847e032fb53fbfa7d11f9505046f8daee 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -195,8 +195,8 @@ static void cl_zgeqrt_cuda_func(void *descr[], void *cl_arg)
 
     cudaThreadSynchronize();
 }
-#endif //defined(CHAMELEON_USE_MAGMA)
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* defined(CHAMELEON_USE_MAGMA) */
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index a325078946474c759b2023ba9cd5ca1dfaaa0aab..f357b215f3190ab02f25147412fe2b8234ebf784 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -161,8 +161,8 @@ static void cl_zgessm_cuda_func(void *descr[], void *cl_arg)
 
     return;
 }
-#endif //defined(CHAMELEON_USE_MAGMA) && defined(HAVE_MAGMA_GETRF_INCPIV_GPU)
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* defined(CHAMELEON_USE_MAGMA) && defined(HAVE_MAGMA_GETRF_INCPIV_GPU) */
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index fd7c69e56c83cacfdaad4d9ccaef4184333984a1..d13dd85c78bfd64d6be161e5d413d69d5bc91260 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -63,7 +63,7 @@ static void cl_zgessq_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &m, &n, &lda);
     CORE_zgessq( m, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1] );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index e17f1917d1cb6a08778d5c753107cfeab3670a87..e6eec579a39c6f1e8bf0add8557fa44c5cd9c988 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -74,7 +74,7 @@ static void cl_zgetrf_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &IPIV, &check_info, &iinfo);
     CORE_zgetrf( m, n, A, lda, IPIV, &info );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 5b05053226d349c4900a1d847daf0cd4ea44676c..8ee3d95dc42be6795727931f3ba46bf3d72ebe0d 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -227,8 +227,8 @@ static void cl_zgetrf_incpiv_cuda_func(void *descr[], void *cl_arg)
 
     cudaThreadSynchronize();
 }
-#endif //defined(CHAMELEON_USE_MAGMA) && defined(HAVE_MAGMA_GETRF_INCPIV_GPU)
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* defined(CHAMELEON_USE_MAGMA) && defined(HAVE_MAGMA_GETRF_INCPIV_GPU) */
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 
 /*
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index fcfd96fc391e23cb53e862a8ec3940a91dcd1830..31e70a4c06c2e040d1d5772c2ce7225b7ae37eb2 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -141,7 +141,7 @@ static void cl_zgetrf_nopiv_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 705c3341f2c87f8501369a5c7441603b964cb2c6..8f47ad6309397e79b9cc8ebb8e5c5b656ec8d223 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -181,7 +181,7 @@ static void cl_zhemm_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 03e9babeaa1ae9854b61ada0f8fdcc14e28157d7..80c4cb7a0113303a5959a955300764d5effddd05 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -169,7 +169,7 @@ static void cl_zher2k_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 3856452313f9a417ccc96b9a0c87b90b9c9d2c2a..d9bfef3b526b1ae9e16ee2289f241fe8a570bd7f 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -166,7 +166,7 @@ static void cl_zherk_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index c07c175783f011de6312d501001d5c7b7bd527ee..aa3904e76b52547f874d31d82d53ca9d9bd15088 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -63,7 +63,7 @@ static void cl_zhessq_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &n, &lda);
     CORE_zhessq( uplo, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1] );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 04b8ec4227b0d2c6965950389cb8c7f22bc08cea..b62d2f06e2cd2f2154ebf9e4cd9bbc08e33e952e 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -82,7 +82,7 @@ static void cl_zlacpy_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &LDA, &LDB);
     CORE_zlacpy(uplo, M, N, A, LDA, B, LDB);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index de6b0efa7a15c37205d2e085319d5999a42bbc4d..7996cc8017ba21776e07bc0993e43d75ba3f9bd6 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -76,7 +76,7 @@ static void cl_zlag2c_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &ldb);
     CORE_zlag2c( m, n, A, lda, B, ldb);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 void MORSE_TASK_clag2z(const MORSE_option_t *options,
                        int m, int n, int nb,
@@ -120,7 +120,7 @@ static void cl_clag2z_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &ldb);
     CORE_clag2z( m, n, A, lda, B, ldb);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 450eb4cca4185f1d10f71e25067436e9df88fc96..219487ed70fdc9345a65b3c43ae0a87744514b34 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -71,7 +71,7 @@ static void cl_zlange_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &norm, &M, &N, &LDA);
     CORE_zlange( norm, M, N, A, LDA, work, normA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
@@ -107,7 +107,7 @@ static void cl_zlange_max_cpu_func(void *descr[], void *cl_arg)
     if ( *A > *normA )
         *normA = *A;
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 13abaec323e12d5703effea68a164363674ea671..529899eece704c3d9d32fff0de1989e435ad5b2b 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -69,7 +69,7 @@ static void cl_zlanhe_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &norm, &uplo, &N, &LDA);
     CORE_zlanhe( norm, uplo, N, A, LDA, work, normA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index 226233aaaade8f089a98a8316ed871abad77ef12..d2973a1d34278f367e7c4cc5adee067dbb4a7330 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -71,7 +71,7 @@ static void cl_zlansy_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &norm, &uplo, &N, &LDA);
     CORE_zlansy( norm, uplo, N, A, LDA, work, normA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index 35304f153d83ed6d40864a6e959c98702d496eb6..6ba5cb732817750122bb2effa8efd47c57c8fc98 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -69,7 +69,7 @@ static void cl_zlantr_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &norm, &uplo, &diag, &M, &N, &LDA);
     CORE_zlantr( norm, uplo, diag, M, N, A, LDA, work, normA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 48e8b628b3056d5ad9462c1a9e5718db073cb560..f40802665fa7899c798940aa4dc87a6f6ddf6bd2 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -103,7 +103,7 @@ static void cl_zlascal_cpu_func(void *descr[], void *cl_arg)
     CORE_zlascal(uplo, M, N, alpha, A, LDA);
     return;
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index d6fa87a31218a50f7cfc167603543dfc1ed921a3..1809d5f2a743da6e9a5f3f94c8e0a54c8c2442ee 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -110,7 +110,7 @@ static void cl_zlaset_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &alpha, &beta, &LDA);
     CORE_zlaset(uplo, M, N, alpha, beta, A, LDA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 0284ea119c14974529e7f1428f501cc5eb9f4978..67572a47f0e60d5520d9a00cfcd5ed73051f4e73 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -105,7 +105,7 @@ static void cl_zlaset2_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &alpha, &LDA);
     CORE_zlaset2(uplo, M, N, alpha, A, LDA);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index a5272248b6d50ef9b07d183fc409b53da750b3b1..d30eb3740569300708b4a9eec8eda5ac5cdce17c 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -90,7 +90,7 @@ static void cl_zlauum_cuda_func(void *descr[], void *cl_arg)
     return;
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index b9126407908a94485621225ddd65796d67067a22..186d9b21078b8ba4d150676cd2a8f83f2237a5b1 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -31,7 +31,7 @@
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
 
-//  MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix.
+/*   MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
 
 void MORSE_TASK_zplghe( const MORSE_option_t *options,
                         double bump, int m, int n, const MORSE_desc_t *A, int Am, int An, int lda,
@@ -60,7 +60,7 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options,
     }
 }
 
-//  cl_zplghe_cpu_func - Generate a tile for random hermitian (positive definite if bump is large enough) matrix.
+/*   cl_zplghe_cpu_func - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
 
 #if !defined(CHAMELEON_SIMULATION)
 static void cl_zplghe_cpu_func(void *descr[], void *cl_arg)
@@ -79,7 +79,7 @@ static void cl_zplghe_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &bump, &m, &n, &lda, &bigM, &m0, &n0, &seed );
     CORE_zplghe( bump, m, n, A, lda, bigM, m0, n0, seed );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index cb86ce122efd2e1f044adfec81a8e6f574a6c130..854947480d870e70cda6d26fbb3318ee712ef1b5 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -32,7 +32,7 @@
 #include "runtime/starpu/include/runtime_codelet_z.h"
 
 
-//  MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix.
+/*   MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
 
 void MORSE_TASK_zplgsy( const MORSE_option_t *options,
                         MORSE_Complex64_t bump, int m, int n, const MORSE_desc_t *A, int Am, int An, int lda,
@@ -61,7 +61,7 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options,
     }
 }
 
-//  cl_zplgsy_cpu_func - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix.
+/*   cl_zplgsy_cpu_func - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
 
 #if !defined(CHAMELEON_SIMULATION)
 static void cl_zplgsy_cpu_func(void *descr[], void *cl_arg)
@@ -80,7 +80,7 @@ static void cl_zplgsy_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &bump, &m, &n, &lda, &bigM, &m0, &n0, &seed );
     CORE_zplgsy( bump, m, n, A, lda, bigM, m0, n0, seed );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 25fd62a10a8f35d42dc66e8684cffb770507b4a0..1935dd343f500b6812750524670a5416c0806e36 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -32,7 +32,7 @@
 #include "runtime/starpu/include/runtime_codelet_z.h"
 
 
-//  MORSE_TASK_zplrnt - Generate a tile for random matrix.
+/*   MORSE_TASK_zplrnt - Generate a tile for random matrix. */
 
 void MORSE_TASK_zplrnt( const MORSE_option_t *options,
                         int m, int n, const MORSE_desc_t *A, int Am, int An, int lda,
@@ -59,7 +59,7 @@ void MORSE_TASK_zplrnt( const MORSE_option_t *options,
     }
 }
 
-//  cl_zplrnt_cpu_func - Generate a tile for random matrix.
+/*   cl_zplrnt_cpu_func - Generate a tile for random matrix. */
 
 #if !defined(CHAMELEON_SIMULATION)
 static void cl_zplrnt_cpu_func(void *descr[], void *cl_arg)
@@ -77,7 +77,7 @@ static void cl_zplrnt_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &m, &n, &lda, &bigM, &m0, &n0, &seed );
     CORE_zplrnt( m, n, A, lda, bigM, m0, n0, seed );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 12af9fd6a1f76d558eb10c75aef592fc5f4765a1..65b51032eab7740e275ec64339b36426b02e7676 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -93,7 +93,7 @@ static void cl_zplssq_cpu_func(void *descr[], void *cl_arg)
         SCLSSQ[1] = SCLSSQ[1]     + (SCALESUMSQ[1] * (( SCALESUMSQ[0] / SCLSSQ[0] ) * ( SCALESUMSQ[0] / SCLSSQ[0] )));
     }
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
@@ -124,7 +124,7 @@ static void cl_zplssq2_cpu_func(void *descr[], void *cl_arg)
 
     RESULT[0] = RESULT[0] * sqrt( RESULT[1] );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index d0a658443bea4eeeebe9db030952e90970215b15..abfd477a2709f11b0d2f1f7a73ddef843dbfb467 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -56,7 +56,7 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options,
             STARPU_RW,        RTBLKADDR(A, MORSE_Complex64_t, Am, An),
             STARPU_VALUE,    &lda,                       sizeof(int),
             STARPU_VALUE,    &iinfo,                     sizeof(int),
-            //STARPU_SCRATCH,   options->ws_worker,
+            /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
             0);
@@ -100,21 +100,21 @@ static void cl_zpotrf_cuda_func(void *descr[], void *cl_arg)
     /*  *\/ */
     /* hA = (cuDoubleComplex *)STARPU_MATRIX_GET_PTR(descr[1]); */
 
-//     stream[0] = starpu_cuda_get_local_stream();
-//     if ( cudaStreamCreate( stream+1 ) != CUDA_SUCCESS ){
-//         fprintf(stderr, "Error while creating stream in codelet_zpotrf\n");
-//         exit(-1);
-//     }
+/*      stream[0] = starpu_cuda_get_local_stream(); */
+/*      if ( cudaStreamCreate( stream+1 ) != CUDA_SUCCESS ){ */
+/*          fprintf(stderr, "Error while creating stream in codelet_zpotrf\n"); */
+/*          exit(-1); */
+/*      } */
 
     CUDA_zpotrf( uplo, n, A, lda, &info);
 
     cudaThreadSynchronize();
-//     cudaStreamDestroy( stream[1] );
+/*      cudaStreamDestroy( stream[1] ); */
 
     return;
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index cf766396b6e256f13d6660d77c79f81e2cc2ac5d..3a59f77080530cc1c9881fb885c346f4b4155d4c 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -212,7 +212,7 @@ static void cl_zssssm_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index c193f200d3d08b41bb9ddad2768634254ffadbf6..5356f6a0321a97d1f4703b4cc47491afc035443c 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -179,7 +179,7 @@ static void cl_zsymm_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index e07c22f0ddd68618d604ae32d54e0431fa4682d7..afaf7ce666cfc3262929e810d0c1e2b338783e79 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -169,7 +169,7 @@ static void cl_zsyr2k_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index a4c12e5517f39cdd0f027719f6adaf3c83936380..9b30fbad70c6fe66a5525680991e0d34b25ed904 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -159,7 +159,7 @@ static void cl_zsyrk_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index ee341935b834a2d5240e1daebeb0d7b3364f2d2d..62fe8f524a522c8054230b4795c94655cf0ae750 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -63,7 +63,7 @@ static void cl_zsyssq_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &n, &lda);
     CORE_zsyssq( uplo, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1] );
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 457b03ec9bbaa35143bb97110ca031c7da502b85..6320ea9a701ba4597dd90b4dea3a477a20ecbd5d 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -50,7 +50,7 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
             STARPU_RW,        RTBLKADDR(A, MORSE_Complex64_t, Am, An),
             STARPU_VALUE,    &lda,                       sizeof(int),
             STARPU_VALUE,    &iinfo,                     sizeof(int),
-            //STARPU_SCRATCH,   options->ws_worker,
+            /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
             0);
@@ -72,7 +72,7 @@ static void cl_zsytrf_nopiv_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &n, &lda, &iinfo);
     CORE_zsytf2_nopiv(uplo, n, A, lda);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index 7f5a967fa3c311bb92958d3964f50a7d7833a8f7..d8f1a1fb64fc0e0f48d5a8df3c0f6ed86f3e342f 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -77,7 +77,7 @@ static void cl_ztile_zero_cpu_func(void *descr[], void *cl_arg)
             A[lda*x+y] = 0.0;
 
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index 706e2aa5c682f29afc14cb2c1a641ba869c39178..24d532ddd6003aae04ad120709fd572eb156ea7c 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -137,7 +137,7 @@ static void cl_ztradd_cpu_func(void *descr[], void *cl_arg)
     CORE_ztradd(uplo, trans, M, N, alpha, A, LDA, beta, B, LDB);
     return;
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index d41179f8832b01d95ca8870e1b5f961a92a24d0a..7ad655c07eff232cebcd0af44049233189b03be3 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -67,7 +67,7 @@ static void cl_ztrasm_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &storev, &uplo, &diag, &M, &N, &lda);
     CORE_ztrasm(storev, uplo, diag, M, N, A, lda, work);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index bd9787389996e7f5f17414d6f600152d77364ff6..bbf932282c77ebb72a41119713fb7575c49b5a23 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -169,7 +169,7 @@ static void cl_ztrmm_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 
 /*
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 9d9138990f8c1f6f10a1e170e9a93c160314820e..2e1ec6c82b52d7ed8acd501c1f45bfaea214e21d 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -52,7 +52,7 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options,
     int rank_changed=0;
     (void)execution_rank;
 
-    // force execution on the rank owning the largest data (tile)
+    /*  force execution on the rank owning the largest data (tile) */
     int threshold;
     char* env = getenv("MORSE_COMM_FACTOR_THRESHOLD");
     if (env != NULL)
@@ -191,7 +191,7 @@ static void cl_ztrsm_cuda_func(void *descr[], void *cl_arg)
 }
 #endif /* CHAMELEON_USE_CUBLAS_V2 */
 #endif /* CHAMELEON_USE_CUDA */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 6f54067363eafe35871853c92e947a026feec6a3..910a81d3c9c72d93ae3cb0f790639870df84c0c8 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -68,7 +68,7 @@ static void cl_ztrssq_cpu_func(void *descr[], void *cl_arg)
     starpu_codelet_unpack_args(cl_arg, &uplo, &diag, &m, &n, &lda);
     CORE_ztrssq( uplo, diag, m, n, A, lda, &SCALESUMSQ[0], &SCALESUMSQ[1]);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index f5bfbfe4d34766b00fe38c54697023e8cfd006af..49e1ca9457e4f2b830da5a664ffdaf5ac3d9aaee 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -100,7 +100,7 @@ static void cl_ztrtri_cuda_func(void *descr[], void *cl_arg)
     return;
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index e97dad0d63953d6ed77beb9467f1e095e1a5fce6..137275a6822ee791a3a495ffc6c0b51086767634 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -212,7 +212,7 @@ static void cl_ztslqt_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index cba63b5246df3bf90a494019e77cc8bd913c5562..f074b8ae8bcf8859c6167310bdefd02074332c62 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -261,7 +261,7 @@ static void cl_ztsmlq_cuda_func(void *descr[], void *cl_arg)
 #endif
 }
 #endif /* defined(CHAMELEON_USE_CUDA) */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index d83d1d2f45e95d007731f719387d843388ec9905..ea579179f2b1edc1193f3fc0adece0a220fae134 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -152,7 +152,7 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options,
     int rank_changed=0;
     (void)execution_rank;
 
-    // force execution on the rank owning the largest data (tile)
+    /*  force execution on the rank owning the largest data (tile) */
     int threshold;
     char* env = getenv("MORSE_COMM_FACTOR_THRESHOLD");
     if (env != NULL)
@@ -293,7 +293,7 @@ static void cl_ztsmqr_cuda_func(void *descr[], void *cl_arg)
 #endif
 }
 #endif /* defined(CHAMELEON_USE_CUDA) */
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 
 /*
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 7cbff9eddde83aa5d4b9a72805fa3ca52f1e5b11..9a5d5e0ac073f932702743e1da3095b9b3bf3fab 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -202,7 +202,7 @@ static void cl_ztsqrt_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 4ce5e815ca784708da9333587634ace0c4aa23cb..2ba801d75f075ea69511ac51c60f0f4585c60f18 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -260,7 +260,7 @@ static void cl_ztstrf_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index b8e9ef0d23182e029b3c6efe5c09ecfa7a04fd39..1eac70c5dd6883e8a4533d1a7f289e0a9408ce56 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -167,7 +167,7 @@ static void cl_zttlqt_cpu_func(void *descr[], void *cl_arg)
 
     CORE_zttlqt(m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index 46f03b4938ad37d849cf69da7c85c4bc8da0d9e3..c3ec7be24e3bb149cb546e3d8b001a4b9fb963d9 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -205,7 +205,7 @@ static void cl_zttmlq_cpu_func(void *descr[], void *cl_arg)
     CORE_zttmlq(side, trans, m1, n1, m2, n2, k, ib, A1, lda1,
                 A2, lda2, V, ldv, T, ldt, WORK, ldwork);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index 64b7f04743a802bbd38f079168e4ec99f3938692..215c1870192806d8691ed667ca80111647b0f47f 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -145,7 +145,7 @@ void MORSE_TASK_zttmqr(const MORSE_option_t *options,
     int rank_changed=0;
     (void)execution_rank;
 
-    // force execution on the rank owning the largest data (tile)
+    /*  force execution on the rank owning the largest data (tile) */
     int threshold;
     char* env = getenv("MORSE_COMM_FACTOR_THRESHOLD");
     if (env != NULL)
@@ -234,7 +234,7 @@ static void cl_zttmqr_cpu_func(void *descr[], void *cl_arg)
     CORE_zttmqr(side, trans, m1, n1, m2, n2, k, ib,
                 A1, lda1, A2, lda2, V, ldv, T, ldt, WORK, ldwork);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index d520c8610561a4b64bee8be79289215d54340cda..3f5fd2ab38042a9b0cf41805d719953a5436d327 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -167,7 +167,7 @@ static void cl_zttqrt_cpu_func(void *descr[], void *cl_arg)
 
     CORE_zttqrt(m, n, ib, A1, lda1, A2, lda2, T, ldt, TAU, WORK);
 }
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index fac849c0ddcb3e74743a8e67dfa71ec3b4b1ab47..61a9ae8a5d94685a71ab0e5758e64023f76397c7 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -214,7 +214,7 @@ static void cl_zunmlq_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index b4c14f7b872c6e3b7b5abf44bab39640e32cd040..e4e278fad8806aba04b55646b0eb1d70b15021b0 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -133,7 +133,7 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options,
     int rank_changed=0;
     (void)execution_rank;
 
-    // force execution on the rank owning the largest data (tile)
+    /*  force execution on the rank owning the largest data (tile) */
     int threshold;
     char* env = getenv("MORSE_COMM_FACTOR_THRESHOLD");
     if (env != NULL)
@@ -240,7 +240,7 @@ static void cl_zunmqr_cuda_func(void *descr[], void *cl_arg)
     cudaThreadSynchronize();
 }
 #endif
-#endif //!defined(CHAMELEON_SIMULATION)
+#endif /* !defined(CHAMELEON_SIMULATION) */
 
 /*
  * Codelet definition