diff --git a/js/stlib_picker.js b/js/stlib_picker.js
index b7f1183..097199e 100644
--- a/js/stlib_picker.js
+++ b/js/stlib_picker.js
@@ -2,11 +2,12 @@
  * @file
  * This library requires JQuery.
  */
+
 // It also requires stcommon.js in your header for an official list of services
 // stlib_picker.defaultServices defines the services from stcommon that get loaded as the default services in the picker
 // 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"]();.
+// Call: var answer = stlib_picker.pickerList[uniqueID]["getServices"]();.
 var stlib_picker = {}, isSecure = ("https:" == document.location.protocol) ? true : false;
 stlib_picker.pickerList = [];
 stlib_picker.defaultServices = ["sharethis", "tumblr", "bebo"];
diff --git a/sharethis.module b/sharethis.module
index 4ff7f72..f610b2e 100644
--- a/sharethis.module
+++ b/sharethis.module
@@ -3,13 +3,12 @@
  * @file
  * A module that adds one of the ShareThis widget to your website.
  */
+
 use Drupal\Core\Url;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 
-
-
 /**
  * Implements hook_help().
  */
@@ -44,7 +43,6 @@ function sharethis_theme($existing, $type, $theme, $path) {
       'function' => 'theme_sharethis_block',
     ),
   );
-  return $theme;
 }
 
 /**
@@ -80,17 +78,10 @@ function sharethis_entity_extra_field_info() {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_view() for node entities.
+ * Implements hook_ENTITY_TYPE_view().
  *
  * Inserts ShareThis widget code onto each node view.
  * TODO: Want to add the option somewhere to select nodes.
- *
- * @param node
- *   The node that is being acted upon
- * @param view_mode
- *   The type of view (teaser, full, etc)
- * @param langcode
- *   Information about the language
  */
 function sharethis_node_view(array &$build, EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
   $sharethis_manager = \Drupal::service('sharethis.manager');
diff --git a/src/Plugin/Block/SharethisBlock.php b/src/Plugin/Block/SharethisBlock.php
index c36867f..1be773a 100644
--- a/src/Plugin/Block/SharethisBlock.php
+++ b/src/Plugin/Block/SharethisBlock.php
@@ -46,10 +46,11 @@ class SharethisBlock extends BlockBase implements ContainerFactoryPluginInterfac
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module manager service.
    * @param \Drupal\Core\Config\Config $sharethis_settings
    *   The config object for 'sharethis.settings'.
+   * @param \Drupal\sharethis\SharethisManagerInterface $sharethisManager
+   *   The module manager service.
+
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, Config $sharethis_settings, SharethisManagerInterface $sharethisManager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
diff --git a/src/Plugin/Block/SharethisWidgetBlock.php b/src/Plugin/Block/SharethisWidgetBlock.php
index b216e94..92fe02c 100644
--- a/src/Plugin/Block/SharethisWidgetBlock.php
+++ b/src/Plugin/Block/SharethisWidgetBlock.php
@@ -49,10 +49,10 @@ class SharethisWidgetBlock extends BlockBase implements ContainerFactoryPluginIn
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module manager service.
    * @param \Drupal\Core\Config\Config $sharethis_settings
    *   The config object for 'sharethis.settings'.
+   * @param \Drupal\sharethis\SharethisManagerInterface $sharethisManager
+   *   The module manager service.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, Config $sharethis_settings, SharethisManagerInterface $sharethisManager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
@@ -86,7 +86,7 @@ class SharethisWidgetBlock extends BlockBase implements ContainerFactoryPluginIn
   /**
    * {@inheritdoc}
    */
-  function blockForm($form, FormStateInterface $form_state) {
+  public function blockForm($form, FormStateInterface $form_state) {
     $formValues = $form_state->getUserInput();
     $description = $this->t('Variable - Different per URL');
     $description .= '<br />';
diff --git a/src/SharethisManager.php b/src/SharethisManager.php
index 1d7957c..e7351de 100644
--- a/src/SharethisManager.php
+++ b/src/SharethisManager.php
@@ -82,7 +82,7 @@ class SharethisManager implements SharethisManagerInterface {
   /**
    * {@inheritdoc}
    */
-  function blockContents() {
+  public function blockContents() {
 
     $sharethisConfig = $this->configFactory->get('sharethis.settings');
     $config = $this->configFactory->get('system.site');
@@ -136,8 +136,8 @@ class SharethisManager implements SharethisManagerInterface {
       }
       $stlight = $this->get_stLight_options($data_options);
       $st_js = $stlight;
-      return $st_js;
       $has_run = TRUE;
+      return $st_js;
     }
   }
 
@@ -188,7 +188,7 @@ class SharethisManager implements SharethisManagerInterface {
   /**
    *
    */
-  function renderSpans($data_options, $mtitle, $mpath) {
+  public function renderSpans($data_options, $mtitle, $mpath) {
     foreach ($data_options['option_extras'] as $service) {
       $data_options['services'] .= ',"' . $service . '"';
     }
diff --git a/src/Tests/SharethisBlockTest.php b/src/Tests/SharethisBlockTest.php
index fb8252e..4758e05 100644
--- a/src/Tests/SharethisBlockTest.php
+++ b/src/Tests/SharethisBlockTest.php
@@ -22,6 +22,7 @@ class SharethisBlockTest extends NodeTestBase {
    * @var array
    */
   public static $modules = array('node', 'system_test', 'block' , 'user', 'sharethis' , 'menu_ui');
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/Tests/SharethisConfigFormTest.php b/src/Tests/SharethisConfigFormTest.php
index 6aeeedd..96d07c1 100644
--- a/src/Tests/SharethisConfigFormTest.php
+++ b/src/Tests/SharethisConfigFormTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @file
+ * Definition of \Drupal\sharethis\Tests\SharethisConfigFormTest.
  */
 
 namespace Drupal\sharethis\Tests;