diff --git a/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php b/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
index 701262a..b212478 100644
--- a/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
+++ b/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\DatabaseExceptionWrapper
+ * Definition of Drupal\Core\Database\DatabaseExceptionWrapper.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php
index 683f1fb..4d10489 100644
--- a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Definition of Drupal\Core\EventSubscriber\AccessSubscriber.
+ */
+
 namespace Drupal\Core\EventSubscriber;
 
 use Symfony\Component\HttpFoundation\Response;
@@ -12,11 +17,6 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * @file
- * Definition of Drupal\Core\EventSubscriber\AccessSubscriber.
- */
-
-/**
  * Access subscriber for controller requests.
  */
 class AccessSubscriber implements EventSubscriberInterface {
diff --git a/core/lib/Drupal/Core/EventSubscriber/LegacyControllerSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/LegacyControllerSubscriber.php
index cc4da15..48cc8a0 100644
--- a/core/lib/Drupal/Core/EventSubscriber/LegacyControllerSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/LegacyControllerSubscriber.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Definition of Drupal\Core\EventSubscriber\LegacyControllerSubscriber.
+ */
+
 namespace Drupal\Core\EventSubscriber;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -8,12 +13,6 @@ use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * @file
- *
- * Definition of Drupal\Core\EventSubscriber\LegacyControllerSubscriber
- */
-
-/**
  * Access subscriber for controller requests.
  */
 class LegacyControllerSubscriber implements EventSubscriberInterface {
@@ -28,20 +27,20 @@ class LegacyControllerSubscriber implements EventSubscriberInterface {
    * controller argument handling entirely and lets the old-style approach work.
    *
    * @todo Convert Drupal to use the IETF-draft-RFC style {placeholders}. That
-   * will allow us to use the native Symfony conversion, including out-of-order
-   * argument mapping, name-based mapping, and with another listener
-   * auto-conversion of parameters to full objects.  That may necessitate not
-   * using func_get_args()-based controllers.  That is likely for the best,
-   * as those are quite hard to document anyway.
+   *   will allow us to use the native Symfony conversion, including
+   *   out-of-order argument mapping, name-based mapping, and with another
+   *   listener auto-conversion of parameters to full objects. That may
+   *   necessitate not using func_get_args()-based controllers. That is likely
+   *   for the best, as those are quite hard to document anyway.
    *
-   * @param GetResponseEvent $event
+   * @param Symfony\Component\HttpKernel\Event\FilterControllerEvent $event
    *   The Event to process.
    */
   public function onKernelControllerLegacy(FilterControllerEvent $event) {
     $router_item = $event->getRequest()->attributes->get('drupal_menu_item');
     $controller = $event->getController();
 
-    // This BC logic applies only to functions.  Otherwise, skip it.
+    // This BC logic applies only to functions. Otherwise, skip it.
     if (is_string($controller) && function_exists($controller)) {
       $new_controller = function() use ($router_item) {
         return call_user_func_array($router_item['page_callback'], $router_item['page_arguments']);
diff --git a/core/lib/Drupal/Core/EventSubscriber/LegacyRequestSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/LegacyRequestSubscriber.php
index 12ca8b6..2620c07 100644
--- a/core/lib/Drupal/Core/EventSubscriber/LegacyRequestSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/LegacyRequestSubscriber.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- *
- * Definition of Drupal\Core\EventSubscriber\LegacyRequestSubscriber
+ * Definition of Drupal\Core\EventSubscriber\LegacyRequestSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
@@ -24,7 +23,7 @@ class LegacyRequestSubscriber implements EventSubscriberInterface {
   /**
    * Initializes the rest of the legacy Drupal subsystems.
    *
-   * @param GetResponseEvent $event
+   * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The Event to process.
    */
   public function onKernelRequestLegacy(GetResponseEvent $event) {
diff --git a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
index 8f29b4d..fd0a765 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- *
- * Definition of Drupal\Core\EventSubscriber\PathListenerBase
+ * Definition of Drupal\Core\EventSubscriber\PathListenerBase.
  */
 
 namespace Drupal\Core\EventSubscriber;
@@ -24,7 +23,7 @@ abstract class PathListenerBase {
     $request->attributes->set('system_path', $path);
 
     // @todo Remove this line once code has been refactored to use the request
-    // object directly.
+    //   object directly.
     _current_path($path);
   }
 }
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
index f1a96f7..86eb30d 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\EventSubscriber\RouterListener;
+ * Definition of Drupal\Core\EventSubscriber\RouterListener.
  */
 
 namespace Drupal\Core\EventSubscriber;
@@ -50,11 +50,11 @@ class RouterListener extends SymfonyRouterListener {
     }
 
     if ($request->attributes->has('_controller')) {
-      // routing is already done
+      // Routing is already done.
       return;
     }
 
-    // add attributes based on the path info (routing)
+    // Add attributes based on the path info (routing).
     try {
       $parameters = $this->urlMatcher->match($request->attributes->get('system_path'));
 
diff --git a/core/lib/Drupal/Core/ExceptionController.php b/core/lib/Drupal/Core/ExceptionController.php
index 021af0a..895a605 100644
--- a/core/lib/Drupal/Core/ExceptionController.php
+++ b/core/lib/Drupal/Core/ExceptionController.php
@@ -115,8 +115,8 @@ class ExceptionController {
       //   reset that are not triggering test failures right now.  If found,
       //   add them here.
       // @todo Refactor the breadcrumb system so that it does not rely on static
-      // variables in the first place, which will eliminate the need for this
-      // hack.
+      //   variables in the first place, which will eliminate the need for this
+      //   hack.
       drupal_static_reset('menu_set_active_trail');
       menu_reset_static_cache();
 
@@ -178,8 +178,8 @@ class ExceptionController {
       //   reset that are not triggering test failures right now.  If found,
       //   add them here.
       // @todo Refactor the breadcrumb system so that it does not rely on static
-      // variables in the first place, which will eliminate the need for this
-      // hack.
+      //   variables in the first place, which will eliminate the need for this
+      //   hack.
       drupal_static_reset('menu_set_active_trail');
       menu_reset_static_cache();
 
@@ -205,7 +205,7 @@ class ExceptionController {
   /**
    * Processes a generic exception into an HTTP 500 response.
    *
-   * @param FlattenException $exception
+   * @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
    *   Metadata about the exception that was thrown.
    * @param Symfony\Component\HttpFoundation\Request $request
    *   The request object that triggered this exception.
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 1b4abc9..b6e1dd1 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -44,7 +44,8 @@ abstract class LocalStream implements StreamWrapperInterface {
 
   /**
    * Gets the path that the wrapper is responsible for.
-   * @todo: Review this method name in D8 per http://drupal.org/node/701358
+   *
+   * @todo Review this method name in D8 per http://drupal.org/node/701358.
    *
    * @return string
    *   String specifying the path.
diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php
index ad2213a..2f33927e 100644
--- a/core/lib/Drupal/Core/Updater/Updater.php
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -213,7 +213,7 @@ class Updater {
       $this->makeWorldReadable($filetransfer, $args['install_dir'] . '/' . $this->name);
 
       // Run the updates.
-      // @todo: decide if we want to implement this.
+      // @todo Decide if we want to implement this.
       $this->postUpdate();
 
       // For now, just return a list of links of things to do.