diff --git a/examples/baseLayers.html b/examples/baseLayers.html
index fd1ecaf261..2114d3f08e 100644
--- a/examples/baseLayers.html
+++ b/examples/baseLayers.html
@@ -18,7 +18,6 @@
     <script src="http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=euzuro-openlayers"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -69,8 +68,6 @@
         function remove() {
             markers.removeMarker(marker);
         }
-                
-    // -->
 
     </script>
   </head>
diff --git a/examples/boxes.html b/examples/boxes.html
index cd85e70629..1b18984d3d 100644
--- a/examples/boxes.html
+++ b/examples/boxes.html
@@ -9,16 +9,15 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
-        box_extents = [
+        var box_extents = [
             [-10, 50, 5, 60],
             [-75, 41, -71, 44],
             [-122.6, 37.6, -122.3, 37.9],
             [10, 10, 20, 20]
         ];
-
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map');
+            map = new OpenLayers.Map('map');
 
             var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                 "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
@@ -39,7 +38,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/canvas.html b/examples/canvas.html
index ea02c39141..dcdec24b4a 100644
--- a/examples/canvas.html
+++ b/examples/canvas.html
@@ -10,7 +10,6 @@
         <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAA9XNhd8q0UdwNC7YSO4YZghSPUCi5aRYVveCcVYxzezM4iaj_gxQ9t-UajFL70jfcpquH5l1IJ-Zyyw'></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, canvas;
         var click;
         function init(){
@@ -46,7 +45,6 @@
             new OpenLayers.LonLat(parseFloat(OpenLayers.Util.getElement('lon2').value), parseFloat(OpenLayers.Util.getElement('lat2').value))
           );
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/ciesin.html b/examples/ciesin.html
index b10e9a44c3..d2b5c96fe4 100644
--- a/examples/ciesin.html
+++ b/examples/ciesin.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map');
+            map = new OpenLayers.Map('map');
 
             var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                 "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
@@ -30,7 +30,6 @@
             // map.setCenter(new OpenLayers.LonLat(0, 0), 0);
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/click.html b/examples/click.html
index 909c7010f6..dbf9db21e9 100644
--- a/examples/click.html
+++ b/examples/click.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map');
+            map = new OpenLayers.Map('map');
 
             var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                 "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
@@ -32,7 +32,6 @@
                                           + lonlat.lon + " E");
             });
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/controls.html b/examples/controls.html
index 5cf06f45a9..e2181e433d 100644
--- a/examples/controls.html
+++ b/examples/controls.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map', { controls: [] });
+            map = new OpenLayers.Map('map', { controls: [] });
 
             map.addControl(new OpenLayers.Control.PanZoomBar());
             map.addControl(new OpenLayers.Control.MouseToolbar());
@@ -42,7 +42,6 @@
             map.addLayers([ol_wms, jpl_wms, dm_wms]);
             if (!map.getCenter()) map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/freemap.html b/examples/freemap.html
index 4c0bd6b8f4..57aadde7c6 100644
--- a/examples/freemap.html
+++ b/examples/freemap.html
@@ -17,11 +17,10 @@
 
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-      <!--
-    var lat = 900863; 
-    var lon = 235829;
-    var zoom = 6;
-    var map, layer;
+        var lat = 900863; 
+        var lon = 235829;
+        var zoom = 6;
+        var map, layer;
 
         function init(){
             map = new OpenLayers.Map( 'map' );
@@ -39,7 +38,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControl(new OpenLayers.Control.LayerSwitcher());
         }
-//      -->
     </script>
   </head>
 
diff --git a/examples/fullScreen.html b/examples/fullScreen.html
index 681199d910..4cdea67acb 100644
--- a/examples/fullScreen.html
+++ b/examples/fullScreen.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map');
+            map = new OpenLayers.Map('map');
 
             var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                 "http://labs.metacarta.com:80/wms/vmap0?", {layers: 'basic'}); 
