diff --git a/config_translation.module b/config_translation.module
index 23c0d6d..77249f5 100644
--- a/config_translation.module
+++ b/config_translation.module
@@ -168,8 +168,8 @@ function config_translation_find_translatable($schema) {
  *   Language code string.
  */
 function config_translation_original_langcode($name) {
-  $config = config($name)->get();
-  return isset($config['langcode']) ? $config['langcode'] : 'en';
+  $configuration = config($name)->get();
+  return isset($configuration['langcode']) ? $configuration['langcode'] : 'en';
 }
 
 /**
diff --git a/lib/Drupal/config_translation/ConfigGroupMapper.php b/lib/Drupal/config_translation/ConfigGroupMapper.php
index 1b77c4b..44c83aa 100644
--- a/lib/Drupal/config_translation/ConfigGroupMapper.php
+++ b/lib/Drupal/config_translation/ConfigGroupMapper.php
@@ -126,7 +126,7 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    * {@inheritdoc}
    */
   public function getConfigGroup($arg = NULL) {
-    // This is already a configuration group.
+    // This is a ConfigGroupMapper already.
     return $this;
   }
 
diff --git a/lib/Drupal/config_translation/Form/ConfigTranslationDeleteForm.php b/lib/Drupal/config_translation/Form/ConfigTranslationDeleteForm.php
index 35bd0bc..a1d647b 100644
--- a/lib/Drupal/config_translation/Form/ConfigTranslationDeleteForm.php
+++ b/lib/Drupal/config_translation/Form/ConfigTranslationDeleteForm.php
@@ -78,7 +78,7 @@ class ConfigTranslationDeleteForm extends ConfirmFormBase {
       $storage->delete('locale.config.' . $this->language->id . '.' . $name);
     }
     // @todo Do we need to flush caches with drupal_flush_all_caches()? The
-    // configuration change may affect page display.
+    //   configuration change may affect page display.
 
     drupal_set_message(t('@language translation of %label was deleted', array('%label' => $this->group->getTitle(), '@language' => $this->language->name)));
     $form_state['redirect'] = $this->group->getBasePath() . '/translate';
diff --git a/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php b/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
index 75f958b..fdc8069 100644
--- a/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
+++ b/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
@@ -332,7 +332,8 @@ class ConfigTranslationListUITest extends WebTestBase {
   }
 
   /*
-   * Tests all lists of config to see if translate link is added to operations.
+   * Tests all lists of configuration to see if translate link is added to
+   * operations.
    */
   public function testTranslateOperationInListUI() {