diff --git a/src/MediaBundleForm.php b/src/MediaBundleForm.php
index 014a538..5d310f0 100644
--- a/src/MediaBundleForm.php
+++ b/src/MediaBundleForm.php
@@ -373,7 +373,7 @@ class MediaBundleForm extends EntityForm {
 
     // Override the "status" base field default value, for this bundle.
     $fields = $this->entityFieldManager->getFieldDefinitions('media', $bundle->id());
-    $media = $this->entityTypeManager->getStorage('media')->create(array('bundle' => $bundle->id()));
+    $media = $this->entityTypeManager->getStorage('media')->create(['bundle' => $bundle->id()]);
     $value = (bool) $form_state->getValue(['options', 'status']);
     if ($media->status->value != $value) {
       $fields['status']->getConfig($bundle->id())->setDefaultValue($value)->save();
diff --git a/src/MediaTypeSourceFieldTrait.php b/src/MediaTypeSourceFieldTrait.php
index f2afdbb..7067882 100644
--- a/src/MediaTypeSourceFieldTrait.php
+++ b/src/MediaTypeSourceFieldTrait.php
@@ -1,14 +1,13 @@
 <?php
+
 namespace Drupal\media_entity;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 
-
 /**
  * To exhibit by derivatives of Drupal\media_entity\MediaTypeBase.
  *
@@ -20,6 +19,11 @@ use Drupal\field\Entity\FieldStorageConfig;
  */
 trait MediaTypeSourceFieldTrait {
 
+  /**
+   * The default source field name.
+   *
+   * @var string
+   */
   protected $defaultSourceFieldName;
 
   /**
@@ -27,7 +31,7 @@ trait MediaTypeSourceFieldTrait {
    *
    * @see \Drupal\Core\StringTranslation\StringTranslationTrait
    */
-  abstract protected function t($string, array $args = array(), array $options = array());
+  abstract protected function t($string, array $args = [], array $options = []);
 
   /**
    * Provide information related to source field configuration.
@@ -52,7 +56,7 @@ trait MediaTypeSourceFieldTrait {
    *   - field_extra_config: (optional) array with extra keys to be passed to
    *     FieldConfig::create().
    */
-  abstract public function sourceFieldInfo();
+  abstract protected function sourceFieldInfo();
 
   /**
    * Produce a form fragment to configure the source field.
@@ -61,9 +65,11 @@ trait MediaTypeSourceFieldTrait {
    *
    * @param array $form
    *   The $form array as passed to the buildConfigurationForm().
-   *
    * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The $form_state instance.
+   *
    * @return array
+   *   The form element to be used in the configuration form.
    */
   protected function sourceFieldConfigurationForm(array $form, FormStateInterface $form_state) {
     $source_field_info = $this->sourceFieldInfo();
@@ -104,7 +110,6 @@ trait MediaTypeSourceFieldTrait {
       '#access' => !$bundle->isNew(),
     ];
 
-
     return $form;
   }
 
diff --git a/src/Plugin/Action/DeleteMedia.php b/src/Plugin/Action/DeleteMedia.php
index b2a98d2..4a5a48e 100644
--- a/src/Plugin/Action/DeleteMedia.php
+++ b/src/Plugin/Action/DeleteMedia.php
@@ -84,7 +84,7 @@ class DeleteMedia extends ActionBase implements ContainerFactoryPluginInterface
    * {@inheritdoc}
    */
   public function execute($object = NULL) {
-    $this->executeMultiple(array($object));
+    $this->executeMultiple([$object]);
   }
 
   /**
diff --git a/tests/src/FunctionalJavascript/BundleCreationTest.php b/tests/src/FunctionalJavascript/BundleCreationTest.php
index e27aeae..385e79d 100644
--- a/tests/src/FunctionalJavascript/BundleCreationTest.php
+++ b/tests/src/FunctionalJavascript/BundleCreationTest.php
@@ -39,7 +39,7 @@ class BundleCreationTest extends MediaEntityJavascriptTestBase {
     $this->assertSession()->fieldExists('Type provider');
     $this->assertSession()->optionExists('Type provider', 'test_type');
     $page->selectFieldOption('Type provider', 'test_type');
-    $this->waitForAjaxToFinish();
+    $this->assertSession()->assertWaitOnAjaxRequest();
 
     // Make sure the checkbox for creating the source field is there and save.
     $this->assertSession()
@@ -85,7 +85,7 @@ class BundleCreationTest extends MediaEntityJavascriptTestBase {
     $this->assertSession()->fieldExists('Type provider');
     $this->assertSession()->optionExists('Type provider', 'test_type');
     $page->selectFieldOption('Type provider', 'test_type');
-    $this->waitForAjaxToFinish();
+    $this->assertSession()->assertWaitOnAjaxRequest();
 
     // Un-check creation of default source field.
     $page->uncheckField('type_configuration[test_type][create_source_field]');
diff --git a/tests/src/FunctionalJavascript/MediaEntityJavascriptTestBase.php b/tests/src/FunctionalJavascript/MediaEntityJavascriptTestBase.php
index 8666d72..e52a064 100644
--- a/tests/src/FunctionalJavascript/MediaEntityJavascriptTestBase.php
+++ b/tests/src/FunctionalJavascript/MediaEntityJavascriptTestBase.php
@@ -94,13 +94,6 @@ abstract class MediaEntityJavascriptTestBase extends JavascriptTestBase {
   }
 
   /**
-   * Waits for jQuery to become ready and animations to complete.
-   */
-  protected function waitForAjaxToFinish() {
-    $this->assertSession()->assertWaitOnAjaxRequest();
-  }
-
-  /**
    * Waits and asserts that a given element is visible.
    *
    * @param string $selector
@@ -115,24 +108,4 @@ abstract class MediaEntityJavascriptTestBase extends JavascriptTestBase {
     $this->assertJsCondition($condition, $timeout, $message);
   }
 
-  /**
-   * Debugger method to save additional HTML output.
-   *
-   * The base class will only save browser output when accessing page using
-   * ::drupalGet and providing a printer class to PHPUnit. This method
-   * is intended for developers to help debug browser test failures and capture
-   * more verbose output.
-   */
-  protected function saveHtmlOutput() {
-    $out = $this->getSession()->getPage()->getContent();
-    // Ensure that any changes to variables in the other thread are picked up.
-    $this->refreshVariables();
-    if ($this->htmlOutputEnabled) {
-      $html_output = '<hr />Ending URL: ' . $this->getSession()->getCurrentUrl();
-      $html_output .= '<hr />' . $out;
-      $html_output .= $this->getHtmlOutputHeaders();
-      $this->htmlOutput($html_output);
-    }
-  }
-
 }