diff --git a/mev_inspect/strategies/arbitrage.py b/mev_inspect/strategies/arbitrage.py
index e122d57..e109fff 100644
--- a/mev_inspect/strategies/arbitrage.py
+++ b/mev_inspect/strategies/arbitrage.py
@@ -2,17 +2,9 @@ from itertools import groupby
 from typing import List, Optional
 
 from mev_inspect.schemas.arbitrage import Arbitrage
-from mev_inspect.schemas.classified_traces import (
-    ClassifiedTrace,
-    Classification,
-)
+from mev_inspect.schemas.classified_traces import ClassifiedTrace
 from mev_inspect.schemas.swaps import Swap
-from mev_inspect.schemas.transfers import Transfer
-from mev_inspect.transfers import (
-    get_child_transfers,
-    filter_transfers,
-    remove_child_transfers,
-)
+from mev_inspect.swaps import get_swaps
 
 
 UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair"
@@ -39,7 +31,7 @@ def get_arbitrages(traces: List[ClassifiedTrace]) -> List[Arbitrage]:
 def _get_arbitrages_for_transaction(
     traces: List[ClassifiedTrace],
 ) -> List[Arbitrage]:
-    swaps = _get_swaps(traces)
+    swaps = get_swaps(traces)
 
     if len(swaps) > 1:
         return _get_arbitrages_from_swaps(swaps)
@@ -114,120 +106,3 @@ def _get_arbitrage_starting_with_swap(
             )
 
     return None
