diff --git a/apps/transfers/scripts/listen.sh b/apps/transfers/scripts/listen.sh
index f99fe12..aa934ff 100755
--- a/apps/transfers/scripts/listen.sh
+++ b/apps/transfers/scripts/listen.sh
@@ -1,8 +1,8 @@
-ROOT=${ROOT:-$HOME}
+#!/bin/bash
 
+ROOT=${ROOT:-$HOME}
 DEFAULT_NODE="127.0.0.1:26657"
 NODE_URL=${NODE_URL:-$DEFAULT_NODE}
-
 # Use the QUARTZ_PORT environment variable if set, otherwise default to 11090
 QUARTZ_PORT="${QUARTZ_PORT:-11090}"
 
@@ -12,14 +12,11 @@ if [ "$#" -eq 0 ]; then
 fi
 
 CONTRACT=$1
-
 CMD="wasmd --node http://$NODE_URL"
-
 WSURL="ws://$NODE_URL/websocket"
 
 SUBSCRIBE_TRANSFER="{\"jsonrpc\":\"2.0\",\"method\":\"subscribe\",\"params\":[\"execute._contract_address = '$CONTRACT' AND wasm-transfer.action = 'user'\"],\"id\":1}"
 SUBSCRIBE_QUERY="{\"jsonrpc\":\"2.0\",\"method\":\"subscribe\",\"params\":[\"execute._contract_address = '$CONTRACT' AND wasm-query_balance.query = 'user'\"],\"id\":2}"
-
 # Attestation constants
 IAS_API_KEY="669244b3e6364b5888289a11d2a1726d"
 RA_CLIENT_SPID="51CAF5A48B450D624AEFE3286D314894"
@@ -29,50 +26,54 @@ REPORT_SIG_FILE="/tmp/${USER}_datareportsig"
 
 # cat keeps the stdin open so websocat doesnt close
 (echo "$SUBSCRIBE_TRANSFER"; echo "$SUBSCRIBE_QUERY"; cat) | websocat $WSURL | while read msg; do 
-    if [[ "$msg" == '{"jsonrpc":"2.0","id":1,"result":{}}' ]] || [[ "$msg" == '{"jsonrpc":"2.0","id":2,"result":{}}' ]]; then
+    if [[ "$msg" == '{"jsonrpc":"2.0","id":1,"result":{}}' ]] || \
+       [[ "$msg" == '{"jsonrpc":"2.0","id":2,"result":{}}' ]]; then
         echo "---------------------------------------------------------"
         echo "... subscribed to $msg"
         echo "... waiting for event"
         continue
     fi 
 
-    # TODO - Some reason this is saying ERROR when its fine, needs to be fixed or removed
-    #if echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | jq 'has("error")' > /dev/null; then
-     #   echo "... error msg $msg"
-     #   echo "---------------------------------------------------------"
-     #   echo "... waiting for event"
-     #   continue
-    #fi 
-
     CLEAN_MSG=$(echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | jq '.result.events')
 
     if echo "$CLEAN_MSG" | grep -q 'wasm-transfer'; then
         echo "---------------------------------------------------------"
         echo "... received wasm-transfer event!"
-
         echo "... fetching requests"
-        REQUESTS=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "requests" | hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
-        STATE=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "state" | hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
+        REQUESTS=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "requests" | \
+            hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
+        STATE=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "state" | \
+            hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
         export ENCLAVE_REQUEST=$(jq -nc --argjson requests "$REQUESTS" --argjson state $STATE '$ARGS.named')
         export REQUEST_MSG=$(jq -nc --arg message "$ENCLAVE_REQUEST" '$ARGS.named')
 
         cd $ROOT/cycles-quartz/apps/transfers/enclave
 
         echo "... executing transfer"
-        export ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" "127.0.0.1:$QUARTZ_PORT" transfers.Settlement/Run | jq .message | jq -R 'fromjson | fromjson' | jq -c )
+        export ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto \
+            -d "$REQUEST_MSG" "127.0.0.1:$QUARTZ_PORT" transfers.Settlement/Run | \
+            jq .message | jq -R 'fromjson | fromjson' | jq -c)
         QUOTE=$(echo "$ATTESTED_MSG" | jq -c '.attestation')
         MSG=$(echo "$ATTESTED_MSG" | jq -c '.msg')
 
