diff --git a/model/ccnx-rit.cc b/model/ccnx-rit.cc
index c3db1ae..6a7e556 100644
--- a/model/ccnx-rit.cc
+++ b/model/ccnx-rit.cc
@@ -56,22 +56,7 @@
 
   return tid;
 }
-
-
-//////////////////////////////////////////////////////////////////////
-// Helper classes
-//////////////////////////////////////////////////////////////////////
-/**
- * \ingroup ccnx
- * \brief Typedef for nonce hash index of RIT container
- */
-struct CcnxRitByNonce
-{
-  typedef
-  CcnxRitContainer::type::index<nonce>::type
-  type;
-};
-
+    
 // /**
 //  * \ingroup ccnx
 //  * \brief Typedef for prefix hash index of RIT container
@@ -126,7 +111,7 @@
 CcnxRit::WasRecentlySatisfied (const CcnxInterestHeader &header)
 {
   NS_LOG_FUNCTION_NOARGS ();
-  std::pair<CcnxRitByNonce::type::iterator,CcnxRitByNonce::type::iterator>
+    std::pair<CcnxRitByNonce::type::iterator,CcnxRitByNonce::type::iterator>
     entries = get<nonce> ().equal_range (header.GetNonce ());
   
   if (entries.first == end ())
diff --git a/model/ccnx-rit.h b/model/ccnx-rit.h
index 3f09273..ba5a133 100644
--- a/model/ccnx-rit.h
+++ b/model/ccnx-rit.h
@@ -104,6 +104,7 @@
     > type;
 };
 
+    
 
 /**
  * \ingroup ccnx
@@ -198,6 +199,20 @@
   Time    m_cleanupTimeout; ///< \brief Configurable timeout of how often cleanup events are working
   EventId m_cleanupEvent; ///< \brief Cleanup event
 };
+  
+//////////////////////////////////////////////////////////////////////
+// Helper classes
+//////////////////////////////////////////////////////////////////////
+/**
+ * \ingroup ccnx
+ * \brief Typedef for nonce hash index of RIT container
+ */
+struct CcnxRitByNonce
+{
+  typedef
+  CcnxRitContainer::type::index<__ccnx_private_rit::nonce>::type
+  type;
+};
 
 } // namespace ns3