diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index f0e41ca..c20cabd 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -134,8 +134,8 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) {
       // No language module, so use the default language only.
       $default = $this->getDefaultLanguage();
       $this->languages = array($default->id => $default);
-
     }
+
     // Filter the full list of languages based on the value of the $all flag. By
     // default we remove the locked languages, but the caller may request for
     // those languages to be added as well.
@@ -368,24 +368,24 @@ public function getConfigOverrideLanguage() {
   /**
    * Filters the full list of languages based on the value of the flag.
    *
-   * By default removes the locked languages.
+   * The locked languages are removed by default.
    *
-   * @param array $languages
-   *    Array with languages to be filtered.
+   * @param \Drupal\Core\Language\LanguageInterface[] $languages
+   *   Array with languages to be filtered.
    *
    * @param int $flags
    *   (optional) Specifies the state of the languages that have to be returned.
    *   It can be: LanguageInterface::STATE_CONFIGURABLE,
-   *   LanguageInterface::STATE_LOCKED, LanguageInterface::STATE_ALL.
+   *   LanguageInterface::STATE_LOCKED, or LanguageInterface::STATE_ALL.
    *
-   * @return array
+   * @return \Drupal\Core\Language\LanguageInterface[]
    *   An associative array of languages, keyed by the language code.
    */
   protected function languageFilter(array $languages, $flags = LanguageInterface::STATE_CONFIGURABLE) {
     $filtered_languages = array();
     // Add the site's default language if flagged as allowed value.
     if ($flags & LanguageInterface::STATE_SITE_DEFAULT) {
-      $default = isset($default) ? $default : $this->getDefaultLanguage();
+      $default = $this->getDefaultLanguage();
       // Rename the default language. But we do not want to do this globally,
       // if we're acting on a global object, so clone the object first.
       $default = clone $default;
@@ -401,4 +401,5 @@ protected function languageFilter(array $languages, $flags = LanguageInterface::
 
     return $filtered_languages;
   }
+
 }
diff --git a/core/modules/language/src/Element/LanguageConfiguration.php b/core/modules/language/src/Element/LanguageConfiguration.php
index 9679dc3..fa24be4 100644
--- a/core/modules/language/src/Element/LanguageConfiguration.php
+++ b/core/modules/language/src/Element/LanguageConfiguration.php
@@ -97,6 +97,7 @@ protected static function getDefaultOptions() {
       'current_interface' => t('Current interface language'),
       'authors_default' => t("Author's preferred language"),
     );
+
     /* @var LanguageInterface[] $languages*/
     $languages = static::languageManager()->getLanguages(LanguageInterface::STATE_ALL);
     foreach ($languages as $langcode => $language) {
diff --git a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php b/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
index 23d3756..74feafa 100644
--- a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
+++ b/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
@@ -10,12 +10,17 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests the Content translation settings language selector options.
+ * Tests the content translation settings language selector options.
  *
  * @group language
  */
 class LanguageSelectorTranslatableTest extends WebTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
   public static $modules = array(
     'language',
     'content_translation',
@@ -26,7 +31,11 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
     'entity_test',
     'locale',
   );
-
+  /**
+   * An administrator user.
+   *
+   * @var \Drupal\user\Entity\User
+   */
   public $administrator;
 
   protected function setUp() {
@@ -43,17 +52,17 @@ protected function setUp() {
   protected function getAdministratorPermissions() {
     return array_filter(
       array('translate interface',
-            'administer content translation',
-            'create content translations',
-            'update content translations',
-            'delete content translations',
-            'administer languages'
+        'administer content translation',
+        'create content translations',
+        'update content translations',
+        'delete content translations',
+        'administer languages'
       )
     );
   }
 
   /**
-   * Test Content Translation language selectors are correctly translate.
+   * Tests content translation language selectors are correctly translate.
    */
   public function testLanguageStringSelector() {
     // Add another language.
@@ -62,7 +71,10 @@ public function testLanguageStringSelector() {
 
     // Translate the string English in Spanish (Inglés). Override config entity.
     $name_translation = 'Inglés';
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('es', 'language.entity.en')->set('label', $name_translation)->save();
+    $override = \Drupal::languageManager()
+      ->getLanguageConfigOverride('es', 'language.entity.en')
+      ->set('label', $name_translation)
+      ->save();
 
     // Check label is set correctly.
     $this->assertEqual($override->get('label'), $name_translation, 'Language label for English is translated into Spanish.');
@@ -77,4 +89,5 @@ public function testLanguageStringSelector() {
     // Check the language text is translated.
     $this->assertEqual((string) $elements[0], $name_translation, 'Checking the option string English is translated to Spanish.');
   }
+
 }