diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
index e31973bcb49..c766a05c921 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
@@ -654,8 +654,8 @@ protected override void ProcessRecord()
                         }
                     }
                 }
-            }//if
-        }////ProcessRecord
+            }
+        }
     }
     #endregion Override Methods
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
index 4dcf2027791..1663b01389c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
@@ -98,9 +98,9 @@ internal Collection<string> ParseCsv(string csv)
                         default:
                             tempString += c;
                             break;
-                    }//switch
-                }//else
-            }//for int
+                    }
+                }
+            }
             if (tempString.Length > 0)
             {
                 result.Add(tempString);
@@ -109,4 +109,3 @@ internal Collection<string> ParseCsv(string csv)
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
index a0df0cc18e9..ac9840020b8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
@@ -251,7 +251,7 @@ protected override void ProcessRecord()
                             itemNotFound));
                 }
             }
-        } // ProcessRecord
+        }
 
         /// <summary>
         /// Writes the aliases to the file
@@ -413,6 +413,5 @@ private void ThrowFileOpenError(Exception e, string pathWithError)
         }
 
         #endregion Command code
-    } // class ExportAliasCommand
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
index 568bbdfbb21..7b99d480d22 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
@@ -84,8 +84,8 @@ protected override void ProcessRecord()
                 {
                     WriteMatches(aliasName, "Default");
                 }
-            }//parameterset else
-        } // ProcessRecord
+            }
+        }
         #endregion Command code
 
         private void WriteMatches(string value, string parametersetname)
@@ -199,6 +199,5 @@ private void WriteMatches(string value, string parametersetname)
                 WriteError(er);
             }
         }
-    } // class GetAliasCommand
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetCultureCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetCultureCommand.cs
index 1667ca7c6ba..6706680d398 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetCultureCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetCultureCommand.cs
@@ -18,7 +18,7 @@ public sealed class GetCultureCommand : PSCmdlet
         protected override void BeginProcessing()
         {
             WriteObject(Host.CurrentCulture);
-        } // EndProcessing
-    } // GetCultureCommand
-} // Microsoft.PowerShell.Commands
+        }
+    }
+}
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
index bc52bd6e864..52d33789433 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
@@ -312,7 +312,7 @@ protected override void ProcessRecord()
 
                 WriteObject(outputObj);
             }
-        } // EndProcessing
+        }
 
         private static readonly DateTime epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
@@ -524,10 +524,10 @@ private string UFormatDateString(DateTime dateTime)
             }
 
             return StringUtil.Format(sb.ToString(), dateTime);
-        } // UFormatDateString
+        }
 
         #endregion
-    } // GetDateCommand
+    }
 
     #endregion
 
@@ -553,5 +553,4 @@ public enum DisplayHintType
     }
 
     #endregion
-} // namespace Microsoft.PowerShell.Commands
-
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUICultureCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUICultureCommand.cs
index 9a958d1e1bc..f0848091c0e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUICultureCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUICultureCommand.cs
@@ -18,7 +18,6 @@ public sealed class GetUICultureCommand : PSCmdlet
         protected override void BeginProcessing()
         {
             WriteObject(Host.CurrentUICulture);
-        } // EndProcessing
-    } // GetUICultureCommand
-} // Microsoft.PowerShell.Commands
-
+        }
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
index 5e31191303e..18534f208fd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
@@ -213,7 +213,7 @@ protected override void ProcessRecord()
                     {
                         variable.Value = result;
                     }
-                } // end _bindingvariable != null
+                }
 
                 // If binding variable is null, write the object to stream
                 else
@@ -232,7 +232,7 @@ protected override void ProcessRecord()
             }
 
             return;
-        } // ProcessRecord
+        }
 
         private string GetFilePath()
         {
@@ -373,6 +373,5 @@ private string GetScript(string filePath)
         }
 
         #endregion Command code
-    } // class ImportLocalizedData
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
index ab36ce955d8..d43dbd87ee1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
@@ -178,7 +178,7 @@ protected override void ProcessRecord()
                     {
                         continue;
                     }
-                } // if (!Force)
+                }
 
                 // Set the alias in the specified scope or the
                 // current scope.
