diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java
index 2b889d12..b78a771f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java
@@ -248,11 +248,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java
index 169f5b24..21160018 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java
@@ -232,11 +232,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java
index 0a2bbadb..d11f170c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java
@@ -280,11 +280,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java
index 678f5203..c3d0b2d8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java
@@ -280,11 +280,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field128.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field128.java
index 204220f8..468f7b6c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field128.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field128.java
@@ -223,11 +223,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field129.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field129.java
index c047b861..223f4306 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field129.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field129.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java
index 631e9fe2..f17e1653 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java
@@ -242,11 +242,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java
index 0d742a5d..9e4e35fb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java
@@ -241,11 +241,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java
index 70ff6f12..1ab64002 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field130.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field130.java
index 232e4abb..26a662e6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field130.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field130.java
@@ -258,11 +258,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field132.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field132.java
index c5669dbf..14ce20a5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field132.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field132.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field133.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field133.java
index 41adf2d0..e35e3e49 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field133.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field133.java
@@ -255,11 +255,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field134.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field134.java
index 36f94763..601722f6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field134.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field134.java
@@ -240,11 +240,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field136.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field136.java
index 0681fa12..318cb5c3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field136.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field136.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field137.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field137.java
index 289cf62e..4dc4a6ac 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field137.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field137.java
@@ -255,11 +255,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java
index c5a26a40..8c21a29a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java
@@ -228,11 +228,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java
index 9c5dd387..623a0827 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13C.java
index a935203d..b6947c74 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13C.java
@@ -273,11 +273,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java
index 75a59a37..e4f86c73 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java
@@ -261,11 +261,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java
index 61204466..2cd80980 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java
index f99d16f9..d83432d5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14G.java
index 74b4e290..86af31c8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14G.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14S.java
index 22d51802..3fc36f1c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14S.java
@@ -267,11 +267,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field165.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field165.java
index 7c7042ba..0f171055 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field165.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field165.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java
index 29a0512d..0fb0ca1d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java
@@ -231,15 +231,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //month and day: MMDD
-            java.text.DateFormat f = new java.text.SimpleDateFormat("MMM dd", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //month and day: MMDD
+        java.text.DateFormat f = new java.text.SimpleDateFormat("MMM dd", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java
index 12eaf4a5..220c8125 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java
index 72d8eb45..9755eb4d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java
@@ -267,14 +267,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java
index 66dea011..b1c2d0e9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19C.java
index 27b35f17..a018741c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19C.java
@@ -229,14 +229,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java
index 35b635b3..8a835e97 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java
index 80f10d48..963bcaa1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java
index 118b4034..f9d5e712 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21H.java
index 5eb3e53f..702a1a55 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21H.java
@@ -227,11 +227,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22.java
index fbd5d858..0d372f31 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22C.java
index b7884ff1..619b7868 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22C.java
@@ -265,11 +265,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java
index 67b9bb65..f8b5b610 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java
index 33961ce4..b72d153f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22K.java
index 342399a2..fdbac9aa 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22K.java
@@ -227,11 +227,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22S.java
index 0dc4052d..8bd5f35f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22S.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java
index 393ea7d7..7c82b132 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java
@@ -286,11 +286,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23A.java
index 9e9593e4..60da6b28 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23A.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23E.java
index 7d4b92dd..bb23a4c1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23E.java
@@ -240,11 +240,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23F.java
index 594b1b49..97c41c9e 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23F.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23G.java
index d8c27364..46e43ebb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23G.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23R.java
index efeb7158..012d17c0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23R.java
@@ -244,11 +244,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(6);
         }
-        if (component == 7) {
-            //default format (as is)
-            return getComponent(7);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(7);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23X.java
index 9a4cc683..99a37881 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23X.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23X.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java
index 61ed2e7a..218f35cb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field24D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field24D.java
index 6e42505e..698d6cdf 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field24D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field24D.java
@@ -227,11 +227,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field24E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field24E.java
index a73a34d3..bfd73c58 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field24E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field24E.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field24G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field24G.java
index d1d8c105..3927be33 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field24G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field24G.java
@@ -281,11 +281,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(12);
         }
-        if (component == 13) {
-            //default format (as is)
-            return getComponent(13);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(13);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field252.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field252.java
index 918b2b24..bb2e6817 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field252.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field252.java
@@ -259,15 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent4AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent4AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field254.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field254.java
index 1bc86c9c..dc4c624c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field254.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field254.java
@@ -259,15 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent4AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent4AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java
index 0e8f8367..d69f61f7 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java
@@ -295,15 +295,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 6) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent6AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent6AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java
index 9541c40d..24118ebb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java
@@ -295,15 +295,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 6) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent6AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent6AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java
index 329ef3ff..46157add 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java
@@ -285,11 +285,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java
index 6d3821ca..cf1e7930 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java
@@ -295,15 +295,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 6) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent6AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent6AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java
index 38c63a0d..495088c2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java
@@ -290,15 +290,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 6) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent6AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent6AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java
index 5579845e..55ade0c3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java
@@ -242,11 +242,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field25P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field25P.java
index 87612f94..bd2cbb87 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field25P.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field25P.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java
index f8e94122..136ae2de 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java
@@ -285,11 +285,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java
index 07d91d5b..d57df3b4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java
@@ -285,11 +285,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java
index 295afee6..137e4718 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java
@@ -285,11 +285,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26A.java
index 8a4f61de..58aa6d77 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26A.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26C.java
index 56f476bd..1223701a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26C.java
@@ -291,11 +291,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26D.java
index 477e4d36..61aad4e8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26D.java
@@ -354,11 +354,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(29);
         }
