diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
index 1ae0a72210..d80c2b9b68 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
@@ -33,8 +33,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
         private static void AddInstrumentation(InstrumentationItem item)
         {
-            var beginContextMethodName = "BeginContext"; /* ORIGINAL: BeginContextMethodName */
-            var endContextMethodName = "EndContext"; /* ORIGINAL: EndContextMethodName */
+            var beginContextMethodName = "BeginContext"; // ORIGINAL: BeginContextMethodName
+            var endContextMethodName = "EndContext"; // ORIGINAL: EndContextMethodName
 
             var beginNode = new CSharpCodeIntermediateNode();
             beginNode.Children.Add(new IntermediateToken()
diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
index cbf0c1021a..2408c552dd 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
@@ -582,21 +582,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         protected bool IsHtmlCommentAhead()
         {
-            /*
-             * From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
-             * 
-             * Comments must have the following format:
-             * 1. The string "<!--"
-             * 2. Optionally, text, with the additional restriction that the text
-             *      2.1 must not start with the string ">" nor start with the string "->"
-             *      2.2 nor contain the strings
-             *          2.2.1 "<!--"
-             *          2.2.2 "-->" // As we will be treating this as a comment ending, there is no need to handle this case at all.
-             *          2.2.3 "--!>"
-             *      2.3 nor end with the string "<!-".
-             * 3. The string "-->"
-             * 
-             * */
+            // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
+            
+            // Comments must have the following format:
+            // 1. The string "<!--"
+            // 2. Optionally, text, with the additional restriction that the text
+            //      2.1 must not start with the string ">" nor start with the string "->"
+            //      2.2 nor contain the strings
+            //          2.2.1 "<!--"
+            //          2.2.2 "-->" As we will be treating this as a comment ending, there is no need to handle this case at all.
+            //          2.2.3 "--!>"
+            //      2.3 nor end with the string "<!-".
+            // 3. The string "-->"
 
             if (CurrentToken.Type != HtmlTokenType.DoubleHyphen)
             {
diff --git a/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs b/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs
index 12fa708189..55705b5eac 100644
--- a/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs
+++ b/src/Microsoft.CodeAnalysis.Razor/RazorDiagnosticFactory.cs
@@ -9,40 +9,30 @@ namespace Microsoft.CodeAnalysis.Razor
     {
         private const string DiagnosticPrefix = "RZ";
 
-        /*
-         * Razor.Language starts at 0, 1000, 2000, 3000. Therefore, we should offset by 500 to ensure we can easily
-         * maintain this list of diagnostic descriptors in conjunction with the one in Razor.Language.
-         */
-
+        // Razor.Language starts at 0, 1000, 2000, 3000. Therefore, we should offset by 500 to ensure we can easily
+        // maintain this list of diagnostic descriptors in conjunction with the one in Razor.Language.
+         
         #region General Errors
 
-        /*
-         * General Errors ID Offset = 500
-         */
+        // General Errors ID Offset = 500
 
         #endregion
 
         #region Language Errors
 
-        /*
-         * Language Errors ID Offset = 1500
-         */
+        // Language Errors ID Offset = 1500
 
         #endregion
 
         #region Semantic Errors
 
-        /*
-         * Semantic Errors ID Offset = 2500
-         */
+        // Semantic Errors ID Offset = 2500
 
         #endregion
 
         #region TagHelper Errors
 
-        /*
-         * TagHelper Errors ID Offset = 3500
-         */
+        // TagHelper Errors ID Offset = 3500
 
         internal static readonly RazorDiagnosticDescriptor TagHelper_InvalidAttributeNameNullOrEmpty =
             new RazorDiagnosticDescriptor(