diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index b7c0391..d3b0210 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -392,9 +392,10 @@ public static function languageManager() {
   }
 
   /**
-   * Retrieves the CRF token manager service.
+   * Returns the CSRF token manager service.
    *
    * @return \Drupal\Core\Access\CsrfTokenManager
+   *   The CSRF token manager.
    */
   public static function csrfToken() {
     return static::$container->get('csrf_token');
diff --git a/core/lib/Drupal/Core/Access/CsrfTokenManager.php b/core/lib/Drupal/Core/Access/CsrfTokenManager.php
index eb7e7f8..efb4575 100644
--- a/core/lib/Drupal/Core/Access/CsrfTokenManager.php
+++ b/core/lib/Drupal/Core/Access/CsrfTokenManager.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains \Drupal\Core\Access\CsrfTokenManager.
@@ -93,11 +94,11 @@ public function createPrivateKey() {
    * Generates a token based on $value, the user session, and the private key.
    *
    * @param string $value
-   *   An additional value to base the token on.
+   *   (optional) An additional value to base the token on.
    *
    * @return string
-   *   A 43-character URL-safe token for validation, based on the user session ID,
-   *   the hash salt provided from drupal_get_hash_salt(), and the
+   *   A 43-character URL-safe token for validation, based on the user session
+   *   ID, the hash salt provided by drupal_get_hash_salt(), and the
    *   'drupal_private_key' configuration variable.
    *
    * @see drupal_get_hash_salt()
@@ -112,9 +113,9 @@ public function getToken($value = '') {
    * @param string $token
    *   The token to be validated.
    * @param string $value
-   *   An additional value to base the token on.
+   *   (optional) An additional value to base the token on.
    * @param bool $skip_anonymous
-   *   Set to TRUE to skip token validation for anonymous users.
+   *   (optional) Set to TRUE to skip token validation for anonymous users.
    *
    * @return bool
    *   TRUE for a valid token, FALSE for an invalid token. When $skip_anonymous
@@ -123,7 +124,7 @@ public function getToken($value = '') {
   public function validateToken($token, $value = '', $skip_anonymous = FALSE) {
     $user = $this->request->attributes->get('account');
 
-    return (($skip_anonymous && $user->id() == 0) || ($token == $this->getToken($value)));
+    return ($skip_anonymous && $user->id() == 0) || ($token == $this->getToken($value));
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfTokenManagerTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfTokenManagerTest.php
index aa03fea..8af8a5e 100644
--- a/core/tests/Drupal/Tests/Core/Access/CsrfTokenManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/CsrfTokenManagerTest.php
@@ -13,7 +13,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
   /**
- * Tests \Drupal\Core\Access\CsrfTokenManager.
+ * Tests the CSRF token manager..
  */
 class CsrfTokenManagerTest extends UnitTestCase {
 
@@ -34,7 +34,6 @@ function setUp() {
     $this->key = $uuid->generate();
 
     $this->state = $this->getMockBuilder('Drupal\Core\KeyValueStore\KeyValueStoreInterface')
-      ->disableOriginalConstructor()
       ->getMock();
 
     $this->manager = new CsrfTokenManager($this->state, new Request());