diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArNoisyROFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArNoisyROFillerTool.cxx
index d900ba8957e8a4b33810e7f2ed675afb24cdc67d..af0fc1dc0596f4f0c1c93bfc22b4f2a0a4e7cfe4 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArNoisyROFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/LArNoisyROFillerTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -44,8 +44,9 @@ StatusCode LArNoisyROFillerTool::fill (const LArNoisyROSummary& c)
   if (m_SaveFEBIDs) 
   {
     m_NoisyFEBIDs->clear();
-    for ( std::vector<HWIdentifier>::const_iterator it = noisyfebs.begin();
-	  it != noisyfebs.end(); it++ ) m_NoisyFEBIDs->push_back(it->get_identifier32().get_compact());
+    for (HWIdentifier hwid : noisyfebs) {
+      m_NoisyFEBIDs->push_back(hwid.get_identifier32().get_compact());
+    }
   }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
index 8725863dda5cea6ed9b4e619c34fdc1127f6dd95..8364ec0495f612a99940ffde10e94222dfa4d59f 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
@@ -1,12 +1,7 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
-/**
- */
-
-
 #include "AthenaKernel/errorcheck.h"
 
 #include <sstream>
@@ -278,7 +273,6 @@ void SCFillerTool::dumpHashTables( const CaloCellContainer& p ) {
     int key = scID;
     std::vector<const CaloCell*> v = (*it).second;
     int nl = v.size();
-    std::vector<const CaloCell*>::iterator vit;
     int pn = ((key >> 28) & 0x1) ? 1: -1;
     int calo = ((key >> 24) & 0xf)*pn;
     int region =  (key>>20) & 0xf;
@@ -289,8 +283,8 @@ void SCFillerTool::dumpHashTables( const CaloCellContainer& p ) {
       std::cout << "SCFillerTool::dumpHashTables() ===> scID = " << scID << " calo,pn,region,lay,ieta,jphi: " << calo << ", " << pn << ", " << region  << ", " << lay << ", " << ieta << ", " << jphi << std::endl;
       std::cout << "SCFillerTool::dumpHashTables() ===> scID = " << scID << " No. of cells: " << nl << std::endl;
       std::cout << "SCFillerTool::dumpHashTables() ===>        " ;
-      for( vit=v.begin(); vit!= v.end(); vit++) {
-	std::cout << *vit << ", " ;
+      for (const CaloCell* cell : v) {
+	std::cout << cell << ", " ;
       }
       std::cout << "" << std::endl;
     }