diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
index 879e748..3457acb 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
@@ -81,7 +81,7 @@ protected function loadFieldItems(array $entities, $age) {
 
       // Build cache data.
       // @todo: Improve this logic to avoid instantiating field objects once
-      //   the field logic is improved to not do that anyway.
+      // the field logic is improved to not do that anyway.
       if ($use_cache) {
         foreach ($queried_entities as $id => $entity) {
           $data = array();
@@ -90,8 +90,8 @@ protected function loadFieldItems(array $entities, $age) {
             foreach ($translation as $field_name => $items) {
               if ($items instanceof ConfigFieldItemListInterface && !$items->isEmpty()) {
                 foreach ($items as $delta => $item) {
-                  // If the field item needs to be prepare the cache data, call
-                  // the corresponding method, otherwise use the values as cache
+                  // If the field item needs to prepare the cache data, call the
+                  // corresponding method, otherwise use the values as cache
                   // data.
                   if ($item instanceof PrepareCacheInterface) {
                     $data[$langcode][$field_name][$delta] = $item->getCacheData();
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php
index a069fff..c2403c59 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php
@@ -71,7 +71,7 @@ public function isEmpty() {
    * {@inheritdoc}
    */
   public function getCacheData() {
-    $values = $this->getValue();
+    $data = $this->getValue();
     // Where possible, generate the processed (sanitized) version of each
     // textual property (e.g., 'value', 'summary') within this field item early
     // so that it is cached in the field cache. This avoids the need to look up
@@ -80,11 +80,11 @@ public function getCacheData() {
     if (!$text_processing || filter_format_allowcache($this->get('format')->getValue())) {
       foreach ($this->getPropertyDefinitions() as $property => $definition) {
         if (isset($definition['class']) && ($definition['class'] == '\Drupal\text\TextProcessed')) {
-          $values[$property] = $this->get($property)->getValue();
+          $data[$property] = $this->get($property)->getValue();
         }
       }
     }
-    return $values;
+    return $data;
   }
 
   /**