diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
index 9d94e94..576495e 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
@@ -18,7 +18,7 @@
 class CategoriesAccessCheck implements AccessCheckInterface {
 
   /**
-   * Database Service Object.
+   * The database connection.
    *
    * @var \Drupal\Core\Database\Connection
    */
@@ -26,6 +26,9 @@ class CategoriesAccessCheck implements AccessCheckInterface {
 
   /**
    * Constructs a CategoriesAccessCheck object.
+   *
+   * @param \Drupal\Core\Database\Connection
+   *   The database connection.
    */
   public function __construct(Connection $database) {
     $this->database = $database;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
index 74c03fe..7f0ac4b 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
@@ -90,7 +90,7 @@ public function feedAdd() {
    */
   public function categories() {
 
-    // TODO move included functions to controller.
+    // @todo remove this once all controller conversions are complete.
     module_load_include('inc', 'aggregator', 'aggregator.pages');
 
     $result = $this->database->query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');