diff --git a/core/lib/Drupal/Core/Mail/MailInterface.php b/core/lib/Drupal/Core/Mail/MailInterface.php
index 848796c..62a6319 100644
--- a/core/lib/Drupal/Core/Mail/MailInterface.php
+++ b/core/lib/Drupal/Core/Mail/MailInterface.php
@@ -17,10 +17,10 @@
    *
    * Allows to preprocess, format, and postprocess a mail message before it is
    * passed to the sending system. By default, all messages may contain HTML and
-   * are converted to plain-text by the Drupal\Core\Mail\Plugin\Mail\PhpMail implementation.
-   * For example, an alternative implementation could override the default
-   * implementation and additionally sanitize the HTML for usage in a
-   * MIME-encoded e-mail, but still invoking the Drupal\Core\Mail\Plugin\Mail\PhpMail
+   * are converted to plain-text by the Drupal\Core\Mail\Plugin\Mail\PhpMail
+   * implementation. For example, an alternative implementation could override
+   * the default implementation and also sanitize the HTML for usage in a MIME-
+   * encoded email, but still invoking the Drupal\Core\Mail\Plugin\Mail\PhpMail
    * implementation to generate an alternate plain-text version for sending.
    *
    * @param array $message
diff --git a/core/lib/Drupal/Core/Mail/MailManager.php b/core/lib/Drupal/Core/Mail/MailManager.php
index a6f3b97..d0d3dd9 100644
--- a/core/lib/Drupal/Core/Mail/MailManager.php
+++ b/core/lib/Drupal/Core/Mail/MailManager.php
@@ -55,17 +55,14 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
   }
 
   /**
-   * Returns the mail plugin for a given message id.
-   *
-   * Allows for one or more custom mail backends to format and send mail messages
-   * composed using drupal_mail().
+   * Returns the mail plugin to use for a given message id.
    *
    * The selection of a particular implementation is controlled via the config
    * 'system.mail.interface', which is a keyed array.  The default
    * implementation is the mail plugin whose id is the value of 'default' key. A
    * more specific match first to key and then to module will be used in
    * preference to the default. To specify a different plugin for all mail sent
-   * by one module, set the plugin name as the value for the key corresponding to
+   * by one module, set the plugin id as the value for the key corresponding to
    * the module name. To specify a plugin for a particular message sent by one
    * module, set the plugin id as the value for the array key that is the
    * message id, which is "${module}_${key}".
diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index 71986e1..b6c030a 100644
--- a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Mail\Plugin\Mail;
 
-use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Mail\MailInterface;
 
 /**
diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
index 47ac6e6..46c7a24 100644
--- a/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
+++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Mail\Plugin\Mail;
 
-use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Mail\MailInterface;
 
 /**
@@ -19,7 +18,7 @@
  * @Plugin(
  *   id = "TestMailCollector",
  *   label = @Translation("Mail Collector"),
- *   description = @Translation("Does not send the message, but stores it in Drupal within the state system. Used for development and testing.")
+ *   description = @Translation("Does not send the message, but stores it in Drupal within the state system. Used for testing.")
  * )
  */
 class TestMailCollector extends PhpMail implements MailInterface {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
index e84bca3..1687c8a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
@@ -48,7 +48,8 @@ public function testPluggableFramework() {
     // Get the default MailInterface class instance.
     $mail_backend = drupal_mail_system('default', 'default');
 
-    // Assert whether the default mail backend is an instance of the expected class.
+    // Assert whether the default mail backend is an instance of the expected
+    // class.
     $this->assertTrue($mail_backend instanceof \Drupal\system_mail_failure_test\Plugin\Mail\TestPhpMailFailure, 'Pluggable mail system is extendable.');
   }
 
@@ -89,8 +90,8 @@ public function testFromAndReplyToHeader() {
     $from_email = 'Drupal <simpletest@example.com>';
     $reply_email = 'someone_else@example.com';
     drupal_mail('simpletest', 'from_test', 'from_test@example.com', $language, array(), $reply_email);
-    // Test that the reply-to e-mail is just the e-mail and not the site name and
-    // default sender e-mail.
+    // Test that the reply-to e-mail is just the e-mail and not the site name
+    // and default sender e-mail.
     $captured_emails = \Drupal::state()->get('system.test_mail_collector');
     $sent_message = end($captured_emails);
     $this->assertEqual($from_email, $sent_message['headers']['From'], 'Message is sent from the site email account.');
diff --git a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/Plugin/Mail/TestPhpMailFailure.php b/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/Plugin/Mail/TestPhpMailFailure.php
index a10d39c..88f909d 100644
--- a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/Plugin/Mail/TestPhpMailFailure.php
+++ b/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/Plugin/Mail/TestPhpMailFailure.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\system_mail_failure_test\Plugin\Mail;
 
-use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Mail\Plugin\Mail\PhpMail;
 use Drupal\Core\Mail\MailInterface;
 
@@ -30,9 +29,10 @@ class TestPhpMailFailure extends PhpMail implements MailInterface {
 
   /**
    * Overrides Drupal\Core\Mail\Plugin\Mail\PhpMail::mail().
+   *
+   * Intentionally fails to send the message.
    */
   public function mail(array $message) {
-    // Instead of attempting to send a message, just return failure.
     return FALSE;
   }
 }
