diff --git a/core/modules/field_layout/field_layout.module b/core/modules/field_layout/field_layout.module
index 0ab3305..2514e0d 100644
--- a/core/modules/field_layout/field_layout.module
+++ b/core/modules/field_layout/field_layout.module
@@ -60,7 +60,7 @@ function field_layout_entity_view_display_presave(EntityInterface $entity) {
 }
 
 /**
- * Ensure there is a layout set on a display entity.
+ * Ensures there is a layout set on a display entity.
  *
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity object.
diff --git a/core/modules/field_layout/src/LayoutRepository.php b/core/modules/field_layout/src/LayoutRepository.php
index 02a21c8..6e18755 100644
--- a/core/modules/field_layout/src/LayoutRepository.php
+++ b/core/modules/field_layout/src/LayoutRepository.php
@@ -14,6 +14,13 @@
  */
 class LayoutRepository implements LayoutRepositoryInterface {
 
+  use DiscoveryTrait;
+  use CategorizingPluginManagerTrait {
+    getModuleHandler as protected;
+    getCategories as protected;
+    getSortedDefinitions as protected;
+  }
+
   /**
    * The module handler.
    *
@@ -28,13 +35,6 @@ class LayoutRepository implements LayoutRepositoryInterface {
    */
   protected $themeHandler;
 
-  use DiscoveryTrait;
-  use CategorizingPluginManagerTrait {
-    getModuleHandler as protected;
-    getCategories as protected;
-    getSortedDefinitions as protected;
-  }
-
   /**
    * LayoutRepository constructor.
    *