diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php
index 2e35611..f41376d 100644
--- a/core/lib/Drupal/Component/Diff/Diff.php
+++ b/core/lib/Drupal/Component/Diff/Diff.php
@@ -44,8 +44,10 @@ public function __construct($from_lines, $to_lines) {
    *
    *  $diff = new Diff($lines1, $lines2);
    *  $rev = $diff->reverse();
-   * @return object A Diff object representing the inverse of the
-   *          original diff.
+   * 
+   * @return object 
+   *   A Diff object representing the inverse of the original diff.
+   *          
    */
   public function reverse() {
     $rev = $this;
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 264bd3f..bad1155 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
    *   The database connection to use.
    * @param array $schema_only
    *   Table patterns for which to only dump the schema, no data.
-   * @return string The PHP script.
+   * @return string 
    *   The PHP script.
    */
   protected function generateScript(Connection $connection, array $schema_only = []) {
@@ -102,7 +102,7 @@ protected function generateScript(Connection $connection, array $schema_only = [
    *
    * @param \Drupal\Core\Database\Connection $connection
    *   The database connection to use.
-   * @return array An array of table names.
+   * @return array 
    *   An array of table names.
    */
   protected function getTables(Connection $connection) {
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 4586652..6774a2d 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -138,11 +138,9 @@ public function __construct(Connection $connection, StateInterface $state, Curre
    * @param Request $request
    *   A request against which to match.
    *
-   * @return \Symfony\Component\Routing\RouteCollection with all urls that
-   *      could potentially match $request. Empty collection if nothing can
-   *      match. The collection will be sorted from highest to lowest fit (match
-   *      of path parts) and then in ascending order by route name for routes
-   *      with the same fit.
+   * @return \Symfony\Component\Routing\RouteCollection 
+   *   A route collection containing all urls that could potentially match
+   *   $request. If nothing can match an empty collection is returned.
    */
   public function getRouteCollectionForRequest(Request $request) {
     // Cache both the system path as well as route parameters and matching
diff --git a/core/modules/serialization/src/LinkManager/TypeLinkManagerInterface.php b/core/modules/serialization/src/LinkManager/TypeLinkManagerInterface.php
index fed9119..e1e3bfd 100644
--- a/core/modules/serialization/src/LinkManager/TypeLinkManagerInterface.php
+++ b/core/modules/serialization/src/LinkManager/TypeLinkManagerInterface.php
@@ -31,7 +31,7 @@ public function getTypeUri($entity_type, $bundle, $context = array());
    * @param array $context
    *   Context from the normalizer/serializer operation.
    *
-   * @return array | boolean
+   * @return array|boolean
    *   If the URI matches a bundle, returns an array containing entity_type and
    *   bundle. Otherwise, returns false.
    */
diff --git a/core/modules/user/src/Tests/RestRegisterUserTest.php b/core/modules/user/src/Tests/RestRegisterUserTest.php
index 62e6bbc..450c552 100644
--- a/core/modules/user/src/Tests/RestRegisterUserTest.php
+++ b/core/modules/user/src/Tests/RestRegisterUserTest.php
@@ -117,7 +117,7 @@ public function testRegisterUser() {
    * @param bool $include_password
    *   Whether to include a password in the user values.
    *
-   * @return string Serialized user values.
+   * @return string
    *   Serialized user values.
    */
   protected function createSerializedUser($name, $include_password = TRUE) {
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index f9d3add..d3b5676 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -139,7 +139,7 @@ public function testOnAlterRoutes() {
   /**
    * Sets up mocks of Views objects needed for testing.
    *
-   * @return array \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
+   * @return \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
    *   An array of two mocked view displays
    */
   protected function setupMocks() {
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 9ad822f..52ae584 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -58,7 +58,6 @@
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamTypeSpaces"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>