diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_account_created_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_account_created_arbitrum_mainnet.sql
index c8ae31bc..8f102e9f 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_account_created_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_account_created_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_account_created as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'account_created'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'account_created') }} --noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_delegation_updated_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_delegation_updated_arbitrum_mainnet.sql
index 2d6910b4..f7b5a185 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_delegation_updated_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_delegation_updated_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with delegation_updated as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'delegation_updated'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'delegation_updated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_deposited_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_deposited_arbitrum_mainnet.sql
index 88f5626e..5a56dea8 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_deposited_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_deposited_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_deposited as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'deposited'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'deposited') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_liquidation_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_liquidation_arbitrum_mainnet.sql
index b9c759fb..957c4eca 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_liquidation_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_liquidation_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_liquidation as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'liquidation'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'liquidation') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_registered_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_registered_arbitrum_mainnet.sql
index d5056259..6b94569c 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_registered_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_registered_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_market_registered as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'market_registered'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'market_registered') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_updated_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_updated_arbitrum_mainnet.sql
index 24e1fcd4..281cb2ec 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_updated_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_market_updated_arbitrum_mainnet.sql
@@ -17,13 +17,7 @@ with events as (
         cast(token_amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'arbitrum',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_collateral_deposited'
-            ) }}
+            {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'market_collateral_deposited') }} -- noqa
         ) as collateral_deposited -- noqa: AL05
     union all
     select
@@ -44,13 +38,7 @@ with events as (
         cast(token_amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'arbitrum',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_collateral_withdrawn'
-            ) }}
+            {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'market_collateral_withdrawn') }} -- noqa
         ) as collateral_withdrawn -- noqa: AL05
     union all
     select
@@ -71,13 +59,7 @@ with events as (
         cast(amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'arbitrum',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_usd_deposited'
-            ) }}
+            {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'market_usd_deposited') }} -- noqa
         ) as usd_deposited -- noqa: AL05
     union all
     select
@@ -98,13 +80,7 @@ with events as (
         cast(amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'arbitrum',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_usd_withdrawn'
-            ) }}
+            {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'market_usd_withdrawn') }} -- noqa
         ) as usd_withdrawn -- noqa: AL05
 )
 
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_pool_created_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_pool_created_arbitrum_mainnet.sql
index 50900539..242bf809 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_pool_created_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_pool_created_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_pool_created as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'pool_created'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'pool_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_claimed_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_claimed_arbitrum_mainnet.sql
index f1ac5a77..1ee3ca98 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_claimed_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_claimed_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_rewards_claimed as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'rewards_claimed'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'rewards_claimed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_distributed_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_distributed_arbitrum_mainnet.sql
index 1ebca472..e48c6551 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_distributed_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_rewards_distributed_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_rewards_distributed as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'rewards_distributed'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'rewards_distributed') }} -- noqa
 )
 
 select
@@ -19,6 +13,6 @@ select
     collateral_type,
     distributor,
     cast(amount as UInt256) as amount,
-    cast(start as UInt256) as start,
+    cast(start as UInt256) as start, -- noqa
     cast(duration as UInt256) as duration
 from core_rewards_distributed
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_burned_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_burned_arbitrum_mainnet.sql
index 23d04bca..b0fa80a2 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_burned_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_burned_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_usd_burned as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'usd_burned'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'usd_burned') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_minted_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_minted_arbitrum_mainnet.sql
index 80de871b..fd0ca15d 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_minted_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_usd_minted_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_usd_minted as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'usd_minted'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'usd_minted') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_vault_liquidation_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_vault_liquidation_arbitrum_mainnet.sql
index f86b1ebc..b2d72fe3 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_vault_liquidation_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_vault_liquidation_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_vault_liquidation as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'vault_liquidation'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'vault_liquidation') }} -- noqa
 )
 
 select
@@ -18,6 +12,6 @@ select
     sender,
     liquidation_data,
     cast(pool_id as UInt128) as pool_id,
