diff --git a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
index b6e651d..28c92a4 100644
--- a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
+++ b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
@@ -4,7 +4,7 @@ file INJECTIONGUARD_individual.template {
 }
 
 file INJECTIONGUARD_automated.template {
-  pattern { DEVICE                               NR  Latch Description }
+  pattern { DEVICE                                            NR  Latch Description }
           { AGEBD-INJECTIONGUARD{{ agebd_env_suffix_upper }}  01  1     "Beam Dump Kicker"}
           { AGEBD-INJECTIONGUARD{{ agebd_env_suffix_upper }}  02  1     "Dump Valve"}
           { AGEBD-INJECTIONGUARD{{ agebd_env_suffix_upper }}  03  1     "MIS"}
diff --git a/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs b/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
index 7028208..6fa7099 100644
--- a/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
+++ b/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
@@ -1,5 +1,5 @@
 file MASTER.template {
-  pattern { SUFFIX                        SERVICE                  STARTON  AUTOOFF }
+  pattern { SUFFIX                              SERVICE                  STARTON  AUTOOFF }
           { "{{ agebd_env_suffix_upper }}",     "MASTER"               , "0",     "30"    }
           { "{{ agebd_env_suffix_upper }}",     "NTURNS"               , "0",     "0"     }
           { "{{ agebd_env_suffix_upper }}",     "DBPM3CURR"            , "1",     "0"     }
diff --git a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
index b4fcf85..710b532 100644
--- a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
+++ b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_main.subs
@@ -1,6 +1,6 @@
 file ORBITBUMP_machine.template {
   pattern
-  {DEVICE                                   sourcepoint      beamline           LOX  HIX   X   LOXP HIXP  XP  LOY  HIY  Y   LOYP HIYP YP   BPM1             C1xx      C1xpx      C1yy       C1ypy       BPM2              C2xx     C2xpx    C2yy     C2ypy      BPM3              C3xx     C3xpx  C3yy     C3ypy     BPM4              C4xx     C4xpx     C4yy      C4ypy}
+  {DEVICE                                         sourcepoint      beamline           LOX  HIX   X   LOXP HIXP  XP  LOY  HIY  Y   LOYP HIYP YP   BPM1             C1xx      C1xpx      C1yy       C1ypy       BPM2              C2xx     C2xpx    C2yy     C2ypy      BPM3              C3xx     C3xpx  C3yy     C3ypy     BPM4              C4xx     C4xpx     C4yy      C4ypy}
   # Diagnostic dipole beamlines
   {AGEBD-ORBITBUMP{{ agebd_env_suffix_upper }}    X01DD            NEMO              -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS01-DBPM-1080   -0.0009920 -0.0006308 -0.0001141 0.0001109  ARS01-DBPM-1460   0.9742755 -0.1432472 0.9455447 -0.0865934   ARS01-DBPM-1900   0.9277200 1.0454287 0.1445141 1.5920941   ARS01-DBPM-2410   -0.0809412 -0.0384293 0.0058229 0.1036650}
   {AGEBD-ORBITBUMP{{ agebd_env_suffix_upper }}    X08DB            DISCO             -300  300   0  -150  150   0  -300  300  0  -150  150  0    ARS08-DBPM-1900   -0.2500389 -0.0365053 0.0001023 0.0000595   ARS08-DBPM-2410   1.2775662 -0.9246414 0.5814965 -0.4999301   ARS08-DBPM-2910   0.6885552 0.9211364 0.4873898 1.7550023   ARS08-DBPM-4220   -0.2391394 -0.0169593 0.0309046 0.1234665}
@@ -32,7 +32,7 @@ file ORBITBUMP_machine.template {
 
 file ORBITBUMP_beamline.template {
   pattern
-  {DEVICE                                   sourcepoint      beamline          DRVL DRVH X    XP   Y    YP }
+  {DEVICE                                         sourcepoint      beamline          DRVL DRVH X    XP   Y    YP }
   # Diagnostic dipole beamlines
   {AGEBD-ORBITBUMP{{ agebd_env_suffix_upper }}    X01DD            NEMO              -10  10   0    0    0    0  }
   {AGEBD-ORBITBUMP{{ agebd_env_suffix_upper }}    X08DB            DISCO             -10  10   0    0    0    0  }
diff --git a/services/plots/current/ioc/AGEBD-CPCL-PLOTS_main.subs b/services/plots/current/ioc/AGEBD-CPCL-PLOTS_main.subs
index 70c6632..17e7b9d 100644
--- a/services/plots/current/ioc/AGEBD-CPCL-PLOTS_main.subs
+++ b/services/plots/current/ioc/AGEBD-CPCL-PLOTS_main.subs
@@ -7,7 +7,7 @@ file PLOTS_timeaxis.template {
 
 file PLOTS_9h.template {
   pattern
-  { DEVICE,                            NAME,                 INP                           }
+  { DEVICE,                                  NAME,                 INP                           }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, CURRENT,              AGEBD-PARAMS:CURRENT          }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, CURRENT-BPM,          AGEBD-DBPM3CURR:CURRENT-AVG   }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, CURRENT-PCT,          ARS07-DPCT-0000:CURR          }
@@ -49,7 +49,7 @@ file PLOTS_9h.template {
 
 file PLOTS_week.template {
   pattern
-  { DEVICE,                            NAME,                 INP                            }
+  { DEVICE,                                  NAME,                 INP                            }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, CURRENT-BPM,          AGEBD-DBPM3CURR:CURRENT-AVG    }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, CURRENT-PCT,          ARS07-DPCT-0000:CURR           }
   { AGEBD-PLOTS{{ agebd_env_suffix_upper }}, TAU-BPM,              AGEBD-TAUBPM:TAU               }
diff --git a/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_main.subs b/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_main.subs
index 259eb9b..c424cf8 100644
--- a/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_main.subs
+++ b/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_main.subs
@@ -6,7 +6,7 @@ file POSTMORTEMLOG.template {
 
 file POSTMORTEMLOG_15min10Hz.template {
   pattern 
-  { DEVICE                                     NAME                INP}
+  { DEVICE                                           NAME                INP}
   # ---------- BEAM CURRENT --------------
   { AGEBD-POSTMORTEMLOG{{ agebd_env_suffix_upper }}  CURRBPM             AGEBD-DBPM3CURR:CURRENT-AVG }
   { AGEBD-POSTMORTEMLOG{{ agebd_env_suffix_upper }}  CURRPCT             ARS07-DPCT-0000:CURR }