--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.h	Mon Oct 06 16:00:06 2014 -0700
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.h	Mon Oct 06 16:05:46 2014 -0700
@@ -80,9 +80,7 @@
 class A2A4RsrqHandoverAlgorithm : public LteHandoverAlgorithm
 {
 public:
-  /**
-   * \brief Creates an A2-A4-RSRQ handover algorithm instance.
-   */
+  /// Creates an A2-A4-RSRQ handover algorithm instance.
   A2A4RsrqHandoverAlgorithm ();
 
   virtual ~A2A4RsrqHandoverAlgorithm ();
@@ -106,41 +104,86 @@
   void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);
 
 private:
-  // Internal methods
+  /**
+   * Called when Event A2 is detected, then trigger a handover if needed.
+   *
+   * \param rnti The RNTI of the UE who reported the event.
+   * \param servingCellRsrq The RSRQ of this cell as reported by the UE.
+   */
   void EvaluateHandover (uint16_t rnti, uint8_t servingCellRsrq);
+
+  /**
+   * Determines if a neighbour cell is a valid destination for handover.
+   * Currently always return true.
+   *
+   * \param cellId The cell ID of the neighbour cell.
+   * \return True if the cell is a valid destination for handover.
+   */
   bool IsValidNeighbour (uint16_t cellId);
+
+  /**
+   * Called when Event A4 is reported, then update the measurements table.
+   * If the RNTI and/or cell ID is not found in the table, a corresponding
+   * entry will be created. Only the latest measurements are stored in the
+   * table.
+   *
+   * \param rnti The RNTI of the UE who reported the event.
+   * \param cellId The cell ID of the measured cell.
+   * \param rsrq The RSRQ of the cell as measured by the UE.
+   */
   void UpdateNeighbourMeasurements (uint16_t rnti, uint16_t cellId,
                                     uint8_t rsrq);
 
-  // The expected measurement identities
+  /// The expected measurement identity for A2 measurements.
   uint8_t m_a2MeasId;
+  /// The expected measurement identity for A4 measurements.
   uint8_t m_a4MeasId;
 
   /**
-   * \brief Measurements reported by a UE for a cell ID.
-   *
-   * The values are quantized according 3GPP TS 36.133 section 9.1.4 and 9.1.7.
+   * Measurements reported by a UE for a cell ID. The values are quantized
+   * according 3GPP TS 36.133 section 9.1.4 and 9.1.7.
    */
   class UeMeasure : public SimpleRefCount<UeMeasure>
   {
   public:
-    uint16_t m_cellId;
-    uint8_t m_rsrp;
-    uint8_t m_rsrq;
+    uint16_t m_cellId;  ///< Cell ID.
+    uint8_t m_rsrp;     ///< RSRP in quantized format. \todo Can be removed?
+    uint8_t m_rsrq;     ///< RSRQ in quantized format.
   };
 
-  //               cellId
+  /**
+   * Measurements reported by a UE for several cells. The structure is a map
+   * indexed by the cell ID.
+   */
   typedef std::map<uint16_t, Ptr<UeMeasure> > MeasurementRow_t;
-  //               rnti
+
+  /**
+   * Measurements reported by several UEs. The structure is a map indexed by
+   * the RNTI of the UE.
+   */
   typedef std::map<uint16_t, MeasurementRow_t> MeasurementTable_t;
+
+  /// Table of measurement reports from all UEs.
   MeasurementTable_t m_neighbourCellMeasures;
 
-  // Class attributes
+  /**
+   * The `ServingCellThreshold` attribute. If the RSRQ of the serving cell is
+   * worse than this threshold, neighbour cells are consider for handover.
+   * Expressed in quantized range of [0..34] as per Section 9.1.7 of
+   * 3GPP TS 36.133.
+   */
   uint8_t m_servingCellThreshold;
+
+  /**
+   * The `NeighbourCellOffset` attribute. Minimum offset between the serving
+   * and the best neighbour cell to trigger the handover. Expressed in
+   * quantized range of [0..34] as per Section 9.1.7 of 3GPP TS 36.133.
+   */
   uint8_t m_neighbourCellOffset;
 
-  // Handover Management SAPs
+  /// Interface to the eNodeB RRC instance.
   LteHandoverManagementSapUser* m_handoverManagementSapUser;
+  /// Receive API calls from the eNodeB RRC instance.
   LteHandoverManagementSapProvider* m_handoverManagementSapProvider;
 
 }; // end of class A2A4RsrqHandoverAlgorithm