diff --git a/advagg_ext_minify/src/Form/SettingsForm.php b/advagg_ext_minify/src/Form/SettingsForm.php
index e4d6309..c44a749 100644
--- a/advagg_ext_minify/src/Form/SettingsForm.php
+++ b/advagg_ext_minify/src/Form/SettingsForm.php
@@ -77,10 +77,10 @@ class SettingsForm extends ConfigFormBase {
     $form = [];
 
     // CSS command line.
-    $this->generateForm($form, ['css', t('CSS')]);
+    $this->generateForm($form, ['css', $this->t('CSS')]);
 
     // JS command line.
-    $this->generateForm($form, ['js', t('JavaScript')]);
+    $this->generateForm($form, ['js', $this->t('JavaScript')]);
     return parent::buildForm($form, $form_state);
   }
 
@@ -98,39 +98,39 @@ class SettingsForm extends ConfigFormBase {
   private function generateForm(array &$form, array $params) {
     $form[$params[0]] = [
       '#type' => 'fieldset',
-      '#title' => t('@title', ['@title' => $params[1]]),
+      '#title' => $this->t('@title', ['@title' => $params[1]]),
     ];
     $form[$params[0]]['cmd'] = [
       '#type' => 'fieldset',
-      '#title' => t('Command Line'),
+      '#title' => $this->t('Command Line'),
     ];
 
-    $description = t('{%CWD%} = \Drupal::root(). <br /> {%IN%} = input file. <br /> {%IN_URL_ENC%} = url pointing to the input file that has been url encoded. <br /> {%OUT%} = output file. <br /><br />');
+    $description = $this->t('{%CWD%} = \Drupal::root(). <br /> {%IN%} = input file. <br /> {%IN_URL_ENC%} = url pointing to the input file that has been url encoded. <br /> {%OUT%} = output file. <br /><br />');
     if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-      $description .= ' ' . t('Example using the <a href="@link1">Microsoft Ajax Minifier</a>. <p><code>@code1</code></p>', [
+      $description .= ' ' . $this->t('Example using the <a href="@link1">Microsoft Ajax Minifier</a>. <p><code>@code1</code></p>', [
         '@link1' => 'http://ajaxmin.codeplex.com/',
         '@code1' => 'AjaxMinifier {%IN%} -o {%OUT%}',
       ]);
     }
 
     if ($params[0] === 'js') {
-      $description .= ' ' . t('Example using the <a href="@link1">Google Closure Compiler</a>. <p><code>@code1</code></p>', [
+      $description .= ' ' . $this->t('Example using the <a href="@link1">Google Closure Compiler</a>. <p><code>@code1</code></p>', [
         '@link1' => 'https://developers.google.com/closure/compiler/docs/gettingstarted_app',
         '@code1' => 'java -jar compiler.jar --js {%CWD%}/{%IN%} --js_output_file {%OUT%}',
       ]);
 
-      $description .= ' ' . t('Example using curl to minify via the <a href="@link1">Online Google Closure Compiler</a>. <p><code>@code1</code></p>', [
+      $description .= ' ' . $this->t('Example using curl to minify via the <a href="@link1">Online Google Closure Compiler</a>. <p><code>@code1</code></p>', [
         '@link1' => 'https://developers.google.com/closure/compiler/docs/api-ref',
         '@code1' => 'curl -o {%OUT%} -d output_info=compiled_code -d code_url={%IN_URL_ENC%} http://closure-compiler.appspot.com/compile',
       ]);
     }
     if ($params[0] === 'css') {
-      $description .= ' ' . t('Example using the <a href="@link1">YUI Compressor</a>. <p><code>@code1</code></p>', [
+      $description .= ' ' . $this->t('Example using the <a href="@link1">YUI Compressor</a>. <p><code>@code1</code></p>', [
         '@link1' => 'http://yui.github.io/yuicompressor/',
         '@code1' => 'java -jar yuicompressor-x.y.z.jar --type css --line-break 4096 {%CWD%}/{%IN%} -o {%OUT%}',
       ]);
 
-      $description .= ' ' . t('Example using curl to minify via an online <a href="@link1">CSS Minifier</a>. <p><code>@code1</code></p>', [
+      $description .= ' ' . $this->t('Example using curl to minify via an online <a href="@link1">CSS Minifier</a>. <p><code>@code1</code></p>', [
         '@link1' => 'http://cnvyr.io/',
         '@code1' => 'curl -o {%OUT%} -F \'files0=@{%IN%}\' http://srv.cnvyr.io/v1?min=css',
       ]);
@@ -138,7 +138,7 @@ class SettingsForm extends ConfigFormBase {
 
     $form[$params[0]]['cmd'][$params[0] . '_cmd'] = [
       '#type' => 'textfield',
-      '#title' => t('Command to run'),
+      '#title' => $this->t('Command to run'),
       '#default_value' => $this->config('advagg_ext_minify.settings')->get($params[0] . '_cmd'),
       '#description' => $description,
     ];
diff --git a/advagg_mod/js/css_defer.js b/advagg_mod/js/css_defer.js
index 1967f2f..b566a15 100644
--- a/advagg_mod/js/css_defer.js
+++ b/advagg_mod/js/css_defer.js
@@ -4,8 +4,8 @@
  */
 
 var urlMatcher = new RegExp('href="(.*?)".*(advagg-css-defer)');
-[].forEach.call(document.querySelectorAll('noscript'), function(el) {
+[].forEach.call(document.querySelectorAll('noscript'), function (el) {
   if (urlMatcher.test(el.innerHTML)) {
     loadCSS(urlMatcher.exec(el.innerHTML)[1]);
   }
-})
+});
diff --git a/advagg_validator/js/csslint_form.js b/advagg_validator/js/csslint_form.js
index c6f38e2..72cc7e7 100644
--- a/advagg_validator/js/csslint_form.js
+++ b/advagg_validator/js/csslint_form.js
@@ -75,11 +75,11 @@ function advagg_validator_css($, results, filename, settings) {
   try {
     // Use the current time to bust the browser cache.
     var t = new Date().getTime();
-    var x = jQuery.ajax({
+    jQuery.ajax({
       url: settings.path.baseUrl + filename + '?t=' + t,
       dataType: 'text',
       async: false,
-      success: function(data) {
+      success: function (data) {
         // File was downloaded; run through CSSLint.
         var y = CSSLint.verify(data, settings.csslint.rules);
         var z = y.messages;
@@ -91,7 +91,7 @@ function advagg_validator_css($, results, filename, settings) {
         }
         $(results).append('</ul></p>');
       },
-      error: function(data, textStatus, errorThrown) {
+      error: function (data, textStatus, errorThrown) {
         // File could not be downloaded; display error.
         $(results).append('<p><h4>' + filename + '</h4><ul>');
         $(results).append('<li class="error">' + Drupal.t('Browser unable to read file. @error', {'@error': errorThrown}) + '</li>');
diff --git a/src/Form/OperationsForm.php b/src/Form/OperationsForm.php
index 6fc4af8..4c450c0 100644
--- a/src/Form/OperationsForm.php
+++ b/src/Form/OperationsForm.php
@@ -301,7 +301,7 @@ class OperationsForm extends ConfigFormBase {
 
     if ($this->config('advagg.settings')->get('cache_level') >= 0) {
       // Display a simple message if not in Development mode.
-      drupal_set_message(t('Advagg Caches Cleared'));
+      drupal_set_message($this->t('Advagg Caches Cleared'));
     }
   }
 
@@ -326,7 +326,7 @@ class OperationsForm extends ConfigFormBase {
     $js_files = $this->jsCollectionOptimizer->deleteAllReal();
 
     // Report back the results.
-    drupal_set_message(t('All AdvAgg aggregates have been deleted. %css_count CSS files and %js_count JS files have been removed.', [
+    drupal_set_message($this->t('All AdvAgg aggregates have been deleted. %css_count CSS files and %js_count JS files have been removed.', [
       '%css_count' => count($css_files),
       '%js_count' => count($js_files),
     ]));
@@ -339,7 +339,7 @@ class OperationsForm extends ConfigFormBase {
     $this->clearAggregates();
     $this->advaggAggregates->deleteAll();
     $this->advaggFiles->deleteAll();
-    drupal_set_message(t('All AdvAgg cached information and aggregates deleted.'));
+    drupal_set_message($this->t('All AdvAgg cached information and aggregates deleted.'));
   }
 
   /**
@@ -352,13 +352,13 @@ class OperationsForm extends ConfigFormBase {
 
     // Report back the results.
     if ($css_count || $js_count) {
-      drupal_set_message(t('All stale aggregates have been deleted. %css_count CSS files and %js_count JS files have been removed.', [
+      drupal_set_message($this->t('All stale aggregates have been deleted. %css_count CSS files and %js_count JS files have been removed.', [
         '%css_count' => $css_count,
         '%js_count' => $js_count,
       ]));
     }
     else {
-      drupal_set_message(t('No stale aggregates found. Nothing was deleted.'));
+      drupal_set_message($this->t('No stale aggregates found. Nothing was deleted.'));
     }
   }
 
@@ -374,7 +374,7 @@ class OperationsForm extends ConfigFormBase {
     $this->config('advagg.settings')
       ->set('global_counter', $new_value)
       ->save();
-    drupal_set_message(t('Global counter is now set to %new_value', [
+    drupal_set_message($this->t('Global counter is now set to %new_value', [
       '%new_value' => $new_value,
     ]));
   }
@@ -396,10 +396,10 @@ class OperationsForm extends ConfigFormBase {
     $deleted = $this->advaggFiles->clearMissingFiles();
     $deleted_aggregates = $this->advaggAggregates->clearMissingFiles();
     if (empty($deleted)) {
-      drupal_set_message(t('No missing files found or they could not be safely cleared out of the database.'));
+      drupal_set_message($this->t('No missing files found or they could not be safely cleared out of the database.'));
     }
     else {
-      drupal_set_message(t('Some missing files were found and could be safely cleared out of the database. <pre> @raw </pre>', [
+      drupal_set_message($this->t('Some missing files were found and could be safely cleared out of the database. <pre> @raw </pre>', [
         '@raw' => print_r($deleted, TRUE),
       ]));
     }
@@ -423,10 +423,10 @@ class OperationsForm extends ConfigFormBase {
     $count = count($this->cssCollectionOptimizer->deleteOld());
     $count += count($this->jsCollectionOptimizer->deleteOld());
     if (empty($count)) {
-      drupal_set_message(t('No old and unused aggregates found. Nothing was deleted.'));
+      drupal_set_message($this->t('No old and unused aggregates found. Nothing was deleted.'));
     }
     else {
-      drupal_set_message(t('Some old and unused aggregates were found. A total of %count database entries were removed.', [
+      drupal_set_message($this->t('Some old and unused aggregates were found. A total of %count database entries were removed.', [
         '%count' => $count,
       ]));
     }
@@ -448,13 +448,13 @@ class OperationsForm extends ConfigFormBase {
     if (!empty($_COOKIE[$cookie_name]) && $_COOKIE[$cookie_name] == $key) {
       setcookie($cookie_name, '', -1, $GLOBALS['base_path'], '.' . $_SERVER['HTTP_HOST']);
       unset($_COOKIE[$cookie_name]);
-      drupal_set_message(t('AdvAgg Bypass Cookie Removed.'));
+      drupal_set_message($this->t('AdvAgg Bypass Cookie Removed.'));
     }
     // If the cookie does not exist then set it.
     else {
       setcookie($cookie_name, $key, REQUEST_TIME + $form_state->getValue('timespan'), $GLOBALS['base_path'], '.' . $_SERVER['HTTP_HOST']);
       $_COOKIE[$cookie_name] = $key;
-      drupal_set_message(t('AdvAgg Bypass Cookie Set for %time.', [
+      drupal_set_message($this->t('AdvAgg Bypass Cookie Set for %time.', [
         '%time' => $this->dateFormatter->formatInterval($form_state->getValue('timespan')),
       ]));
     }