diff --git a/src/Controller/RevisionControllerTrait.php b/src/Controller/RevisionControllerTrait.php
index f640b859dbfc2354caa10a082c0e1a45dec90524..e62384777098db3348d0c1f837fc863ef274f655 100644
--- a/src/Controller/RevisionControllerTrait.php
+++ b/src/Controller/RevisionControllerTrait.php
@@ -17,11 +17,15 @@ use Drupal\Core\Entity\EntityInterface;
 trait RevisionControllerTrait {
 
   /**
+   * Returns the entity type manager.
+   *
    * @return \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   abstract protected function entityTypeManager();
 
   /**
+   * Returns the langauge manager.
+   *
    * @return \Drupal\Core\Language\LanguageManagerInterface
    */
   public abstract function languageManager();
@@ -54,9 +58,8 @@ trait RevisionControllerTrait {
    * @param \Drupal\Core\Entity\EntityInterface $entity_revision
    *   The entity to build a revert revision link for.
    *
-   * @return array A link render array.
-   * A link render array.
-   * @internal param int $revision_id The revision ID of the revert link.*   The revision ID of the revert link.
+   * @return array
+   *   A link render array.
    *
    */
   abstract protected function buildRevertRevisionLink(EntityInterface $entity_revision);
@@ -67,10 +70,8 @@ trait RevisionControllerTrait {
    * @param \Drupal\Core\Entity\EntityInterface $entity_revision
    *   The entity to build a delete revision link for.
    *
-   * @return array A link render array.
-   * A link render array.
-   * @internal param int $revision_id The revision ID of the delete link.*   The revision ID of the delete link.
-   *
+   * @return array
+   *   A link render array.
    */
   abstract protected function buildDeleteRevisionLink(EntityInterface $entity_revision);
 
@@ -81,6 +82,7 @@ trait RevisionControllerTrait {
    *   non-current revision, it also provides a link to view that revision.
    *
    * @param \Drupal\Core\Entity\ContentEntityInterface $revision
+   *   The entity revision.
    * @param bool $is_current
    *   TRUE if the revision is the current revision.
    *
@@ -90,9 +92,12 @@ trait RevisionControllerTrait {
   abstract protected function getRevisionDescription(ContentEntityInterface $revision, $is_current = FALSE);
 
   /**
+   * Loads all revision IDs of an entity sorted by revision ID descending.
+   *
    * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity.
    *
-   * @return array
+   * @return mixed[]
    */
   protected function revisionIds(ContentEntityInterface $entity) {
     $entity_type = $entity->getEntityTypeId();
@@ -111,13 +116,12 @@ trait RevisionControllerTrait {
    *   An entity object.
    *
    * @return array
-   *   An array as expected by drupal_render().
+   *   A render array.
    */
   protected function revisionOverview(ContentEntityInterface $entity) {
     $langcode = $this->languageManager()
       ->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)
       ->getId();
-    /** @var \Drupal\content_entity_base\Entity\Storage\RevisionableStorageInterface $entity_storage */
     $entity_storage = $this->entityTypeManager()
       ->getStorage($entity->getEntityTypeId());
 
@@ -181,13 +185,11 @@ trait RevisionControllerTrait {
    */
   protected function getOperationLinks(EntityInterface $entity_revision) {
     $links = [];
-    $revert_permission = $this->hasRevertRevisionAccess($entity_revision);
-    $delete_permission = $this->hasDeleteRevisionAccess($entity_revision);
-    if ($revert_permission) {
+    if ($this->hasRevertRevisionAccess($entity_revision)) {
       $links['revert'] = $this->buildRevertRevisionLink($entity_revision);
     }
 
-    if ($delete_permission) {
+    if ($this->hasDeleteRevisionAccess($entity_revision)) {
       $links['delete'] = $this->buildDeleteRevisionLink($entity_revision);
     }
 
diff --git a/src/Controller/RevisionOverviewController.php b/src/Controller/RevisionOverviewController.php
index bba961598e575686c36930cf0fad3988a0875777..5629c5af8e0d8e6a46b330ec64107da63c304abe 100644
--- a/src/Controller/RevisionOverviewController.php
+++ b/src/Controller/RevisionOverviewController.php
@@ -18,6 +18,13 @@ use Drupal\entity\Revision\EntityRevisionLogInterface;
 use Drupal\user\EntityOwnerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * Provides a controller which shows the revision history.
+ *
+ * This controller leverages the revision controller trait, which is agnostic to
+ * any entity type, by using the new interface
+ * \Drupal\entity\Revision\EntityRevisionLogInterface.
+ */
 class RevisionOverviewController extends ControllerBase {
 
   use RevisionControllerTrait;
@@ -77,6 +84,15 @@ class RevisionOverviewController extends ControllerBase {
     }
   }
 
+  /**
+   * Generates an overview table of older revisions of an entity.
+   *
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The route match.
+   *
+   * @return array
+   *   A render array.
+   */
   public function revisionOverviewController(RouteMatchInterface $route_match) {
     return $this->revisionOverview($route_match->getParameter($route_match->getRouteObject()->getOption('entity_type_id')));
   }
@@ -87,23 +103,20 @@ class RevisionOverviewController extends ControllerBase {
   protected function getRevisionDescription(ContentEntityInterface $revision, $is_default = FALSE) {
     /** @var \Drupal\Core\Entity\ContentEntityInterface|\Drupal\user\EntityOwnerInterface|\Drupal\entity\Revision\EntityRevisionLogInterface $revision */
 
-    if ($revision instanceof EntityOwnerInterface) {
-      $username = [
-        '#theme' => 'username',
-        '#account' => $revision->getOwner(),
-      ];
-    }
-    else {
-      $username = '';
-    }
-
     if ($revision instanceof EntityRevisionLogInterface) {
       // Use revision link to link to revisions that are not active.
       $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
       $link = $revision->toLink($date, 'revision');
+
+      $username = [
+        '#theme' => 'username',
+        '#account' => $revision->getRevisionUser(),
+      ];
     }
     else {
       $link = $revision->toLink($revision->label(), 'revision');
+      $username = '';
+
     }
 
     $markup = '';
diff --git a/src/Routing/RevisionRouteProvider.php b/src/Routing/RevisionRouteProvider.php
index ca58c920a90597183bbeca8a37b70e7c0f8e476a..33d2766f9d3af38c54c6abe78705b7b7dad3a9cf 100644
--- a/src/Routing/RevisionRouteProvider.php
+++ b/src/Routing/RevisionRouteProvider.php
@@ -118,9 +118,7 @@ class RevisionRouteProvider implements EntityRouteProviderInterface {
         '_controller' => '\Drupal\entity\Controller\RevisionOverviewController::revisionOverviewController',
         '_title' => 'Revisions',
       ]);
-      $route->addRequirements([
-        '_entity_access_revision' => "$entity_type_id.list",
-      ]);
+      $route->setRequirement('_entity_access_revision', "$entity_type_id.list");
       $route->setOption('entity_type_id', $entity_type->id());
       $route->setOption('parameters', [
         $entity_type->id() => [
diff --git a/tests/src/Kernel/RevisionBasicUITest.php b/tests/src/Kernel/RevisionBasicUITest.php
index dfde91102301fe10dfdcf53487cda2d60f05f0de..fc5dab071da6d8fde46e3472ecc02c48169fec4f 100644
--- a/tests/src/Kernel/RevisionBasicUITest.php
+++ b/tests/src/Kernel/RevisionBasicUITest.php
@@ -43,6 +43,9 @@ class RevisionBasicUITest extends KernelTestBase {
     \Drupal::service('router.builder')->rebuild();
   }
 
+  /**
+   * Tests the revision history controller.
+   */
   public function testRevisionHistory() {
     $entity = EnhancedEntity::create([
       'name' => 'rev 1',