-        echo "... getting report"
-        echo -n "$QUOTE" | xxd -r -p - > "$QUOTE_FILE"
-        gramine-sgx-ias-request report -g "$RA_CLIENT_SPID" -k "$IAS_API_KEY" -q "$QUOTE_FILE" -r "$REPORT_FILE" -s "$REPORT_SIG_FILE" > /dev/null 2>&1
-        REPORT=$(cat "$REPORT_FILE")
-        REPORTSIG=$(cat "$REPORT_SIG_FILE" | tr -d '\r')
+        if [ -n "$MOCK_SGX" ]; then
+            echo "... running in MOCK_SGX mode"
+            EXECUTE=$(jq -nc --argjson update "$(jq -nc --argjson msg "$MSG" \
+                --argjson attestation "$QUOTE" '$ARGS.named')" '$ARGS.named')
+        else
+            echo "... getting report"
+            echo -n "$QUOTE" | xxd -r -p - > "$QUOTE_FILE"
+            gramine-sgx-ias-request report -g "$RA_CLIENT_SPID" -k "$IAS_API_KEY" -q "$QUOTE_FILE" \
+                -r "$REPORT_FILE" -s "$REPORT_SIG_FILE" > /dev/null 2>&1
+            REPORT=$(cat "$REPORT_FILE")
+            REPORTSIG=$(cat "$REPORT_SIG_FILE" | tr -d '\r')
+
+            EXECUTE=$(jq -nc --argjson update "$(jq -nc --argjson msg "$MSG" --argjson attestation \
+                "$(jq -nc --argjson report "$(jq -nc --argjson report "$REPORT" \
+                --arg reportsig "$REPORTSIG" '$ARGS.named')" '$ARGS.named')" '$ARGS.named')" '$ARGS.named')
+        fi
 
         echo "... submitting update"
-        export EXECUTE=$(jq -nc --argjson update "$(jq -nc --argjson msg "$MSG" --argjson attestation \
-            "$(jq -nc --argjson report "$(jq -nc --argjson report "$REPORT" --arg reportsig "$REPORTSIG" '$ARGS.named')" '$ARGS.named')" \
-            '$ARGS.named')" '$ARGS.named')
         echo $EXECUTE | jq '.'
         $CMD tx wasm execute "$CONTRACT" "$EXECUTE" --from admin --chain-id testing -y --gas 2000000
 
@@ -83,63 +84,50 @@ REPORT_SIG_FILE="/tmp/${USER}_datareportsig"
         echo "... received wasm-query_balance event!"
         echo "... fetching state"
 
-        STATE=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "state" | hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
+        STATE=$($CMD query wasm contract-state raw $CONTRACT $(printf '%s' "state" | \
+            hexdump -ve '/1 "%02X"') -o json | jq -r .data | base64 -d)
 
-        # Extract the address from the event
-        ADDRESS=$(echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | jq -r '.result.events["message.sender"]'[0])
+        ADDRESS=$(echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | \
+            jq -r '.result.events["message.sender"]'[0])
 
-        EPHEMERAL_PUBKEY=$(echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | jq -r '.result.events["wasm-query_balance.emphemeral_pubkey"]'[0])
+        EPHEMERAL_PUBKEY=$(echo "$msg" | sed 's/"log":"\[.*\]"/"log":"<invalid_json>"/' | \
+            jq -r '.result.events["wasm-query_balance.emphemeral_pubkey"]'[0])
 
-        # Create the enclave request with state and address
-        export ENCLAVE_REQUEST=$(jq -nc --argjson state "$STATE" --arg address "$ADDRESS" --arg ephemeral_pubkey "$EPHEMERAL_PUBKEY" '$ARGS.named')
+        export ENCLAVE_REQUEST=$(jq -nc --argjson state "$STATE" --arg address "$ADDRESS" \
+            --arg ephemeral_pubkey "$EPHEMERAL_PUBKEY" '$ARGS.named')
         export REQUEST_MSG=$(jq -nc --arg message "$ENCLAVE_REQUEST" '$ARGS.named')
 
         cd $ROOT/cycles-quartz/apps/transfers/enclave
 
         echo "... executing query balance"
-        ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" "127.0.0.1:$QUARTZ_PORT" transfers.Settlement/Query | jq -r '.message | fromjson')
-        echo "atts msg"
-        echo $ATTESTED_MSG
+        ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto \
+            -d "$REQUEST_MSG" "127.0.0.1:$QUARTZ_PORT" transfers.Settlement/Query | jq -r '.message | fromjson')
         QUOTE=$(echo "$ATTESTED_MSG" | jq -c '.attestation')
         MSG=$(echo "$ATTESTED_MSG" | jq -c '.msg')
