diff --git a/src/opengl.h b/src/opengl.h
index 18529a6..7b54d3e 100644
--- a/src/opengl.h
+++ b/src/opengl.h
@@ -65,12 +65,16 @@ typedef struct glTexture_ {
   char* name;         /**< Name of graphic. */
 
   /* Dimensions */
-  double w, h;        /**< Real size of the image (excluding POT buffer). */
-  double rw, rh;      /**< Size of POT surface. */
+  double w;           /**< Real width of the image. */
+  double h;           /**< Real height of the image. */
+  double rw;          /**< Padded POT width of the image. */
+  double rh;          /**< Padded POT height of the image. */
 
   /* Sprites */
-  double sx, sy;      /**< Number of sprites on x and y axes. */
-  double sw, sh;      /**< Size of each sprite. */
+  double sx;          /**< Number of sprites on the x axis. */
+  double sy;          /**< Number of sprites on the y axis. */
+  double sw;          /**< Width of the sprite. */
+  double sh;          /**< Height of the sprite. */
 
   /* Data */
   GLuint texture;     /**< The opengl texture itself. */
diff --git a/src/player.c b/src/player.c
index c07ea84..8e0a688 100644
--- a/src/player.c
+++ b/src/player.c
@@ -100,8 +100,10 @@ extern StarSystem* systems_stack;
  * @brief Represents the player's radar.
  */
 typedef struct Radar_ {
-  double x,y;         /**< Position. */
-  double w,h;         /**< Dimensions. */
+  double x;           /**< X position. */
+  double y;           /**< Y position. */
+  double w;           /**< Width. */
+  double h;           /**< Height. */
   RadarShape shape;   /**< Shape. */
   double res;         /**< Resolution. */
 } Radar;
@@ -118,8 +120,10 @@ typedef struct Radar_ {
  * @brief Represents a rectangle.
  */
 typedef struct Rect_ {
-  double x,y;
-  double w,h;
+  double x;   /**< X position. */
+  double y;   /**< Y position. */
+  double w;   /**< Width. */
+  double h;   /**< Height. */
 } Rect;
 
 /**
@@ -134,9 +138,13 @@ typedef struct GUI_ {
 
   Radar radar;                                      /**< The radar. */
   Rect nav;                                         /**< Navigation computer. */
-  Rect shield, armour, energy;                      /**< Health bars. */
+  Rect shield;                                      /**< Shield bar. */
+  Rect armour;                                      /**< Armour bar. */
+  Rect energy;                                      /**< Energy bar. */
   Rect weapon;                                      /**< Weapon targeting system. */
-  Rect target_health, target_name, target_faction;  /**< Target stuff. */
+  Rect target_health;                               /**< Target health. */
+  Rect target_name;                                 /**< Name of the target. */
+  Rect target_faction;                              /**< Faction of the target. */
   Rect misc;                                        /**< Misc stuff: credits, cargo.. */
   Rect msg;                                         /**< Where messages go. */