-        if (component == 30) {
-            //default format (as is)
-            return getComponent(30);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(30);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field27.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field27.java
index 575f0f8a..d4164efd 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field27.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field27.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java
index 1fae9a80..321210c6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java
@@ -232,11 +232,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return df.format(cal.getTime()) + " " + tf.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java
index 1f5e8c0b..d3f5a079 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java
@@ -232,11 +232,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return df.format(cal.getTime()) + " " + tf.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java
index d3c87c3f..8708507a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java
@@ -232,11 +232,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return df.format(cal.getTime()) + " " + tf.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field28.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field28.java
index 81d1a5bc..f759965a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field28.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field28.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field280.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field280.java
index a6ba62e6..5ba1b7b2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field280.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field280.java
@@ -256,11 +256,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field281.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field281.java
index 3559cc05..0829dda2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field281.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field281.java
@@ -256,11 +256,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field28C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field28C.java
index c23b0079..3d1fedab 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field28C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field28C.java
@@ -223,11 +223,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field28D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field28D.java
index f96bef0d..50cb6c9a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field28D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field28D.java
@@ -236,11 +236,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field28E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field28E.java
index f5545924..8adb2fe0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field28E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field28E.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29B.java
index d7d3e3a2..c4032303 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29B.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29E.java
index c1d458d6..b019e647 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29E.java
@@ -221,13 +221,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29J.java
index 5f666a29..a2ce4604 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29J.java
@@ -221,13 +221,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29K.java
index 6c98d50b..f24f9259 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29K.java
@@ -221,13 +221,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java
index 2881fb18..5fc1b6ac 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java
@@ -241,13 +241,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29M.java
index ca5e1add..70ffb486 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29M.java
@@ -221,13 +221,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java
index cf99e9d9..9da06324 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java
@@ -241,13 +241,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29O.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29O.java
index 2282e622..333b444f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29O.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29O.java
@@ -247,13 +247,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field304.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field304.java
index b0eab6aa..4ba7780a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field304.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field304.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java
index 8d987b83..bddb77a8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java
@@ -239,13 +239,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java
index db49c659..523b4112 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java
@@ -235,13 +235,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30J.java
index 376f8304..b0eb7c41 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30J.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java
index d2afe56b..a6d2d09c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java
@@ -231,11 +231,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java
index 13f329f9..355d9bb9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java
@@ -247,11 +247,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java
index 0c64151c..ffe749f5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java
@@ -244,11 +244,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java
index 49b6d979..6bdb435e 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java
@@ -231,11 +231,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java
index 51d2aa61..fafa5fe1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java
@@ -228,13 +228,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java
index 8a86c053..a880eb69 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java
@@ -254,11 +254,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java
index 621f6a39..71a9516f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java
index 8c96b6cd..86b3cb9d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java
@@ -229,14 +229,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java
index 3427b54f..476fe60a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java
index 8ceade16..b142de99 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32F.java
index e80d159a..705e338a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32F.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java
index b609584b..ffdb7c19 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java
index 71fcebc8..baa088a2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java
@@ -241,14 +241,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java
index 3cd62e09..383fc0d0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java
@@ -284,14 +284,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java
index 435fd12d..cc6508a6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java
index 221b403d..d339c438 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java
@@ -223,11 +223,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32R.java
index 3e2fd9bf..47648c8d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32R.java
@@ -244,14 +244,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java
index a696cdf9..b693be61 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field330.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field330.java
index 34f8f497..d517c006 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field330.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field330.java
@@ -278,11 +278,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java
index 077acac3..017764cb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java
@@ -359,11 +359,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field332.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field332.java
index 13a3f400..eb242cbc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field332.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field332.java
@@ -226,11 +226,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java
index f107b3b6..259da196 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java
@@ -323,11 +323,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(7);
         }
