diff --git a/apps/create-webmcp-app/templates/react/src/App.tsx b/apps/create-webmcp-app/templates/react/src/App.tsx
index 63873fc..9ed1107 100644
--- a/apps/create-webmcp-app/templates/react/src/App.tsx
+++ b/apps/create-webmcp-app/templates/react/src/App.tsx
@@ -32,11 +32,9 @@ import { z } from 'zod';
  * ```
  */
 export default function App() {
-  // Track connection to parent window
   const [isReady, setIsReady] = useState(false);
   const [message, setMessage] = useState('Hello from WebMCP Template!');
 
-  // Listen for parent ready event
   useEffect(() => {
     const handleMessage = (event: MessageEvent) => {
       if (event.data?.type === 'parent_ready') {
@@ -46,7 +44,6 @@ export default function App() {
 
     window.addEventListener('message', handleMessage);
 
-    // Notify parent we're ready
     window.parent.postMessage({ type: 'iframe_ready' }, '*');
 
     return () => window.removeEventListener('message', handleMessage);
@@ -109,7 +106,6 @@ export default function App() {
     },
   });
 
-  // Handle UI button click
   const handleUpdateClick = useCallback(() => {
     const newMessage = prompt('Enter new message:');
     if (newMessage) {
@@ -126,7 +122,6 @@ export default function App() {
       <div className="text-center">
         <h1 className="mb-4 text-3xl font-bold text-gray-900">WebMCP Template</h1>
 
-        {/* Connection status */}
         <div className="mb-6">
           {isReady ? (
             <div className="inline-flex items-center gap-2 rounded-full bg-green-100 px-4 py-2 text-sm text-green-800">
@@ -141,12 +136,10 @@ export default function App() {
           )}
         </div>
 
-        {/* Current message display */}
         <div className="rounded-lg bg-blue-50 p-6 mb-6">
           <p className="text-xl text-gray-700">{message}</p>
         </div>
 
-        {/* Action buttons */}
         <div className="flex gap-4 justify-center">
           <button
             onClick={handleUpdateClick}
@@ -164,7 +157,6 @@ export default function App() {
           </button>
         </div>
 
-        {/* Info about registered tools */}
         <div className="mt-8 rounded-lg bg-gray-50 p-4 text-left text-sm text-gray-600">
           <h2 className="font-semibold mb-2">Registered WebMCP Tools:</h2>
           <ul className="space-y-1">
diff --git a/apps/create-webmcp-app/templates/react/src/main.tsx b/apps/create-webmcp-app/templates/react/src/main.tsx
index 05df969..f475ef2 100644
--- a/apps/create-webmcp-app/templates/react/src/main.tsx
+++ b/apps/create-webmcp-app/templates/react/src/main.tsx
@@ -10,17 +10,14 @@ import { createRoot } from 'react-dom/client';
 import App from './App.tsx';
 import './index.css';
 
-// Initialize WebMCP transport
-// This sets up communication with the parent window via postMessage
 initializeWebModelContext({
   transport: {
     tabServer: {
-      allowedOrigins: ['*'], // Allow any origin for iframe communication
+      allowedOrigins: ['*'],
     },
   },
 });
 
-// Mount React app
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
diff --git a/apps/create-webmcp-app/templates/react/worker/index.ts b/apps/create-webmcp-app/templates/react/worker/index.ts
index 2d31a3f..708cfec 100644
--- a/apps/create-webmcp-app/templates/react/worker/index.ts
+++ b/apps/create-webmcp-app/templates/react/worker/index.ts
@@ -12,7 +12,6 @@ export { TemplateMCP };
  */
 const app = new Hono<{ Bindings: Env }>();
 
-// Apply CORS middleware to all routes
 app.use(
   '/*',
   cors({
@@ -22,7 +21,6 @@ app.use(
   })
 );
 
-// Route SSE (Server-Sent Events) endpoints
 app.all('/sse/*', async (c) => {
   return await TemplateMCP.serveSSE('/sse').fetch(c.req.raw, c.env, c.executionCtx);
 });
@@ -31,17 +29,14 @@ app.all('/sse', async (c) => {
   return await TemplateMCP.serveSSE('/sse').fetch(c.req.raw, c.env, c.executionCtx);
 });
 
-// Route MCP protocol endpoint
 app.all('/mcp', async (c) => {
   return await TemplateMCP.serve('/mcp').fetch(c.req.raw, c.env, c.executionCtx);
 });
 
-// 404 handler for unmatched routes
 app.notFound((c) => {
   return c.json({ error: 'Not found', path: c.req.path }, 404);
 });
 
-// Error handler
 app.onError((error, c) => {
   console.error('Worker error:', error);
   return c.json(
diff --git a/apps/create-webmcp-app/templates/react/worker/mcpServer.ts b/apps/create-webmcp-app/templates/react/worker/mcpServer.ts
index b391e11..d4da04c 100644
--- a/apps/create-webmcp-app/templates/react/worker/mcpServer.ts
+++ b/apps/create-webmcp-app/templates/react/worker/mcpServer.ts
@@ -49,9 +49,6 @@ Use this as a starting point to build your own interactive apps!`,
       {},
       async () => {
         try {
-          // Construct iframe URL from environment variable
-          // In dev: http://localhost:8888
-          // In prod: https://your-worker.workers.dev
           const iframeUrl = `${this.env.APP_URL}/`;
 
           const uiResource = createUIResource({
diff --git a/apps/create-webmcp-app/templates/vanilla/public/index.html b/apps/create-webmcp-app/templates/vanilla/public/index.html
index 15e263f..472bfc5 100644
--- a/apps/create-webmcp-app/templates/vanilla/public/index.html
+++ b/apps/create-webmcp-app/templates/vanilla/public/index.html
@@ -5,10 +5,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>WebMCP Template - Vanilla</title>
 
-  <!-- Tailwind CSS via CDN -->
   <script src="https://cdn.tailwindcss.com"></script>
 
-  <!-- @mcp-b/global - IIFE version (no build required!) -->
   <script src="https://unpkg.com/@mcp-b/global@latest/dist/index.iife.js"></script>
 
   <style>
@@ -22,7 +20,6 @@
     <div class="text-center max-w-2xl">
       <h1 class="mb-4 text-3xl font-bold text-gray-900">WebMCP Template (Vanilla)</h1>
 
-      <!-- Connection status -->
       <div id="status" class="mb-6">
         <div class="inline-flex items-center gap-2 rounded-full bg-yellow-100 px-4 py-2 text-sm text-yellow-800">
           <span class="h-2 w-2 rounded-full bg-yellow-600"></span>
@@ -30,12 +27,10 @@ <h1 class="mb-4 text-3xl font-bold text-gray-900">WebMCP Template (Vanilla)</h1>
         </div>
       </div>
 
-      <!-- Current message display -->
       <div class="rounded-lg bg-blue-50 p-6 mb-6">
         <p id="message" class="text-xl text-gray-700">Hello from WebMCP Template!</p>
       </div>
 
-      <!-- Action buttons -->
       <div class="flex gap-4 justify-center">
         <button
           id="btn-update"
@@ -51,7 +46,6 @@ <h1 class="mb-4 text-3xl font-bold text-gray-900">WebMCP Template (Vanilla)</h1>
         </button>
       </div>
 
-      <!-- Info about registered tools -->
       <div class="mt-8 rounded-lg bg-gray-50 p-4 text-left text-sm text-gray-600 border border-gray-200">
         <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
         <ul class="space-y-1">
@@ -63,19 +57,15 @@ <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
     </div>
   </div>
 
-  <!-- Application Logic -->
   <script>
-    // App state
     let isReady = false;
     let message = 'Hello from WebMCP Template!';
 
-    // DOM elements
     const statusEl = document.getElementById('status');
     const messageEl = document.getElementById('message');
     const btnUpdate = document.getElementById('btn-update');
     const btnReset = document.getElementById('btn-reset');
 
-    // Update UI based on state
     function updateUI() {
       messageEl.textContent = message;
 
@@ -100,7 +90,6 @@ <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
       }
     }
 
-    // Listen for parent ready event
     window.addEventListener('message', (event) => {
       if (event.data?.type === 'parent_ready') {
         isReady = true;
@@ -109,10 +98,8 @@ <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
       }
     });
 
-    // Notify parent we're ready
     window.parent.postMessage({ type: 'iframe_ready' }, '*');
 
-    // Button event handlers
     btnUpdate.addEventListener('click', () => {
       const newMessage = prompt('Enter new message:');
       if (newMessage) {
@@ -126,8 +113,6 @@ <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
       updateUI();
     });
 
-    // Register WebMCP tools using the W3C API
-    // window.navigator.modelContext is already available via the IIFE script!
     window.navigator.modelContext.provideContext({
       tools: [
         {
@@ -195,7 +180,6 @@ <h2 class="font-semibold mb-2">Registered WebMCP Tools:</h2>
       ]
     });
 
-    // Initial UI update
     updateUI();
 
     console.log('[App] WebMCP tools registered successfully');
diff --git a/apps/create-webmcp-app/templates/vanilla/worker/index.ts b/apps/create-webmcp-app/templates/vanilla/worker/index.ts
index 8348f10..76ff253 100644
--- a/apps/create-webmcp-app/templates/vanilla/worker/index.ts
+++ b/apps/create-webmcp-app/templates/vanilla/worker/index.ts
@@ -12,7 +12,6 @@ export { VanillaTemplateMCP };
  */
 const app = new Hono<{ Bindings: Env }>();
 
-// Apply CORS middleware to all routes
 app.use(
   '/*',
   cors({
@@ -22,7 +21,6 @@ app.use(
   })
 );
 
-// Route SSE (Server-Sent Events) endpoints
 app.all('/sse/*', async (c) => {
   return await VanillaTemplateMCP.serveSSE('/sse').fetch(c.req.raw, c.env, c.executionCtx);
 });
@@ -31,17 +29,14 @@ app.all('/sse', async (c) => {
   return await VanillaTemplateMCP.serveSSE('/sse').fetch(c.req.raw, c.env, c.executionCtx);
 });
 
-// Route MCP protocol endpoint
 app.all('/mcp', async (c) => {
   return await VanillaTemplateMCP.serve('/mcp').fetch(c.req.raw, c.env, c.executionCtx);
 });
 
-// 404 handler for unmatched routes
 app.notFound((c) => {
   return c.json({ error: 'Not found', path: c.req.path }, 404);
 });
 
-// Error handler
 app.onError((error, c) => {
   console.error('Worker error:', error);
   return c.json(
diff --git a/apps/create-webmcp-app/templates/vanilla/worker/mcpServer.ts b/apps/create-webmcp-app/templates/vanilla/worker/mcpServer.ts
index f14a3a6..c8dd6d9 100644
--- a/apps/create-webmcp-app/templates/vanilla/worker/mcpServer.ts
+++ b/apps/create-webmcp-app/templates/vanilla/worker/mcpServer.ts
@@ -54,7 +54,6 @@ Perfect for learning WebMCP or building simple interactive tools!`,
       {},
       async () => {
         try {
-          // Construct iframe URL from environment variable
           const iframeUrl = `${this.env.APP_URL}/`;
 
           const uiResource = createUIResource({