diff --git a/modules/video_embed_media/src/Plugin/MediaEntity/Type/VideoEmbedField.php b/modules/video_embed_media/src/Plugin/MediaEntity/Type/VideoEmbedField.php
index dab5866..deeae3e 100644
--- a/modules/video_embed_media/src/Plugin/MediaEntity/Type/VideoEmbedField.php
+++ b/modules/video_embed_media/src/Plugin/MediaEntity/Type/VideoEmbedField.php
@@ -46,6 +46,31 @@ class VideoEmbedField extends MediaTypeBase {
   /**
    * {@inheritdoc}
    */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, Config $config, ProviderManagerInterface $provider_manager, Config $media_settings) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $config);
+    $this->providerManager = $provider_manager;
+    $this->mediaSettings = $media_settings;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager'),
+      $container->get('config.factory')->get('media_entity.settings'),
+      $container->get('video_embed_field.provider_manager'),
+      $container->get('config.factory')->get('media_entity.settings')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function thumbnail(MediaInterface $media) {
     if ($provider = $this->loadProvider($media)) {
       $provider->downloadThumbnail();
@@ -198,29 +223,4 @@ class VideoEmbedField extends MediaTypeBase {
     return $this->mediaSettings->get('icon_base') . '/video.png';
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, Config $config, ProviderManagerInterface $provider_manager, Config $media_settings) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $config);
-    $this->providerManager = $provider_manager;
-    $this->mediaSettings = $media_settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager'),
-      $container->get('entity_field.manager'),
-      $container->get('config.factory')->get('media_entity.settings'),
-      $container->get('video_embed_field.provider_manager'),
-      $container->get('config.factory')->get('media_entity.settings')
-    );
-  }
-
 }
diff --git a/modules/video_embed_wysiwyg/src/Form/VideoEmbedDialog.php b/modules/video_embed_wysiwyg/src/Form/VideoEmbedDialog.php
index a859254..836b723 100644
--- a/modules/video_embed_wysiwyg/src/Form/VideoEmbedDialog.php
+++ b/modules/video_embed_wysiwyg/src/Form/VideoEmbedDialog.php
@@ -39,6 +39,26 @@ class VideoEmbedDialog extends FormBase {
   protected $renderer;
 
   /**
+   * VideoEmbedDialog constructor.
+   *
+   * @param \Drupal\video_embed_field\ProviderManager $provider_manager
+   *   The video provider plugin manager.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(ProviderManager $provider_manager, RendererInterface $renderer) {
+    $this->providerManager = $provider_manager;
+    $this->render = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('video_embed_field.provider_manager'), $container->get('renderer'));
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, FilterFormat $filter_format = NULL) {
@@ -197,24 +217,4 @@ class VideoEmbedDialog extends FormBase {
     return 'video_embed_dialog';
   }
 
-  /**
-   * VideoEmbedDialog constructor.
-   *
-   * @param \Drupal\video_embed_field\ProviderManager $provider_manager
-   *   The video provider plugin manager.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   */
-  public function __construct(ProviderManager $provider_manager, RendererInterface $renderer) {
-    $this->providerManager = $provider_manager;
-    $this->render = $renderer;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('video_embed_field.provider_manager'), $container->get('renderer'));
-  }
-
 }
