diff --git a/Block/Adminhtml/System/Config/Form/Composer/Version.php b/Block/Adminhtml/System/Config/Form/Composer/Version.php
index ea13b61..2d99fe5 100755
--- a/Block/Adminhtml/System/Config/Form/Composer/Version.php
+++ b/Block/Adminhtml/System/Config/Form/Composer/Version.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Composer;
diff --git a/Block/Adminhtml/System/Config/Form/Module/Version.php b/Block/Adminhtml/System/Config/Form/Module/Version.php
index 1922b3d..b6e6bb0 100755
--- a/Block/Adminhtml/System/Config/Form/Module/Version.php
+++ b/Block/Adminhtml/System/Config/Form/Module/Version.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Module;
diff --git a/Block/Adminhtml/System/Config/ValidateConfigButton.php b/Block/Adminhtml/System/Config/ValidateConfigButton.php
index 38540d4..8db5b11 100755
--- a/Block/Adminhtml/System/Config/ValidateConfigButton.php
+++ b/Block/Adminhtml/System/Config/ValidateConfigButton.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config;
diff --git a/Block/Adminhtml/ValidateConfig.php b/Block/Adminhtml/ValidateConfig.php
index 49d08da..b403217 100755
--- a/Block/Adminhtml/ValidateConfig.php
+++ b/Block/Adminhtml/ValidateConfig.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Block\Adminhtml;
diff --git a/Controller/Adminhtml/Validateconfig/Index.php b/Controller/Adminhtml/Validateconfig/Index.php
index 62f8193..3ec597e 100755
--- a/Controller/Adminhtml/Validateconfig/Index.php
+++ b/Controller/Adminhtml/Validateconfig/Index.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Controller\Adminhtml\Validateconfig;
diff --git a/Helper/Data.php b/Helper/Data.php
index ea0ccd2..c4e0d92 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Helper;
@@ -24,7 +24,7 @@ class Data extends AbstractHelper
     protected $testConfig = [];
 
     /**
-     * @param null $key
+     * @param $key null|string
      * @return array|mixed|string
      */
     public function getTestConfig($key = null)
@@ -39,7 +39,7 @@ public function getTestConfig($key = null)
     }
 
     /**
-     * @param null $fields
+     * @param $fields
      * @return $this
      */
     public function setTestConfig($fields)
@@ -49,7 +49,7 @@ public function setTestConfig($fields)
     }
 
     /**
-     * @param null $store_id
+     * @param $store_id int|null
      * @return bool
      */
     public function isActive($store_id = null)
@@ -67,8 +67,7 @@ public function isActive($store_id = null)
 
     /**
      * Get local client name
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigName($store_id = null)
@@ -78,8 +77,7 @@ public function getConfigName($store_id = null)
 
     /**
      * Get system config password
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigPassword($store_id = null)
@@ -89,8 +87,7 @@ public function getConfigPassword($store_id = null)
 
     /**
      * Get system config username
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigUsername($store_id = null)
@@ -100,8 +97,7 @@ public function getConfigUsername($store_id = null)
 
     /**
      * Get system config auth
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigAuth($store_id = null)
@@ -111,8 +107,7 @@ public function getConfigAuth($store_id = null)
 
     /**
      * Get system config ssl
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigSsl($store_id = null)
@@ -122,8 +117,7 @@ public function getConfigSsl($store_id = null)
 
     /**
      * Get system config host
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigSmtpHost($store_id = null)
@@ -133,8 +127,7 @@ public function getConfigSmtpHost($store_id = null)
 
     /**
      * Get system config port
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigSmtpPort($store_id = null)
@@ -144,8 +137,7 @@ public function getConfigSmtpPort($store_id = null)
 
     /**
      * Get system config reply to
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return bool
      */
     public function getConfigSetReplyTo($store_id = null)
@@ -159,8 +151,7 @@ public function getConfigSetReplyTo($store_id = null)
 
     /**
      * Get system config set return path
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return int
      */
     public function getConfigSetReturnPath($store_id = null)
@@ -170,8 +161,7 @@ public function getConfigSetReturnPath($store_id = null)
 
     /**
      * Get system config return path email
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigReturnPathEmail($store_id = null)
@@ -181,8 +171,7 @@ public function getConfigReturnPathEmail($store_id = null)
 
     /**
      * Get system config from
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigSetFrom($store_id = null)
@@ -192,8 +181,7 @@ public function getConfigSetFrom($store_id = null)
 
     /**
      * Get system config from
-     *
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigCustomFromEmail($store_id = null)
@@ -203,9 +191,8 @@ public function getConfigCustomFromEmail($store_id = null)
 
     /**
      * Get system config
-     *
      * @param String path
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return string
      */
     public function getConfigValue($path, $store_id = null)