-    cast(collateral_type as text) as collateral_type,
+    cast(collateral_type as String) as collateral_type,
     cast(liquidate_as_account_id as UInt128) as liquidate_as_account_id
 from core_vault_liquidation
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_withdrawn_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_withdrawn_arbitrum_mainnet.sql
index 28ffb995..fbc021c4 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_withdrawn_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/core/core_withdrawn_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with core_withdrawn as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'withdrawn'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'core_proxy', 'withdrawn') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_created_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_created_arbitrum_mainnet.sql
index acdf9373..cb253df0 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_created_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_created_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_account_created as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'account_created'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'account_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_liquidation_attempt_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_liquidation_attempt_arbitrum_mainnet.sql
index 3b0e6e58..c556da93 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_liquidation_attempt_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_account_liquidation_attempt_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_account_liquidation_attempt as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'account_liquidation_attempt'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'account_liquidation_attempt') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_collateral_modified_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_collateral_modified_arbitrum_mainnet.sql
index ddea7d8b..35d1b301 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_collateral_modified_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_collateral_modified_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_collateral_modified as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'collateral_modified'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'collateral_modified') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_charged_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_charged_arbitrum_mainnet.sql
index d57289ad..31eae8ac 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_charged_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_charged_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_interest_charged as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'interest_charged'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'interest_charged') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_rate_updated_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_rate_updated_arbitrum_mainnet.sql
index 85c836d6..5f5be5fe 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_rate_updated_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_interest_rate_updated_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_interest_rate_updated as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'interest_rate_updated'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'interest_rate_updated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_created_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_created_arbitrum_mainnet.sql
index d211c010..c95c77cb 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_created_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_created_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_market_created as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'market_created'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'market_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_updated_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_updated_arbitrum_mainnet.sql
index 1db8e162..28278537 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_updated_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_market_updated_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_market_updated as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'market_updated'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'market_updated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_committed_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_committed_arbitrum_mainnet.sql
index f3820f19..369b7b39 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_committed_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_committed_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_order_committed as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'order_committed'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'order_committed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_settled_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_settled_arbitrum_mainnet.sql
index a895dfad..51819fd9 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_settled_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_order_settled_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_order_settled as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'order_settled'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'order_settled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_position_liquidated_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_position_liquidated_arbitrum_mainnet.sql
index ef84609d..257b75aa 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_position_liquidated_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_position_liquidated_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_position_liquidated as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'position_liquidated'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'position_liquidated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_previous_order_expired_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_previous_order_expired_arbitrum_mainnet.sql
index c050f40a..77a15df7 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_previous_order_expired_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/perp/perp_previous_order_expired_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_previous_order_expired as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'previous_order_expired'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'perps_market_proxy', 'previous_order_expired') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_cancelled_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_cancelled_arbitrum_mainnet.sql
index 83103f9c..26ca9ee0 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_cancelled_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_cancelled_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_cancelled as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_cancelled'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_cancelled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_committed_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_committed_arbitrum_mainnet.sql
index e4345fd0..8a551248 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_committed_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_committed_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_committed as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_committed'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_committed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_settled_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_settled_arbitrum_mainnet.sql
index 5d57b1f9..bc500d3f 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_settled_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_order_settled_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_settled as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_settled'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_settled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_bought_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_bought_arbitrum_mainnet.sql
index ce0c419b..e84b91bd 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_bought_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_bought_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_bought as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_bought'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_bought') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_registered_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_registered_arbitrum_mainnet.sql
index 1b0d769b..eaf23c35 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_registered_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_registered_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_registered as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_registered'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_registered') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_sold_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_sold_arbitrum_mainnet.sql
index 558a7f44..33481f30 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_sold_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_sold_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_sold as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_sold'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_sold') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_unwrapped_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_unwrapped_arbitrum_mainnet.sql
index 57151930..926f3013 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_unwrapped_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_unwrapped_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_unwrapped as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_unwrapped'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_unwrapped') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_wrapped_arbitrum_mainnet.sql b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_wrapped_arbitrum_mainnet.sql
index 27ebfcfd..19b23a98 100644
--- a/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_wrapped_arbitrum_mainnet.sql
+++ b/transformers/synthetix/models/core/arbitrum/mainnet/synthetix/spot/spot_synth_wrapped_arbitrum_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_wrapped as (
-    {{ get_event_data( -- noqa
-        'arbitrum',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_wrapped'
-    ) }}
+    {{ get_event_data('arbitrum', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_wrapped') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/buyback/buyback_processed_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/buyback/buyback_processed_base_mainnet.sql
index 4dd32d8c..e4128790 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/buyback/buyback_processed_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/buyback/buyback_processed_base_mainnet.sql
@@ -1,21 +1,9 @@
 with legacy_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'buyback_snx_legacy',
-        'buyback_processed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'buyback_snx_legacy', 'buyback_processed') }} -- noqa
 ),
 
 current_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'buyback_snx',
-        'buyback_processed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'buyback_snx', 'buyback_processed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_account_created_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_account_created_base_mainnet.sql
index 15aab1f6..e83b59c9 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_account_created_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_account_created_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_account_created as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'account_created'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'account_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_delegation_updated_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_delegation_updated_base_mainnet.sql
index eb466d61..979315c0 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_delegation_updated_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_delegation_updated_base_mainnet.sql
@@ -1,11 +1,5 @@
 with delegation_updated as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'delegation_updated'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'delegation_updated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_deposited_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_deposited_base_mainnet.sql
index 6af26866..c5e6035f 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_deposited_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_deposited_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_deposited as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'deposited'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'deposited') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_liquidation_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_liquidation_base_mainnet.sql
index 3bd72e6a..d93a8433 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_liquidation_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_liquidation_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_liquidation as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'liquidation'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'liquidation') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_registered_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_registered_base_mainnet.sql
index 7b450449..d4b76cfa 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_registered_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_registered_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_market_registered as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'market_registered'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'market_registered') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_updated_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_updated_base_mainnet.sql
index ddfc57a7..6556ddae 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_updated_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_market_updated_base_mainnet.sql
@@ -17,13 +17,7 @@ with events as (
         cast(token_amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'base',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_collateral_deposited'
-            ) }}
+            {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'market_collateral_deposited') }} -- noqa
         ) as collateral_deposited -- noqa: AL05
     union all
     select
