diff --git a/ess/lib_tw_elem.py b/ess/lib_tw_elem.py
index c190903640ae15e6690decf3a9bce69d11dbd729..0b3f22ed7c7e4807931d76db2d49f5748774b74d 100644
--- a/ess/lib_tw_elem.py
+++ b/ess/lib_tw_elem.py
@@ -608,17 +608,10 @@ class GAP(ELEM):
         return lin
 
     def get_madx(self):
-        i = "0" * (3 - int(numpy.log10(self.idx_elem + 1))) + str(self.idx_elem + 1)
+        name = self.name if self.name else f"ELEM{self.idx_elem + 1:04d}_GAP"
+        lag = (0.5 * numpy.pi - self.phs_rf) / (2.0 * numpy.pi)  # phs_MADX = pi/2-phs_TW
 
-        if self.name != "":
-            lin = self.name + ": RFCAVITY, L=0, "
-        if self.name == "":
-            lin = "ELEM" + i + "_GAP" + ": RFCAVITY, L=0, "
-        lin += "FREQ=" + str(self.freq) + ", "
-        lin += "VOLT=" + str(self.E0TL) + ", "
-        lin += "LAG=" + str((0.5 * numpy.pi - self.phs_rf) / (2.0 * numpy.pi)) + "; "  # phs_MADX = pi/2-phs_TW
-
-        return lin
+        return f"{name}: RFCAVITY, L=0, FREQ={self.freq}, VOLT={self.E0TL}, LAG={lag}"
 
     def get_fluka(self):
         i = "0" * (3 - int(numpy.log10(self.idx_elem + 1))) + str(self.idx_elem + 1)