diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index b966f3e..29fef78 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -64,14 +64,14 @@ class Token {
    * @see self::getInfo()
    * @see self::resetInfo()
    */
-  protected $tokenInfo = NULL;
+  protected $tokenInfo;
 
   /**
    * The module handler service.
    *
    * @var \Drupal\Core\Extension\ModuleHandlerInterface
    */
-  protected $moduleHandler = NULL;
+  protected $moduleHandler;
 
   /**
    * Constructor.
@@ -294,8 +294,6 @@ public function getInfo() {
    *   Token metadata that has an identical structure to the return value of
    *   hook_token_info().
    *
-   * @return NULL
-   *
    * @see hook_token_info()
    */
   public function setInfo(array $tokens) {
@@ -304,8 +302,6 @@ public function setInfo(array $tokens) {
 
   /**
    * Resets metadata describing supported tokens.
-   *
-   * @return NULL
    */
   public function resetInfo() {
     $this->tokenInfo = NULL;