diff --git a/src/Plugin/Block/EntityField.php b/src/Plugin/Block/EntityField.php
index 82954f3..388fe4a 100644
--- a/src/Plugin/Block/EntityField.php
+++ b/src/Plugin/Block/EntityField.php
@@ -21,7 +21,7 @@ use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Provides a block to view a specific entity.
+ * Provides a block to a field on an entity.
  *
  * @Block(
  *   id = "entity_field",
@@ -38,7 +38,7 @@ class EntityField extends BlockBase implements ContextAwarePluginInterface, Cont
   protected $entityManager;
 
   /**
-   * The formatter manager.
+   * The field type manager.
    *
    * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
    */
@@ -97,7 +97,7 @@ class EntityField extends BlockBase implements ContextAwarePluginInterface, Cont
     $this->formatterManager = $formatter_manager;
 
     // Get the entity type and field name from the plugin id.
-    list ($plugin_base_id, $entity_type_id, $field_name) = explode(':', $plugin_id);
+    list (, $entity_type_id, $field_name) = explode(':', $plugin_id);
     $this->entityTypeId = $entity_type_id;
     $this->fieldName = $field_name;
 
diff --git a/src/Plugin/Deriver/EntityFieldDeriver.php b/src/Plugin/Deriver/EntityFieldDeriver.php
index 4e6d59f..cc59f8e 100644
--- a/src/Plugin/Deriver/EntityFieldDeriver.php
+++ b/src/Plugin/Deriver/EntityFieldDeriver.php
@@ -10,7 +10,7 @@ namespace Drupal\ctools\Plugin\Deriver;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 
 /**
- * Provides entity view block definitions for each entity type.
+ * Provides entity field block definitions for every field.
  */
 class EntityFieldDeriver extends EntityDeriverBase {