@@ -44,13 +38,7 @@ with events as (
         cast(token_amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'base',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_collateral_withdrawn'
-            ) }}
+            {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'market_collateral_withdrawn') }} -- noqa
         ) as collateral_withdrawn -- noqa: AL05
     union all
     select
@@ -71,13 +59,7 @@ with events as (
         cast(amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'base',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_usd_deposited'
-            ) }}
+            {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'market_usd_deposited') }} -- noqa
         ) as usd_deposited -- noqa: AL05
     union all
     select
@@ -98,13 +80,7 @@ with events as (
         cast(amount as UInt256) as token_amount
     from
         (
-            {{ get_event_data(
-                'base',
-                'mainnet',
-                'synthetix',
-                'core_proxy',
-                'market_usd_withdrawn'
-            ) }}
+            {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'market_usd_withdrawn') }} -- noqa
         ) as usd_withdrawn -- noqa: AL05
 )
 
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_pool_created_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_pool_created_base_mainnet.sql
index 757669e6..3a70a5a9 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_pool_created_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_pool_created_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_pool_created as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'pool_created'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'pool_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_claimed_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_claimed_base_mainnet.sql
index 3e817471..47e9a1fe 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_claimed_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_claimed_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_rewards_claimed as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'rewards_claimed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'rewards_claimed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_distributed_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_distributed_base_mainnet.sql
index b5e0837f..e683d5ae 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_distributed_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_rewards_distributed_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_rewards_distributed as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'rewards_distributed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'rewards_distributed') }} -- noqa
 )
 
 select
@@ -19,6 +13,6 @@ select
     collateral_type,
     distributor,
     cast(amount as UInt256) as amount,
-    cast(start as UInt256) as start,
+    cast(start as UInt256) as start, -- noqa
     cast(duration as UInt256) as duration
 from core_rewards_distributed
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_burned_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_burned_base_mainnet.sql
index 260232a2..68ea1cac 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_burned_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_burned_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_usd_burned as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'usd_burned'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'usd_burned') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_minted_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_minted_base_mainnet.sql
index aa195815..451446f0 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_minted_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_usd_minted_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_usd_minted as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'usd_minted'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'usd_minted') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_vault_liquidation_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_vault_liquidation_base_mainnet.sql
index c3a8c940..9dd621cb 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_vault_liquidation_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_vault_liquidation_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_vault_liquidation as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'vault_liquidation'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'vault_liquidation') }} -- noqa
 )
 
 select
@@ -18,6 +12,6 @@ select
     sender,
     liquidation_data,
     cast(pool_id as UInt128) as pool_id,
-    cast(collateral_type as text) as collateral_type,
+    cast(collateral_type as String) as collateral_type,
     cast(liquidate_as_account_id as UInt128) as liquidate_as_account_id
 from core_vault_liquidation
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_withdrawn_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_withdrawn_base_mainnet.sql
index edc2f589..b678eba9 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_withdrawn_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/core/core_withdrawn_base_mainnet.sql
@@ -1,11 +1,5 @@
 with core_withdrawn as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'core_proxy',
-        'withdrawn'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'core_proxy', 'withdrawn') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_created_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_created_base_mainnet.sql
index bcbeab19..d1061667 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_created_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_created_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_account_created as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'account_created'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'account_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_liquidation_attempt_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_liquidation_attempt_base_mainnet.sql
index 050032c6..b57d9f36 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_liquidation_attempt_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_account_liquidation_attempt_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_account_liquidation_attempt as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'account_liquidation_attempt'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'account_liquidation_attempt') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_collateral_modified_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_collateral_modified_base_mainnet.sql
index 24a85791..24490f5d 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_collateral_modified_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_collateral_modified_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_collateral_modified as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'collateral_modified'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'collateral_modified') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_charged_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_charged_base_mainnet.sql
index 19e28ae4..c13a4571 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_charged_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_charged_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_interest_charged as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'interest_charged'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'interest_charged') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_rate_updated_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_rate_updated_base_mainnet.sql
index 8628bc45..a5551c91 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_rate_updated_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_interest_rate_updated_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_interest_rate_updated as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'interest_rate_updated'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'interest_rate_updated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_created_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_created_base_mainnet.sql
index 9c2801fa..697142ee 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_created_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_created_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_market_created as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'market_created'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'market_created') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_updated_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_updated_base_mainnet.sql
index 15dfca8b..780784a2 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_updated_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_market_updated_base_mainnet.sql
@@ -1,21 +1,9 @@
 with legacy_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy_legacy',
