diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEFCaloSelectorTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEFCaloSelectorTool.cxx
index fb2b2a9af71f383d36676664fed69db5b76ab502..6273d312216a5c466d3984f5b572221640f19ab7 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEFCaloSelectorTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEFCaloSelectorTool.cxx
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ *   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  *   */
 
 /**********************************************************************
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEFCaloSelectorTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEFCaloSelectorTool.h
index 1a7de4802d5909ce3ac04385d730203ec4bbe44a..27def77df3c9f7b0d19319199cb1ace824a757f0 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEFCaloSelectorTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEFCaloSelectorTool.h
@@ -10,10 +10,7 @@
 #include "TrigEgammaEmulationTool/TrigEgammaSelectorBaseTool.h"
 #include "AsgTools/AsgTool.h"
 #include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
-//#include "ElectronPhotonSelectorTools/IAsgPhotonIsEMSelector.h"
 #include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
-//#include "egammaInterfaces/IEMFourMomBuilder.h"
-//#include "egammaInterfaces/IEMShowerBuilder.h"
 #include <vector>
 
 namespace Trig{
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
index d0946b0e49cf91057626fed65739cb92f252c373..a3060965f41f0ee34074f01ab0b78653a216caf3 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
@@ -123,17 +123,17 @@ class TrigEgammaEmulationTool
   template<class T>
   const T*
   TrigEgammaEmulationTool::getFeature(const HLT::TriggerElement* te,const std::string key){
-      if ( te == NULL ) return NULL;
-      if ( (m_trigdec->ancestor<T>(te,key)).te() == NULL )
-          return NULL;
+      if ( te == nullptr ) return nullptr;
+      if ( (m_trigdec->ancestor<T>(te,key)).te() == nullptr )
+          return nullptr;
       return ( (m_trigdec->ancestor<T>(te)).cptr() );
   }
 
   template<class T>
   bool
   TrigEgammaEmulationTool::ancestorPassed(const HLT::TriggerElement* te,const std::string key){
-      if ( te == NULL ) return false;
-      if ( (m_trigdec->ancestor<T>(te,key)).te() == NULL )
+      if ( te == nullptr ) return false;
+      if ( (m_trigdec->ancestor<T>(te,key)).te() == nullptr )
           return false;
       return ( (m_trigdec->ancestor<T>(te)).te()->getActiveState());
   }
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationIsolationConfig.py b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationIsolationConfig.py
index 652d2222337e38baeaa6937b17d6683133484d5b..23961e8ee341da9225168e7a51a8f84b4086fa12 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationIsolationConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationIsolationConfig.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
 def createIsoToolElectronSelector():
 
   from AthenaCommon.AppMgr import ToolSvc