diff --git a/modules/video_embed_wysiwyg/src/Plugin/Filter/VideoEmbedWysiwyg.php b/modules/video_embed_wysiwyg/src/Plugin/Filter/VideoEmbedWysiwyg.php
index 1d139d9..7334122 100644
--- a/modules/video_embed_wysiwyg/src/Plugin/Filter/VideoEmbedWysiwyg.php
+++ b/modules/video_embed_wysiwyg/src/Plugin/Filter/VideoEmbedWysiwyg.php
@@ -45,6 +45,36 @@ class VideoEmbedWysiwyg extends FilterBase implements ContainerFactoryPluginInte
   protected $currentUser;
 
   /**
+   * VideoEmbedWysiwyg constructor.
+   *
+   * @param array $configuration
+   *   Plugin configuration.
+   * @param string $plugin_id
+   *   Plugin ID.
+   * @param mixed $plugin_definition
+   *   Plugin definition.
+   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
+   *   The video provider manager.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ProviderManagerInterface $provider_manager, RendererInterface $renderer, AccountProxyInterface $current_user) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->providerManager = $provider_manager;
+    $this->renderer = $renderer;
+    $this->currentUser = $current_user;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('video_embed_field.provider_manager'), $container->get('renderer'), $container->get('current_user'));
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function process($text, $langcode) {
@@ -132,34 +162,4 @@ class VideoEmbedWysiwyg extends FilterBase implements ContainerFactoryPluginInte
     return TRUE;
   }
 
-  /**
-   * VideoEmbedWysiwyg constructor.
-   *
-   * @param array $configuration
-   *   Plugin configuration.
-   * @param string $plugin_id
-   *   Plugin ID.
-   * @param mixed $plugin_definition
-   *   Plugin definition.
-   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
-   *   The video provider manager.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   The current user.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ProviderManagerInterface $provider_manager, RendererInterface $renderer, AccountProxyInterface $current_user) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->providerManager = $provider_manager;
-    $this->renderer = $renderer;
-    $this->currentUser = $current_user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('video_embed_field.provider_manager'), $container->get('renderer'), $container->get('current_user'));
-  }
-
 }
diff --git a/src/Plugin/Field/FieldFormatter/Colorbox.php b/src/Plugin/Field/FieldFormatter/Colorbox.php
index f5e462a..34f545b 100644
--- a/src/Plugin/Field/FieldFormatter/Colorbox.php
+++ b/src/Plugin/Field/FieldFormatter/Colorbox.php
@@ -53,6 +53,60 @@ class Colorbox extends FormatterBase implements ContainerFactoryPluginInterface
   protected $renderer;
 
   /**
+   * Constructs a new instance of the plugin.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Third party settings.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Drupal\Core\Field\FormatterInterface $thumbnail_formatter
+   *   The field formatter for thumbnails.
+   * @param \Drupal\Core\Field\FormatterInterface $video_formatter
+   *   The field formatter for videos.
+   * @param \Drupal\colorbox\ElementAttachmentInterface|null $colorbox_attachment
+   *   The colorbox attachment if colorbox is enabled.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, RendererInterface $renderer, FormatterInterface $thumbnail_formatter, FormatterInterface $video_formatter, $colorbox_attachment) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->thumbnailFormatter = $thumbnail_formatter;
+    $this->videoFormatter = $video_formatter;
+    $this->renderer = $renderer;
+    $this->colorboxAttachment = $colorbox_attachment;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    $formatter_manager = $container->get('plugin.manager.field.formatter');
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('renderer'),
+      $formatter_manager->createInstance('video_embed_field_thumbnail', $configuration),
+      $formatter_manager->createInstance('video_embed_field_video', $configuration),
+      $container->get('colorbox.attachment')
+    );
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
@@ -153,58 +207,4 @@ class Colorbox extends FormatterBase implements ContainerFactoryPluginInterface
     return \Drupal::moduleHandler()->moduleExists('colorbox');
   }
 
-  /**
-   * Constructs a new instance of the plugin.
-   *
-   * @param string $plugin_id
-   *   The plugin_id for the formatter.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The definition of the field to which the formatter is associated.
-   * @param array $settings
-   *   The formatter settings.
-   * @param string $label
-   *   The formatter label display setting.
-   * @param string $view_mode
-   *   The view mode.
-   * @param array $third_party_settings
-   *   Third party settings.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\Core\Field\FormatterInterface $thumbnail_formatter
-   *   The field formatter for thumbnails.
-   * @param \Drupal\Core\Field\FormatterInterface $video_formatter
-   *   The field formatter for videos.
-   * @param \Drupal\colorbox\ElementAttachmentInterface|null $colorbox_attachment
-   *   The colorbox attachment if colorbox is enabled.
-   */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, RendererInterface $renderer, FormatterInterface $thumbnail_formatter, FormatterInterface $video_formatter, $colorbox_attachment) {
-    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
-    $this->thumbnailFormatter = $thumbnail_formatter;
-    $this->videoFormatter = $video_formatter;
-    $this->renderer = $renderer;
-    $this->colorboxAttachment = $colorbox_attachment;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $formatter_manager = $container->get('plugin.manager.field.formatter');
-    return new static(
-      $plugin_id,
-      $plugin_definition,
-      $configuration['field_definition'],
-      $configuration['settings'],
-      $configuration['label'],
-      $configuration['view_mode'],
-      $configuration['third_party_settings'],
-      $container->get('renderer'),
-      $formatter_manager->createInstance('video_embed_field_thumbnail', $configuration),
-      $formatter_manager->createInstance('video_embed_field_video', $configuration),
-      $container->get('colorbox.attachment')
-    );
-  }
-
 }
