diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index d9d7bee..4a09e40 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -384,7 +384,7 @@ public function onEntityTypeDelete(EntityTypeInterface $entity_type) {
     // Delete storage definitions for the deleted entity.
     foreach (array_keys($schema) as $storage_definition_name) {
       $entity_type_id = substr($storage_definition_name, 0, strpos($storage_definition_name, '.'));
-      if($entity_type_id == $entity_type->id()) {
+      if ($entity_type_id == $entity_type->id()) {
         $this->installedStorageSchema()->delete($storage_definition_name);
       }
     }
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
index 46245f5..c52b09e 100644
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
@@ -146,12 +146,12 @@ public function testCleanUpStorageDefinition() {
     // Find all the entity types provided by the entity_test module and install
     // the schema for them.
 
-    $entity_type_ids =[];
+    $entity_type_ids = [];
     $entities = \Drupal::entityManager()->getDefinitions();
-    foreach ($entities as $name => $definition) {
+    foreach ($entities as $entity_type_id => $definition) {
       if ($definition->getProvider() == 'entity_test') {
-        $this->installEntitySchema($name);
-        $entity_type_ids[] = $name;
+        $this->installEntitySchema($entity_type_id);
+        $entity_type_ids[] = $entity_type_id;
       };
     }
 
@@ -162,19 +162,19 @@ public function testCleanUpStorageDefinition() {
     $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
     $schema = $key_value_store->getAll();
 
-    $item_count = 0;
+    $entity_type_id_count = 0;
 
     // Count the storage definitions that come from entity types provided by
     // the entity_test module.
     foreach (array_keys($schema) as $storage_definition_name) {
-      $entity_item = substr($storage_definition_name, 0, strpos($storage_definition_name, '.'));
-      if (in_array($entity_item, $entity_type_ids)) {
-        $item_count++;
+      $entity_type_id = substr($storage_definition_name, 0, strpos($storage_definition_name, '.'));
+      if (in_array($entity_type_id, $entity_type_ids)) {
+        $entity_type_id_count++;
       }
     }
 
     // Ensure that all storage definitions have been removed from the schema.
-    $this->assertEqual($item_count, 0, 'After uninstalling entity_test module the schema still contains fields from entities provided by this module.');
+    $this->assertEqual($entity_type_id_count, 0, 'After uninstalling entity_test module the schema should not contains fields from entities provided by the module.');
   }
 
 }