-        if (component == 8) {
-            //default format (as is)
-            return getComponent(8);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(8);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field334.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field334.java
index 29c5fbc2..a143363b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field334.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field334.java
@@ -221,15 +221,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field335.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field335.java
index fae29b6a..df5c9fa4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field335.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field335.java
@@ -274,15 +274,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent5AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent5AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field336.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field336.java
index 58542b38..614edd2c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field336.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field336.java
@@ -239,11 +239,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java
index f4b25b22..c01ffce3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33B.java
index 84d00395..43180efc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33B.java
@@ -228,14 +228,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java
index 26801603..e2a67191 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java
index 245cde3e..26d2307b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java
index e5a294ca..a1665df1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java
index 4c7f4e68..300aa7e3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java
index 7d3c8b66..4f69305c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java
@@ -247,11 +247,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java
index de450b18..d9a4c75d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33J.java
index 36a37f09..ee15c3bb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33J.java
@@ -229,14 +229,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java
index 9543489c..e9c5eea4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java
@@ -284,14 +284,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33S.java
index 29297f6d..54094dcc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33S.java
@@ -229,14 +229,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33T.java
index b7c9cea4..306a1b52 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33T.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33T.java
@@ -229,14 +229,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field340.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field340.java
index 8d0143bf..25a53197 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field340.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field340.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field342.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field342.java
index 38d54a96..e55f02ad 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field342.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field342.java
@@ -225,15 +225,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
-        return null;
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field343.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field343.java
index 27499a2a..1a9a4545 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field343.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field343.java
@@ -252,11 +252,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field344.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field344.java
index 83565c6b..c2e8831f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field344.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field344.java
@@ -227,11 +227,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field345.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field345.java
index d081f42a..09dd1718 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field345.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field345.java
@@ -301,11 +301,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(9);
         }
-        if (component == 10) {
-            //default format (as is)
-            return getComponent(10);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(10);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field346.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field346.java
index 8c102a4e..82cd57ea 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field346.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field346.java
@@ -299,11 +299,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(9);
         }
-        if (component == 10) {
-            //default format (as is)
-            return getComponent(10);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(10);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field347.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field347.java
index efa666cb..5c78cce8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field347.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field347.java
@@ -299,11 +299,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(9);
         }
