diff --git a/RingBuffer.h b/RingBuffer.h
index cfb8d53..4878d8c 100644
--- a/RingBuffer.h
+++ b/RingBuffer.h
@@ -53,9 +53,9 @@ public:
   
   uint16_t getData() const;
 
-  bool put(TDATATYPE sample);
+  bool put(const TDATATYPE item);
 
-  bool get(TDATATYPE& sample);
+  bool get(TDATATYPE& item);
 
   TDATATYPE peek() const;
 
@@ -72,6 +72,6 @@ private:
   bool                  m_overflow;
 };
 
-
+#include "RingBuffer.impl.h"
 
 #endif
\ No newline at end of file
diff --git a/RingBuffer.cpp b/RingBuffer.impl.h
similarity index 89%
rename from RingBuffer.cpp
rename to RingBuffer.impl.h
index f350023..6839255 100644
--- a/RingBuffer.cpp
+++ b/RingBuffer.impl.h
@@ -56,7 +56,7 @@ template <typename TDATATYPE> uint16_t CRingBuffer<TDATATYPE>::getData() const
     return m_length - m_tail + m_head;
 }
 
-template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::put(TDATATYPE sample)
+template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::put(const TDATATYPE sample)
 {
   if (m_full) {
     m_overflow = true;
@@ -80,12 +80,12 @@ template <typename TDATATYPE> TDATATYPE CRingBuffer<TDATATYPE>::peek() const
   return m_buffer[m_tail];
 }
 
-template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::get(TDATATYPE& sample)
+template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::get(TDATATYPE& item)
 {
   if (m_head == m_tail && !m_full)
     return false;
 
-  sample = m_buffer[m_tail];
+  item = m_buffer[m_tail];
 
   m_full = false;
 
@@ -111,9 +111,4 @@ template <typename TDATATYPE> void CRingBuffer<TDATATYPE>::reset()
   m_tail = 0U;
   m_full     = false;
   m_overflow = false;
-}
-
-//Add here any declarations you need
-template class CRingBuffer<uint8_t>;
-template class CRingBuffer<q15_t>;
-template class CRingBuffer<uint16_t>;
\ No newline at end of file
+}
\ No newline at end of file