diff --git a/.github/workflows/claude-review.yml b/.github/workflows/claude-review.yml
index 966a761..78f2ec2 100644
--- a/.github/workflows/claude-review.yml
+++ b/.github/workflows/claude-review.yml
@@ -18,8 +18,7 @@ jobs:
   code-review:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -60,8 +59,10 @@ jobs:
               throw error;
             }
 
-      - name: Generate diff
-        id: diff
+      - name: Generate diff and analyze
+        id: analysis
+        env:
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
         run: |
           # Configure git to fetch PR refs
           git config --local --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"
@@ -90,71 +91,82 @@ jobs:
           echo "Found $DIFF_SIZE bytes of relevant changes"
           echo "diff_size=$DIFF_SIZE" >> $GITHUB_OUTPUT
           
-          # Base64 encode the diff to preserve formatting
-          ENCODED_DIFF=$(base64 -w 0 diff_filtered.txt)
-          echo "diff_content=$ENCODED_DIFF" >> $GITHUB_OUTPUT
-
-      - name: Analyze with Claude
-        if: steps.diff.outputs.diff_size != '0'
-        id: analysis
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        run: |
-          # Decode the diff content
-          DIFF_CONTENT=$(echo "${{ steps.diff.outputs.diff_content }}" | base64 -d)
+          # Prepare the diff content
+          DIFF_CONTENT=$(cat diff_filtered.txt)
           
-          # Create request JSON using jq
-          REQUEST=$(jq -n \
-            --arg diff "$DIFF_CONTENT" \
+          # Create the JSON payload
+          read -r -d '' PROMPT << EOM
+          You are performing a code review. Please analyze this code diff and provide a thorough review that covers:
+
+          1. Potential conflicts with existing codebase
+          2. Code correctness and potential bugs
+          3. Security vulnerabilities or risks
+          4. Performance implications
+          5. Maintainability and readability issues
+          6. Adherence to best practices and coding standards
+          7. Suggestions for improvements
+
+          For each issue found:
+          - Explain the problem clearly
+          - Rate the severity (Critical/High/Medium/Low)
+          - Provide specific recommendations for fixes
+          - Include code examples where helpful
+
+          If no issues are found in a particular area, explicitly state that.
+
+          Here is the code diff to review:
+
+          \`\`\`
+          ${DIFF_CONTENT}
+          \`\`\`
+          EOM
+          
+          # Create API request JSON
+          REQUEST_JSON=$(jq -n \
+            --arg prompt "$PROMPT" \
             '{
-              model: "claude-3-sonnet-20240229",
-              max_tokens: 4096,
-              temperature: 0.7,
-              messages: [{
-                role: "user",
-                content: "You are performing a code review. Please analyze this code diff and provide a thorough review that covers:\n\n1. Potential conflicts with existing codebase\n2. Code correctness and potential bugs\n3. Security vulnerabilities or risks\n4. Performance implications\n5. Maintainability and readability issues\n6. Adherence to best practices and coding standards\n7. Suggestions for improvements\n\nFor each issue found:\n- Explain the problem clearly\n- Rate the severity (Critical/High/Medium/Low)\n- Provide specific recommendations for fixes\n- Include code examples where helpful\n\nIf no issues are found in a particular area, explicitly state that.\n\nHere is the code diff to review:\n\n```\n" + $diff + "\n```"
-              }]
+              "model": "claude-3-sonnet-20240229",
+              "max_tokens": 4096,
+              "temperature": 0.7,
+              "messages": [
+                {
+                  "role": "user",
+                  "content": $prompt
+                }
+              ]
             }')
           
-          # Make the API request
+          # Make API request and capture response in a file to preserve formatting
           echo "Sending request to Claude API..."
           RESPONSE=$(curl -s https://api.anthropic.com/v1/messages \
             -H "Content-Type: application/json" \
             -H "x-api-key: $ANTHROPIC_API_KEY" \
             -H "anthropic-version: 2023-06-01" \
-            -d "$REQUEST")
+            -d "$REQUEST_JSON")
           
           if echo "$RESPONSE" | jq -e '.content[0].text' > /dev/null; then
-            # Save the review text
-            REVIEW=$(echo "$RESPONSE" | jq -r '.content[0].text')
-            {
-              echo 'review<<EOF'
-              echo "$REVIEW"
-              echo 'EOF'
-            } >> $GITHUB_OUTPUT
+            echo 'review<<EOF' >> $GITHUB_OUTPUT
+            echo "$RESPONSE" | jq -r '.content[0].text' >> $GITHUB_OUTPUT
+            echo 'EOF' >> $GITHUB_OUTPUT
           else
             echo "Error in Claude API response: $RESPONSE"
+            echo "Request was: $REQUEST_JSON"
             exit 1
           fi
 
       - name: Post review comment
-        if: success() && steps.diff.outputs.diff_size != '0'
+        if: success() && steps.analysis.outputs.diff_size != '0'
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            try {
-              const { owner, repo } = context.repo;
-              const review = `${{ steps.analysis.outputs.review }}`;
-              const prNumber = ${{ steps.pr-number.outputs.number }};
-              
-              await github.rest.issues.createComment({
-                owner,
-                repo,
-                issue_number: prNumber,
-                body: "# Claude Code Review\n\n" + review
-              });
-            } catch (error) {
-              core.setFailed(`Failed to post review: ${error.message}`);
-              throw error;
-            }
+            const { owner, repo } = context.repo;
+            const review = `${{ steps.analysis.outputs.review }}`;
+            const prNumber = ${{ steps.pr-number.outputs.number }};
+            
+            await github.rest.issues.createComment({
+              owner,
+              repo,
+              issue_number: prNumber,
+              body: "# Claude Code Review\n\n" + review
+            });