diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php
index 637eca9..65760d1 100644
--- a/core/lib/Drupal/Component/Diff/Diff.php
+++ b/core/lib/Drupal/Component/Diff/Diff.php
@@ -34,7 +34,6 @@ class Diff {
   public function __construct($from_lines, $to_lines) {
     $eng = new DiffEngine();
     $this->edits = $eng->diff($from_lines, $to_lines);
-    //$this->_check($from_lines, $to_lines);
   }
 
   /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index 78ec76a..1dd3467 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -88,7 +88,7 @@ public function diff($from_lines, $to_lines) {
     // Find the LCS.
     $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
 
-    // Merge edits when possible
+    // Merge edits when possible.
     $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
     $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
 
@@ -299,8 +299,6 @@ protected function _compareseq($xoff, $xlim, $yoff, $ylim) {
     }
     else {
       // This is ad hoc but seems to work well.
-      //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
-      //$nchunks = max(2, min(8, (int)$nchunks));
       $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
       list($lcs, $seps)
       = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
diff --git a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
index f5cba32..a6592cf 100644
--- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -48,7 +48,7 @@ protected function _flushLine($new_tag) {
       array_push($this->lines, $this->line);
     }
     else {
-      // make empty lines visible by inserting an NBSP
+      // Make empty lines visible by inserting an NBSP.
       array_push($this->lines, $this::NBSP);
     }
     $this->line = '';
diff --git a/core/lib/Drupal/Component/Diff/WordLevelDiff.php b/core/lib/Drupal/Component/Diff/WordLevelDiff.php
index c9114bc..55c3857 100644
--- a/core/lib/Drupal/Component/Diff/WordLevelDiff.php
+++ b/core/lib/Drupal/Component/Diff/WordLevelDiff.php
@@ -26,8 +26,8 @@ protected function _split($lines) {
     $stripped = array();
     $first = TRUE;
     foreach ($lines as $line) {
-      // If the line is too long, just pretend the entire line is one big word
-      // This prevents resource exhaustion problems
+      // If the line is too long, just pretend the entire line is one big word.
+      // This prevents resource exhaustion problems.
       if ( $first ) {
         $first = FALSE;
       }
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index dbd06d1..69a5d8c 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -272,7 +272,6 @@ private function readLine() {
 
       if (!strncmp('#', $line, 1)) {
         // Lines starting with '#' are comments.
-
         if ($this->_context == 'COMMENT') {
           // Already in comment context, add to current comment.
           $this->_current_item['#'][] = substr($line, 1);
@@ -297,7 +296,6 @@ private function readLine() {
       }
       elseif (!strncmp('msgid_plural', $line, 12)) {
         // A plural form for the current source string.
-
         if ($this->_context != 'MSGID') {
           // A plural form can only be added to an msgid directly.
           $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgid_plural" was expected but not found on line %line.', $log_vars);
@@ -328,7 +326,6 @@ private function readLine() {
       }
       elseif (!strncmp('msgid', $line, 5)) {
         // Starting a new message.
-
         if (($this->_context == 'MSGSTR') || ($this->_context == 'MSGSTR_ARR')) {
           // We are currently in string context, save current item.
           $this->setItemFromArray($this->_current_item);
@@ -359,7 +356,6 @@ private function readLine() {
       }
       elseif (!strncmp('msgctxt', $line, 7)) {
         // Starting a new context.
-
         if (($this->_context == 'MSGSTR') || ($this->_context == 'MSGSTR_ARR')) {
           // We are currently in string context, save current item.
           $this->setItemFromArray($this->_current_item);
@@ -389,7 +385,6 @@ private function readLine() {
       }
       elseif (!strncmp('msgstr[', $line, 7)) {
         // A message string for a specific plurality.
-
         if (($this->_context != 'MSGID') &&
             ($this->_context != 'MSGCTXT') &&
             ($this->_context != 'MSGID_PLURAL') &&
@@ -431,7 +426,6 @@ private function readLine() {
       }
       elseif (!strncmp("msgstr", $line, 6)) {
         // A string pair for an msgid (with optional context).
-
         if (($this->_context != 'MSGID') && ($this->_context != 'MSGCTXT')) {
           // Strings are only valid within an id or context scope.
           $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgstr" is unexpected on line %line.', $log_vars);
@@ -456,7 +450,6 @@ private function readLine() {
       }
       elseif ($line != '') {
         // Anything that is not a token may be a continuation of a previous token.
-
         $quoted = $this->parseQuoted($line);
         if ($quoted === FALSE) {
           // This string must be quoted.
diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index 96318ac..5a832b9 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -143,7 +143,6 @@ public function validateContexts() {
     $violations = new ConstraintViolationList();
     // @todo: Implement symfony validator API to let the validator traverse
     // and set property paths accordingly.
-
     foreach ($this->getContexts() as $context) {
       $violations->addAll($context->validate());
     }
diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index 0801b36..f3dec4f 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -107,7 +107,7 @@ public function build($class_name, $proxy_class_name = '') {
 
     $output .= $this->buildUseStatements();
 
-    // The actual class;
+    // The actual class.
     $properties = <<<'EOS'
 /**
  * The id of the original proxied service.
@@ -302,7 +302,7 @@ protected function buildMethodBody(\ReflectionMethod $reflection_method) {
       $output .= "    \\$class_name::$function_name(";
     }
 
-    // Add parameters;
+    // Add parameters.
     $parameters = [];
     foreach ($reflection_method->getParameters() as $parameter) {
       $parameters[] = '$' . $parameter->getName();
diff --git a/core/lib/Drupal/Component/Utility/Crypt.php b/core/lib/Drupal/Component/Utility/Crypt.php
index 2c18d91..1310889 100644
--- a/core/lib/Drupal/Component/Utility/Crypt.php
+++ b/core/lib/Drupal/Component/Utility/Crypt.php
@@ -89,7 +89,7 @@ public static function hashEquals($known_string, $user_string) {
       return hash_equals($known_string, $user_string);
     }
     else {
-      // Backport of hash_equals() function from PHP 5.6
+      // Backport of hash_equals() function from PHP 5.6.
       // @see https://github.com/php/php-src/blob/PHP-5.6/ext/hash/hash.c#L739
       if (!is_string($known_string)) {
         trigger_error(sprintf("Expected known_string to be a string, %s given", gettype($known_string)), E_USER_WARNING);
diff --git a/core/lib/Drupal/Component/Utility/Tags.php b/core/lib/Drupal/Component/Utility/Tags.php
index 3f8ed13..ac1971ba 100644
--- a/core/lib/Drupal/Component/Utility/Tags.php
+++ b/core/lib/Drupal/Component/Utility/Tags.php
@@ -20,7 +20,9 @@ class Tags {
    */
   public static function explode($tags) {
     // This regexp allows the following types of user input:
+    // @code
     // this, "somecompany, llc", "and ""this"" w,o.rks", foo bar
+    // @endcode
     $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
     preg_match_all($regexp, $tags, $matches);
     $typed_tags = array_unique($matches[1]);
diff --git a/core/lib/Drupal/Component/Utility/Unicode.php b/core/lib/Drupal/Component/Utility/Unicode.php
index f6b4668..0ca1c2a 100644
--- a/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -607,7 +607,7 @@ public static function strcasecmp($str1 , $str2) {
    */
   public static function mimeHeaderEncode($string) {
     if (preg_match('/[^\x20-\x7E]/', $string)) {
-      $chunk_size = 47; // floor((75 - strlen("=?UTF-8?B??=")) * 0.75);
+      $chunk_size = 47;
       $len = strlen($string);
       $output = '';
       while ($len > 0) {
diff --git a/core/lib/Drupal/Component/Utility/UserAgent.php b/core/lib/Drupal/Component/Utility/UserAgent.php
index bd81105..3979bd0 100644
--- a/core/lib/Drupal/Component/Utility/UserAgent.php
+++ b/core/lib/Drupal/Component/Utility/UserAgent.php
@@ -40,10 +40,15 @@ public static function getBestMatchingLangcode($http_accept_language, $langcodes
     // The Accept-Language header contains information about the language
     // preferences configured in the user's user agent / operating system.
     // RFC 2616 (section 14.4) defines the Accept-Language header as follows:
+    // @code
     //   Accept-Language = "Accept-Language" ":"
     //                  1#( language-range [ ";" "q" "=" qvalue ] )
     //   language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
-    // Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
+    // @endcode
+    // Samples:
+    // @code
+    //   "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
+    // @endcode
     $ua_langcodes = array();
     if (preg_match_all('@(?<=[, ]|^)([a-zA-Z-]+|\*)(?:;q=([0-9.]+))?(?:$|\s*,\s*)@', trim($http_accept_language), $matches, PREG_SET_ORDER)) {
       foreach ($matches as $match) {