-        if (component == 10) {
-            //default format (as is)
-            return getComponent(10);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(10);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java
index 6a377e82..556b852a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java
index b0c023c6..4294822d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java
index cbfbe63a..3e9df4ad 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java
@@ -271,14 +271,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java
index bf2feaba..5b8a75be 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java
@@ -241,14 +241,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java
index 80c7c72e..2b28d25f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java
@@ -241,14 +241,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34J.java
index bb4455d8..8d785b12 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34J.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java
index 4e7527df..b7f42277 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java
index 0d047408..29277697 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35A.java
index 0debaf27..9a5dc39a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35A.java
@@ -236,14 +236,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35B.java
index 9d1f0bde..2adaaf35 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35B.java
@@ -281,11 +281,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35C.java
index f28690b9..6b7d3171 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35C.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35E.java
index 942acdbd..21a6dc8d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35E.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35G.java
index 89ae2d03..139d6ecb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35G.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35H.java
index cfca568a..3c945d60 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35H.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35L.java
index 9e27564a..97e0f352 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35L.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35N.java
index bb85a4a4..2f355ca6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35N.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35N.java
@@ -236,14 +236,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35S.java
index 03cd966d..59eedd5a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35S.java
@@ -236,14 +236,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35U.java
index cf7d24e0..80105e0d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35U.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35U.java
@@ -248,11 +248,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java
index e6d16579..5399c650 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java
@@ -240,14 +240,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java
index 266b17ff..5e5dd090 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java
index 575304b1..d1da5f90 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java
@@ -238,11 +238,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java
index 2b752297..967556cc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java
@@ -260,14 +260,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java
index e085198e..a36121e9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java
index 7427a8d6..690393f5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java
index 479bfd74..3dd81f55 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java
index b668e834..ffee20f8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java
index 21a7fc07..87c452ec 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java
index 26f91d77..c4091880 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java
@@ -307,11 +307,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37G.java
index 325479aa..2fad28b4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37G.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37H.java
index 163cb786..7a4e24c7 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37H.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37K.java
index 2849420d..89f142b3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37K.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37M.java
index 0aa230a7..a66c9527 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37M.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37R.java
index 70f34314..cda998a7 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37R.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37V.java
index c2c8720e..06cbf64e 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37V.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37V.java
@@ -222,14 +222,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38E.java
index c3cb7613..b05fbb10 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38E.java
@@ -220,11 +220,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38G.java
index 0f28261e..326e51cb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38G.java
@@ -247,11 +247,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38H.java
index 09b70356..2d5c53ef 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38H.java
@@ -247,11 +247,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38J.java
index 8890c1e5..0c6e7625 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38J.java
@@ -227,11 +227,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39A.java
index aab4bf5f..b9205cb0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39A.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39C.java
index 554fc66e..9e9a67a8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39C.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39D.java
index a06f6bbd..6ea484f2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39D.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39E.java
index 6f90596b..ebcb2848 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39E.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39F.java
index 8975653a..8e6da25d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39F.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field405.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field405.java
index a07f1b24..76cd2919 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field405.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field405.java
@@ -226,11 +226,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40B.java
index 3c222e83..48a5cc33 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40B.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40C.java
index 6c0d25bf..8fa0cc89 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40C.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40E.java
index 27392d68..13a7db64 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40E.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field41A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field41A.java
index 5ea37223..1a69597d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field41A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field41A.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field41D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field41D.java
index 9bb72254..257913b1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field41D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field41D.java
@@ -252,11 +252,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field41G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field41G.java
index 6294d400..02e5a67c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field41G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field41G.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field422.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field422.java
index a7fe2259..0e531c68 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field422.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field422.java
@@ -345,11 +345,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(23);
         }
-        if (component == 24) {
-            //default format (as is)
-            return getComponent(24);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(24);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field425.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field425.java
index efeedaf8..c56b727a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field425.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field425.java
@@ -425,11 +425,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(39);
         }
