diff --git a/control/async.c b/control/async.c
index aa25dfb128c31dd6fcb15f8eeebfc90f0e014ece..b6dee05fd28df42a3c6584116e1eeb4203ba319e 100644
--- a/control/async.c
+++ b/control/async.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon asynchronous management routines
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/async.h b/control/async.h
index a7be465ab1f93089992e305a3ac404ad42cadef1..a2196ffe459f9cbe4e3f2c6697ab6435d26bee79 100644
--- a/control/async.h
+++ b/control/async.h
@@ -7,11 +7,9 @@
  * @copyright 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- **/
-/***
- *
+ ***
  *
- *  MORSE auxiliary routines
+ * @brief Chameleon asynchronous management header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/auxiliary.h b/control/auxiliary.h
index 9d6fb207bc0ffd79c1d1346d92ca6250c0da97fc..b80039a7bb40a1946a9bcb2367262d6b32ae1647 100644
--- a/control/auxiliary.h
+++ b/control/auxiliary.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon auxiliary header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/compute_z.h b/control/compute_z.h
index 55368f626606e56337f6f493577866ced84928ea..582faf667dfeecb6966a814741ef46209e2c9ba3 100644
--- a/control/compute_z.h
+++ b/control/compute_z.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon computational functions header
  *
  * @version 1.0.0
  * @comment This file has been automatically generated
diff --git a/control/context.c b/control/context.c
index 3b9c6ed997fd3a966f65ba6cc50c1413fe7f1ba9..5b26edd7bce42afe8f3e33528c8077258a408b1c 100644
--- a/control/context.c
+++ b/control/context.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon context management routines
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/context.h b/control/context.h
index cf30f03b722c500a087170a162960c48d805bf10..52334df5198aeb683f7f840c4e2e44ca504c3953 100644
--- a/control/context.h
+++ b/control/context.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon context header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/control.c b/control/control.c
index 69044f9f51424b93653372df91f7761e9418d1b2..5dd372f8bcb2cceb163a33aa2226030451e30c81 100644
--- a/control/control.c
+++ b/control/control.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon control routines
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/descriptor.c b/control/descriptor.c
index da0e0835165f6e207c6c1585e1fea15b00523d26..a9a43054e8386c448e59f1c2be7ba8d41d4fa4e1 100644
--- a/control/descriptor.c
+++ b/control/descriptor.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon descriptors routines
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/control/descriptor.h b/control/descriptor.h
index 42f8b265c22f6459849c15430dd0cc3cfd0e1754..02c6d9730901e96e6ab2622136e2a3f14c9eb63f 100644
--- a/control/descriptor.h
+++ b/control/descriptor.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon descriptor header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/gkkleader.h b/control/gkkleader.h
index ed299e54f1b6473f2311f82f2799dcc2f366ee31..90ba2bce546f3402687174c6ee5341205232952c 100644
--- a/control/gkkleader.h
+++ b/control/gkkleader.h
@@ -9,16 +9,15 @@
  *
  ***
  *
- * @brief Chameleon InPlaceTransformation module
- *
- *  This work is the implementation of an inplace transformation 
- *  based on the GKK algorithm by Gustavson, Karlsson, Kagstrom 
- *  and its fortran implementation.
- *
+ * @brief Chameleon InPlaceTransformation main module header
  * @version 1.0.0
  * @author Mathieu Faverge
  * @date 2010-11-15
  *
+ * This work is the implementation of an inplace transformation
+ * based on the GKK algorithm by Gustavson, Karlsson, Kagstrom
+ * and its fortran implementation.
+ *
  **/
 #ifndef GKKLEADERS_H
 #define GKKLEADERS_H
@@ -27,16 +26,17 @@ int  GKK_doublingtable(int x, int m, int emax, int *dt);
 int  GKK_modpow(int *dt, int e, int m);
 int  GKK_primroot(int p, int e, primedec_t *pr_p1, int t_p1);
 int  GKK_multorder(int n, int p, int e, int pe, primedec_t *pr_p1, int t_p1);
