diff --git a/core/modules/image/src/ImageStyleStorageInterface.php b/core/modules/image/src/ImageStyleStorageInterface.php
index dee8c8a..518d95c 100644
--- a/core/modules/image/src/ImageStyleStorageInterface.php
+++ b/core/modules/image/src/ImageStyleStorageInterface.php
@@ -10,7 +10,7 @@
 interface ImageStyleStorageInterface {
 
   /**
-   * Stores a replacement when deleting an image style.
+   * Stores a replacement ID for an image style being deleted.
    *
    * The method stores a replacement style to be used by the configuration
    * dependency system when a image style is deleted. The replacement style is
@@ -18,15 +18,14 @@
    * formatters) that are depending on the image style being deleted.
    *
    * @param string $name
-   *   The ID of the image style to be replaced.
-   * @param string|null $replacement
-   *   The ID of the image style used as replacement or NULL, if no replacement
-   *   has been chosen.
+   *   The ID of the image style to be deleted.
+   * @param string $replacement
+   *   The ID of the image style used as replacement.
    */
   public function setReplacementId($name, $replacement);
 
   /**
-   * Retrieves the replacement of a deleted image style.
+   * Retrieves the replacement ID of a deleted image style.
    *
    * The method is retrieving the value stored by ::setReplacementId().
    *
@@ -34,10 +33,10 @@ public function setReplacementId($name, $replacement);
    *   The ID of the image style to be replaced.
    *
    * @return string|null
-   *   The ID of the image style used as replacement, if there's any or NULL.
+   *   The ID of the image style used as replacement, if there's any, or NULL.
    *
-   * @see \Drupal\image\ImageStyleStorageInatreface::setReplacementId().
+   * @see \Drupal\image\ImageStyleStorageInterface::setReplacementId().
    */
   public function getReplacementId($name);
 
-}
\ No newline at end of file
+}
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index e651810..0d3100f 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -245,16 +245,14 @@ public function calculateDependencies() {
    */
   public function onDependencyRemoval(array $dependencies) {
     $changed = parent::onDependencyRemoval($dependencies);
-    /** @var \Drupal\image\ImageStyleInterface $style */
     $name = $this->getSetting('image_style');
+    /** @var \Drupal\image\ImageStyleInterface $style */
     if ($name && $style = ImageStyle::load($name)) {
-      /** @var \Drupal\image\ImageStyleInterface $removed_style */
       if (!empty($dependencies[$style->getConfigDependencyKey()][$style->getConfigDependencyName()])) {
         /** @var \Drupal\image\ImageStyleStorageInterface $storage */
         $storage = \Drupal::entityManager()->getStorage($style->getEntityTypeId());
         if ($replacement_id = $storage->getReplacementId($name)) {
-          /** @var \Drupal\image\ImageStyleInterface $replacement */
-          if ($replacement = ImageStyle::load($replacement_id)) {
+          if (ImageStyle::load($replacement_id)) {
             $this->setSetting('image_style', $replacement_id);
             $changed = TRUE;
           }
diff --git a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
index 2adf64f..60b5611 100644
--- a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
+++ b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
@@ -292,16 +292,14 @@ public function calculateDependencies() {
    */
   public function onDependencyRemoval(array $dependencies) {
     $changed = parent::onDependencyRemoval($dependencies);
-    /** @var \Drupal\image\ImageStyleInterface $style */
     $name = $this->getSetting('preview_image_style');
+    /** @var \Drupal\image\ImageStyleInterface $style */
     if ($name && $style = ImageStyle::load($name)) {
-      /** @var \Drupal\image\ImageStyleInterface $removed_style */
       if (!empty($dependencies[$style->getConfigDependencyKey()][$style->getConfigDependencyName()])) {
         /** @var \Drupal\image\ImageStyleStorageInterface $storage */
         $storage = \Drupal::entityManager()->getStorage($style->getEntityTypeId());
         if ($replacement_id = $storage->getReplacementId($name)) {
-         /** @var \Drupal\image\ImageStyleInterface $replacement */
-          if ($replacement = ImageStyle::load($replacement_id)) {
+          if (ImageStyle::load($replacement_id)) {
             $this->setSetting('preview_image_style', $replacement_id);
             $changed = TRUE;
           }