-        if (component == 40) {
-            //default format (as is)
-            return getComponent(40);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(40);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field42C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field42C.java
index 29b762f8..1529d7c7 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field42C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field42C.java
@@ -219,11 +219,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field42M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field42M.java
index 8424c952..20654f29 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field42M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field42M.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field42P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field42P.java
index 9bedbd46..9b1a8d31 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field42P.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field42P.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field433.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field433.java
index af2f21b1..edb24d36 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field433.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field433.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field434.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field434.java
index a60bb387..c8d1dcaa 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field434.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field434.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44D.java
index cf8b655d..a01acaad 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44D.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44H.java
index 7a7eb826..30826bbb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44H.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java
index 124fc584..c2fe3eb2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java
@@ -240,11 +240,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field48.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field48.java
index 86522041..e646424c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field48.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field48.java
@@ -223,11 +223,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field49A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field49A.java
index 3e952a87..a5eba219 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field49A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field49A.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field50.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field50.java
index 6c282341..e50a6fff 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field50.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field50.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field50A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field50A.java
index 65e1aa9e..3662b7cc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field50A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field50A.java
@@ -239,11 +239,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field50B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field50B.java
index bb334517..c40a20d5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field50B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field50B.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field50F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field50F.java
index 0e0fb526..4f200af2 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field50F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field50F.java
@@ -305,9 +305,8 @@ public String getValueDisplay(int component, Locale locale) {
             //special case for party identifier in field 50F
             if (StringUtils.startsWith(getComponent(1), "/")) {
                 return getComponent(1).substring(1);
-            } else {
-                return getComponent(1);
             }
+            return getComponent(1);
         }
         if (component == 2) {
             //default format (as is)
@@ -337,11 +336,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(8);
         }
-        if (component == 9) {
-            //default format (as is)
-            return getComponent(9);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(9);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field51.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field51.java
index 06d4e5d0..fa747df9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field51.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field51.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field59.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field59.java
index befe8afd..d8a89434 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field59.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field59.java
@@ -244,11 +244,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field59A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field59A.java
index 507aeb35..13c36538 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field59A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field59A.java
@@ -239,11 +239,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field59F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field59F.java
index 432a5196..626acffa 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field59F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field59F.java
@@ -312,11 +312,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(8);
         }
-        if (component == 9) {
-            //default format (as is)
-            return getComponent(9);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(9);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java
index cb54f044..56a12224 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java
@@ -260,14 +260,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java
index c036b85d..22b5b7b8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java
@@ -260,14 +260,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java
index 698a2a4b..316e4c1d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java
@@ -348,11 +348,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(9);
         }
-        if (component == 10) {
-            //default format (as is)
-            return getComponent(10);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(10);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java
index fb16c6e0..e23dcac5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java
@@ -259,14 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java
index 8e3af3c8..06766188 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java
@@ -259,14 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java
index 2a625a07..37e75225 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java
@@ -259,14 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java
index 869ae3a8..6342467e 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java
@@ -259,14 +259,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java
index 7e1bf262..c2f863e8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java
@@ -285,11 +285,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java
index ad6bcfa1..9647f05d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java
@@ -243,13 +243,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java
index 2479f5b7..37724c9b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java
@@ -317,13 +317,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //time with seconds: HHmmss
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
-            java.util.Calendar cal = getComponent5AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time with seconds: HHmmss
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
+        java.util.Calendar cal = getComponent5AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java
index 5d3c19d0..ba13e291 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java
@@ -243,11 +243,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java
index af54495c..c195467d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java
@@ -266,11 +266,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java
index a766c4da..5fa73721 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java
@@ -246,13 +246,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java
index c0bda987..39212a06 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java
@@ -269,13 +269,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //time with seconds: HHmmss
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
-            java.util.Calendar cal = getComponent4AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time with seconds: HHmmss
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
+        java.util.Calendar cal = getComponent4AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java
index 53823186..6b2a6fa8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java
index e4d10d9e..5c7b14d8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java
@@ -243,11 +243,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java
index b5e2b71e..d039b3da 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java
@@ -253,11 +253,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(6);
         }
-        if (component == 7) {
-            //default format (as is)
-            return getComponent(7);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(7);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java
index a52ca132..2bf7478f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java
@@ -273,11 +273,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(10);
         }
-        if (component == 11) {
-            //default format (as is)
-            return getComponent(11);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(11);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java
index 09825630..05091d35 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java
@@ -223,11 +223,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java
index 86b9e24e..461a7129 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java
@@ -273,11 +273,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(10);
         }
-        if (component == 11) {
-            //default format (as is)
-            return getComponent(11);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(11);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java
index d38c2ca7..a513ca06 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71C.java
index 4e94d90b..5dea0cdb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71C.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java
index 1ca45a68..ee02d80d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java
index be543af7..563cc8ff 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java
@@ -223,14 +223,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71N.java
index a91e4fa0..2b1334dc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71N.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71N.java
@@ -244,11 +244,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(6);
         }
-        if (component == 7) {
-            //default format (as is)
-            return getComponent(7);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(7);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field73R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field73R.java
index e6d8e956..fe841734 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field73R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field73R.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field73S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field73S.java
index 3ad921cd..125e8753 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field73S.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field73S.java
@@ -221,11 +221,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java
index 8d00cd9e..8bc148f0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java
@@ -249,11 +249,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field78.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field78.java
index 78b83bbd..38a832d6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field78.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field78.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field78D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field78D.java
index deb15160..6642f23c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field78D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field78D.java
@@ -264,11 +264,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(11);
         }
-        if (component == 12) {
-            //default format (as is)
-            return getComponent(12);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(12);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field79.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field79.java
index fc45061c..75a122a8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field79.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field79.java
@@ -379,11 +379,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(34);
         }
-        if (component == 35) {
-            //default format (as is)
-            return getComponent(35);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(35);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field79Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field79Z.java
index 17af1e60..9e0376f9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field79Z.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field79Z.java
@@ -379,11 +379,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(34);
         }
-        if (component == 35) {
-            //default format (as is)
-            return getComponent(35);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(35);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field80C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field80C.java
index 830443ec..fee85647 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field80C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field80C.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field86.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field86.java
index fec1b8b4..cd01f240 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field86.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field86.java
@@ -234,11 +234,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java
index f0075a3b..b9c0b6fd 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java
@@ -253,14 +253,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java
index 6ef83ad3..d9953be4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java
@@ -260,14 +260,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java
index 878b419f..371e71a9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java
@@ -235,14 +235,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java
index 1f5c9c9a..2bd3d5eb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java
@@ -235,14 +235,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java
index 0500bc32..719968f9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java
index 048194c5..e4d8e31b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java
@@ -294,14 +294,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent6AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent6AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java
index 588b09df..c0d31060 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java
@@ -307,14 +307,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent6AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent6AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java
index bfb7e732..9e43a64b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java
@@ -233,14 +233,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java
index 2edcef37..740cb7d5 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java
index d1d76e70..50bfad64 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java
index ae749479..c67eecf0 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java
@@ -254,14 +254,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java
index 7306378c..86af3f94 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java
@@ -242,11 +242,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java
index 7f8534dd..8102eaa1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java
@@ -245,14 +245,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java
index 22557918..1d884b5c 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java
@@ -247,14 +247,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java
index f06f9883..c69bb9e4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java
@@ -266,11 +266,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java
index dff4bf48..52c82cf7 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java
@@ -300,11 +300,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 6) {
-            //default format (as is)
-            return getComponent(6);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(6);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java
index ab1a390a..ba0d0ef1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java
index 9248756d..026edf4f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java
@@ -286,14 +286,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java
index 94388120..26d899e9 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java
@@ -266,14 +266,13 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(n);
             }
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java
index a6306b51..5f39f9f3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java
@@ -265,14 +265,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java
index 1e648d22..d9444dce 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java
@@ -233,14 +233,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent2AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent2AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java
index 4d2cfb8a..bece9a59 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java
@@ -266,14 +266,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent4AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent4AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java
index 7d934403..22e305bd 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java
@@ -242,11 +242,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java
index 07f2012d..18ffe090 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java
@@ -273,14 +273,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java
index 7aa05931..80ec9235 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java
@@ -273,14 +273,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java
index 6ac51daf..f9a09f18 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java
@@ -246,14 +246,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent3AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent3AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java
index 262d1f88..9ca8d43a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java
@@ -266,14 +266,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java
index 0a12046e..e78da832 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java
@@ -266,14 +266,13 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //amount, rate
-            java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
-            f.setMaximumFractionDigits(13);
-            BigDecimal n = getComponent5AsBigDecimal();
-            if (n != null) {
-                return f.format(n);
-            }
+        // This is the last component, return directly without `if`
+        //amount, rate
+        java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale));
+        f.setMaximumFractionDigits(13);
+        BigDecimal n = getComponent5AsBigDecimal();
+        if (n != null) {
+            return f.format(n);
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java
index 9d5cbb32..9f684d6a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java
@@ -249,11 +249,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java
index 09144786..2fb473c6 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java
index 5d7899f6..3a2577cd 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java
@@ -236,11 +236,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java
index cc01969e..93a01d5d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java
@@ -273,11 +273,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(10);
         }
