diff --git a/model/ccnx-bestroute-strategy.h b/model/ccnx-bestroute-strategy.h
index d6f9a5a..4e5eb6c 100644
--- a/model/ccnx-bestroute-strategy.h
+++ b/model/ccnx-bestroute-strategy.h
@@ -22,14 +22,7 @@
 #ifndef CCNX_BESTROUTE_STRATEGY_H
 #define CCNX_BESTROUTE_STRATEGY_H
 
-#include "ns3/packet.h"
-#include "ns3/callback.h"
-#include "ns3/object.h"
-#include "ns3/log.h"
-
 #include "ccnx-forwarding-strategy.h"
-#include "ccnx.h"
-#include "ccnx-fib.h"
 
 namespace ns3 
 {
@@ -40,22 +33,26 @@
 /**
  * \ingroup ccnx
  * \brief Best route strategy
+ *
+ * \todo Describe
  */
-    
 class CcnxBestRouteStrategy : public CcnxForwardingStrategy
 {
 public:
   static TypeId GetTypeId (void);
-        
+
+  /**
+   * @brief Default constructor
+   */
   CcnxBestRouteStrategy ();
         
+  // inherited from  CcnxForwardingStrategy
   virtual bool
-  PropagateInterest  (CcnxPitEntryContainer::type::iterator pitEntry,
-                      CcnxFibEntryContainer::type::iterator fibEntry,
-                      const Ptr<CcnxFace> &incomingFace,
-                      Ptr<CcnxInterestHeader> &header,
-                      const Ptr<const Packet> &packet,
-                      SendCallback ucb);
+  PropagateInterest (const CcnxPitEntry  &pitEntry, 
+                     const Ptr<CcnxFace> &incomingFace,
+                     Ptr<CcnxInterestHeader> &header,
+                     const Ptr<const Packet> &packet,
+                     SendCallback sendCallback);
 };
 
 } //namespace ns3