-void GKK_prepare(int q, int n, primedec_t *pr_q, int *t, 
-                 primedec_t **pr_pi1, int *t_pi1, int *gi, 
+void GKK_prepare(int q, int n, primedec_t *pr_q, int *t,
+                 primedec_t **pr_pi1, int *t_pi1, int *gi,
                  int *Nif, int *Kif, int *dif);
-void GKK_L(int t, primedec_t *pr_q, int *fi, int *Kif, int *dif, 
+void GKK_L(int t, primedec_t *pr_q, int *fi, int *Kif, int *dif,
            int *Li, int *diLi, int *cl, int *nl);
-void GKK_precompute_terms(int q, primedec_t *pr_q, int t, int *gi, 
+void GKK_precompute_terms(int q, primedec_t *pr_q, int t, int *gi,
                           int *diLi, int *rp, int *Mg, int nMg);
 void GKK_BalanceLoad(int thrdnbr, int *Tp, int *leaders, int nleaders, int L);
-void GKK_output_tables(int m, int n, int q, primedec_t *pr_q, int t, 
+void GKK_output_tables(int m, int n, int q, primedec_t *pr_q, int t,
                        int *gi, int *Nif, int *Kif, int *dif);
 
-int GKK_getLeaderNbr(int me, int ne, int *nleaders, int **leaders);
+int  GKK_getLeaderNbr(int me, int ne, int *nleaders, int **leaders);
+
 #endif /* GKKLEADERS_H */
diff --git a/control/global.h b/control/global.h
index 359f39e9a328ce57af15ba967671f4936783e18b..50fbcbf923510d65076d3e608c914e936cffe950 100644
--- a/control/global.h
+++ b/control/global.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon global variables header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/morse_f77.c b/control/morse_f77.c
index acc2f80a42bf0845a5534dd2442afad5ff1de920..b0cec40dacd75ffbf0e6238128b2bdfa8441aabb 100644
--- a/control/morse_f77.c
+++ b/control/morse_f77.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon Fortran77 interface
  *
  * @version 1.0.0
  * @author Bilel Hadri
diff --git a/control/morse_f77.h b/control/morse_f77.h
index 65dd47a087193ec068c7e3e365ca712748e1fd73..7b8df94131fef6adf067a200537ddc5ae47b5083 100644
--- a/control/morse_f77.h
+++ b/control/morse_f77.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon Fortran names
+ * @brief Chameleon Fortran77 naming macros
  *
  * @version 1.0.0
  * @author Florent Pruvost
diff --git a/control/morse_mf77.c b/control/morse_mf77.c
index 7bd91faac90152d963e40caca4e7567feaf38a18..e1875b1df737aa8998e58306907a14b9f68b752a 100644
--- a/control/morse_mf77.c
+++ b/control/morse_mf77.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon mixed-precision computational routines
+ * @brief Chameleon Fortran77 interface for mixed-precision computational routines
  *
  * @version 1.0.0
  * @author Bilel Hadri
diff --git a/control/morse_zf77.c b/control/morse_zf77.c
index f01952f585fc6d5523d227504df0c92f639ff475..2b75de7ca20cb1ba9b764c5bb1ad48b70bee875f 100644
--- a/control/morse_zf77.c
+++ b/control/morse_zf77.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon computational routines
+ * @brief Chameleon Fortran77 computational routines
  *
  * @version 1.0.0
  * @comment This file has been automatically generated
diff --git a/control/morsewinthread.c b/control/morsewinthread.c
index 90b92918b52f51db1e4029469bd1824f7e8e4cab..52390f7a536c09941fa92a24116dbcee343c0f7d 100644
--- a/control/morsewinthread.c
+++ b/control/morsewinthread.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon thread routines
+ * @brief Chameleon windows threads interface
  *
  * @version 1.0.0
  * @author Piotr Luszczek
diff --git a/control/morsewinthread.h b/control/morsewinthread.h
index e094f0d3063b28f2495f166edb1e3ed994022a9d..f4e261425f35113e9faa65e088ad2577f453c8b5 100644
--- a/control/morsewinthread.h
+++ b/control/morsewinthread.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon thread routines
+ * @brief Chameleon Windows thread interface header
  *
  * @version 1.0.0
  * @author Piotr Luszczek
diff --git a/control/primes.h b/control/primes.h
index a8c2b9e2956f2be9462ce020a62573465413fbf0..0bb6660d3d224d25e5c645b979e682bc02c5bb8e 100644
--- a/control/primes.h
+++ b/control/primes.h
@@ -9,17 +9,16 @@
  *
  ***
  *
- * @brief Chameleon InPlaceTransformation module
- *
- *  This work is the implementation of an inplace transformation 
- *  based on the GKK algorithm by Gustavson, Karlsson, Kagstrom 
- *  and its fortran implementation.
- *
+ * @brief Chameleon InPlaceTransformation prime numbers module header
  * @version 1.0.0
  * @author Mathieu Faverge
  * @author Cedric Castagnede
  * @date 2010-11-15
  *
+ * This work is the implementation of an inplace transformation
+ * based on the GKK algorithm by Gustavson, Karlsson, Kagstrom
+ * and its fortran implementation.
+ *
  **/
 #ifndef PRIMES_H
 #define PRIMES_H
diff --git a/control/tile.c b/control/tile.c
index 9ddba0a2b2918481e40dd39a22bb182e0a1e27d1..c32bd077e6819dcfcf80f4656aabe62bc6313cff 100644
--- a/control/tile.c
+++ b/control/tile.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon layout conversion wrappers
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/workspace.c b/control/workspace.c
index bcc6edd6de1d4120dfbadd89b8fb9a944b468514..73c2308b3a4e6aa4c9fb0c69eb295ab629ec58f8 100644
--- a/control/workspace.c
+++ b/control/workspace.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon workspace routines
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/control/workspace.h b/control/workspace.h
index b603b287bf4e1920f4d9c75a004f085515f6a2e6..f8535feac8e85d5d535773472977bbce16bc3c46 100644
--- a/control/workspace.h
+++ b/control/workspace.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon workspace header
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/control/workspace_z.c b/control/workspace_z.c
index fdbca6aea333e547cbd98e7e27423e0736ee8654..d0aab7d185d9f5ce983a5bc2845cf3f3a8acade5 100644
--- a/control/workspace_z.c
+++ b/control/workspace_z.c
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon precision dependent workspace routines
  *
  * @version 1.0.0
  * @comment This file has been automatically generated