diff --git a/js/sharethis.form.js b/js/sharethis.form.js
index 3de3d47..e319e44 100644
--- a/js/sharethis.form.js
+++ b/js/sharethis.form.js
@@ -4,7 +4,9 @@
  */
 
 (function ($, window, drupalSettings, stlib_picker) {
-
+  /*global drupal_st;*/
+  /*global _all_services;*/
+  /*global stlib_picker;*/
   'use strict';
 
   // Create the drupal ShareThis object for clean code and namespacing:
@@ -83,7 +85,7 @@
     },
     getGlobalCNSConfig: function () {
       try {
-        drupal_st.odjs(('https:' === document.location.protocol) ? 'https://wd-edge.sharethis.com/button/getDefault.esi?cb=drupal_st.cnsCallback' : 'http://wd-edge.sharethis.com/button/getDefault.esi?cb=drupal_st.cnsCallback');
+        drupal_st.odjs((document.location.protocol === 'https:') ? 'https://wd-edge.sharethis.com/button/getDefault.esi?cb=drupal_st.cnsCallback' : 'http://wd-edge.sharethis.com/button/getDefault.esi?cb=drupal_st.cnsCallback');
       }
       catch (err) {
         drupal_st.cnsCallback(err);
diff --git a/js/sharethis.js b/js/sharethis.js
index 3f7b8b1..ad4b58f 100644
--- a/js/sharethis.js
+++ b/js/sharethis.js
@@ -4,6 +4,7 @@
  */
 
 (function ($, drupalSettings) {
+  /*global stLight;*/
   'use strict';
   Drupal.behaviors.shareThis = {
     attach: function (context) {
diff --git a/js/stlib_picker.js b/js/stlib_picker.js
index e591ba8..ee33354 100644
--- a/js/stlib_picker.js
+++ b/js/stlib_picker.js
@@ -8,11 +8,12 @@
 // Styling can be found in stlib_picker.css and should be linked in the page.
 // To get selected services as an array of strings:  (ie ["twitter", "sharethis", "facebook"] )
 // Call: var answer = stlib_picker.pickerList[uniqueID]["getServices"]();.
+/*global _all_services;*/
 (function ($, drupalSettings) {
   'use strict';
-
+  /*global _all_services;*/
   var stlib_picker = {};
-  var isSecure = ('https:' == document.location.protocol) ? true : false;
+  var isSecure = (document.location.protocol ==='https:') ? true : false;
   stlib_picker.pickerList = [];
   stlib_picker.defaultServices = ['sharethis', 'tumblr', 'bebo'];
   stlib_picker.getServices = function (id) {
diff --git a/sharethis.module b/sharethis.module
index 718e126..420b813 100644
--- a/sharethis.module
+++ b/sharethis.module
@@ -160,7 +160,7 @@ function sharethis_node_view(array &$build, EntityInterface $node, EntityViewDis
           '#attributes' => array(
             'class' => array('links', 'inline'),
           ),
-        // Wrap it in a div.
+          // Wrap it in a div.
           '#tag' => 'div',
           '#type' => 'html_tag',
           '#weight' => 10,
@@ -179,7 +179,9 @@ function sharethis_comment_view(array &$build, EntityInterface $comment, EntityV
   if ($sharethis_settings->get('comments') == 1) {
     $st_js = $sharethis_manager->sharethisIncludeJs();
     $data_options = $sharethis_manager->getOptions();
-    $current_path = \Drupal::routeMatch()->getRouteName() ? Url::fromRouteMatch(\Drupal::routeMatch())->getInternalPath() : '';
+    $current_path = \Drupal::routeMatch()
+      ->getRouteName() ? Url::fromRouteMatch(\Drupal::routeMatch())
+      ->getInternalPath() : '';
     $path = isset($current_path) ? $current_path : '<front>';
     global $base_url;
     $path_obj = Url::fromUri($base_url . '/' . $path,
@@ -191,7 +193,8 @@ function sharethis_comment_view(array &$build, EntityInterface $comment, EntityV
     $path = $path_obj->toString();
     $request = \Drupal::request();
     $route_match = \Drupal::routeMatch();
-    $title = \Drupal::service('title_resolver')->getTitle($request, $route_match->getRouteObject());
+    $title = \Drupal::service('title_resolver')
+      ->getTitle($request, $route_match->getRouteObject());
     $content = $sharethis_manager->renderSpans($data_options, $title, $path);
     $build['sharethis_comments'] = array(
       '#theme' => 'sharethis_block',
diff --git a/src/Form/SharethisConfigurationForm.php b/src/Form/SharethisConfigurationForm.php
index cb6b765..fc02895 100644
--- a/src/Form/SharethisConfigurationForm.php
+++ b/src/Form/SharethisConfigurationForm.php
@@ -203,8 +203,7 @@ class SharethisConfigurationForm extends ConfigFormBase {
     $form['context']['block']['#children'] = 'You must choose which region to display the in from the Blocks administration';
     $entity_bundles = $this->entityManager->getBundleInfo('node');
     // Add checkboxes for each view mode of each bundle.
-    $entity_modes = $this->entityManager->getViewModes('node');
-    ;
+    $entity_modes = $this->entityManager->getViewModes('node');;
     $modes = array();
     foreach ($entity_modes as $mode => $mode_info) {
       $modes[$mode] = $mode_info['label'];
@@ -402,7 +401,8 @@ class SharethisConfigurationForm extends ConfigFormBase {
       ->save();
     if (is_array($entity_types)) {
       foreach ($entity_types as $key => $entity_type) {
-        $config->set('sharethisnodes.' . $key, $values[$key . '_options'])->save();
+        $config->set('sharethisnodes.' . $key, $values[$key . '_options'])
+          ->save();
       }
     }
     parent::submitForm($form, $form_state);
diff --git a/src/Tests/SharethisBlockTest.php b/src/Tests/SharethisBlockTest.php
index acf5089..8c7049b 100644
--- a/src/Tests/SharethisBlockTest.php
+++ b/src/Tests/SharethisBlockTest.php
@@ -50,7 +50,7 @@ class SharethisBlockTest extends NodeTestBase {
     $theme_settings = $this->config('system.theme');
     foreach (['bartik', 'seven', 'stark'] as $theme) {
       $this->drupalGet('admin/structure/block/list/' . $theme);
-      $this->assertTitle(t('Block layout') . ' | Drupal');
+      $this->assertTitle(t('Block layout'));
       // Select the 'Sharethis' block to be placed.
       $block = array();
       $block['id'] = strtolower($this->randomMachineName());