@@ -31,7 +31,6 @@
             // map.setCenter(new OpenLayers.LonLat(0, 0), 0);
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/geojson.html b/examples/geojson.html
index b4c2b25192..9c9978eb7c 100644
--- a/examples/geojson.html
+++ b/examples/geojson.html
@@ -54,7 +54,6 @@
     <script src="../lib/Firebug/firebug.js"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, vectors, drawControls, formats, select;
         function init(){
             map = new OpenLayers.Map('map');
@@ -131,8 +130,6 @@
                 offImages[i].src = "../theme/default/img/" + roots[i] + "_on.png";
             }
         })();
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/georss-markers.html b/examples/georss-markers.html
index cfdd83b671..03952b976f 100644
--- a/examples/georss-markers.html
+++ b/examples/georss-markers.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         OpenLayers.ProxyHost = "/proxy/?url=";
@@ -26,7 +25,6 @@
             var newl = new OpenLayers.Layer.GeoRSS( 'Yelp GeoRSS', 'yelp-georss.xml', {'icon':yelp});
             map.addLayer(newl);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/georss-serialize.html b/examples/georss-serialize.html
index 985ffed1c7..2b05c2cae0 100644
--- a/examples/georss-serialize.html
+++ b/examples/georss-serialize.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, drawControl, g;
         function serialize(feature) {
             feature.attributes = {};
@@ -36,8 +35,6 @@
             
             map.setCenter(new OpenLayers.LonLat(0, 0), 3);
         }
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/georss.html b/examples/georss.html
index bc0e705ef5..beec1fcda7 100644
--- a/examples/georss.html
+++ b/examples/georss.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         OpenLayers.ProxyHost = "/proxy/?url=";
@@ -29,7 +28,6 @@
                 map.addLayer(newl);
             urlObj.value = "";
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/gml-layer.html b/examples/gml-layer.html
index 16a3e40295..4e838451f6 100644
--- a/examples/gml-layer.html
+++ b/examples/gml-layer.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -23,7 +22,6 @@
             map.zoomToExtent(new OpenLayers.Bounds(-3.922119,44.335327,4.866943,49.553833));
             map.addLayer(new OpenLayers.Layer.GML("GML", "gml/polygon.xml"));
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/gml-serialize.html b/examples/gml-serialize.html
index 98bdffa9ca..cca8bd0a1b 100644
--- a/examples/gml-serialize.html
+++ b/examples/gml-serialize.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, drawControl, g;
         function serialize(feature) {
             feature.attributes = {};
@@ -57,7 +56,6 @@
                 }
             }
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/google-factbook-tc.html b/examples/google-factbook-tc.html
index c3e50832fe..012b550a4f 100644
--- a/examples/google-factbook-tc.html
+++ b/examples/google-factbook-tc.html
@@ -16,7 +16,6 @@
     <!-- <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhT2yXp_ZAY8_ufC3CFXhHIE1NvwkxTS6gjckBmeABOGXIUiOiZObZESPg'></script>-->
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, gmap, merc;
 
         function init(){
@@ -40,8 +39,6 @@
             
         }
 
-    // -->
-
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/google-factbook.html b/examples/google-factbook.html
index 7bb1709048..7c278a22c2 100644
--- a/examples/google-factbook.html
+++ b/examples/google-factbook.html
@@ -16,7 +16,6 @@
     <!-- <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhT2yXp_ZAY8_ufC3CFXhHIE1NvwkxTS6gjckBmeABOGXIUiOiZObZESPg'></script>-->
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, gmap, merc;
 
         function init(){
@@ -40,8 +39,6 @@
             
         }
 
-    // -->
-
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/google.html b/examples/google.html
index 21a66926c9..ab00e42a0a 100644
--- a/examples/google.html
+++ b/examples/google.html
@@ -15,7 +15,6 @@
     <!-- <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhT2yXp_ZAY8_ufC3CFXhHIE1NvwkxTS6gjckBmeABOGXIUiOiZObZESPg'></script>-->
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 17;
@@ -69,8 +68,6 @@
         function remove() {
             markers.removeMarker(marker);
         }
-                
-    // -->
 
     </script>
   </head>
diff --git a/examples/gutter.html b/examples/gutter.html
index f8ddf64da2..fe2b0ae8d8 100644
--- a/examples/gutter.html
+++ b/examples/gutter.html
@@ -12,7 +12,6 @@
     </style> 
     <script src="../lib/OpenLayers.js"></script> 
     <script type="text/javascript"> 
-        <!-- 
         OpenLayers.IMAGE_RELOAD_ATTEMPTS = 2; 
         var map; 
         window.onload = function() { 
@@ -31,7 +30,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher()); 
             map.setCenter(new OpenLayers.LonLat(-71.848, 42.2), 0); 
         } 
-        // --> 
     </script> 
   </head> 
   <body> 
