diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 16a546310d..eca9fbbb5a 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -316,11 +316,10 @@ OpenLayers.Map.prototype = {
 
   /********************************************************/
   /*                                                      */
-  /*           Layers, Controls, Popup Functions          */
+  /*                  Layer Functions                     */
   /*                                                      */
   /*     The following functions deal with adding and     */
-  /*        removing Layers, Controls, and Popups         */
-  /*                to and from the Map                   */
+  /*        removing Layers to and from the Map           */
   /*                                                      */
   /********************************************************/         
 
@@ -559,6 +558,16 @@ OpenLayers.Map.prototype = {
         }
     },
 
+
+  /********************************************************/
+  /*                                                      */
+  /*                 Control Functions                    */
+  /*                                                      */
+  /*     The following functions deal with adding and     */
+  /*        removing Controls to and from the Map         */
+  /*                                                      */
+  /********************************************************/         
+
     /**
     * @param {OpenLayers.Control} control
     * @param {OpenLayers.Pixel} px
@@ -589,6 +598,15 @@ OpenLayers.Map.prototype = {
         }
     },
     
+  /********************************************************/
+  /*                                                      */
+  /*                  Popup Functions                     */
+  /*                                                      */
+  /*     The following functions deal with adding and     */
+  /*        removing Popups to and from the Map           */
+  /*                                                      */
+  /********************************************************/         
+
     /** 
     * @param {OpenLayers.Popup} popup
     * @param {Boolean} exclusive If true, closes all other popups first