diff --git a/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php b/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
index 54faef9..cc35f13 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
@@ -2,13 +2,13 @@
 /**
  * @file
  * Contains \Drupal\Component\Plugin\Exception\MapperExceptionInterface.
- *
- * Base exception interface for grouping mapper exceptions.
  */
 
 namespace Drupal\Component\Plugin\Exception;
 
 /**
+ * Base exception interface for grouping mapper exceptions.
+ *
  * Extended interface for exceptions thrown specifically by the Mapper subsystem
  * within the Plugin component.
  */
diff --git a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index ab09ceb..b661b6d 100644
--- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -3,10 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Component\Transliteration\PhpTransliteration.
- *
- * Some parts of this code were derived from the MediaWiki project's UtfNormal
- * class, Copyright © 2004 Brion Vibber <brion@pobox.com>,
- * http://www.mediawiki.org/
  */
 
 namespace Drupal\Component\Transliteration;
@@ -25,6 +21,10 @@
  * PhpTransliteration::readGenericData()). If looking up the character in the
  * generic table results in a NULL value, or an illegal character is
  * encountered, then a substitute character is returned.
+ *
+ * Some parts of this code were derived from the MediaWiki project's UtfNormal
+ * class, Copyright © 2004 Brion Vibber <brion@pobox.com>,
+ * http://www.mediawiki.org/
  */
 class PhpTransliteration implements TransliterationInterface {
 
diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
index 95553af..13da55c 100644
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -3,9 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Core\Routing\LinkGeneratorTrait.
- *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Link instead.
  */
 
 namespace Drupal\Core\Routing;
@@ -21,6 +18,9 @@
  * classes that would implement ContainerInjectionInterface. Services registered
  * in the Container should not use this trait but inject the appropriate service
  * directly for easier testing.
+ *
+ * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Core\Link instead.
  */
 trait LinkGeneratorTrait {
 
diff --git a/core/lib/Drupal/Core/Template/TwigTransTokenParser.php b/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
index e87bd65..3c31e68 100644
--- a/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
+++ b/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
@@ -3,9 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Core\Template\TwigTransTokenParser.
- *
- * @see http://twig.sensiolabs.org/doc/extensions/i18n.html
- * @see https://github.com/fabpot/Twig-extensions
  */
 
 namespace Drupal\Core\Template;
@@ -18,6 +15,8 @@
  * into PHP code usable for runtime execution of the template.
  *
  * @see \Twig_TokenParser
+ * @see http://twig.sensiolabs.org/doc/extensions/i18n.html
+ * @see https://github.com/fabpot/Twig-extensions
  */
 class TwigTransTokenParser extends \Twig_TokenParser {
 
diff --git a/core/lib/Drupal/Core/Utility/ProjectInfo.php b/core/lib/Drupal/Core/Utility/ProjectInfo.php
index db7294e..4c14b7b 100644
--- a/core/lib/Drupal/Core/Utility/ProjectInfo.php
+++ b/core/lib/Drupal/Core/Utility/ProjectInfo.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Core\Utility\ProjectInfo.
- *
- * API for building lists of installed projects.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index dba9134..7a5cc4c 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\forum\Tests\ForumTest.
- *
- * Tests for forum.module.
  */
 
 namespace Drupal\forum\Tests;
@@ -18,6 +16,8 @@
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
+ * Tests for forum.module.
+ *
  * Create, view, edit, delete, and change forum entries and verify its
  * consistency in the database.
  *
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
index f13ea87..3dd47bf 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
@@ -3,11 +3,6 @@
 /**
  * @file
  * Contains \Drupal\link\Plugin\Field\FieldFormatter\LinkSeparateFormatter.
- *
- * @todo
- * Merge into 'link' formatter once there is a #type like 'item' that
- * can render a compound label and content outside of a form context.
- * @see https://www.drupal.org/node/1829202
  */
 
 namespace Drupal\link\Plugin\Field\FieldFormatter;
@@ -18,6 +13,10 @@
 /**
  * Plugin implementation of the 'link_separate' formatter.
  *
+ * @todo https://www.drupal.org/node/1829202 Merge into 'link' formatter once
+ *   there is a #type like 'item' that can render a compound label and content
+ *   outside of a form context.
+ *
  * @FieldFormatter(
  *   id = "link_separate",
  *   label = @Translation("Separate link text and URL"),
diff --git a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
index b204e47..38e4ede 100644
--- a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\menu_ui\Tests\MenuLanguageTest.
- *
- * Tests for menu_ui language settings.
  */
 
 namespace Drupal\menu_ui\Tests;
@@ -14,6 +12,8 @@
 use Drupal\language\Entity\ContentLanguageSettings;
 
 /**
+ * Tests for menu_ui language settings.
+ *
  * Create menu and menu links in non-English language, and edit language
  * settings.
  *
diff --git a/core/modules/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php
index cf66820..e115cb2 100644
--- a/core/modules/search/src/SearchQuery.php
+++ b/core/modules/search/src/SearchQuery.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\search\SearchQuery.
- *
- * Search query extender and helper functions.
  */
 
 namespace Drupal\search;
@@ -14,6 +12,8 @@
 use Drupal\Core\Database\Query\SelectInterface;
 
 /**
+ * Search query extender and helper functions.
+ *
  * Performs a query on the full-text search index for a word or words.
  *
  * This query is used by search plugins that use the search index (not all
diff --git a/core/modules/update/src/Tests/UpdateTestBase.php b/core/modules/update/src/Tests/UpdateTestBase.php
index faec496..13b9419 100644
--- a/core/modules/update/src/Tests/UpdateTestBase.php
+++ b/core/modules/update/src/Tests/UpdateTestBase.php
@@ -3,6 +3,16 @@
 /**
  * @file
  * Contains \Drupal\update\Tests\UpdateTestBase.
+ */
+
+namespace Drupal\update\Tests;
+
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Defines some shared functions used by all update tests.
  *
  * The overarching methodology of these tests is we need to compare a given
  * state of installed modules and themes (e.g., version, project grouping,
@@ -18,16 +28,6 @@
  * assertions that the report matches our expectations given the specific
  * initial state and availability scenario.
  */
-
-namespace Drupal\update\Tests;
-
-use Drupal\Core\DrupalKernel;
-use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Defines some shared functions used by all update tests.
- */
 abstract class UpdateTestBase extends WebTestBase {
 
   protected function setUp() {