diff --git a/examples/image-layer.html b/examples/image-layer.html
index bcfab86b0b..faba77f813 100644
--- a/examples/image-layer.html
+++ b/examples/image-layer.html
@@ -12,7 +12,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map;
         function init(){
             map = new OpenLayers.Map('map');
@@ -34,7 +33,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/kamap.html b/examples/kamap.html
index d2798e5c84..5ef50f2d8d 100644
--- a/examples/kamap.html
+++ b/examples/kamap.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map');
+            map = new OpenLayers.Map('map');
 
             var ol_wms = new OpenLayers.Layer.WMS( "World Map", 
                 "http://labs.metacarta.com/wms/vmap0?",
@@ -29,7 +29,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/kml-layer-linestring.html b/examples/kml-layer-linestring.html
index 18bd8ea2d1..8b55185338 100644
--- a/examples/kml-layer-linestring.html
+++ b/examples/kml-layer-linestring.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -23,7 +22,6 @@
             map.addLayer(new OpenLayers.Layer.GML("KML", "kml/lines.kml", {format: OpenLayers.Format.KML}));
             map.zoomToExtent(new OpenLayers.Bounds(-112.292744,36.068477,-112.22408,36.109246));
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/kml-layer.html b/examples/kml-layer.html
index dd4cceb848..2e91865a6b 100644
--- a/examples/kml-layer.html
+++ b/examples/kml-layer.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -23,7 +22,6 @@
             map.addLayer(new OpenLayers.Layer.GML("KML", "kml/mc-search.kml", {format: OpenLayers.Format.KML}));
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/layer-opacity.html b/examples/layer-opacity.html
index bd57cc0a9a..fc46aaf7ff 100644
--- a/examples/layer-opacity.html
+++ b/examples/layer-opacity.html
@@ -34,7 +34,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map = null;
         var shade = null;
         var maxOpacity = 0.9;
@@ -66,7 +65,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(464348.5,4975876), 1);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/layerLoadMonitoring.html b/examples/layerLoadMonitoring.html
index bcf10b63b3..9c247e1f53 100644
--- a/examples/layerLoadMonitoring.html
+++ b/examples/layerLoadMonitoring.html
@@ -22,7 +22,6 @@
     <script src="../lib/Firebug/firebug.js"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -106,8 +105,6 @@
         function clearLog() {
             eventsLog.innerHTML = "<b>Events Log:</b>";
         }
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/layerswitcher.html b/examples/layerswitcher.html
index 3cf070a261..63416f5f09 100644
--- a/examples/layerswitcher.html
+++ b/examples/layerswitcher.html
@@ -9,9 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
-            var map = new OpenLayers.Map('map', { controls: [] });
+            map = new OpenLayers.Map('map', { controls: [] });
 
             map.addControl(new OpenLayers.Control.LayerSwitcher({'div':OpenLayers.Util.getElement('layerswitcher')}));
 
@@ -35,7 +35,6 @@
             map.addLayers([ol_wms, jpl_wms, dm_wms]);
             if (!map.getCenter()) map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/lite.html b/examples/lite.html
index f6830028ed..02bbcf7f30 100644
--- a/examples/lite.html
+++ b/examples/lite.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -23,7 +22,6 @@
             map.addLayer(layer);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/mapserver.html b/examples/mapserver.html
index 518e2c5950..0cddfe925a 100644
--- a/examples/mapserver.html
+++ b/examples/mapserver.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -26,7 +25,6 @@
             map.addControl( new OpenLayers.Control.LayerSwitcher() );
         }
         
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/mapserver_untiled.html b/examples/mapserver_untiled.html
index cbb726f7bf..6f08fc3125 100644
--- a/examples/mapserver_untiled.html
+++ b/examples/mapserver_untiled.html
@@ -9,8 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
+        var map;
         window.onload = function(){
-            var map = new OpenLayers.Map( 'map', {maxResolution: 'auto'} );
+            map = new OpenLayers.Map( 'map', {maxResolution: 'auto'} );
             var layer = new OpenLayers.Layer.MapServer( "MapServer Untiled", 
                     "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'}, {singleTile: true} );
             map.addLayer(layer);
diff --git a/examples/markerResize.html b/examples/markerResize.html
index 40d95746da..4252c886ac 100644
--- a/examples/markerResize.html
+++ b/examples/markerResize.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
         var size, icon;
         
@@ -41,7 +40,6 @@
             icon.setSize(size);   
             
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/markers.html b/examples/markers.html
index b615459294..4f21ede96d 100644
--- a/examples/markers.html
+++ b/examples/markers.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         function init(){
@@ -44,7 +43,6 @@
 
             halfIcon.setOpacity(0.5);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/markersTextLayer.html b/examples/markersTextLayer.html
index 8fb396df49..06e93957f4 100644
--- a/examples/markersTextLayer.html
+++ b/examples/markersTextLayer.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         function init(){
@@ -26,7 +25,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/mm.html b/examples/mm.html
index 44e809815c..a249ce7749 100644
--- a/examples/mm.html
+++ b/examples/mm.html
@@ -14,8 +14,6 @@
 
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
- 
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -45,7 +43,6 @@
         function remove() {
             markers.removeMarker(marker);
         }
-  // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/mouse-position.html b/examples/mouse-position.html
index aa5827265f..e800098363 100644
--- a/examples/mouse-position.html
+++ b/examples/mouse-position.html
@@ -14,7 +14,7 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
             var map = new OpenLayers.Map('map');
 
@@ -32,7 +32,6 @@
                 OpenLayers.Util.getElement("coords").innerHTML = position;
             });
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/multiserver.html b/examples/multiserver.html
index 1cb98a41ab..26c9fd9432 100644
--- a/examples/multiserver.html
+++ b/examples/multiserver.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -26,7 +25,6 @@
             map.addLayer(layer);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/navtoolbar-outsidemap.html b/examples/navtoolbar-outsidemap.html
index 28f738fe24..f3458d2363 100644
--- a/examples/navtoolbar-outsidemap.html
+++ b/examples/navtoolbar-outsidemap.html
@@ -16,7 +16,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -32,7 +31,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/navtoolbar.html b/examples/navtoolbar.html
index 70f073ef47..843dc8b38f 100644
--- a/examples/navtoolbar.html
+++ b/examples/navtoolbar.html
@@ -11,7 +11,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -28,7 +27,6 @@
 
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/notile.html b/examples/notile.html
index 56dd79cab5..fa8b20bc5b 100644
--- a/examples/notile.html
+++ b/examples/notile.html
@@ -9,7 +9,7 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
             map = new OpenLayers.Map('mapDiv', {maxResolution: 'auto'});
 
@@ -26,7 +26,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(6.5, 40.5), 4);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/openmnnd.html b/examples/openmnnd.html
index f5aee4eb18..9d225c8e13 100644
--- a/examples/openmnnd.html
+++ b/examples/openmnnd.html
@@ -12,7 +12,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         function init(){
@@ -115,7 +114,6 @@
             html += "</ul>";
             OpenLayers.Util.getElement('feature_info').innerHTML = html;
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/outOfRangeMarkers.html b/examples/outOfRangeMarkers.html
index de0ff1c7df..a62ef7fd04 100644
--- a/examples/outOfRangeMarkers.html
+++ b/examples/outOfRangeMarkers.html
@@ -14,11 +14,11 @@
   
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
             
             // Variables
-            var map = new OpenLayers.Map('map', { controls: [] });
+            map = new OpenLayers.Map('map', { controls: [] });
             var lon = 35;
             var lat = -6;
             var zoom = 6;
@@ -45,7 +45,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             if (!map.getCenter()) map.zoomToMaxExtent();
         }
-        // -->
     </script>
  </head>
 
diff --git a/examples/panel.html b/examples/panel.html
index 9644c11d4f..f5d50922aa 100644
--- a/examples/panel.html
+++ b/examples/panel.html
@@ -52,7 +52,6 @@
     <script src="../lib/OpenLayers.js"></script>
     <script src="../lib/Firebug/debug.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -80,7 +79,6 @@
 
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/popups.html b/examples/popups.html
index 97a922e635..90604c60f8 100644
--- a/examples/popups.html
+++ b/examples/popups.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer, popup;
         var markers, feature, marker;
         
@@ -115,9 +114,6 @@
             layer.destroy();
 //            map.removeLayer(markers);
         }
