diff --git a/daemon/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
index c6e2cc53c8eeb4219ab0e71c26c439aebebf2cee..b3bae20aee1791ca2e1aa875667ef276e339170e 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@@ -41,11 +41,6 @@ AudioCodecFactory::AudioCodecFactory() : _CodecsMap(), _defaultCodecOrder(), _Ca
 {
 }
 
-AudioCodecFactory::~AudioCodecFactory()
-{
-
-}
-
 void
 AudioCodecFactory::init()
 {
@@ -103,13 +98,12 @@ double AudioCodecFactory::getBitRate (AudioCodecType payload)
 }
 
 
-int AudioCodecFactory::getSampleRate (AudioCodecType payload)
+int AudioCodecFactory::getSampleRate (AudioCodecType payload) const
 {
+    CodecsMap::const_iterator iter = _CodecsMap.find (payload);
 
-    CodecsMap::iterator iter = _CodecsMap.find (payload);
-
-    if (iter!=_CodecsMap.end())
-        return (iter->second->getClockRate());
+    if (iter != _CodecsMap.end())
+        return iter->second->getClockRate();
 
 	return 0;
 }
@@ -130,9 +124,9 @@ void AudioCodecFactory::saveActiveCodecs (const std::vector<std::string>& list)
 void
 AudioCodecFactory::deleteHandlePointer (void)
 {
-    for (size_t i = 0 ; i < _CodecInMemory.size() ; i++) {
-        unloadCodec (_CodecInMemory[i]);
-    }
+    for (std::vector<CodecHandlePointer>::const_iterator iter =
+            _CodecInMemory.begin(); iter != _CodecInMemory.end(); ++iter)
+        unloadCodec (*iter);
 
     _CodecInMemory.clear();
 }
diff --git a/daemon/src/audio/codecs/audiocodecfactory.h b/daemon/src/audio/codecs/audiocodecfactory.h
index de91ac7b0fa477876de7a16a4d786250b6944770..81e6c32d91da4c7f4388b61bab7dc5448f91f27a 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.h
+++ b/daemon/src/audio/codecs/audiocodecfactory.h
@@ -60,11 +60,6 @@ class AudioCodecFactory
          */
         AudioCodecFactory();
 
-        /**
-         * Destructor
-         */
-        ~AudioCodecFactory();
-
         /**
          * Accessor to data structures
          * @return CodecsMap& The available codec
@@ -111,7 +106,7 @@ class AudioCodecFactory
          * @param payload The payload of the codec
          * @return int The clock rate of the specified codec
          */
-        int getSampleRate (AudioCodecType payload);
+        int getSampleRate (AudioCodecType payload) const;
 
         /**
          * Set the order of codecs by their payload