diff --git a/src/Plugin/Field/FieldFormatter/Thumbnail.php b/src/Plugin/Field/FieldFormatter/Thumbnail.php
index be7a004..543db3f 100644
--- a/src/Plugin/Field/FieldFormatter/Thumbnail.php
+++ b/src/Plugin/Field/FieldFormatter/Thumbnail.php
@@ -51,6 +51,49 @@ class Thumbnail extends FormatterBase implements ContainerFactoryPluginInterface
   const LINK_PROVIDER = 'provider';
 
   /**
+   * Constructs a new instance of the plugin.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Third party settings.
+   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
+   *   The video embed provider manager.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, ProviderManagerInterface $provider_manager, EntityStorageInterface $image_style_storage) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->providerManager = $provider_manager;
+    $this->imageStyleStorage = $image_style_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('video_embed_field.provider_manager'),
+      $container->get('entity.manager')->getStorage('image_style')
+    );
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
@@ -128,49 +171,6 @@ class Thumbnail extends FormatterBase implements ContainerFactoryPluginInterface
   }
 
   /**
-   * Constructs a new instance of the plugin.
-   *
-   * @param string $plugin_id
-   *   The plugin_id for the formatter.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The definition of the field to which the formatter is associated.
-   * @param array $settings
-   *   The formatter settings.
-   * @param string $label
-   *   The formatter label display setting.
-   * @param string $view_mode
-   *   The view mode.
-   * @param array $third_party_settings
-   *   Third party settings.
-   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
-   *   The video embed provider manager.
-   */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, ProviderManagerInterface $provider_manager, EntityStorageInterface $image_style_storage) {
-    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
-    $this->providerManager = $provider_manager;
-    $this->imageStyleStorage = $image_style_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $plugin_id,
-      $plugin_definition,
-      $configuration['field_definition'],
-      $configuration['settings'],
-      $configuration['label'],
-      $configuration['view_mode'],
-      $configuration['third_party_settings'],
-      $container->get('video_embed_field.provider_manager'),
-      $container->get('entity.manager')->getStorage('image_style')
-    );
-  }
-
-  /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
diff --git a/src/Plugin/Field/FieldFormatter/Video.php b/src/Plugin/Field/FieldFormatter/Video.php
index 8d2f399..152b524 100644
--- a/src/Plugin/Field/FieldFormatter/Video.php
+++ b/src/Plugin/Field/FieldFormatter/Video.php
@@ -40,6 +40,51 @@ class Video extends FormatterBase implements ContainerFactoryPluginInterface {
   protected $currentUser;
 
   /**
+   * Constructs a new instance of the plugin.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Third party settings.
+   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
+   *   The video embed provider manager.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   The logged in user.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, ProviderManagerInterface $provider_manager, AccountInterface $current_user) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->providerManager = $provider_manager;
+    $this->currentUser = $current_user;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('video_embed_field.provider_manager'),
+      $container->get('current_user')
+    );
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
@@ -142,51 +187,6 @@ class Video extends FormatterBase implements ContainerFactoryPluginInterface {
   }
 
   /**
-   * Constructs a new instance of the plugin.
-   *
-   * @param string $plugin_id
-   *   The plugin_id for the formatter.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The definition of the field to which the formatter is associated.
-   * @param array $settings
-   *   The formatter settings.
-   * @param string $label
-   *   The formatter label display setting.
-   * @param string $view_mode
-   *   The view mode.
-   * @param array $third_party_settings
-   *   Third party settings.
-   * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
-   *   The video embed provider manager.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The logged in user.
-   */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, $settings, $label, $view_mode, $third_party_settings, ProviderManagerInterface $provider_manager, AccountInterface $current_user) {
-    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
-    $this->providerManager = $provider_manager;
-    $this->currentUser = $current_user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $plugin_id,
-      $plugin_definition,
-      $configuration['field_definition'],
-      $configuration['settings'],
-      $configuration['label'],
-      $configuration['view_mode'],
-      $configuration['third_party_settings'],
-      $container->get('video_embed_field.provider_manager'),
-      $container->get('current_user')
-    );
-  }
-
-  /**
    * Get an instance of the Video field formatter plugin.
    *
    * This is useful because there is a lot of overlap to the configuration and
diff --git a/src/Plugin/Field/FieldType/VideoEmbedField.php b/src/Plugin/Field/FieldType/VideoEmbedField.php
index 3a66618..48b1b54 100644
--- a/src/Plugin/Field/FieldType/VideoEmbedField.php
+++ b/src/Plugin/Field/FieldType/VideoEmbedField.php
@@ -33,6 +33,22 @@ class VideoEmbedField extends FieldItemBase {
   /**
    * {@inheritdoc}
    */