-
-
-def _get_swaps(traces: List[ClassifiedTrace]) -> List[Swap]:
-    ordered_traces = list(sorted(traces, key=lambda t: t.trace_address))
-
-    swaps: List[Swap] = []
-    prior_transfers: List[Transfer] = []
-
-    for trace in ordered_traces:
-        if trace.classification == Classification.transfer:
-            prior_transfers.append(Transfer.from_trace(trace))
-
-        elif trace.classification == Classification.swap:
-            child_transfers = get_child_transfers(trace.trace_address, traces)
-            swap = _build_swap(
-                trace,
-                remove_child_transfers(prior_transfers),
-                remove_child_transfers(child_transfers),
-            )
-
-            if swap is not None:
-                swaps.append(swap)
-
-    return swaps
-
-
-def _build_swap(
-    trace: ClassifiedTrace,
-    prior_transfers: List[Transfer],
-    child_transfers: List[Transfer],
-) -> Optional[Swap]:
-    if trace.abi_name == UNISWAP_V2_PAIR_ABI_NAME:
-        return _parse_uniswap_v2_swap(trace, prior_transfers, child_transfers)
-    elif trace.abi_name == UNISWAP_V3_POOL_ABI_NAME:
-        return _parse_uniswap_v3_swap(trace, child_transfers)
-
-    return None
-
-
-def _parse_uniswap_v3_swap(
-    trace: ClassifiedTrace,
-    child_transfers: List[Transfer],
-) -> Optional[Swap]:
-    pool_address = trace.to_address
-    recipient_address = (
-        trace.inputs["recipient"]
-        if trace.inputs is not None and "recipient" in trace.inputs
-        else trace.from_address
-    )
-
-    transfers_to_pool = filter_transfers(child_transfers, to_address=pool_address)
-    transfers_from_pool_to_recipient = filter_transfers(
-        child_transfers, to_address=recipient_address, from_address=pool_address
-    )
-
-    if len(transfers_to_pool) == 0:
-        return None
-
-    if len(transfers_from_pool_to_recipient) != 1:
-        return None
-
-    transfer_in = transfers_to_pool[-1]
-    transfer_out = transfers_from_pool_to_recipient[0]
-
-    return Swap(
-        abi_name=UNISWAP_V3_POOL_ABI_NAME,
-        transaction_hash=trace.transaction_hash,
-        trace_address=trace.trace_address,
-        pool_address=pool_address,
-        from_address=transfer_in.from_address,
-        to_address=transfer_out.to_address,
-        token_in_address=transfer_in.token_address,
-        token_in_amount=transfer_in.amount,
-        token_out_address=transfer_out.token_address,
-        token_out_amount=transfer_out.amount,
-    )
-
-
-def _parse_uniswap_v2_swap(
-    trace: ClassifiedTrace,
-    prior_transfers: List[Transfer],
-    child_transfers: List[Transfer],
-) -> Optional[Swap]:
-
-    pool_address = trace.to_address
-    recipient_address = (
-        trace.inputs["to"]
-        if trace.inputs is not None and "to" in trace.inputs
-        else trace.from_address
-    )
-
-    transfers_to_pool = filter_transfers(prior_transfers, to_address=pool_address)
-    transfers_from_pool_to_recipient = filter_transfers(
-        child_transfers, to_address=recipient_address, from_address=pool_address
-    )
-
-    if len(transfers_to_pool) == 0:
-        return None
-
-    if len(transfers_from_pool_to_recipient) != 1:
-        return None
-
-    transfer_in = transfers_to_pool[-1]
-    transfer_out = transfers_from_pool_to_recipient[0]
-
-    return Swap(
-        abi_name=UNISWAP_V2_PAIR_ABI_NAME,
-        transaction_hash=trace.transaction_hash,
-        trace_address=trace.trace_address,
-        pool_address=pool_address,
-        from_address=transfer_in.from_address,
-        to_address=transfer_out.to_address,
-        token_in_address=transfer_in.token_address,
-        token_in_amount=transfer_in.amount,
-        token_out_address=transfer_out.token_address,
-        token_out_amount=transfer_out.amount,
-    )
diff --git a/mev_inspect/swaps.py b/mev_inspect/swaps.py
new file mode 100644
index 0000000..d155fc2
--- /dev/null
+++ b/mev_inspect/swaps.py
@@ -0,0 +1,134 @@
+from typing import List, Optional
+
+from mev_inspect.schemas.classified_traces import (
+    ClassifiedTrace,
+    Classification,
+)
+from mev_inspect.schemas.swaps import Swap
+from mev_inspect.schemas.transfers import Transfer
+from mev_inspect.transfers import (
+    get_child_transfers,
+    filter_transfers,
+    remove_child_transfers,
+)
+
+
+UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair"
+UNISWAP_V3_POOL_ABI_NAME = "UniswapV3Pool"
+
+
+def get_swaps(traces: List[ClassifiedTrace]) -> List[Swap]:
+    ordered_traces = list(sorted(traces, key=lambda t: t.trace_address))
+
+    swaps: List[Swap] = []
+    prior_transfers: List[Transfer] = []
+
+    for trace in ordered_traces:
+        if trace.classification == Classification.transfer:
+            prior_transfers.append(Transfer.from_trace(trace))
+
+        elif trace.classification == Classification.swap:
+            child_transfers = get_child_transfers(trace.trace_address, traces)
+            swap = _build_swap(
+                trace,
+                remove_child_transfers(prior_transfers),
+                remove_child_transfers(child_transfers),
+            )
+
+            if swap is not None:
+                swaps.append(swap)
+
+    return swaps
+
+
+def _build_swap(
+    trace: ClassifiedTrace,
+    prior_transfers: List[Transfer],
+    child_transfers: List[Transfer],
+) -> Optional[Swap]:
+    if trace.abi_name == UNISWAP_V2_PAIR_ABI_NAME:
+        return _parse_uniswap_v2_swap(trace, prior_transfers, child_transfers)
+    elif trace.abi_name == UNISWAP_V3_POOL_ABI_NAME:
+        return _parse_uniswap_v3_swap(trace, child_transfers)
+
+    return None
+
+
+def _parse_uniswap_v3_swap(
+    trace: ClassifiedTrace,
+    child_transfers: List[Transfer],
+) -> Optional[Swap]:
+    pool_address = trace.to_address
+    recipient_address = (
+        trace.inputs["recipient"]
+        if trace.inputs is not None and "recipient" in trace.inputs
+        else trace.from_address
+    )
+
+    transfers_to_pool = filter_transfers(child_transfers, to_address=pool_address)
+    transfers_from_pool_to_recipient = filter_transfers(
+        child_transfers, to_address=recipient_address, from_address=pool_address
+    )
+
+    if len(transfers_to_pool) == 0:
+        return None
+
+    if len(transfers_from_pool_to_recipient) != 1:
+        return None
+
+    transfer_in = transfers_to_pool[-1]
+    transfer_out = transfers_from_pool_to_recipient[0]
+
+    return Swap(
+        abi_name=UNISWAP_V3_POOL_ABI_NAME,
+        transaction_hash=trace.transaction_hash,
+        trace_address=trace.trace_address,
+        pool_address=pool_address,
+        from_address=transfer_in.from_address,
+        to_address=transfer_out.to_address,
+        token_in_address=transfer_in.token_address,
+        token_in_amount=transfer_in.amount,
+        token_out_address=transfer_out.token_address,
+        token_out_amount=transfer_out.amount,
+    )
+
+
+def _parse_uniswap_v2_swap(
+    trace: ClassifiedTrace,
+    prior_transfers: List[Transfer],
+    child_transfers: List[Transfer],
+) -> Optional[Swap]:
+
+    pool_address = trace.to_address
+    recipient_address = (
+        trace.inputs["to"]
+        if trace.inputs is not None and "to" in trace.inputs
+        else trace.from_address
+    )
+
+    transfers_to_pool = filter_transfers(prior_transfers, to_address=pool_address)
+    transfers_from_pool_to_recipient = filter_transfers(
+        child_transfers, to_address=recipient_address, from_address=pool_address
+    )
+
+    if len(transfers_to_pool) == 0:
+        return None
+
+    if len(transfers_from_pool_to_recipient) != 1:
+        return None
+
+    transfer_in = transfers_to_pool[-1]
+    transfer_out = transfers_from_pool_to_recipient[0]
+
+    return Swap(
+        abi_name=UNISWAP_V2_PAIR_ABI_NAME,
+        transaction_hash=trace.transaction_hash,
+        trace_address=trace.trace_address,
+        pool_address=pool_address,
+        from_address=transfer_in.from_address,
+        to_address=transfer_out.to_address,
+        token_in_address=transfer_in.token_address,
+        token_in_amount=transfer_in.amount,
+        token_out_address=transfer_out.token_address,
+        token_out_amount=transfer_out.amount,
+    )