diff --git a/core/modules/aggregator/aggregator.api.php b/core/modules/aggregator/aggregator.api.php
index 8387445..632b3af 100644
--- a/core/modules/aggregator/aggregator.api.php
+++ b/core/modules/aggregator/aggregator.api.php
@@ -154,10 +154,6 @@ function hook_aggregator_process($feed) {
  * If this hook is not implemented aggregator will use your module's file name
  * as title and there will be no description.
  *
- * @param object $feed
- *   The feed object that the title and short description of the processor
- *   describes.
- *
  * @return
  *   An associative array defining a title and a description string.
  *
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index a479bd6..c2c7e26 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -739,7 +739,7 @@ function theme_aggregator_block_item($variables) {
 }
 
 /**
- * Renders safely HTML content, as allowed.
+ * Renders the HTML content safely, as allowed.
  *
  * @param $value
  *   The content to be filtered.
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 71d56b9..84a0386 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -9,7 +9,7 @@
  * Page callback: Displays the most recent items gathered from any feed.
  *
  * @return string
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  *
  * @see aggregator_menu()
  */
@@ -22,13 +22,13 @@ function aggregator_page_last() {
 }
 
 /**
- * Page callback: Displays all the items captured from a particular feed.
+ * Page callback: Displays all the items captured from the particular feed.
  *
  * @param $feed
  *   The feed for which to display all items.
  *
  * @return string
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  *
  * @see aggregator_menu()
  */
@@ -50,7 +50,7 @@ function aggregator_page_source($feed) {
  *   The feed for which to list all the aggregated items.
  *
  * @return string
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  *
  * @see aggregator_menu()
  * @see aggregator_page_source()
@@ -68,7 +68,7 @@ function aggregator_page_source_form($form, $form_state, $feed) {
  *   The category for which to list all the aggregated items.
  *
  * @return string
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  *
  * @see aggregator_menu()
  *
@@ -91,7 +91,7 @@ function aggregator_page_category($category) {
  *   The category for which to list all the aggregated items.
  *
  * @return string
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  *
  * @see aggregator_menu()
  * @see aggregator_page_category()
@@ -180,7 +180,7 @@ function aggregator_load_feed_items($type, $data = NULL) {
  *   The feed source URL.
  *
  * @return
- *   The rendered list of items for a feed.
+ *   The rendered list of items for the feed.
  */
 function _aggregator_page_list($items, $op, $feed_source = '') {
   if (user_access('administer news feeds') && ($op == 'categorize')) {
@@ -452,7 +452,7 @@ function aggregator_page_rss() {
 }
 
 /**
- * Prints the RSS page for a feed.
+ * Prints the RSS page for the feed.
  *
  * @param $variables
  *   An associative array containing:
@@ -522,9 +522,9 @@ function aggregator_page_opml($cid = NULL) {
 }
 
 /**
- * Prints the OPML page for a feed.
+ * Prints the OPML page for the feed.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - feeds: An array of the feeds to theme.
  *
diff --git a/core/modules/aggregator/aggregator.parser.inc b/core/modules/aggregator/aggregator.parser.inc
index a972932..e1491f3 100644
--- a/core/modules/aggregator/aggregator.parser.inc
+++ b/core/modules/aggregator/aggregator.parser.inc
@@ -168,13 +168,6 @@ function aggregator_parse_feed(&$data, $feed) {
  * Performs an action when an opening tag is encountered.
  *
  * Callback function used by xml_parse() within aggregator_parse_feed().
- *
- * @param mixed $parser
- *   The variable is not used in this function, but is included for consistency.
- * @param string $name
- *   The name of the opening tag.
- * @param array $attributes
- *   The link attributes.
  */
 function aggregator_element_start($parser, $name, $attributes) {
   global $item, $element, $tag, $items, $channel;
@@ -225,11 +218,6 @@ function aggregator_element_start($parser, $name, $attributes) {
  * Performs an action when a closing tag is encountered.
  *
  * Callback function used by xml_parse() within aggregator_parse_feed().
- *
- * @param mixed $parser
- *   The variable is not used in this function, but is included for consistency.
- * @param string $name
- *   The name of the closing tag.
  */
 function aggregator_element_end($parser, $name) {
   global $element;
@@ -255,10 +243,6 @@ function aggregator_element_end($parser, $name) {
  *
  * Callback function used by xml_parse() within aggregator_parse_feed().
  *
- * @param mixed $parser
- *   The variable is not used in this function, but is included for consistency.
- * @param mixed $data
- *   The data portion of a tag.
  */
 function aggregator_element_data($parser, $data) {
   global $channel, $element, $items, $item, $image, $tag;
diff --git a/core/modules/aggregator/aggregator.theme-rtl.css b/core/modules/aggregator/aggregator.theme-rtl.css
index bf6d228..3efccd0 100644
--- a/core/modules/aggregator/aggregator.theme-rtl.css
+++ b/core/modules/aggregator/aggregator.theme-rtl.css
@@ -1,5 +1,5 @@
 /**
- * Right-to-Left styles for theme in aggregator module.
+ * Right-to-Left styles for theme in Aggregator module.
  */
 
 .aggregator .feed-icon {
diff --git a/core/modules/aggregator/aggregator.theme.css b/core/modules/aggregator/aggregator.theme.css
index 4593645..7943913 100644
--- a/core/modules/aggregator/aggregator.theme.css
+++ b/core/modules/aggregator/aggregator.theme.css
@@ -1,5 +1,5 @@
 /**
- * Styles for theme in aggregator module.
+ * Styles for theme in Aggregator module.
  */
 
 .aggregator .feed-icon {
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
index aac1040..bbe883c 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -14,7 +14,7 @@
 /**
  * Defines a default fetcher implementation.
  *
- * This class uses drupal_http_request() to download the feed.
+ * Uses drupal_http_request() to download the feed.
  *
  * @Plugin(
  *   id = "aggregator",
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php
index 8e21c55..079c3dc 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests aggregator feed adding.
+ * Tests Aggregator feed adding.
  */
 class AddFeedTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
index 98c7d25..4aec917 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests aggregator configuration settings.
+ * Tests the configuration settings functionality in the Aggregator module.
  */
 class AggregatorConfigurationTest extends AggregatorTestBase {
 
@@ -38,4 +38,5 @@ function testSettingsPage() {
       $this->assertFieldByName($name, $value, format_string('"@name" has correct default value.', array('@name' => $name)));
     }
   }
+
 }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php
index 2dba4bb..750ddd7 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests cron process functionality in aggregator module.
+ * Tests cron process functionality in Aggregator module.
  */
 class AggregatorCronTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
index a237700..9397e93 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests rendering functionality in aggregator module.
+ * Tests rendering functionality in Aggregator module.
  */
 class AggregatorRenderingTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
index eec5ff0..340c93e 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Defines a base class for testing the aggregator module.
+ * Defines a base class for testing the Aggregator module.
  */
 abstract class AggregatorTestBase extends WebTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php
index 7b8a1de..371b28b 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests categorization functionality in aggregator module.
+ * Tests categorization functionality in Aggregator module.
  */
 class CategorizeFeedItemTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php
index 4c6fad8..c6f0b23 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests categorize feed functionality in aggregator module.
+ * Tests categorize feed functionality in Aggregator module.
  */
 class CategorizeFeedTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php
index 9ff4088..66c38e8 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests for feed parsing.
+ * Tests for feed parsing in the Aggregator module.
  */
 class FeedParserTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
index 2989498..5ec0cf0 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests importing feeds from OPML functionality for aggregator module.
+ * Tests importing feeds from OPML functionality for Aggregator module.
  */
 class ImportOpmlTest extends AggregatorTestBase {
 
@@ -129,7 +129,7 @@ function submitImportForm() {
   }
 
   /**
-   * Tests the import of an Opml feed.
+   * Tests the import of an OPML feed.
    */
   function testOpmlImport() {
     $this->openImportForm();
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php
index 44530db..092a098 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests removing a feed item functionality.
+ * Tests removing a feed item functionality in the Aggregator module.
  */
 class RemoveFeedItemTest extends AggregatorTestBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php
index 983ec57..8932e67 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php
@@ -7,7 +7,11 @@
 
 namespace Drupal\aggregator\Tests;
 
+/**
+ * Test the removal of a feed functionality in the Aggregator module.
+ */
 class RemoveFeedTest extends AggregatorTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Remove feed functionality',
@@ -17,7 +21,7 @@ public static function getInfo() {
   }
 
   /**
-   * Remove a feed and ensure that all it services are removed.
+   * Removes a feed and ensures that all of its services are removed.
    */
   function testRemoveFeed() {
     $feed = $this->createFeed();
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php
index 9087913..3115725 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php
@@ -8,9 +8,10 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests updating a feed item functionality.
+ * Tests updating a feed item functionality in the Aggregator module.
  */
 class UpdateFeedItemTest extends AggregatorTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Update feed item functionality',
@@ -68,4 +69,5 @@ function testUpdateFeedItem() {
     $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
     $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (!before === !after)', array('!before' => $before, '!after' => $after)));
   }
+
 }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php
index cf5e60d..9fc512c 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 /**
- * Tests updating the feed functionality.
+ * Tests updating the feed functionality in the Aggregator module.
  */
 class UpdateFeedTest extends AggregatorTestBase {
 
@@ -51,4 +51,5 @@ function testUpdateFeed() {
       $this->deleteFeed($feed);
     }
   }
+
 }