-
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/regular-polygons.html b/examples/regular-polygons.html
index c7bed84832..c27e9d064b 100644
--- a/examples/regular-polygons.html
+++ b/examples/regular-polygons.html
@@ -42,7 +42,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, polygonControl;
         OpenLayers.Util.onImageLoadErrorColor = "transparent";
         function init(){
@@ -76,7 +75,6 @@
             polygonControl.handler.setOptions({radius: radius,
                                                angle: 0});
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/resize-features.html b/examples/resize-features.html
index 842189882e..395b833929 100644
--- a/examples/resize-features.html
+++ b/examples/resize-features.html
@@ -13,7 +13,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, vectorLayer, pointFeature, lineFeature, polygonFeature;
 
         function init(){
@@ -80,7 +79,6 @@
             vectorLayer.redraw();
         }
 
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/rotate-features.html b/examples/rotate-features.html
index 10d9daf6cd..2b856c2870 100644
--- a/examples/rotate-features.html
+++ b/examples/rotate-features.html
@@ -13,7 +13,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, pointFeature, lineFeature, polygonFeature;
 
         function init(){
@@ -93,8 +92,6 @@
             feature.geometry.rotate(angle, origin);
             feature.layer.drawFeature(feature);
         }
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/select-feature-openpopup.html b/examples/select-feature-openpopup.html
index 8da9a9c19d..fbd0448b92 100644
--- a/examples/select-feature-openpopup.html
+++ b/examples/select-feature-openpopup.html
@@ -12,7 +12,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, drawControls, select;
         function onFeatureSelect(feature) {
             popup = new OpenLayers.Popup.Anchored("chicken", 
@@ -67,7 +66,6 @@
                 }
             }
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/select-feature.html b/examples/select-feature.html
index 1548e980d1..eb529df9a5 100644
--- a/examples/select-feature.html
+++ b/examples/select-feature.html
@@ -12,7 +12,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, drawControls, select;
         function init(){
             map = new OpenLayers.Map('map');
@@ -50,7 +49,6 @@
                 }
             }
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/tiger.html b/examples/tiger.html
index e89d6bace1..c360aa1203 100644
--- a/examples/tiger.html
+++ b/examples/tiger.html
@@ -9,7 +9,7 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
             var map = new OpenLayers.Map('map', {'maxResolution': 1.40625/4, controls:[]});
 