@@ -228,7 +228,7 @@ protected override void ProcessRecord()
                     WriteObject(result);
                 }
             }
-        } // ProcessRecord
+        }
 
         private Dictionary<string, CommandTypes> _existingCommands;
         private Dictionary<string, CommandTypes> ExistingCommands
@@ -480,6 +480,5 @@ private static bool OnlyContainsWhitespace(string line)
             return result;
         }
         #endregion Command code
-    } // class ImportAliasCommand
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
index 82d0ba29301..2e81dbe3146 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
@@ -1707,7 +1707,7 @@ private bool doMatchWorker(string operandString, MatchInfo matchInfo, out MatchI
                 return true;
             }
             return false;
-        } // end doMatch
+        }
 
         /// Get a list or resolved file paths.
         private List<string> ResolveFilePaths(string[] filePaths, bool isLiteralPath)
@@ -1858,6 +1858,5 @@ private bool meetsIncludeExcludeCriteria(string filename)
 
             return ok;
         }
-    } // end class SelectStringCommand
+    }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
index bc6276eada2..9c2d05a471c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
@@ -127,8 +127,7 @@ protected override void ProcessRecord()
                     WriteObject(result);
                 }
             }
-        } // ProcessRecord
+        }
         #endregion Command code
-    } // class NewAliasCommand
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
index c346dfb6697..6a28cbc49ab 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
@@ -122,9 +122,8 @@ protected override void ProcessRecord()
             }
 
             WriteObject(result);
-        } // EndProcessing
+        }
 
         #endregion
-    }  // NewTimeSpanCommand
-} // namespace Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
index dd5d8ea0575..127240fa5c0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
@@ -72,8 +72,7 @@ protected override void ProcessRecord()
                     WriteObject(result);
                 }
             }
-        } // ProcessRecord
+        }
         #endregion Command code
-    } // class SetAliasCommand
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
index fb7f0fc9fde..134e9133bd0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
@@ -106,7 +106,7 @@ protected override void ProcessRecord()
             outputObj.Properties.Add(note);
 
             WriteObject(outputObj);
-        } // EndProcessing
+        }
 
         #endregion
 
@@ -129,9 +129,8 @@ public struct SystemTime
 
             [DllImport(PinvokeDllNames.SetLocalTimeDllName, SetLastError = true)]
             public static extern bool SetLocalTime(ref SystemTime systime);
-        } // NativeMethods
+        }
 
         #endregion
-    } // SetDateCommand
-} // namespace Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index 2abf326f546..34f8fdb45ec 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -109,7 +109,7 @@ protected override void ProcessRecord()
             }
 
             Sleep(sleepTime);
-        } // EndProcessing
+        }
 
         /// <summary>
         /// stopprocessing override
@@ -129,6 +129,5 @@ protected override
         }
 
         #endregion
-    } // StartSleepCommand
-} // namespace Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
index 26857e97e42..2942540dadd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
@@ -49,7 +49,7 @@ public sealed class MeasureCommandCommand : PSCmdlet
         protected override void EndProcessing()
         {
             WriteObject(_stopWatch.Elapsed);
-        } // EndProcessing
+        }
 
         /// <summary>
         /// Execute the script block passing in the current pipeline object as
@@ -71,8 +71,6 @@ protected override void ProcessRecord()
 
             _stopWatch.Stop();
         }
-
         #endregion
     }
-} // namespace Microsoft.PowerShell.Commands
-
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
index af39227d230..03008f7b1e5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
@@ -217,5 +217,4 @@ public override string ToString()
             return result.ToString();
         }
     }
-} // namespace Microsoft.PowerShell.Commands
-
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
index f0d39620af1..099bce98cc3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -564,8 +564,8 @@ protected override void ProcessRecord()
                     WriteObject(newVariable);
                 }
             }
-        } // ProcessRecord
-    } // NewVariableCommand
+        }
+    }
 
     /// <summary>
     /// This class implements set-variable command
@@ -1016,8 +1016,8 @@ private void SetVariable(string[] varNames, object varValue)
                     }
                 }
             }
-        } // ProcessRecord
-    } // SetVariableCommand
+        }
+    }
 
     /// <summary>
     /// The Remove-Variable cmdlet implementation