-        if (component == 11) {
-            //default format (as is)
-            return getComponent(11);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(11);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java
index 3ca2c3aa..24d8fc4b 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java
@@ -253,11 +253,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java
index 93dcd70d..db15f8ce 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java
@@ -236,11 +236,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java
index 60133454..5841a123 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java
@@ -232,11 +232,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java
index 77ef6191..fbcec06f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java
@@ -241,11 +241,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java
index e9fcb5da..790fc99d 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java
@@ -222,11 +222,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java
index d5332c1b..f98d92de 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java
@@ -241,11 +241,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java
index d74c3cce..e7765adb 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java
@@ -273,11 +273,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(10);
         }
-        if (component == 11) {
-            //default format (as is)
-            return getComponent(11);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(11);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java
index a06f50d8..f3c235fc 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java
index 13b2b8a7..29163d33 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java
@@ -250,11 +250,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java
index 9c6572e6..81678a65 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java
index ce99e286..03135db4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java
@@ -235,11 +235,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java
index 3d129848..9e7ad785 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java
@@ -229,11 +229,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java
index a4e97e60..f5e8ea50 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java
@@ -225,13 +225,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //date: [YY]YYMMDD
-            java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //date: [YY]YYMMDD
+        java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java
index bc3d9a68..ddcca9e8 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java
@@ -242,11 +242,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java
index 1b8e49c4..e8d90de1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java
@@ -244,13 +244,12 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            //time with seconds: HHmmss
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time with seconds: HHmmss
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java
index b21b1d77..a7708813 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java
@@ -296,13 +296,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent5AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent5AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java
index d9cfbe6b..e0a5acb4 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java
@@ -312,13 +312,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(5);
         }