-        'market_updated'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy_legacy', 'market_updated') }} -- noqa
 ),
 
 current_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'market_updated'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'market_updated') }} -- noqa
 )
 
 
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_committed_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_committed_base_mainnet.sql
index f4855ef0..d131f64f 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_committed_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_committed_base_mainnet.sql
@@ -1,21 +1,9 @@
 with legacy_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy_legacy',
-        'order_committed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy_legacy', 'order_committed') }} -- noqa
 ),
 
 current_events as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'order_committed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'order_committed') }} -- noqa
 )
 
 select
@@ -30,7 +18,7 @@ select
     cast(commitment_time as UInt256) as commitment_time,
     cast(expiration_time as UInt256) as expiration_time,
     cast(settlement_time as UInt256) as settlement_time,
-    cast(null as Nullable(UInt256)) as expected_price_time,
+    cast(null as Nullable(UInt256)) as expected_price_time, -- noqa
     cast(acceptable_price as UInt256) as acceptable_price,
     cast(order_type as UInt8) as order_type,
     cast(size_delta as Int128) as size_delta,
@@ -51,7 +39,7 @@ select
     cast(commitment_time as UInt256) as commitment_time,
     cast(expiration_time as UInt256) as expiration_time,
     cast(settlement_time as UInt256) as settlement_time,
-    cast(expected_price_time as Nullable(UInt256)) as expected_price_time,
+    cast(expected_price_time as Nullable(UInt256)) as expected_price_time, -- noqa
     cast(acceptable_price as UInt256) as acceptable_price,
     cast(order_type as UInt8) as order_type,
     cast(size_delta as Int128) as size_delta,
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_settled_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_settled_base_mainnet.sql
index a390d620..40e7e5b5 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_settled_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_order_settled_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_order_settled as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'order_settled'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'order_settled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_position_liquidated_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_position_liquidated_base_mainnet.sql
index ce5e53ea..49c5fc56 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_position_liquidated_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_position_liquidated_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_position_liquidated as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'position_liquidated'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'position_liquidated') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_previous_order_expired_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_previous_order_expired_base_mainnet.sql
index 3a29b656..2cc239b7 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_previous_order_expired_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/perp/perp_previous_order_expired_base_mainnet.sql
@@ -1,11 +1,5 @@
 with perps_previous_order_expired as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'perps_market_proxy',
-        'previous_order_expired'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'perps_market_proxy', 'previous_order_expired') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_cancelled_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_cancelled_base_mainnet.sql
index e051d15a..f8491c7c 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_cancelled_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_cancelled_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_cancelled as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_cancelled'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_cancelled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_committed_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_committed_base_mainnet.sql
index f33695e8..fc20d283 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_committed_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_committed_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_committed as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_committed'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_committed') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_settled_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_settled_base_mainnet.sql
index 80e3deff..6e53a300 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_settled_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_order_settled_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_order_settled as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'order_settled'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'order_settled') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_bought_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_bought_base_mainnet.sql
index 55cc3781..a95d2977 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_bought_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_bought_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_bought as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_bought'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_bought') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_registered_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_registered_base_mainnet.sql
index c8bcc9fb..aba87f35 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_registered_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_registered_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_registered as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_registered'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_registered') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_sold_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_sold_base_mainnet.sql
index d0ae9b65..738cb048 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_sold_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_sold_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_sold as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_sold'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_sold') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_unwrapped_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_unwrapped_base_mainnet.sql
index f952474a..de9a55b5 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_unwrapped_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_unwrapped_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_unwrapped as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_unwrapped'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_unwrapped') }} -- noqa
 )
 
 select
diff --git a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_wrapped_base_mainnet.sql b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_wrapped_base_mainnet.sql
index 05f52b2c..291d11e1 100644
--- a/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_wrapped_base_mainnet.sql
+++ b/transformers/synthetix/models/core/base/mainnet/synthetix/spot/spot_synth_wrapped_base_mainnet.sql
@@ -1,11 +1,5 @@
 with spot_synth_wrapped as (
-    {{ get_event_data( -- noqa
-        'base',
-        'mainnet',
-        'synthetix',
-        'spot_market_proxy',
-        'synth_wrapped'
-    ) }}
+    {{ get_event_data('base', 'mainnet', 'synthetix', 'spot_market_proxy', 'synth_wrapped') }} -- noqa
 )
 
 select