diff --git a/include/chameleon/chameleon_timer.h b/include/chameleon/chameleon_timer.h
index 1e248404fcbb0fabe7ba1c9ca0c2422a20da1e2e..996a0b693c3dc92057f9d806b9d2d22a7bd59072 100644
--- a/include/chameleon/chameleon_timer.h
+++ b/include/chameleon/chameleon_timer.h
@@ -9,6 +9,8 @@
  *
  * @version 1.0.0
  *
+ * @brief Chameleon timer
+ *
  * Provide a simple timer for examples and runtimes which do not provide their
  * own timer.
  *
@@ -40,29 +42,29 @@ gettimeofday(struct timeval* tv, struct timezone* tz)
     static int       tzflag;
 
     if (NULL != tv)
-        {
-            GetSystemTimeAsFileTime(&ft);
-            tmpres |=  ft.dwHighDateTime;
-            tmpres <<= 32;
-            tmpres |=  ft.dwLowDateTime;
+    {
+        GetSystemTimeAsFileTime(&ft);
+        tmpres |=  ft.dwHighDateTime;
+        tmpres <<= 32;
+        tmpres |=  ft.dwLowDateTime;
 
-            /*converting file time to unix epoch*/
-            tmpres /= 10;  /*convert into microseconds*/
-            tmpres -= DELTA_EPOCH_IN_MICROSECS;
+        /*converting file time to unix epoch*/
+        tmpres /= 10;  /*convert into microseconds*/
+        tmpres -= DELTA_EPOCH_IN_MICROSECS;
 
-            tv->tv_sec  = (long)(tmpres / 1000000UL);
-            tv->tv_usec = (long)(tmpres % 1000000UL);
-        }
+        tv->tv_sec  = (long)(tmpres / 1000000UL);
+        tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
     if (NULL != tz)
+    {
+        if (!tzflag)
         {
-            if (!tzflag)
-                {
-                    _tzset();
-                    tzflag++;
-                }
-            tz->tz_minuteswest = _timezone / 60;
-            tz->tz_dsttime     = _daylight;
+            _tzset();
+            tzflag++;
         }
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime     = _daylight;
+    }
     return 0;
 }
 
diff --git a/include/chameleon/morse_constants.h b/include/chameleon/morse_constants.h
index 1c127bb37f3303855859c27e734070ad5d4e30b3..01f412b95506f0626bbe7ff7493958b2bba675f2 100644
--- a/include/chameleon/morse_constants.h
+++ b/include/chameleon/morse_constants.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon header
+ * @brief Chameleon global constants
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/include/chameleon/morse_fortran.h b/include/chameleon/morse_fortran.h
index 3f8c2cf09f2dbf52244432936dcb636a93eeb14c..b1fb41aec6e042ca0a85bb6e2833199e82fe31b1 100644
--- a/include/chameleon/morse_fortran.h
+++ b/include/chameleon/morse_fortran.h
@@ -1,4 +1,4 @@
-!!!
+!**
 !
 ! -- Inria
 ! -- (C) Copyright 2012
@@ -33,15 +33,9 @@
 ! The fact that you are presently reading this means that you have had
 ! knowledge of the CeCILL-B license and that you accept its terms.
 !
-!!!
-
 !**
 !
-!
-!  MORSE FORTRAN header
-!  MORSE is a software package provided by Univ. of Tennessee,
-!  Univ. of California Berkeley and Univ. of Colorado Denver
-!
+! @brief Chameleon Fortran77 header
 ! @version 1.0.0
 ! @author Bilel Hadri
 ! @author Mathieu Faverge
diff --git a/include/chameleon/morse_kernels.h b/include/chameleon/morse_kernels.h
index ea8a1f19c80932f466af59caf93a17858c8e7215..8427865968ca77b0b0abd4f3352685cf068ac2b7 100644
--- a/include/chameleon/morse_kernels.h
+++ b/include/chameleon/morse_kernels.h
@@ -9,12 +9,12 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon elementary kernels enum
  *
  * @version 1.0.0
- *  @author Mathieu Faverge
- *  @author Cedric Augonnet
- *  @date 2011-06-01
+ * @author Mathieu Faverge
+ * @author Cedric Augonnet
+ * @date 2011-06-01
  *
  **/
 #ifndef _MORSE_KERNELS_H_
