diff --git a/library/jesd204/scripts/jesd204.tcl b/library/jesd204/scripts/jesd204.tcl
index 29989b763..84329eb72 100644
--- a/library/jesd204/scripts/jesd204.tcl
+++ b/library/jesd204/scripts/jesd204.tcl
@@ -250,23 +250,23 @@ proc adi_tpl_jesd204_tx_create {ip_name num_of_lanes num_of_converters samples_p
      ]
 
     if {$num_of_converters > 1} {
-    # Concatenation and slicer cores
-    ad_ip_instance xlconcat "${ip_name}/data_concat" [list \
-      NUM_PORTS $num_of_converters \
-    ]
+      # Concatenation and slicer cores
+      ad_ip_instance xlconcat "${ip_name}/data_concat" [list \
+        NUM_PORTS $num_of_converters \
+      ]
 
-    for {set i 0} {$i < $num_of_converters} {incr i} {
-      ad_ip_instance xlslice "${ip_name}/enable_slice_${i}" [list \
-        DIN_WIDTH $num_of_converters \
-        DIN_FROM $i \
-        DIN_TO $i \
-      ]
-      ad_ip_instance xlslice "${ip_name}/valid_slice_${i}" [list \
-        DIN_WIDTH $num_of_converters \
-        DIN_FROM $i \
-        DIN_TO $i \
-      ]
-    }
+      for {set i 0} {$i < $num_of_converters} {incr i} {
+        ad_ip_instance xlslice "${ip_name}/enable_slice_${i}" [list \
+          DIN_WIDTH $num_of_converters \
+          DIN_FROM $i \
+          DIN_TO $i \
+        ]
+        ad_ip_instance xlslice "${ip_name}/valid_slice_${i}" [list \
+          DIN_WIDTH $num_of_converters \
+          DIN_FROM $i \
+          DIN_TO $i \
+        ]
+      }
     }
     # Create connections
     # TPL configuration interface