-        echo "quote"
-        echo $QUOTE
-        echo "msg"
-        echo $MSG
-
-        echo -n "$QUOTE" | xxd -r -p - > "$QUOTE_FILE"
-        gramine-sgx-ias-request report -g "$RA_CLIENT_SPID" -k "$IAS_API_KEY" -q "$QUOTE_FILE" -r "$REPORT_FILE" -s "$REPORT_SIG_FILE" > /dev/null 2>&1
-        REPORT=$(cat "$REPORT_FILE")
-        REPORTSIG=$(cat "$REPORT_SIG_FILE" | tr -d '\r')
-
-        echo "... submitting update"
-
-        # Create the QueryResponseMsg structure with address inside the msg
-        export QUERY_RESPONSE_MSG=$(jq -n \
-            --arg address "$ADDRESS" \
-            --argjson msg "$MSG" \
+        QUERY_RESPONSE_MSG=$(jq -n --arg address "$ADDRESS" --argjson msg "$MSG" \
             '{address: $address, encrypted_bal: $msg.encrypted_bal}')
 
+        if [ -n "$MOCK_SGX" ]; then
+            echo "... running in MOCK_SGX mode"
+            EXECUTE=$(jq -nc --argjson query_response "$(jq -nc --argjson msg "$QUERY_RESPONSE_MSG" \
+                --argjson attestation "$QUOTE" '$ARGS.named')" '{query_response: $query_response}')
+        else
+            echo -n "$QUOTE" | xxd -r -p - > "$QUOTE_FILE"
+            gramine-sgx-ias-request report -g "$RA_CLIENT_SPID" -k "$IAS_API_KEY" -q "$QUOTE_FILE" \
+                -r "$REPORT_FILE" -s "$REPORT_SIG_FILE" > /dev/null 2>&1
+            REPORT=$(cat "$REPORT_FILE")
+            REPORTSIG=$(cat "$REPORT_SIG_FILE" | tr -d '\r')
+            EXECUTE=$(jq -nc --argjson query_response "$(jq -nc --argjson msg "$QUERY_RESPONSE_MSG" \
+                --argjson attestation "$(jq -nc --argjson report "$(jq -nc --argjson report "$REPORT" \
+                --arg reportsig "$REPORTSIG" '$ARGS.named')" '$ARGS.named')" '$ARGS.named')" \
+                '{query_response: $query_response}')
+        fi
 
-        # Create the execute message for query_response
-        export EXECUTE=$(jq -nc \
-            --argjson query_response "$(jq -nc \
-                --argjson msg "$QUERY_RESPONSE_MSG" \
-                --argjson attestation "$(jq -nc \
-                    --argjson report "$(jq -nc \
-                        --argjson report "$REPORT" \
-                        --arg reportsig "$REPORTSIG" \
-                        '$ARGS.named')" \
-                    '$ARGS.named')" \
-                '$ARGS.named')" \
-            '{query_response: $query_response}')
-
+        echo "... submitting update"
         echo $EXECUTE | jq '.'
-
         $CMD tx wasm execute "$CONTRACT" "$EXECUTE" --from admin --chain-id testing -y --gas 2000000
-
         echo " ... done"
         echo "------------------------------------"
         echo "... waiting for event"
     fi
-done
+done
\ No newline at end of file
diff --git a/relayer/scripts/relay.sh b/relayer/scripts/relay.sh
index 721f7bd..72f96f0 100755
--- a/relayer/scripts/relay.sh
+++ b/relayer/scripts/relay.sh
@@ -32,24 +32,22 @@ MSG=$(echo "$ATTESTED_MSG" | jq 'del(.quote)')
 
 if [ -n "$MOCK_SGX" ]; then
     case "$REQUEST" in
-    "Instantiate")
-    jq -nc --argjson msg "$MSG" --argjson "attestation" \
-        "$QUOTE" \
-        '$ARGS.named' ;;
-
-"SessionCreate" | "SessionSetPubKey")
-    REQUEST_KEY=$(echo "$REQUEST" | perl -pe 's/([A-Z])/_\L$1/g;s/^_//') #sed 's/\([A-Z]\)/_\L\1/g;s/^_//')
-    jq -nc --argjson quartz "$(jq -nc --argjson "$REQUEST_KEY" "$(jq -nc --argjson  msg "$MSG" --argjson attestation \
-                "$QUOTE" '$ARGS.named')" '$ARGS.named')" '$ARGS.named' ;;
-
-    *)
-    usage ;;
-esac
-
-exit
+        "Instantiate")
+            jq -nc --argjson msg "$MSG" --argjson "attestation" "$QUOTE" '$ARGS.named'
+            ;;
+        "SessionCreate" | "SessionSetPubKey")
+            REQUEST_KEY=$(echo "$REQUEST" | perl -pe 's/([A-Z])/_\L$1/g;s/^_//')
+            jq -nc --argjson quartz "$(jq -nc --argjson "$REQUEST_KEY" "$(jq -nc \
+                --argjson msg "$MSG" --argjson attestation "$QUOTE" '$ARGS.named')" \
+                '$ARGS.named')" '$ARGS.named'
+            ;;
+        *)
+            usage
+            ;;
+    esac
+    exit
 fi
 
-
 # clear tmp files from previous runs
 rm -f "$QUOTE_FILE" "$REPORT_FILE" "$REPORT_SIG_FILE"