diff --git a/src/Controller/FlagListBuilder.php b/src/Controller/FlagListBuilder.php
index 1d16b62..7b8dcaf 100644
--- a/src/Controller/FlagListBuilder.php
+++ b/src/Controller/FlagListBuilder.php
@@ -17,7 +17,7 @@ use Drupal\Core\Url;
 class FlagListBuilder extends ConfigEntityListBuilder {
 
   /**
-   * Overrides Drupal\Core\Entity\EntityListController::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $header['label'] = t('Flag');
@@ -61,7 +61,7 @@ class FlagListBuilder extends ConfigEntityListBuilder {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityListController::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
 
@@ -77,10 +77,9 @@ class FlagListBuilder extends ConfigEntityListBuilder {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityListController::render().
-   *
-   * We override the render() method to add helpful text below the entity list.
+   * {@inheritdoc}
    */
+  // We override the render() method to add helpful text below the entity list.
   public function render() {
     $build['table'] = parent::render();
 
diff --git a/src/Entity/Flag.php b/src/Entity/Flag.php
index 8de581b..24f9550 100644
--- a/src/Entity/Flag.php
+++ b/src/Entity/Flag.php
@@ -217,7 +217,7 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
   public $weight = 0;
 
   /**
-   * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::__construct().
+   * {@inheritdoc}
    */
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);
diff --git a/src/Form/FlagFormBase.php b/src/Form/FlagFormBase.php
index 5a3666b..08dd67c 100644
--- a/src/Form/FlagFormBase.php
+++ b/src/Form/FlagFormBase.php
@@ -246,7 +246,7 @@ abstract class FlagFormBase extends EntityForm {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::validateForm().
+   * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     parent::validateForm($form, $form_state);
@@ -258,7 +258,7 @@ abstract class FlagFormBase extends EntityForm {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::save().
+   * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
     $flag = $this->entity;
@@ -312,7 +312,7 @@ abstract class FlagFormBase extends EntityForm {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::delete().
+   * {@inheritdoc}
    */
   public function delete(array $form, FormStateInterface $form_state) {
     $form_state->setRedirect('flag_list');