diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 33e05dfd36..c37f253709 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -3,7 +3,6 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
-@using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 
 @{
@@ -16,7 +15,6 @@
     Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
 
     var success = TempData["ProfileUpdateSuccess"] != null;
-
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
@@ -26,7 +24,7 @@
 {   
     if (success)
     {
-        // This message will show if RedirectOnSucces is set to false (default)
+        @* This message will show if RedirectOnSucces is set to false (default) *@
         <p>Profile updated</p>
     }
     
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 4ce0d13985..3dc013f2e8 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -6,7 +6,7 @@ and use it to point the macro at a specific media folder to display it's content
 a simple list.
 
 Macro Parameters To Create, for this macro to work:
-Show:True   Alias:mediaId     Name:Media Folder ID    Type:MediaCurrent
+Alias:mediaId     Name:Media Folder ID    Type:Single Media Picker
 *@
 
 @if (Model.MacroParameters["mediaId"] != null)
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
index d1fe543412..cbb190dde9 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
@@ -1,7 +1,7 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @*
     === Macro Parameters To Create ===
-    Show:True   Alias:nodeId Name:Node ID    Type:Content Picker
+    Alias:nodeId Name:Node ID    Type:Content Picker
 *@
 
 @if (Model.MacroParameters["startNodeID"] != null)
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
index c9e79f7892..3a75914e09 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
@@ -1,7 +1,7 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 <ul>
-	@*OrderBy() takes the property to sort by and optionally order desc/asc *@
+	@* OrderBy() takes the property to sort by and optionally order desc/asc *@
 	
     @foreach (var page in CurrentPage.Children.Where("Visible").OrderBy("CreateDate desc"))
     { 
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
index 10ae17b364..3ea4460c38 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
@@ -1,6 +1,6 @@
 @inherits Umbraco.Web.Mvc.UmbracoTemplatePage
 <ul>
-	@*OrderBy() takes the property to sort by*@
+	@* OrderBy() takes the property to sort by *@
     @foreach (var page in CurrentPage.Children.Where("Visible").OrderBy("Name"))
     { 
         <li><a href="@page.Url">@page.Name</a></li>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
index 6295e8b339..f224a782d1 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
@@ -1,18 +1,15 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @*
     Macro parameter to be set on the macro
-    Show:True   Alias:propertyAlias     Name:Property Alias    Type:Textstring
+    Alias:propertyAlias     Name:Property Alias    Type:Textbox
 *@   
 
-
 @{
-    
     @* Get the property alias we want to filter on from the macro parameter *@
     var propertyAlias = Model.MacroParameters["propertyAlias"];
     var selection = CurrentPage.Children.Where("Visible").OrderBy(propertyAlias);
 }
 
-
 <ul>
     @foreach (var page in selection)
     { 
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
index eb0ccdb481..d5445c54e7 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
@@ -7,7 +7,6 @@
 	Settings section).
 *@
 
-
 @{    
 	@*Build a query and return the visible items *@
     var selection= CurrentPage.Textpages.Where("Visible");
@@ -18,7 +17,6 @@
     *@
 }
 
-
 @*Determine if there are any nodes in the selection, then render list *@
 @if(selection.Any()){
 
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
index 061cc3ae30..9048c2927d 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
@@ -1,8 +1,8 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
-Macro Parameters To Create, for this macro to work:
-Show:True   Alias:mediaId     Name:Media Folder ID    Type:MediaCurrent
+    Macro Parameters To Create, for this macro to work:
+    Alias:mediaId     Name:Media Folder ID    Type:Single Media Picker
 *@
 
 @if (Model.MacroParameters["mediaId"] != null)
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index 846f9a987d..6687efa474 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -16,7 +16,7 @@
     Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
 }
 
-@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
+@* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
 @Html.RenderJsHere()
 
 @using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index bc516d6fa2..b80c74347e 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -16,16 +16,15 @@
 
     var logoutModel = new PostRedirectModel();
     
-    /*
-     * Here you can specify a redirect URL for after logging out, by default umbraco will simply
-     * redirect to the current page. Example to redirect to the home page:
-     * 
-     *   logoutModel.RedirectUrl = "/";
-     *   
-     */
+    @*
+        Here you can specify a redirect URL for after logging out, by default umbraco will simply
+        redirect to the current page. Example to redirect to the home page:
+        
+        logoutModel.RedirectUrl = "/"; 
+    *@
 }
 
-@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
+@* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
 @Html.RenderJsHere()
 
 @if (loginStatusModel.IsLoggedIn)
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
index 6920d4bc06..d3312a1ac0 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
@@ -6,9 +6,8 @@
     the css class "current".
 *@
 
-
 @{
-    @*Get the root of the website *@
+    @* Get the root of the website *@
     var root = CurrentPage.AncestorOrSelf(1);
 }
 
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index d0abf09e96..34527e2953 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -3,37 +3,34 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
-@using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 
 @{
+    @*
+        You can specify a custom member type alias in the constructor, the default is 'Member'    
+        for example, to use 'Custom Member' you'd use this syntax:
     
-    /* 
-     * You can specify a custom member type alias in the constructor, the default is 'Member'    
-     * for example, to use 'Custom Member' you'd use this syntax:
-     * 
-     *      var registerModel = Members.CreateRegistrationModel("Custom Member");
-
-     */
+        var registerModel = Members.CreateRegistrationModel("Custom Member");
+    *@
     
     var registerModel = Members.CreateRegistrationModel();
     
-    /* 
-     * Configurable here:           
-     * 
-     * registerModel.RedirectUrl       - Optional. What path to redirect to if registration is successful. 
-     *                                   By default the member will be redirected to the current umbraco page 
-     *                                   unless this is specified.
-     * 
-     * registerModel.UsernameIsEmail   - the default is true
-     *                                   if you want the username to be different from the email
-     *                                   address, set this to true and add a new Username field in
-     *                                   the form below
-     *
-     *                                   @Html.LabelFor(m => registerModel.Username)
-     *                                   @Html.TextBoxFor(m => registerModel.Username)
-     *                                   @Html.ValidationMessageFor(m => registerModel.Username)
-     */
+    @*
+        Configurable here:           
+    
+        registerModel.RedirectUrl       - Optional. What path to redirect to if registration is successful. 
+                                          By default the member will be redirected to the current umbraco page 
+                                          unless this is specified.
+    
+        registerModel.UsernameIsEmail   - the default is true
+                                          if you want the username to be different from the email
+                                          address, set this to true and add a new Username field in
+                                          the form below
+    
+                                          @Html.LabelFor(m => registerModel.Username)
+                                          @Html.TextBoxFor(m => registerModel.Username)
+                                          @Html.ValidationMessageFor(m => registerModel.Username)
+    *@
   
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
@@ -49,16 +46,16 @@
 
 @if (success) 
 { 
-    // This message will show if RedirectOnSucces is set to false (default)
+    @* This message will show if RedirectOnSucces is set to false (default) *@
     <p>Registration succeeeded.</p>
-} 
-else 
-{   
+}
+else
+{
     using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
     {
         <fieldset>
             <legend>Register Member</legend>
-            
+
             @Html.ValidationSummary("registerModel", true)
 
             @Html.LabelFor(m => registerModel.Name)
@@ -75,8 +72,9 @@ else
             @Html.PasswordFor(m => registerModel.Password)
             @Html.ValidationMessageFor(m => registerModel.Password)
             <br />
-        
-            @if (registerModel.MemberProperties != null) {
+
+            @if (registerModel.MemberProperties != null)
+            {
                 for (var i = 0; i < registerModel.MemberProperties.Count; i++)
                 {
                     @Html.LabelFor(m => registerModel.MemberProperties[i].Value, registerModel.MemberProperties[i].Name)
@@ -87,10 +85,10 @@ else
             }
 
             @Html.HiddenFor(m => registerModel.MemberTypeAlias)
-            @Html.HiddenFor(m => registerModel.RedirectUrl)      
+            @Html.HiddenFor(m => registerModel.RedirectUrl)
             @Html.HiddenFor(m => registerModel.UsernameIsEmail)
 
             <button>Register</button>
-        </fieldset>             
+        </fieldset>
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
index 9cd2a415ef..7e1a6ca087 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
@@ -1,20 +1,20 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
-@*Render the sitemap by passing the root node to the traverse helper*@
+@* Render the sitemap by passing the root node to the traverse helper *@
 <div class="sitemap">
     @Traverse(CurrentPage.AncestorOrSelf())
 </div>
 
-@*Helper method to travers through all descendants*@
+@* Helper method to travers through all descendants *@
 @helper Traverse(dynamic node)
 {
     @* Update the level to reflect how deep you want the sitemap to go *@
     var maxLevelForSitemap = 4;
     
-    @*Select visible children *@
+    @* Select visible children *@
     var items = node.Children.Where("Visible").Where("Level <= " + maxLevelForSitemap);
 
-    @*If any items are returned, render a list *@
+    @* If any items are returned, render a list *@
     if (items.Any())
     {
         <ul>
@@ -23,7 +23,7 @@
                 <li class="level-@item.Level">
                     <a href="@item.Url">@item.Name</a>
 
-                    @*Run the traverse helper again *@
+                    @* Run the traverse helper again *@
                     @Traverse(item)
                 </li>
             }
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Breadcrumb.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Breadcrumb.cshtml
index 97d1fda58f..43d36c4313 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Breadcrumb.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Breadcrumb.cshtml
@@ -1,24 +1,24 @@
 @inherits umbraco.MacroEngines.DynamicNodeContext
 
-@*
-This snippet makes a breadcrumb of parents using an unordred html list.
-
-How it works:
-- It uses the Ancestors() method to get all parents and then generates links so the visitor get go back
-- Finally it outputs the name of the current page (without a link)
-*@
-
+@*
+This snippet makes a breadcrumb of parents using an unordred html list.
+
+How it works:
+- It uses the Ancestors() method to get all parents and then generates links so the visitor get go back
+- Finally it outputs the name of the current page (without a link)
+*@
+
 
 @if (Model.Ancestors().Any())
-	{
+	{
     <ul class="breadcrumb">
         @* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@
         @foreach (var page in Model.Ancestors().OrderBy("Level"))
         {
             <li><a href="@page.Url">@page.Name</a> <span class="divider">/</span></li>
-	}
+	}
 
         @* Display the current page as the last item in the list *@
         <li class="active">@Model.Name</li>
-</ul>
+</ul>
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/EmptyTemplate.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/EmptyTemplate.cshtml
index b767d94901..f45160420d 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/EmptyTemplate.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/EmptyTemplate.cshtml
@@ -11,7 +11,5 @@
     		@Library.NodeById(1233)
 *@
 
-
-
 @* The fun starts here *@
 
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Gallery.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Gallery.cshtml
index 0db5339928..1124ada95b 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Gallery.cshtml
@@ -1,12 +1,12 @@
 @inherits umbraco.MacroEngines.DynamicNodeContext
 
 @*
-Macro to display a gallery from a media folder. Add the below parameter to the macro
-and use it to point the macro at a specific media folder to display it's content as
-a simple list.
+    Macro to display a gallery from a media folder. Add the below parameter to the macro
+    and use it to point the macro at a specific media folder to display it's content as
+    a simple list.
 
-Macro Parameters To Create, for this macro to work:
-Show:True   Alias:mediaId     Name:Media Folder ID    Type:MediaCurrent
+    Macro Parameters To Create, for this macro to work:
+    Alias:mediaId     Name:Media Folder ID    Type:Single Media Picker
 *@
 
 
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesFromChangeableSource.cshtml
index 57e4f12245..8b682d9090 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesFromChangeableSource.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesFromChangeableSource.cshtml
@@ -1,7 +1,7 @@
 @inherits umbraco.MacroEngines.DynamicNodeContext
 @*
     === Macro Parameters To Create ===
-    Show:True   Alias:nodeId Name:Node ID    Type:Content Picker
+    Alias:nodeId Name:Node ID    Type:Content Picker
 *@
 
 
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByDate.cshtml
index ce0aa17d38..db32eed518 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByDate.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByDate.cshtml
@@ -2,8 +2,7 @@
 
 
 <ul>
-	@*OrderBy() takes the property to sort by and optionally order desc/asc *@
-	
+	@* OrderBy() takes the property to sort by and optionally order desc/asc *@
     @foreach (var page in Model.Children.Where("Visible").OrderBy("CreateDate desc"))
     { 
         <li><a href="@page.Url">@page.Name</a></li>
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByName.cshtml
index 57fd127205..c565234b4a 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByName.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByName.cshtml
@@ -1,8 +1,7 @@
 @inherits umbraco.MacroEngines.DynamicNodeContext
 
-
 <ul>
-	@*OrderBy() takes the property to sort by*@
+	@* OrderBy() takes the property to sort by *@
     @foreach (var page in Model.Children.Where("Visible").OrderBy("Name"))
     { 
         <li><a href="@page.Url">@page.Name</a></li>
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml
index 8383d9077e..6befd750d9 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml
@@ -2,10 +2,9 @@
 
 @*
     Macro parameter to be set on the macro
-    Show:True   Alias:propertyAlias     Name:Property Alias    Type:Textstring
+    Alias:propertyAlias     Name:Property Alias    Type:Textbox
 *@   
 
-
 @{
     
     @* Get the property alias we want to filter on from the macro parameter *@
@@ -13,7 +12,6 @@
     var selection = Model.Children.Where("Visible").OrderBy(propertyAlias);
 }
 
-
 <ul>
     @foreach (var page in selection)
     { 
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesWithDoctype.cshtml
index 7bf279768b..d82a0823e0 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesWithDoctype.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesWithDoctype.cshtml
@@ -7,9 +7,8 @@
 	Settings section).
 *@
 
-
 @{    
-	@*Build a query and return the visible items *@
+	@* Build a query and return the visible items *@
     var selection= Model.Textpages.Where("Visible");
     
     @*
@@ -18,8 +17,7 @@
     *@
 }
 
-
-@*Determine if there are any nodes in the selection, then render list *@
+@* Determine if there are any nodes in the selection, then render list *@
 @if(selection.Any()){
 
    <ul>
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListImagesFromMediaFolder.cshtml
index 7f63b3a98a..a400effae3 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListImagesFromMediaFolder.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListImagesFromMediaFolder.cshtml
@@ -1,13 +1,10 @@
-
-
 @inherits umbraco.MacroEngines.DynamicNodeContext
 
 @*
-Macro Parameters To Create, for this macro to work:
-Show:True   Alias:mediaId     Name:Media Folder ID    Type:MediaCurrent
+    Macro Parameters To Create, for this macro to work:
+    Alias:mediaId     Name:Media Folder ID    Type:Single Media Picker
 *@
 
-
 @if (Parameter.mediaId != null)
 {
      @* Get the media folder as a dynamic node *@
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/MultinodeTree-picker.cshtml
index a0a17155e4..a14f6f2332 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/MultinodeTree-picker.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/MultinodeTree-picker.cshtml
@@ -12,7 +12,6 @@
 	var selection = Model.PropertyWithPicker;
 }
 
-
 @* Lists each selected value from the picker as a link *@
 <ul>
 	@foreach(var id in selection.Split(',')){
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
index dd8be57d9b..5189b265d3 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
@@ -5,10 +5,9 @@
 	Also highlights the current active page/section in the navigation with
 	the css class "current". 
 *@
-
 
 @{ 
-	@*Get the root of the website *@
+	@* Get the root of the website *@
     var root = Model.AncestorOrSelf(1);
 }
 
diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
index d9d2ec35df..b25b439742 100644
--- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
@@ -1,38 +1,34 @@
-@inherits umbraco.MacroEngines.DynamicNodeContext
-
-@{    
-    @* Walk up the tree from the current page to get the root node *@
-    var rootNode = Model.AncestorOrself(1);
-}
+@inherits umbraco.MacroEngines.DynamicNodeContext
 
-@*Render the sitemap by passing the root node to the traverse helper*@
-<div class="sitemap"> 
+@* Render the sitemap by passing the root node to the traverse helper *@
+<div class="sitemap">
     @traverse(@Model.AncestorOrSelf())
 </div>
 
+@* Helper method to travers through all descendants *@
+@helper traverse(dynamic node)
+{
+
+    @* If a MaxLevelForSitemap parameter is passed to the macro, otherwise default to 4 levels *@
+    var maxLevelForSitemap = String.IsNullOrEmpty(Parameter.MaxLevelForSitemap) ? 4 : int.Parse(Parameter.MaxLevelForSitemap);
+
+    @* Select visible children *@
+    var items = node.Children.Where("Visible").Where("Level <= " + maxLevelForSitemap);
 
 
-@*Helper method to travers through all descendants*@
-@helper traverse(dynamic node){
+    @* If any items are returned, render a list *@
+    if (items.Any())
+    {
+        <ul>
+            @foreach (var item in items)
+            {
+                <li class="level-@item.Level">
+                    <a href="@item.Url">@item.Name</a>
 
-@*If a MaxLevelForSitemap parameter is passed to the macro, otherwise default to 4 levels*@
-var maxLevelForSitemap = String.IsNullOrEmpty(Parameter.MaxLevelForSitemap) ? 4 : int.Parse(Parameter.MaxLevelForSitemap); 
-
-@*Select visible children *@
-var items = node.Children.Where("Visible").Where("Level <= " + maxLevelForSitemap);
-
-
-@*If any items are returned, render a list *@
-if (items.Any()) { 
-   <ul>
-            @foreach (var item in items) {
-          <li class="level-@item.Level">
-					<a href="@item.Url">@item.Name</a>
-
-             @*Run the traverse helper again *@
-					@traverse(item)
-                </li>
-            }
-   </ul>
-    }
+                    @*Run the traverse helper again *@
+                    @traverse(item)
+                </li>
+            }
+        </ul>
+    }
 }
\ No newline at end of file