@@ -26,7 +26,6 @@
             map.addControl(new OpenLayers.Control.PanZoomBar());
             map.setCenter(new OpenLayers.LonLat(-96, 35), 2);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/tilecache.html b/examples/tilecache.html
index 1c151267a5..9137dc2392 100644
--- a/examples/tilecache.html
+++ b/examples/tilecache.html
@@ -19,7 +19,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
         function init(){
             map = new OpenLayers.Map( $('map'));
@@ -44,8 +43,6 @@
             //this.src = "../img/blank.gif";
             //this.style.display = "";
         };
-
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/tms.html b/examples/tms.html
index 7345a193e7..c5ffee98bb 100644
--- a/examples/tms.html
+++ b/examples/tms.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -34,7 +33,6 @@
             map.addLayer(l);
             map.setBaseLayer(l);
         }  
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/urban.html b/examples/urban.html
index 6531b10fd7..93778d117e 100644
--- a/examples/urban.html
+++ b/examples/urban.html
@@ -9,7 +9,7 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
+        var map;
         function init(){
             var mapOptions = { maxResolution: 1.6, numZoomLevels: 21};
             var map = new OpenLayers.Map('map', mapOptions);
@@ -26,7 +26,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(-71.4, 42.3), 6);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/ve.html b/examples/ve.html
index f5d45e72ff..cf411dbb23 100644
--- a/examples/ve.html
+++ b/examples/ve.html
@@ -13,7 +13,6 @@
 
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
  
         var lon = 5;
         var lat = 40;
@@ -53,7 +52,6 @@
         function remove() {
             markers.removeMarker(marker);
         }
-  // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/vector-features.html b/examples/vector-features.html
index 8701ca704c..567c39be0a 100644
--- a/examples/vector-features.html
+++ b/examples/vector-features.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js" type="text/javascript"></script>
     <script type="text/javascript">