@@ -280,16 +280,16 @@ proc adi_tpl_jesd204_tx_create {ip_name num_of_lanes num_of_converters samples_p
 
     # TPL - app layer
     if {$num_of_converters > 1} {
-    for {set i 0} {$i < $num_of_converters} {incr i} {
-      ad_connect ${ip_name}/tpl_core/enable ${ip_name}/enable_slice_$i/Din
-      ad_connect ${ip_name}/tpl_core/dac_valid ${ip_name}/valid_slice_$i/Din
+      for {set i 0} {$i < $num_of_converters} {incr i} {
+        ad_connect ${ip_name}/tpl_core/enable ${ip_name}/enable_slice_$i/Din
+        ad_connect ${ip_name}/tpl_core/dac_valid ${ip_name}/valid_slice_$i/Din
 
-      ad_connect ${ip_name}/enable_slice_$i/Dout ${ip_name}/dac_enable_$i
-      ad_connect ${ip_name}/valid_slice_$i/Dout ${ip_name}/dac_valid_$i
-      ad_connect ${ip_name}/dac_data_$i ${ip_name}/data_concat/In$i
+        ad_connect ${ip_name}/enable_slice_$i/Dout ${ip_name}/dac_enable_$i
+        ad_connect ${ip_name}/valid_slice_$i/Dout ${ip_name}/dac_valid_$i
+        ad_connect ${ip_name}/dac_data_$i ${ip_name}/data_concat/In$i
 
-    }
-    ad_connect ${ip_name}/data_concat/dout ${ip_name}/tpl_core/dac_ddata
+      }
+      ad_connect ${ip_name}/data_concat/dout ${ip_name}/tpl_core/dac_ddata
     } else {
       ad_connect ${ip_name}/dac_data_0 ${ip_name}/tpl_core/dac_ddata
       ad_connect ${ip_name}/tpl_core/enable ${ip_name}/dac_enable_0
@@ -365,25 +365,25 @@ proc adi_tpl_jesd204_rx_create {ip_name num_of_lanes num_of_converters samples_p
      ]
 
     if {$num_of_converters > 1} {
-    # Slicer cores
-    for {set i 0} {$i < $num_of_converters} {incr i} {
-      ad_ip_instance xlslice ${ip_name}/data_slice_$i [list \
-        DIN_WIDTH [expr $sample_width*$samples_per_channel*$num_of_converters] \
-        DIN_FROM [expr $sample_width*$samples_per_channel*($i+1)-1] \
-        DIN_TO [expr $sample_width*$samples_per_channel*$i] \
-      ]
+      # Slicer cores
+      for {set i 0} {$i < $num_of_converters} {incr i} {
+        ad_ip_instance xlslice ${ip_name}/data_slice_$i [list \
+          DIN_WIDTH [expr $sample_width*$samples_per_channel*$num_of_converters] \
+          DIN_FROM [expr $sample_width*$samples_per_channel*($i+1)-1] \
+          DIN_TO [expr $sample_width*$samples_per_channel*$i] \
+        ]
 
-      ad_ip_instance xlslice "${ip_name}/enable_slice_${i}" [list \
-        DIN_WIDTH $num_of_converters \
-        DIN_FROM $i \
-        DIN_TO $i \
-      ]
-      ad_ip_instance xlslice "${ip_name}/valid_slice_${i}" [list \
-        DIN_WIDTH $num_of_converters \
-        DIN_FROM $i \
-        DIN_TO $i \
-      ]
-    }
+        ad_ip_instance xlslice "${ip_name}/enable_slice_${i}" [list \
+          DIN_WIDTH $num_of_converters \
+          DIN_FROM $i \
+          DIN_TO $i \
+        ]
+        ad_ip_instance xlslice "${ip_name}/valid_slice_${i}" [list \
+          DIN_WIDTH $num_of_converters \
+          DIN_FROM $i \
+          DIN_TO $i \
+        ]
+      }
     }
 
     # Create connections
@@ -401,16 +401,16 @@ proc adi_tpl_jesd204_rx_create {ip_name num_of_lanes num_of_converters samples_p
 
     # TPL - app layer
     if {$num_of_converters > 1} {
-    for {set i 0} {$i < $num_of_converters} {incr i} {
-      ad_connect ${ip_name}/tpl_core/adc_data ${ip_name}/data_slice_$i/Din
-      ad_connect ${ip_name}/tpl_core/enable ${ip_name}/enable_slice_$i/Din
-      ad_connect ${ip_name}/tpl_core/adc_valid ${ip_name}/valid_slice_$i/Din
+      for {set i 0} {$i < $num_of_converters} {incr i} {
+        ad_connect ${ip_name}/tpl_core/adc_data ${ip_name}/data_slice_$i/Din
+        ad_connect ${ip_name}/tpl_core/enable ${ip_name}/enable_slice_$i/Din
+        ad_connect ${ip_name}/tpl_core/adc_valid ${ip_name}/valid_slice_$i/Din
 
-      ad_connect ${ip_name}/data_slice_$i/Dout ${ip_name}/adc_data_$i
-      ad_connect ${ip_name}/enable_slice_$i/Dout ${ip_name}/adc_enable_$i
-      ad_connect ${ip_name}/valid_slice_$i/Dout ${ip_name}/adc_valid_$i
+        ad_connect ${ip_name}/data_slice_$i/Dout ${ip_name}/adc_data_$i
+        ad_connect ${ip_name}/enable_slice_$i/Dout ${ip_name}/adc_enable_$i
+        ad_connect ${ip_name}/valid_slice_$i/Dout ${ip_name}/adc_valid_$i
 
-    }
+      }
     } else {
       ad_connect ${ip_name}/tpl_core/adc_data ${ip_name}/adc_data_0
       ad_connect ${ip_name}/tpl_core/enable ${ip_name}/adc_enable_0