-        if (component == 6) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent6AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent6AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java
index 2ca4a839..0f6e1a98 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java
@@ -263,13 +263,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //time with seconds: HHmmss
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
-            java.util.Calendar cal = getComponent4AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time with seconds: HHmmss
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale));
+        java.util.Calendar cal = getComponent4AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java
index c437b364..6b4905bf 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java
@@ -303,13 +303,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(4);
         }
-        if (component == 5) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent5AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent5AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98H.java
index ae5af3c4..b9ed5316 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98H.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98H.java
@@ -286,13 +286,12 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            //time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent4AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // This is the last component, return directly without `if`
+        //time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent4AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java
index d98624b7..17f257a3 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java
@@ -276,11 +276,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 4) {
-            //default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(4);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java
index d99c965a..20dd337f 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java
@@ -279,11 +279,9 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 5) {
-            //default format (as is)
-            return getComponent(5);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(5);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java
index c7aa075f..14facf75 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java
@@ -244,11 +244,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(2);
         }
-        if (component == 3) {
-            //default format (as is)
-            return getComponent(3);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(3);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java
index e6729dd7..26f962b1 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**
diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java
index 3b36a078..f692917a 100644
--- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java
+++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java
@@ -224,11 +224,9 @@ public String getValueDisplay(int component, Locale locale) {
             //default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            //default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // This is the last component, return directly without `if`
+        //default format (as is)
+        return getComponent(2);
     }
 
     /**