diff --git a/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt b/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
index 179480de2faa184411352a8ad95ef681737bce17..d3df31711c2bde9f594628ffb6cef546665c9f2f 100644
--- a/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
+++ b/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
@@ -1,28 +1,18 @@
-################################################################################
-# Package: TrackToCalo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrackToCalo )
 
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_library( TrackToCaloLib
                    src/*.cxx
                    PUBLIC_HEADERS TrackToCalo
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers GeoPrimitives xAODCaloEvent GaudiKernel ParticleCaloExtension RecoToolInterfaces 
-		   TrackCaloClusterRecToolsLib TrkCaloExtension TrkParametersIdentificationHelpers CaloDetDescrLib CaloUtilsLib InDetReadoutGeometry TRT_ReadoutGeometry
-                   PRIVATE_LINK_LIBRARIES CaloIdentifier AthenaBaseComps AtlasDetDescr FourMomUtils xAODTracking xAODMuon xAODEgamma xAODTruth TrkSurfaces 
-                   TrkEventPrimitives TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces CxxUtils StoreGateLib EventKernel ParticlesInConeToolsLib ITrackToVertex
-                   InDetTrackSelectionToolLib )
+                   LINK_LIBRARIES CaloEvent CaloGeoHelpers CaloUtilsLib GaudiKernel GeoPrimitives InDetReadoutGeometry ParticleCaloExtension RecoToolInterfaces TrkCaloExtension TrkExInterfaces TrkParametersIdentificationHelpers TrkToolInterfaces TRT_ReadoutGeometry xAODCaloEvent xAODTruth
+                   PRIVATE_LINK_LIBRARIES AthenaBaseComps AtlasDetDescr CaloConditions CaloDetDescrLib CaloIdentifier StoreGateLib TrkDetDescrUtils TrkEventPrimitives TrkParameters TrkSurfaces TrkTrack VxVertex xAODEgamma xAODMuon xAODTracking )
 
 atlas_add_component( TrackToCalo
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES GaudiKernel TrackToCaloLib InDetTrackSelectionToolLib 
-                     ITrackToVertex TrkLinks VxVertex TrackVertexAssociationToolLib)
+                     LINK_LIBRARIES TrackToCaloLib )
 
-atlas_install_python_modules( python/*.py )
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Reconstruction/RecoTools/TrackToCalo/python/CaloExtensionBuilderAlgConfig.py b/Reconstruction/RecoTools/TrackToCalo/python/CaloExtensionBuilderAlgConfig.py
index 4711c6011c609765daad507343209b993af4b36c..44520d826a592fb4aa347061c7ba5678a9c804e0 100644
--- a/Reconstruction/RecoTools/TrackToCalo/python/CaloExtensionBuilderAlgConfig.py
+++ b/Reconstruction/RecoTools/TrackToCalo/python/CaloExtensionBuilderAlgConfig.py
@@ -1,26 +1,30 @@
-## CaloExtensionBuilderAlg Stuff
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 def CaloExtensionBuilder(useLRT):
+    import traceback
+    from AthenaCommon.Logging import logging
+    mlog = logging.getLogger('CaloExtensionBuilder')
+
     try: 
         from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
         from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool
-    except:
+    except Exception:
         mlog.error("could not import" "TrackToCaloConf.Trk__ParticleCaloExtensionTool")
         mlog.error("could not import TrkExTools.AtlasExtrapolator")
         mlog.error (traceback.format_exc())
     try:
         from TrackToCalo.TrackToCaloConf import Trk__CaloExtensionBuilderAlg as CaloExtensionBuilderAlg
-    except:
+    except Exception:
         mlog.error("could not import TrackToCaloConf.Trk__CaloExtensionBuilderAlg")
         mlog.error (traceback.format_exc())
     try:
         from AthenaCommon.AppMgr import ToolSvc
-    except:
+    except Exception:
         mlog.error("could not import ToolSvc")
         mlog.error (traceback.format_exc())
     try:
         from AthenaCommon.AlgSequence import AlgSequence
-    except:
+    except Exception:
         mlog.error("could not import AlgSequence")
         mlog.error (traceback.format_exc())
 
@@ -32,19 +36,17 @@ def CaloExtensionBuilder(useLRT):
     pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = theAtlasExtrapolator)
     ToolSvc += pcExtensionTool
 
-    if (True == useLRT):
+    if (True is useLRT):
       algName = "CaloExtensionBuilderAlg_LRT"      
     else:
       algName = "CaloExtensionBuilderAlg"
     CaloExtensionBuilderTool = CaloExtensionBuilderAlg(algName, LastCaloExtentionTool = pcExtensionTool)
 
-    if True == useLRT:
+    if True is useLRT:
       CaloExtensionBuilderTool.TrkPartContainerName = "InDetLargeD0TrackParticles"
       CaloExtensionBuilderTool.ParticleCache = "ParticleCaloExtension_LRT"
 
-    from AthenaCommon.BeamFlags import jobproperties
     ToolSvc += CaloExtensionBuilderTool.LastCaloExtentionTool
-
     topSequence += CaloExtensionBuilderTool
 
     return True