diff --git a/include/chameleon/morse_runtime.h b/include/chameleon/morse_runtime.h
index 8bbc969183c95825a07ebd426d49ac61dd242941..7ab4e3b23eebaec4a39782cc536f76c0613ce652 100644
--- a/include/chameleon/morse_runtime.h
+++ b/include/chameleon/morse_runtime.h
@@ -7,12 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- *  CHAMELEON runtimes API
- *
- *  CHAMELEON is a software package provided by Univ. of Tennessee,
- *  Univ. of California Berkeley and Univ. of Colorado Denver,
- *  and Inria Bordeaux Sud-Ouest
+ ***
  *
+ * @brief Chameleon runtimes API
  * @version 1.0.0
  * @author Mathieu Faverge
  * @author Cedric Augonnet
diff --git a/include/chameleon/morse_simulate.h b/include/chameleon/morse_simulate.h
index e55a72939ca9038afa30646a58c51e2dc3afc27b..40db7729f32a4ccc6b28ac8d334a861f102ec847 100644
--- a/include/chameleon/morse_simulate.h
+++ b/include/chameleon/morse_simulate.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon SimGrid simulation header
  *
  * @version 1.0.0
  * @author Florent Pruvost
diff --git a/include/chameleon/morse_struct.h b/include/chameleon/morse_struct.h
index f0ac2cd3471e918735597ce71281b896033cd12b..9919d14dba2ed070ea3097a5968004194751c72c 100644
--- a/include/chameleon/morse_struct.h
+++ b/include/chameleon/morse_struct.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon header
+ * @brief Chameleon structures
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/include/chameleon/morse_tasks.h b/include/chameleon/morse_tasks.h
index 467177d5b7be78d56d0922259d251f802431ed9d..5babbd1c879b8c22824a606431029ec183d67698 100644
--- a/include/chameleon/morse_tasks.h
+++ b/include/chameleon/morse_tasks.h
@@ -9,12 +9,12 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon elementary tasks main header
  *
  * @version 1.0.0
- *  @author Mathieu Faverge
- *  @author Cedric Augonnet
- *  @date 2011-06-01
+ * @author Mathieu Faverge
+ * @author Cedric Augonnet
+ * @date 2011-06-01
  *
  **/
 #ifndef _MORSE_TASKS_H_
diff --git a/include/chameleon/morse_tasks_z.h b/include/chameleon/morse_tasks_z.h
index abc917060647358b0ed31dd06cbe4b2e8a845bac..5e7dbc9160283ee8ec7e8435d7f827ce23eb4168 100644
--- a/include/chameleon/morse_tasks_z.h
+++ b/include/chameleon/morse_tasks_z.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon MORSE_Complex64_t elementary tasks header
  *
  * @version 1.0.0
  * @comment This file has been automatically generated
diff --git a/include/chameleon/morse_tasks_zc.h b/include/chameleon/morse_tasks_zc.h
index bb5a675497b13e033c510f32b0cb0b6a965a499e..3ddd459460d49555401c86a46c277dd9b338f0b6 100644
--- a/include/chameleon/morse_tasks_zc.h
+++ b/include/chameleon/morse_tasks_zc.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon complex mixed precision elementary tasks header
  *
  * @version 1.0.0
  * @comment This file has been automatically generated
diff --git a/include/chameleon/morse_types.h b/include/chameleon/morse_types.h
index 73134e1c4fcc96ee3911c3546dafee2eed979129..aca77a0eaf4940a51c40649170f9e36f3e80bcab 100644
--- a/include/chameleon/morse_types.h
+++ b/include/chameleon/morse_types.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon header
+ * @brief Chameleon basic datatypes header
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/include/chameleon/morse_z.h b/include/chameleon/morse_z.h
index 8d4923f2a20f25b68be78212e2ebcf5021309a8a..cee8b9808071f50e995a9b5a07e1563defac326e 100644
--- a/include/chameleon/morse_z.h
+++ b/include/chameleon/morse_z.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon header file for double _Complex routines
+ * @brief Chameleon MORSE_complex64_t wrappers
  *
  * @version 1.0.0
  * @comment This file has been automatically generated
diff --git a/include/chameleon/morse_zc.h b/include/chameleon/morse_zc.h
index fd93971041e537022343f93c3091b9c8cb7ece12..39e2fbb41da80b84c40654a73c114d29fde35f63 100644
--- a/include/chameleon/morse_zc.h
+++ b/include/chameleon/morse_zc.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon header file for iterative refinement routines
+ * @brief Chameleon mixed precision wrappers header
  *
  * @version 1.0.0
  * @comment This file has been automatically generated