+  public function __construct($definition, $name = NULL, TraversableTypedDataInterface $parent = NULL, $provider_manager = NULL) {
+    parent::__construct($definition, $name, $parent);
+    $this->providerManager = $provider_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance($definition, $name = NULL, TraversableTypedDataInterface $parent = NULL) {
+    $provider_manager = \Drupal::service('video_embed_field.provider_manager');
+    return new static($definition, $name, $parent, $provider_manager);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
     return [
       'columns' => [
@@ -86,20 +102,4 @@ class VideoEmbedField extends FieldItemBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($definition, $name = NULL, TraversableTypedDataInterface $parent = NULL, $provider_manager = NULL) {
-    parent::__construct($definition, $name, $parent);
-    $this->providerManager = $provider_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance($definition, $name = NULL, TraversableTypedDataInterface $parent = NULL) {
-    $provider_manager = \Drupal::service('video_embed_field.provider_manager');
-    return new static($definition, $name, $parent, $provider_manager);
-  }
-
 }
diff --git a/src/Plugin/Validation/Constraint/VideoEmbedConstraintValidator.php b/src/Plugin/Validation/Constraint/VideoEmbedConstraintValidator.php
index 0d83de3..f4ebd0f 100644
--- a/src/Plugin/Validation/Constraint/VideoEmbedConstraintValidator.php
+++ b/src/Plugin/Validation/Constraint/VideoEmbedConstraintValidator.php
@@ -21,15 +21,6 @@ class VideoEmbedConstraintValidator extends ConstraintValidator implements Conta
   protected $providerManager;
 
   /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('video_embed_field.provider_manager')
-    );
-  }
-
-  /**
    * Create an instance of the validator.
    *
    * @param \Drupal\video_embed_field\ProviderManagerInterface $provider_manager
@@ -42,6 +33,15 @@ class VideoEmbedConstraintValidator extends ConstraintValidator implements Conta
   /**
    * {@inheritdoc}
    */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('video_embed_field.provider_manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function validate($field, Constraint $constraint) {
     if (!isset($field->value)) {
       return NULL;