-        <!--
         var map;
 
         function init(){
@@ -102,7 +101,6 @@
             map.setCenter(new OpenLayers.LonLat(point.x, point.y), 5);
             vectorLayer.addFeatures([pointFeature, pointFeature3, pointFeature2, lineFeature, polygonFeature]);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/webcam.html b/examples/webcam.html
index 5c5949a1a4..9a69b40f12 100644
--- a/examples/webcam.html
+++ b/examples/webcam.html
@@ -12,7 +12,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map;
         function init(){
             map = new OpenLayers.Map('map',
@@ -34,7 +33,6 @@
         function refresh(layer) {
             layer.moveTo(layer.map.getExtent(), true);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wfs-t.html b/examples/wfs-t.html
index b424392bf0..44796da9f3 100644
--- a/examples/wfs-t.html
+++ b/examples/wfs-t.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         function init(){
@@ -60,7 +59,6 @@
             map.addControl(p);
             map.zoomToExtent(new OpenLayers.Bounds(145.51045,-44.0,149.0,-40.5));
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wfs.html b/examples/wfs.html
index 587f1f5ee3..9c88880e35 100644
--- a/examples/wfs.html
+++ b/examples/wfs.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer;
 
         function init(){
@@ -27,7 +26,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(-100, 60), 3);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wkt.html b/examples/wkt.html
index 8d192cb8f3..f2bed8219a 100644
--- a/examples/wkt.html
+++ b/examples/wkt.html
@@ -28,7 +28,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, vectors, drawControls, wkt;
         function init(){
             map = new OpenLayers.Map('map');
@@ -108,7 +107,6 @@
                 element.value = 'Bad WKT';
             }
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wms-untiled.html b/examples/wms-untiled.html
index 37edc0e01c..bb43316476 100644
--- a/examples/wms-untiled.html
+++ b/examples/wms-untiled.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -24,8 +23,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControl( new OpenLayers.Control.LayerSwitcher() );
         }
-        
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wms.html b/examples/wms.html
index ac39511e5b..b29e51261c 100644
--- a/examples/wms.html
+++ b/examples/wms.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 5;
         var lat = 40;
         var zoom = 5;
@@ -24,8 +23,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControl( new OpenLayers.Control.LayerSwitcher() );
         }
-        
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wmst.html b/examples/wmst.html
index d3664f0535..e2c5e6a212 100644
--- a/examples/wmst.html
+++ b/examples/wmst.html
@@ -9,8 +9,7 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
-var map,ia_wms;
+        var map, ia_wms;
         function init(){
             map = new OpenLayers.Map('map');
 
@@ -29,7 +28,6 @@ var map,ia_wms;
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/worldwind.html b/examples/worldwind.html
index 5af8b0263b..88b3889946 100644
--- a/examples/worldwind.html
+++ b/examples/worldwind.html
@@ -9,10 +9,9 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
-        var ol_wms, ww, ww2;
+        var map, ol_wms, ww, ww2;
         function init(){
-            var map = new OpenLayers.Map('map', {'maxResolution': .28125, tileSize: new OpenLayers.Size(512, 512)});
+            map = new OpenLayers.Map('map', {'maxResolution': .28125, tileSize: new OpenLayers.Size(512, 512)});
 
             ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
             "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
@@ -30,7 +29,6 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(-71.4, 42.3), 6);
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/wrapDateLine.html b/examples/wrapDateLine.html
index 8e75755734..49aba45023 100644
--- a/examples/wrapDateLine.html
+++ b/examples/wrapDateLine.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map;
         function init(){
             map = new OpenLayers.Map( 'map', {maxResolution: 1.40625} );
@@ -48,7 +47,6 @@
             map.addControl(new OpenLayers.Control.MousePosition());
             map.zoomToMaxExtent();
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/yahoo.html b/examples/yahoo.html
index f0be241914..2bdcd8ed61 100644
--- a/examples/yahoo.html
+++ b/examples/yahoo.html
@@ -10,7 +10,6 @@
     <script src="http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=euzuro-openlayers"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var map, layer, velayer;
 
         function init(){
@@ -28,7 +27,6 @@
             map.setCenter(new OpenLayers.LonLat(-5, 40), 4);
             map.addControl(new OpenLayers.Control.LayerSwitcher());
         }
-        // -->
     </script>
   </head>
   <body onload="init()">
diff --git a/examples/zoomLevels.html b/examples/zoomLevels.html
index 367de57594..c204d2738e 100644
--- a/examples/zoomLevels.html
+++ b/examples/zoomLevels.html
@@ -9,7 +9,6 @@
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
-        <!--
         var lon = 50;
         var lat = 0;
         var zoom = 0;
@@ -44,7 +43,6 @@
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
         }
         
-        // -->
     </script>
   </head>
   <body onload="init()">
