diff --git a/CI/domain_map.py b/CI/domain_map.py
index a88dd6f12f60134fc5a089e3541cbcd314e05bb6..332104b86689ed234d06f8392e254b6e4170b08d 100644
--- a/CI/domain_map.py
+++ b/CI/domain_map.py
@@ -1,32 +1,35 @@
+# dictionary for mapping package names to software domains
+# keys   ... must be strings for the name of the software domain
+# values ... must be sets containing valid regular expression strings
 DOMAIN_MAP = {}
 
-DOMAIN_MAP['Analysis'] = set(['PhysicsAnalysis/'])
-DOMAIN_MAP['Build'] = set(['Build/','Projects/'])
-DOMAIN_MAP['Calorimeter'] = set(['Calorimeter/'])
-DOMAIN_MAP['CI'] = set(['^CI'])
-DOMAIN_MAP['Core'] = set(['Control/'])
-DOMAIN_MAP['Database'] = set(['Database/'])
-DOMAIN_MAP['DQ'] = set(['DataQuality/','LumiBlock/'])
-DOMAIN_MAP['EDM'] = set(['Event/'])
-DOMAIN_MAP['Egamma'] = set(['egamma'])
-DOMAIN_MAP['EventDisplay'] = set(['graphics/'])
-DOMAIN_MAP['Externals'] = set(['External/'])
+DOMAIN_MAP['Analysis']         = set(['PhysicsAnalysis/'])
+DOMAIN_MAP['Build']            = set(['Build/','Projects/'])
+DOMAIN_MAP['Calorimeter']      = set(['Calorimeter/'])
+DOMAIN_MAP['CI']               = set(['^CI'])
+DOMAIN_MAP['Core']             = set(['Control/'])
+DOMAIN_MAP['Database']         = set(['Database/'])
+DOMAIN_MAP['DQ']               = set(['DataQuality/','LumiBlock/'])
+DOMAIN_MAP['EDM']              = set(['Event/'])
+DOMAIN_MAP['Egamma']           = set(['egamma'])
+DOMAIN_MAP['EventDisplay']     = set(['graphics/'])
+DOMAIN_MAP['Externals']        = set(['External/'])
 DOMAIN_MAP['ForwardDetectors'] = set(['ForwardDetectors/'])
-DOMAIN_MAP['Generators'] = set(['Generators/'])
-DOMAIN_MAP['Geometry'] = set(['AtlasGeometryCommon/','DetectorDescription/'])
-DOMAIN_MAP['InnerDetector'] = set(['InnerDetector/'])
-DOMAIN_MAP['JetEtmiss'] = set(['Jet','MET','MissingEt','EventShape'])
-DOMAIN_MAP['LAr'] = set(['LArCalorimeter/'])
-DOMAIN_MAP['Magnets'] = set(['MagneticField/'])
+DOMAIN_MAP['Generators']       = set(['Generators/'])
+DOMAIN_MAP['Geometry']         = set(['AtlasGeometryCommon/','DetectorDescription/'])
+DOMAIN_MAP['InnerDetector']    = set(['InnerDetector/'])
+DOMAIN_MAP['JetEtmiss']        = set(['Jet','MET','MissingEt','EventShape'])
+DOMAIN_MAP['LAr']              = set(['LArCalorimeter/'])
+DOMAIN_MAP['Magnets']          = set(['MagneticField/'])
 DOMAIN_MAP['MuonSpectrometer'] = set(['MuonSpectrometer/'])
-DOMAIN_MAP['Other'] = set(['Commission/','LCG_Interfaces','PackDist/','ReleaseTests/'])
-DOMAIN_MAP['Reconstruction'] = set(['Reconstruction/'])
-DOMAIN_MAP['Simulation'] = set(['Simulation/'])
-DOMAIN_MAP['Tau'] = set(['Tau'])
-DOMAIN_MAP['Test'] = set(['AtlasTest/','TestPolicy/'])
-DOMAIN_MAP['TestBeam'] = set(['TestBeam/'])
-DOMAIN_MAP['Tile'] = set(['TileCalorimeter/'])
-DOMAIN_MAP['Tools'] = set(['Tools/'])
-DOMAIN_MAP['Tracking'] = set(['Tracking/'])
-DOMAIN_MAP['Trigger'] = set(['Trigger/','HLT/','Trig','DetectorDescription/.?Reg','DetectorDescription/RoiDescriptor','RegionSelector'])
+DOMAIN_MAP['Other']            = set(['Commission/','LCG_Interfaces','PackDist/','ReleaseTests/'])
+DOMAIN_MAP['Reconstruction']   = set(['Reconstruction/'])
+DOMAIN_MAP['Simulation']       = set(['Simulation/'])
+DOMAIN_MAP['Tau']              = set(['Tau'])
+DOMAIN_MAP['Test']             = set(['AtlasTest/','TestPolicy/'])
+DOMAIN_MAP['TestBeam']         = set(['TestBeam/'])
+DOMAIN_MAP['Tile']             = set(['TileCalorimeter/'])
+DOMAIN_MAP['Tools']            = set(['Tools/'])
+DOMAIN_MAP['Tracking']         = set(['Tracking/'])
+DOMAIN_MAP['Trigger']          = set(['Trigger/','HLT/','Trig','DetectorDescription/.?Reg','DetectorDescription/RoiDescriptor','RegionSelector'])
 
diff --git a/CI/watch_list.py b/CI/watch_list.py
index cd32c1d04e178e5096dcbd269e91f9fb0fcc0f97..2c45cbc5ba00bdbd9ac95036521fba9bf3212e69 100644
--- a/CI/watch_list.py
+++ b/CI/watch_list.py
@@ -1,4 +1,7 @@
-WATCH_LIST = \
-{ 'CI': set(['cgumpert']),
-  'Simulation': set(['ritsch'])
-}
+# dictionary defining a watch list for MR notifications
+# keys   ... must be valid regular expression
+# values ... must be sets containing Gitlab usernames as strings
+WATCH_LIST = {}
+
+WATCH_LIST['^CI/']       = set(['cgumpert'])
+WATCH_LIST['Simulation'] = set(['ritsch'])