@@ -224,7 +211,7 @@ public function getConfigValue($path, $store_id = null)
 
     /**
      * @param String path
-     * @param ScopeInterface::SCOPE_STORE $store
+     * @param $store_id int|null
      * @return mixed
      */
     public function getScopeConfigValue($path, $store_id = null)
@@ -251,7 +238,7 @@ public function getStoreId()
     }
 
     /**
-     * @param int/null $storeId
+     * @param $store_id int|null
      */
     public function setStoreId($storeId = null)
     {
diff --git a/Mail/Smtp.php b/Mail/Smtp.php
index 481554f..2589680 100644
--- a/Mail/Smtp.php
+++ b/Mail/Smtp.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Mail;
diff --git a/Model/Config/Source/Authtype.php b/Model/Config/Source/Authtype.php
index b8f9d3c..b337e27 100755
--- a/Model/Config/Source/Authtype.php
+++ b/Model/Config/Source/Authtype.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 namespace MagePal\CustomSmtp\Model\Config\Source;
 
diff --git a/Model/Email.php b/Model/Email.php
index 6febffb..b75e737 100755
--- a/Model/Email.php
+++ b/Model/Email.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Model;
diff --git a/Model/Store.php b/Model/Store.php
index 783964f..ad5880b 100755
--- a/Model/Store.php
+++ b/Model/Store.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Model;
diff --git a/Plugin/Mail/Template/TransportBuilderByStorePlugin.php b/Plugin/Mail/Template/TransportBuilderByStorePlugin.php
index 8dcabac..eeb52a8 100755
--- a/Plugin/Mail/Template/TransportBuilderByStorePlugin.php
+++ b/Plugin/Mail/Template/TransportBuilderByStorePlugin.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 namespace MagePal\CustomSmtp\Plugin\Mail\Template;
 
@@ -20,7 +20,6 @@ class TransportBuilderByStorePlugin
 
     /**
      * Sender resolver.
-     *
      * @var SenderResolverInterface
      */
     private $senderResolver;
@@ -38,9 +37,10 @@ public function __construct(
     }
 
     /**
+     * Set the sender email address based on the store context
      * @param TransportBuilderByStore $subject
-     * @param $from
-     * @param $store
+     * @param $from string
+     * @param $store int|null
      * @return array
      * @throws MailException
      */
diff --git a/Plugin/Mail/Template/TransportBuilderPlugin.php b/Plugin/Mail/Template/TransportBuilderPlugin.php
index b509a38..68e034a 100755
--- a/Plugin/Mail/Template/TransportBuilderPlugin.php
+++ b/Plugin/Mail/Template/TransportBuilderPlugin.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Plugin\Mail\Template;
@@ -12,7 +12,6 @@
 
 class TransportBuilderPlugin
 {
-
     /** @var Store */
     protected $storeModel;
 
@@ -26,6 +25,7 @@ public function __construct(
     }
 
     /**
+     *  Plugin to set the store ID in template options.
      * @param TransportBuilder $subject
      * @param $templateOptions
      * @return array
diff --git a/Plugin/Mail/TransportPlugin.php b/Plugin/Mail/TransportPlugin.php
index a50c2da..e593c7a 100644
--- a/Plugin/Mail/TransportPlugin.php
+++ b/Plugin/Mail/TransportPlugin.php
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Plugin\Mail;
@@ -31,11 +31,12 @@ class TransportPlugin
     /**
      * @var Smtp
      */
-    private SmtpFactory $smtpFactory;
+    private $smtpFactory;
 
     /**
      * @param Data $dataHelper
      * @param Store $storeModel
+     * @param SmtpFactory $smtpFactory
      */
     public function __construct(
         Data $dataHelper,
diff --git a/etc/acl.xml b/etc/acl.xml
index 4cd7794..6d0d8a1 100755
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
index 97bd47d..56ecc43 100755
--- a/etc/adminhtml/routes.xml
+++ b/etc/adminhtml/routes.xml
@@ -3,7 +3,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
diff --git a/etc/config.xml b/etc/config.xml
index 37d182d..cfd466c 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -3,7 +3,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
diff --git a/etc/di.xml b/etc/di.xml
index a6f219d..8c1dcaa 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -3,7 +3,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
diff --git a/view/adminhtml/templates/system/config/validateConfigButton.phtml b/view/adminhtml/templates/system/config/validateConfigButton.phtml
index 010343f..d83541f 100755
--- a/view/adminhtml/templates/system/config/validateConfigButton.phtml
+++ b/view/adminhtml/templates/system/config/validateConfigButton.phtml
@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 ?>
 
diff --git a/view/adminhtml/web/js/validate-config.js b/view/adminhtml/web/js/validate-config.js
index 8d574fd..efc6a53 100755
--- a/view/adminhtml/web/js/validate-config.js
+++ b/view/adminhtml/web/js/validate-config.js
@@ -1,7 +1,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 define([