diff --git a/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol b/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
index 230c8311..3b09247f 100644
--- a/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
@@ -28,12 +28,12 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _buyAmt,
         uint256 _getId,
         uint256 _setId
     ) external payable returns (string memory _eventName, bytes memory _eventParam) {
-		BuyInfo memory buyData = BuyInfo({
+        return _buy(BuyInfo({
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
@@ -41,8 +41,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAmt: _buyAmt,
 			getId: _getId,
 			setId: _setId
-		});
-		return _buy(buyData);
+		}));
 	}
 
 	/**
@@ -69,7 +68,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			sellAmt: _sellAmt,
 			getId: _getId,
 			setId: _setId
diff --git a/contracts/mainnet/connectors/uniswap/v3_swap/main.sol b/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
index 80c7ca34..7bbeeafa 100644
--- a/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
@@ -28,7 +28,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _buyAmt,
         uint256 _getId,
         uint256 _setId
@@ -37,7 +37,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			buyAmt: _buyAmt,
 			getId: _getId,
 			setId: _setId
@@ -59,7 +59,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _sellAmt,
         uint256 _getId,
         uint256 _setId
@@ -68,7 +68,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			sellAmt: _sellAmt,
 			getId: _getId,
 			setId: _setId
diff --git a/contracts/optimism/connectors/uniswap/v3_swap/main.sol b/contracts/optimism/connectors/uniswap/v3_swap/main.sol
index 94a8a103..25b81758 100644
--- a/contracts/optimism/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/optimism/connectors/uniswap/v3_swap/main.sol
@@ -28,7 +28,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _buyAmt,
         uint256 _getId,
         uint256 _setId
@@ -37,7 +37,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			buyAmt: _buyAmt,
 			getId: _getId,
 			setId: _setId
@@ -59,7 +59,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _sellAmt,
         uint256 _getId,
         uint256 _setId
@@ -68,7 +68,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			sellAmt: _sellAmt,
 			getId: _getId,
 			setId: _setId
diff --git a/contracts/polygon/connectors/uniswap/v3_swap/main.sol b/contracts/polygon/connectors/uniswap/v3_swap/main.sol
index 285c9050..cbc3f2a3 100644
--- a/contracts/polygon/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/polygon/connectors/uniswap/v3_swap/main.sol
@@ -27,7 +27,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _buyAmt,
         uint256 _getId,
         uint256 _setId
@@ -36,7 +36,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			buyAmt: _buyAmt,
 			getId: _getId,
 			setId: _setId
@@ -59,7 +59,7 @@ abstract contract UniswapResolver is Helpers, Events {
         address _buyAddr,
         address _sellAddr,
         uint24 _fee,
-		uint256 _unitAmt,
+        uint256 _unitAmt,
         uint256 _sellAmt,
         uint256 _getId,
         uint256 _setId
@@ -68,7 +68,7 @@ abstract contract UniswapResolver is Helpers, Events {
 			buyAddr: _buyAddr,		
 			sellAddr: _sellAddr,	
 			fee: _fee,
-			unitAmt: _unitAmt,
+            unitAmt: _unitAmt,
 			sellAmt: _sellAmt,
 			getId: _getId,
 			setId: _setId