diff --git a/Generators/GeneratorModules/CMakeLists.txt b/Generators/GeneratorModules/CMakeLists.txt
index 1239ed294e3a612ad2b4fdb62fc8e543544ddc29..0169106379a7b002e6d789021688e4565ef89bea 100644
--- a/Generators/GeneratorModules/CMakeLists.txt
+++ b/Generators/GeneratorModules/CMakeLists.txt
@@ -21,5 +21,5 @@ atlas_add_component( GeneratorModules
                      LINK_LIBRARIES GeneratorModulesLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
diff --git a/Generators/GeneratorModules/python/EvgenAlg.py b/Generators/GeneratorModules/python/EvgenAlg.py
index a91051415f7ef4d598767c3161fb821a62547c11..878765d65ae001948c094450dafbab5b38d6cca1 100644
--- a/Generators/GeneratorModules/python/EvgenAlg.py
+++ b/Generators/GeneratorModules/python/EvgenAlg.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPython import PyAthena
 from AthenaPython.PyAthena import StatusCode
@@ -27,8 +27,8 @@ class EvgenAlg(PyAthena.Alg):
 
 
     def initialize(self):
-        import McParticleEvent.Pythonizations
-        self.msg.debug("Initializing [%s]"% self.getName())
+        import McParticleEvent.Pythonizations  # noqa: F401
+        self.msg.debug("Initializing [%s]", self.getName())
 
         return self.genInitialize()
 
@@ -36,21 +36,21 @@ class EvgenAlg(PyAthena.Alg):
     def execute(self):
         from AthenaPython.PyAthena import McEventCollection, HepMC
 
-        self.msg.debug("Executing [%s]"% self.getName())
+        self.msg.debug("Executing [%s]", self.getName())
 
         ## Retrieve MC event collection or create a new one
         mcevts = None
         if self.evtStore.contains(McEventCollection, self.McEventKey):
-            self.msg.debug(self.McEventKey + " found before alg execution!")
+            self.msg.debug("%s found before alg execution!", self.McEventKey)
             mcevts = self.evtStore[self.McEventKey]
         else:
-            self.msg.debug("Creating " + self.McEventKey + " before alg execution!")
+            self.msg.debug("Creating %s before alg execution!", self.McEventKey)
             mcevts = McEventCollection()
             self.evtStore.record(mcevts, self.McEventKey, True, False)
         ROOT.SetOwnership(mcevts, False)
 
         if self.evtStore.contains(McEventCollection, self.McEventKey):
-            self.msg.debug(self.McEventKey + " found after alg execution!")
+            self.msg.debug("%s found after alg execution!", self.McEventKey)
 
         ## Get the first event from the MCEC, or make a new one
         evt = None
diff --git a/Generators/GeneratorModules/python/EvgenAnalysisAlg.py b/Generators/GeneratorModules/python/EvgenAnalysisAlg.py
index a504e2e59671c9e62a29fbdb08671e8b55366867..915380772c14c3f9dc8f19873527c2e0ede2d6b2 100644
--- a/Generators/GeneratorModules/python/EvgenAnalysisAlg.py
+++ b/Generators/GeneratorModules/python/EvgenAnalysisAlg.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPython import PyAthena
-from AthenaPython.PyAthena import StatusCode, McEventCollection, HepMC, CLHEP
-import McParticleEvent.Pythonizations
+import McParticleEvent.Pythonizations  # noqa: F401
 
 
 class EvgenAnalysisAlg(PyAthena.Alg):