diff --git a/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml b/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml
index 3239d6593..f0eb83310 100644
--- a/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel
     <ul class="pageStatus">
-        <li>@// Published or not
+        <li>@* Published or not *@
         @if (Model.HasPublished) {
             <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/online.gif")" alt="@T("Online")" title="@T("The page is currently online")" /> <text>@T("Published")&nbsp;&#124;&nbsp;</text>
         }
@@ -9,7 +9,7 @@
         }
         </li>
         <li>
-        @// Does the page have a draft
+        @* Does the page have a draft *@
         @if (Model.HasDraft) {
             <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/draft.gif")" alt="@T("Draft")" title="@T("The page has a draft")" /><text> @T("Draft")&nbsp;&#124;&nbsp;</text>
         }
diff --git a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
index add65c39f..cf5aaba5d 100644
--- a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
+++ b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
@@ -28,7 +28,7 @@
     </div>
 </fieldset>
 <script type="text/javascript">    $(function () {
-        @//todo: (heskew) make a plugin
+        @* todo: (heskew) make a plugin *@
         $("label.forpicker").each(function () {
             var $this = $(this);
             var pickerInput = $("#" + $this.attr("for"));
diff --git a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
index 98759ff34..b899580be 100644
--- a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
@@ -12,8 +12,8 @@
      //todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes)
      //todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
      }
-     @//Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);
-     @//Html.Zone("head", ":metas :styles :scripts"); %>
+     @* Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model); *@
+     @* Html.Zone("head", ":metas :styles :scripts"); %> *@
 	 @Display(Model.Head)
     <script>(function(d){d.className="dyn"+d.className.substring(6,d.className.length);})(document.documentElement);</script> 
 </head> 
diff --git a/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml b/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml
index c9459aa29..357d26321 100644
--- a/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/Layout.cshtml
@@ -1,4 +1,4 @@
-@// Html.RegisterStyle("site.css");
+@* Html.RegisterStyle("site.css"); *@
 @{ 
     Model.Header.Add(Display.Header(), "5");
     Model.Header.Add(Display.User(), "10");
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
index dfc127ab1..0e65b0dce 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
@@ -11,7 +11,7 @@
 @Display(Model.secondary)
         <fieldset>
             <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
-            @//TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to
+            @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@
             @if (blogPost.HasDraft && blogPost.HasPublished) {
             @Html.AntiForgeryTokenValueOrchardLink(T("Discard Draft").ToString(), Url.Action("DiscardDraft", new {Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id = Model.Item.Id}), new {@class = "button"})
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
index a1cb5f13e..d1a0549f8 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
@@ -6,7 +6,7 @@
         <a href="@Url.BlogForAdmin((string)Model.Slug)" title="@T("List Posts")">@T("List Posts")</a>@T(" | ")
         <a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" title="@T("New Post")">@T("New Post")</a>@T(" | ")
         <a href="@Url.BlogEdit((string)Model.Slug)" title="@T("Edit")">@T("Edit")</a>@T(" | ")
-        @//todo: (heskew) this is a bit too verbose. need template helpers for all ibuttons
+        @* todo: (heskew) this is a bit too verbose. need template helpers for all ibuttons *@
         @using (Html.BeginFormAntiForgeryPost(Url.BlogRemove((string)Model.Slug), FormMethod.Post, new { @class = "inline link" })) {
         <button type="submit" class="linkButton" title="@T("Remove")">@T("Remove")</button>
         }
@@ -14,7 +14,7 @@
     <div class="properties">
         <h3>@Html.Link((string)Model.Title, Url.BlogForAdmin((string)Model.Slug))</h3>
         <p>@Display(Model.meta)</p>
-        @//<p>[list of authors] [modify blog access]</p>
+        @* <p>[list of authors] [modify blog access]</p> *@
         <p>@Model.Description</p>              
     </div>
     <div style="clear:both;"></div>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml
index f9f3bf024..abe6ab523 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml
@@ -9,9 +9,9 @@
         <fieldset>
             <label for="DisplayName">@T("Display Name")</label>
             @Html.TextBoxFor(m => m.DisplayName, new { @class = "textMedium" })
-            @// todo: if we continue to go down the midrodata route, some helpers would be nice
+            @* todo: if we continue to go down the midrodata route, some helpers would be nice *@
             <meta itemprop="DisplayName" content="@Model.DisplayName" />
-            @// has unintended consequences (renamging the type) - changing the name creates a new type of that name
+            @* has unintended consequences (renamging the type) - changing the name creates a new type of that name *@
             <meta itemprop="Name" content="@Model.Name" />
             @Html.HiddenFor(m => m.Name)
         </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
index efe8f56e9..5cf769f41 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
@@ -6,7 +6,7 @@
     @Html.ValidationSummary()
     <fieldset>
         <label for="Name">@T("Name")</label>
-        @// has unintended consequences (renamging the part) - changing the name creates a new part of that name
+        @* has unintended consequences (renamging the part) - changing the name creates a new part of that name  *@
         @Html.TextBoxFor(m => m.Name, new {@class = "textMedium", disabled = "disabled"})
         @Html.HiddenFor(m => m.Name)
     </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
index 22bf232d6..f157dcd11 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
@@ -2,7 +2,7 @@
     <fieldset class="manage-field">
         <h3>@Model.Name <span>(@Model.FieldDefinition.Name)</span></h3>
         <div class="manage">
-            @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation
+            @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @* <- some experimentation *@
         </div>
         <div class="details">
             @{Html.RenderTemplates(Model.Templates);}
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
index 2a05be99f..8f83675ce 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
@@ -2,7 +2,7 @@
     <fieldset class="manage-part" itemscope="itemscope" itemid="@Model.PartDefinition.Name" itemtype="http://orchardproject.net/data/ContentTypePart">
         <h3 itemprop="Name">@Model.PartDefinition.DisplayName</h3>
         <div class="manage">
-            @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation
+            @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @* <- some experimentation *@
         </div>
         <div class="details">@Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition")
         @if (Model.Templates.Any()) {
@@ -13,7 +13,7 @@
             }
         </div>
         }
-        @//don't show global part settings for now - @Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition")
+        @* don't show global part settings for now - @Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") *@
         @Html.HiddenFor(m => m.PartDefinition.Name)
         @Html.HiddenFor(m => m.Index)
         </div>
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
index 3be2b0c58..2eea709ed 100644
--- a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
@@ -4,11 +4,11 @@
 	Style.Include("blog.css");
 }
 <div id="wrapper">
-@// HTML.Include will render a div with a class="user-display"
-@// Can use this -> {Html.Include("User");}
-@// or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape"
+@* HTML.Include will render a div with a class="user-display" *@
+@* Can use this -> {Html.Include("User");} *@
+@* or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape" *@
 @Display.User()
-@// Top Navigation and branding
+@* Top Navigation and branding *@
 <div id="headercontainer">
     <div id="header">
         <h1>@WorkContext.CurrentSite.SiteName</h1>
@@ -21,14 +21,14 @@
 
 <div id="main">
         <div id="content">
-        @// Main Content
+        @* Main Content *@
 @Display(Model.Content)
         </div>
         <div id="sidebar">
 @Display(Model.search)
 @Display(Model.sidebar)
         </div>
-        @// End Content
+        @* End Content *@
 @Display.Footer(Navigation:Model.Navigation)
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
index 13e131baa..fa0d04387 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
@@ -12,7 +12,7 @@
     <script>(function(d){d.className="dyn"+d.className.substring(6,d.className.length);})(document.documentElement);</script> 
 </head> 
 <body>
-@// Layout (template) is in the Body zone @ the default position (nothing, zero, zilch)
+@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
 @Display(Model.Body)
 @Display(Model.Tail)
 </body>
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index f0bd49aaa..b61f2cf2e 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -13,7 +13,7 @@
 }
 <div id="layout-wrapper">
     <header id="layout-header">
-        @// needs to be the page title, not page (head) title...
+        @* needs to be the page title, not page (head) title... *@
         <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
         @if(Model.Header != null) {
         <div id="header">
@@ -36,7 +36,7 @@
         @Zone(Model.Featured)
     </div>
     }
-    @// the model content for the page is in the Content zone @ the default position (nothing, zero, zilch)
+    @* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
     @if(Model.Content != null) {
     <div id="content">
         @Zone(Model.Content)