diff --git a/src/gui/widgets/timeline/timeline-header-container.hpp b/src/gui/widgets/timeline/timeline-header-container.hpp
index 612d70aca..749c43157 100644
--- a/src/gui/widgets/timeline/timeline-header-container.hpp
+++ b/src/gui/widgets/timeline/timeline-header-container.hpp
@@ -243,11 +243,23 @@ private:
    */
   Glib::RefPtr<Gdk::Window> gdkWindow;
   
+  /**
+   * The Menu object which will be displayed as the context menu when
+   * the user right clicks on the header container.
+   * @remarks The context menu will be displayed when the user's right
+   * click is not processed by track headers.
+   **/
+  Gtk::Menu contextMenu;
+  
+  /**
+   * A map of tracks to the rectangles of their headers.
+   * @remarks This map is used as a cache, so that the rectangles don't
+   * need to be perpetually recalculated. This cache is regenerated by
+   * the layout_headers method.
+   **/
   std::map<boost::shared_ptr<timeline::Track>, Gdk::Rectangle>
     headerBoxes;
   
-  Gtk::Menu contextMenu;
-  
   //----- User Interaction State -----//
   boost::shared_ptr<timeline::Track> hoveringExpander;