diff --git a/src/CCIP2ETH.sol b/src/CCIP2ETH.sol
index 895def0..fc174f7 100644
--- a/src/CCIP2ETH.sol
+++ b/src/CCIP2ETH.sol
@@ -566,6 +566,15 @@ contract CCIP2ETH is iCCIP2ETH {
     }
 
     /// @dev : Management functions
+    
+    /// @dev - Returns owner of the contract
+    function owner() public view returns (address) {
+        return gateway.owner();
+    }
+    /// @dev - Updates ChainID in case of a hardfork
+    function updateChainID() public {
+        chainID = gateway.uintToString(block.chainid);
+    }
     /**
      * @dev Sets fees for ownerhash
      * Note - Set to 0 at launch
@@ -616,20 +625,6 @@ contract CCIP2ETH is iCCIP2ETH {
         emit UpdatedWrapper(_addr, _set);
     }
 
-    /**
-     * @dev - Updates Chain ID in case of a hardfork
-     */
-    function updateChainID() public {
-        chainID = gateway.uintToString(block.chainid);
-    }
-
-    /**
-     * @dev - Owner of contract
-     */
-    function owner() public view returns (address) {
-        return gateway.owner();
-    }
-
     /**
      * @dev Withdraw Ether to owner; to be used for tips or in case some Ether gets locked in the contract
      */