diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index 2e55c68b25f0e8eeaa9eda8e327776e73db75f37..d0532a0f24ea2ac2f79453b6ae61b24aedc38b35 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -18,7 +18,7 @@ ProtocolManager::ProtocolManager(Tango::DeviceImpl* deviceImpl_p,
 }
 
 //==============================================================================
-//      ProtocolManager::ProtocolManager()
+//      ProtocolManager::~ProtocolManager()
 //==============================================================================
 ProtocolManager::~ProtocolManager()
 {
@@ -26,7 +26,7 @@ ProtocolManager::~ProtocolManager()
 }
 
 //==============================================================================
-//      ProtocolManager::ProtocolManager()
+//      ProtocolManager::create()
 //==============================================================================
 ProtocolManager::SP ProtocolManager::create(Tango::DeviceImpl* deviceImpl_p,
     Configuration::SP configuration_sp, DBManager::SP dBManager_sp)
@@ -38,7 +38,7 @@ ProtocolManager::SP ProtocolManager::create(Tango::DeviceImpl* deviceImpl_p,
 }
 
 //==============================================================================
-//      ProtocolManager::ProtocolManager()
+//      ProtocolManager::setRemoteEndpoint()
 //==============================================================================
 void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint)
 {
@@ -243,19 +243,20 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp)
         if(m_isValidated)
         {
             const Request::Metadata& metadataReq = request_sp->metadata();
+
             int64_t rawTimestamp = metadataReq.timestamp();
-            std::tm timestamp = *localtime(&rawTimestamp);
+            std::tm tmTimestamp = *localtime(&rawTimestamp);
 
             DEBUG_STREAM << "ProtocolManager::prepareMetadata() Searching in "
                 << m_validatedSchema << "." << m_validatedTable << " timestamp "
-                << asctime(&timestamp) << " from " << m_remoteEndpoint << endl;
+                << asctime(&tmTimestamp) << " from " << m_remoteEndpoint << endl;
 
             try
             {
                 if(!m_rowSet_sp)
                 {
                     m_rowSet_sp = m_dBManager_sp->retrieveNewTuples(
-                        m_validatedSchema, m_validatedTable, timestamp);
+                        m_validatedSchema, m_validatedTable, tmTimestamp);
 
                     m_it = m_rowSet_sp->begin();
                 }
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index 86a7c3b12769aa1520da415fbd44cb579bc84cbd..bbf6f082eb0300ec32c5f4e8dbe0688d458d89d6 100644
--- a/src/ProtocolManager.h
+++ b/src/ProtocolManager.h
@@ -73,11 +73,14 @@ protected:
         throw(std::runtime_error);
 
 //------------------------------------------------------------------------------
-//  [Protected] Validation related methods
+//  [Protected] Columns validation method
 //------------------------------------------------------------------------------
     virtual void validateColumn(const Request::Validation::Column&,
         DBManager::InformationList&) throw(std::runtime_error);
 
+//------------------------------------------------------------------------------
+//  [Protected] Metadata serialization method
+//------------------------------------------------------------------------------
     virtual void fillMetadata(Response::Metadata*) throw(std::runtime_error);
 
     virtual void fillRow(Response::Metadata::Row*) throw(std::runtime_error);
@@ -106,7 +109,7 @@ protected:
     //Retrieved data iterator
     soci::rowset<soci::row>::const_iterator m_it;
 
-    //Retrieved data
+    //Retrieved data shared pointer
     boost::shared_ptr< soci::rowset<soci::row> > m_rowSet_sp;
 
     //Address and port of remote endpoint