@@ -1169,8 +1169,8 @@ protected override void ProcessRecord()
                     }
                 }
             }
-        } // ProcessRecord
-    } // RemoveVariableCommand
+        }
+    }
 
     /// <summary>
     /// This class implements set-variable command
@@ -1347,7 +1347,7 @@ protected override void ProcessRecord()
                     }
                 }
             }
-        } // ProcessRecord
+        }
 
         /// <summary>
         /// Clears the value of the variable using the PSVariable instance if the scope
@@ -1372,6 +1372,5 @@ private PSVariable ClearValue(PSVariable matchingVariable)
             }
             return result;
         }
-    } // ClearVariableCommand
+    }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write-Object.cs
index 8d5e6bd1b39..ab38eca7332 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write-Object.cs
@@ -56,7 +56,7 @@ protected override void ProcessRecord()
             }
 
             WriteObject(_inputObjects, enumerate);
-        }//processrecord
-    }//WriteOutputCommand
+        }
+    }
     #endregion
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
index 478e0cbf3a5..622ff1d3448 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
@@ -94,6 +94,5 @@ public SwitchParameter Force
         private bool _force;
         #endregion Parameters
 
-    } // class WriteAliasCommandBase
-}//Microsoft.PowerShell.Commands
-
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index fed18cd94e0..635eba5418c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -796,7 +796,7 @@ internal void Stop()
                 _deserializer.Stop();
             }
         }
-    } // ImportXmlHelper
+    }
 
     #region Select-Xml
     ///<summary>
@@ -1078,10 +1078,9 @@ protected override void ProcessRecord()
             {
                 Dbg.Assert(false, "Unrecognized parameterset");
             }
-        }//End ProcessRecord()
-
+        }
         #endregion overrides
-    }//End Class
+    }
 
     /// <summary>
     /// The object returned by Select-Xml representing the result of a match.
@@ -1218,7 +1217,5 @@ private string FormatLine(string text, string displaypath)
             }
         }
     }
-
     #endregion Select-Xml
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
index 82f78f06848..105509458c5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
@@ -295,7 +295,7 @@ protected override void BeginProcessing()
                 WriteObject(comObject);
             }
 #endif
-        }//protected override void BeginProcessing()
+        }
 
         #endregion Overrides
 
@@ -473,7 +473,7 @@ private object CreateComObject()
         // HResult code '-2147417850' - Cannot change thread mode after it is set.
         private const int RPC_E_CHANGED_MODE = unchecked((int)0x80010106);
         private const string netSetName = "Net";
-    }//internal class NewObjectCommand: PSCmdlet
+    }
 
     /// <summary>
     /// Native methods for dealing with COM objects
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
index 2b175daed71..5e34265a642 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
@@ -54,8 +54,8 @@ protected override void ProcessRecord()
             {
                 WriteDebug(Message);
             }
-        }//processrecord
-    }//WriteDebugCommand
+        }
+    }
     #endregion WriteDebugCommand
 
     #region WriteVerboseCommand
@@ -103,8 +103,8 @@ protected override void ProcessRecord()
             {
                 WriteVerbose(Message);
             }
-        }//processrecord
-    }//WriteVerboseCommand
+        }
+    }
     #endregion WriteVerboseCommand
 
     #region WriteWarningCommand
@@ -152,8 +152,8 @@ protected override void ProcessRecord()
             {
                 WriteWarning(Message);
             }
-        }//processrecord
-    }//WriteWarningCommand
+        }
+    }
     #endregion WriteWarningCommand
 
     #region WriteInformationCommand
@@ -205,8 +205,7 @@ protected override void ProcessRecord()
         {
             WriteInformation(MessageData, Tags);
         }
-
-    }//WriteInformationCommand
+    }
 
     #endregion WriteInformationCommand
 
@@ -388,8 +387,8 @@ protected override void ProcessRecord()
             /*
             }
             */
-        }//processrecord
-    }//WriteOrThrowErrorCommand
+        }
+    }
 
     /// <summary>
     /// This class implements Write-Error command
@@ -483,7 +482,6 @@ protected WriteErrorException(SerializationInfo info,
         {
         }
         #endregion Serialization
-    } // WriteErrorException
+    }
     #endregion WriteErrorException
-} //namespace
-
+}