diff --git a/.travis.yml b/.travis.yml
index b4854d6..cd3ea2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ matrix:
     env: MAGENTO_VERSION=2.3.0 CODE_QUALITY=true
   - php: 7.2
     env: MAGENTO_VERSION=2.3.*
-  - php: 7.3
-    env: MAGENTO_VERSION=2.3.0
   - php: 7.3
     env: MAGENTO_VERSION=2.3.*
 
diff --git a/Block/Imprint/Content.php b/Block/Imprint/Content.php
index 35296f5..f7a9c54 100644
--- a/Block/Imprint/Content.php
+++ b/Block/Imprint/Content.php
@@ -67,6 +67,8 @@ public function getCountry()
     }
 
     /**
+     *  Get Website
+     *
      * Retrieve the setting "website". If parameter checkForProtocol is true,
      * check if there is a valid protocol given, otherwise add http:// manually.
      *
@@ -90,8 +92,8 @@ public function getWeb($checkForProtocol = false)
     /**
      * Try to limit spam by generating a javascript email link
      *
-     * @param boolean true
-     * @return string
+     * @param bool $antispam
+     * @return mixed|string
      */
     public function getEmail($antispam = false)
     {
@@ -122,7 +124,7 @@ public function getEmail($antispam = false)
     /**
      * Generate JS code
      *
-     * @param $parts
+     * @param mixed $parts
      * @return string
      */
     public function getEmailJs($parts)
@@ -135,6 +137,8 @@ public function getEmailJs($parts)
     }
 
     /**
+     * Get Imprint Value
+     *
      * @param string $field
      * @return mixed
      */
diff --git a/Block/Price/Details.php b/Block/Price/Details.php
index 6f9975f..22454d2 100644
--- a/Block/Price/Details.php
+++ b/Block/Price/Details.php
@@ -45,13 +45,15 @@ class Details extends \Magento\Framework\View\Element\Template
     private $taxHelper;
 
     /**
+     * Details constructor.
+     *
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \FireGento\MageSetup\Model\System\Config         $magesetupConfig
-     * @param \Magento\Customer\Model\Session                  $customerSession
-     * @param GroupRepository                                  $groupRepository
-     * @param \Magento\Tax\Model\Calculation\Proxy             $taxCalculation
-     * @param \Magento\Tax\Helper\Data                         $taxHelper
-     * @param array                                            $data
+     * @param \FireGento\MageSetup\Model\System\Config $magesetupConfig
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param GroupRepository $groupRepository
+     * @param \Magento\Tax\Model\Calculation\Proxy $taxCalculation
+     * @param \Magento\Tax\Helper\Data $taxHelper
+     * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -73,6 +75,8 @@ public function __construct(
     }
 
     /**
+     * Se saleable item
+     *
      * @param \Magento\Framework\Pricing\SaleableInterface $saleableItem
      */
     public function setSaleableItem(\Magento\Framework\Pricing\SaleableInterface $saleableItem)
@@ -82,6 +86,8 @@ public function setSaleableItem(\Magento\Framework\Pricing\SaleableInterface $sa
     }
 
     /**
+     * Get formatted tax rate
+     *
      * @return string
      */
     public function getFormattedTaxRate()
@@ -94,6 +100,8 @@ public function getFormattedTaxRate()
     }
 
     /**
+     * Get price display type
+     *
      * @return int
      */
     public function getPriceDisplayType()
@@ -102,6 +110,8 @@ public function getPriceDisplayType()
     }
 
     /**
+     * Inclunding shipping coast
+     *
      * @return bool
      */
     public function isIncludingShippingCosts()
@@ -114,6 +124,8 @@ public function isIncludingShippingCosts()
     }
 
     /**
+     * Show Shipping link
+     *
      * @return bool
      */
     public function canShowShippingLink()
@@ -128,6 +140,8 @@ public function canShowShippingLink()
     }
 
     /**
+     * Get shipping cost url
+     *
      * @return string|bool
      */
     public function getShippingCostUrl()
@@ -136,6 +150,8 @@ public function getShippingCostUrl()
     }
 
     /**
+     * Get tax percent by saleable item
+     *
      * @return float|int
      */
     private function getTaxPercentBySaleableItem()
diff --git a/Block/Product/Delivery.php b/Block/Product/Delivery.php
index de8fe3c..981f08a 100644
--- a/Block/Product/Delivery.php
+++ b/Block/Product/Delivery.php
@@ -5,6 +5,11 @@
  */
 namespace FireGento\MageSetup\Block\Product;
 
+/**
+ * Class Delivery
+ *
+ * @package FireGento\MageSetup\Block\Product
+ */
 class Delivery extends \Magento\Catalog\Block\Product\View\Description
 {
     /**
diff --git a/Command/SetupRunCommand.php b/Command/SetupRunCommand.php
index a5d4f2c..4b5f8c2 100644
--- a/Command/SetupRunCommand.php
+++ b/Command/SetupRunCommand.php
@@ -66,6 +66,8 @@ class SetupRunCommand extends Command
     private $subProcessorPool;
 
     /**
+     * SetupRunCommand constructor.
+     *
      * @param SetupServiceFactory $setupService
      * @param ConfigFactory $magesetupConfig
      * @param SubProcessorPool $subProcessorPool
@@ -95,7 +97,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -107,6 +109,8 @@ protected function configure()
     }
 
     /**
+     * Setup command
+     *
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int Non zero if invalid type, 0 otherwise
diff --git a/Helper/Data.php b/Helper/Data.php
index cedf1ff..9949021 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -11,10 +11,18 @@
 
 /**
  * Class AroundRenderPlugin
+ *
  * @package FireGento\MageSetup\Helper
  */
 class Data extends AbstractHelper
 {
+    /**
+     * Get config value
+     *
+     * @param mixed $field
+     * @param mixed $storeId
+     * @return mixed
+     */
     public function getConfigValue($field, $storeId = null)
     {
         return $this->scopeConfig->getValue(
diff --git a/Model/Config.php b/Model/Config.php
index fbbcf0f..2f036b7 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -40,9 +40,11 @@ class Config implements ConfigInterface
     private $loadedConfig;
 
     /**
-     * @param Reader         $reader
+     * Config constructor.
+     *
+     * @param Reader $reader
      * @param CacheInterface $cache
-     * @param string         $country
+     * @param mixed $country
      */
     public function __construct(
         Reader $reader,
@@ -57,6 +59,8 @@ public function __construct(
     }
 
     /**
+     * Get country
+     *
      * @return string
      */
     public function getCountry()
@@ -65,6 +69,8 @@ public function getCountry()
     }
 
     /**
+     * Get allowed countries
+     *
      * @return array
      */
     public function getAllowedCountries()
@@ -81,6 +87,8 @@ public function getAllowedCountries()
     }
 
     /**
+     * Get system config
+     *
      * @return array
      */
     public function getSystemConfig()
@@ -94,6 +102,8 @@ public function getSystemConfig()
     }
 
     /**
+     * Get tax classes
+     *
      * @return array|bool
      */
     public function getTaxClasses()
@@ -106,6 +116,8 @@ public function getTaxClasses()
     }
 
     /**
+     * Get tax calculation rates
+     *
      * @return array|bool
      */
     public function getTaxCalculationRates()
@@ -118,6 +130,8 @@ public function getTaxCalculationRates()
     }
 
     /**
+     * Get tax calculation rules
+     *
      * @return array|bool
      */
     public function getTaxCalculationRules()
@@ -130,6 +144,8 @@ public function getTaxCalculationRules()
     }
 
     /**
+     * Get agreements
+     *
      * @return array|bool
      */
     public function getAgreements()
@@ -142,6 +158,8 @@ public function getAgreements()
     }
 
     /**
+     * Get cms pages
+     *
      * @return array|bool
      */
     public function getCmsPages()
@@ -154,6 +172,8 @@ public function getCmsPages()
     }
 
     /**
+     * Get cms blocks
+     *
      * @return array|bool
      */
     public function getCmsBlocks()
diff --git a/Model/Config/Converter.php b/Model/Config/Converter.php
index 6b93320..bbbfffd 100644
--- a/Model/Config/Converter.php
+++ b/Model/Config/Converter.php
@@ -13,6 +13,8 @@
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
+     * Convert
+     *
      * @param \DOMDocument $source
      * @return array
      */
@@ -57,6 +59,8 @@ public function convert($source)
     }
 
     /**
+     * Get one tier config
+     *
      * @param \DOMElement $node
      * @return array
      */
@@ -76,6 +80,8 @@ public function getOneTierConfig(\DOMElement $node)
     }
 
     /**
+     * Get tax config
+     *
      * @param \DOMElement $node
      * @return array
      */
@@ -124,6 +130,8 @@ public function getTaxConfig(\DOMElement $node)
     }
 
     /**
+     * Get two tier config
+     *
      * @param \DOMElement $node
      * @return array
      */
diff --git a/Model/ConfigInterface.php b/Model/ConfigInterface.php
index 9fd827b..5062765 100644
--- a/Model/ConfigInterface.php
+++ b/Model/ConfigInterface.php
@@ -23,36 +23,50 @@ interface ConfigInterface
     const DEFAULT_NODE = 'default';
 
     /**
+     * Get country
+     *
      * @return string
      */
     public function getCountry();
 
     /**
+     * Get allowed countries
+     *
      * @return array
      */
     public function getAllowedCountries();
 
     /**
+     * Get system config
+     *
      * @return array
      */
     public function getSystemConfig();
 
     /**
+     * Get tax classes
+     *
      * @return array|bool
      */
     public function getTaxClasses();
 
     /**
+     * Get tax calculation rates
+     *
      * @return array|bool
      */
     public function getTaxCalculationRates();
 
     /**
+     * Get tax calculation rules
+     *
      * @return array|bool
      */
     public function getTaxCalculationRules();
 
     /**
+     * Get agreements
+     *
      * @return array|bool
      */
     public function getAgreements();
diff --git a/Model/Setup/SubProcessor/AbstractSubProcessor.php b/Model/Setup/SubProcessor/AbstractSubProcessor.php
index 24971f8..1574b9b 100644
--- a/Model/Setup/SubProcessor/AbstractSubProcessor.php
+++ b/Model/Setup/SubProcessor/AbstractSubProcessor.php
@@ -20,6 +20,8 @@ abstract class AbstractSubProcessor implements SubProcessorInterface
     private $configWriter;
 
     /**
+     * AbstractSubProcessor constructor.
+     *
      * @param WriterInterface $configWriter
      */
     public function __construct(WriterInterface $configWriter)
@@ -28,9 +30,11 @@ public function __construct(WriterInterface $configWriter)
     }
 
     /**
+     * Save config value
+     *
      * @param string $path
      * @param string $value
-     * @param null   $storeId
+     * @param mixed $storeId
      */
     public function saveConfigValue($path, $value, $storeId = null)
     {
diff --git a/Model/Setup/SubProcessor/AgreementsSubProcessor.php b/Model/Setup/SubProcessor/AgreementsSubProcessor.php
index 49de420..704d815 100644
--- a/Model/Setup/SubProcessor/AgreementsSubProcessor.php
+++ b/Model/Setup/SubProcessor/AgreementsSubProcessor.php
@@ -36,9 +36,11 @@ class AgreementsSubProcessor extends AbstractSubProcessor
     private $agreementsRepository;
 
     /**
-     * @param WriterInterface                                                $configWriter
-     * @param \Magento\Framework\Module\Dir\Reader                           $moduleReader
-     * @param \Magento\CheckoutAgreements\Model\AgreementFactory             $agreementFactory
+     * AgreementsSubProcessor constructor.
+     *
+     * @param WriterInterface $configWriter
+     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     * @param \Magento\CheckoutAgreements\Model\AgreementFactory $agreementFactory
      * @param \Magento\CheckoutAgreements\Model\CheckoutAgreementsRepository $agreementsRepository
      */
     public function __construct(
@@ -54,6 +56,8 @@ public function __construct(
     }
 
     /**
+     * Process
+     *
      * @param Config $config
      * @return void
      */
@@ -123,6 +127,8 @@ public function process(Config $config)
     }
 
     /**
+     * Get template path
+     *
      * @return string
      */
     private function getTemplatePath()
diff --git a/Model/Setup/SubProcessor/CmsSubProcessor.php b/Model/Setup/SubProcessor/CmsSubProcessor.php
index 202d672..31d4475 100644
--- a/Model/Setup/SubProcessor/CmsSubProcessor.php
+++ b/Model/Setup/SubProcessor/CmsSubProcessor.php
@@ -50,12 +50,14 @@ class CmsSubProcessor extends AbstractSubProcessor
     private $blockRepository;
 
     /**
-     * @param WriterInterface                      $configWriter
+     * CmsSubProcessor constructor.
+     *
+     * @param WriterInterface $configWriter
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @param PageFactory                          $pageFactory
-     * @param PageRepository                       $pageRepository
-     * @param BlockFactory                         $blockFactory
-     * @param BlockRepository                      $blockRepository
+     * @param PageFactory $pageFactory
+     * @param PageRepository $pageRepository
+     * @param BlockFactory $blockFactory
+     * @param BlockRepository $blockRepository
      */
     public function __construct(
         WriterInterface $configWriter,
@@ -74,6 +76,8 @@ public function __construct(
     }
 
     /**
+     * Process
+     *
      * @param Config $config
      * @return void
      */
diff --git a/Model/Setup/SubProcessor/EmailSubProcessor.php b/Model/Setup/SubProcessor/EmailSubProcessor.php
index eb7f769..63cf81f 100644
--- a/Model/Setup/SubProcessor/EmailSubProcessor.php
+++ b/Model/Setup/SubProcessor/EmailSubProcessor.php
@@ -16,6 +16,8 @@
 class EmailSubProcessor extends AbstractSubProcessor
 {
     /**
+     * EmailSubProcessor constructor.
+     *
      * @param WriterInterface $configWriter
      */
     public function __construct(WriterInterface $configWriter)
@@ -24,6 +26,8 @@ public function __construct(WriterInterface $configWriter)
     }
 
     /**
+     * Proccess
+     *
      * @param Config $config
      * @return void
      */
diff --git a/Model/Setup/SubProcessor/SubProcessorInterface.php b/Model/Setup/SubProcessor/SubProcessorInterface.php
index fc93fac..32f8d9d 100644
--- a/Model/Setup/SubProcessor/SubProcessorInterface.php
+++ b/Model/Setup/SubProcessor/SubProcessorInterface.php
@@ -15,6 +15,8 @@
 interface SubProcessorInterface
 {
     /**
+     * Process
+     *
      * @param Config $config
      * @return void
      */
diff --git a/Model/Setup/SubProcessor/SubProcessorPool.php b/Model/Setup/SubProcessor/SubProcessorPool.php
index 4918433..f04d836 100644
--- a/Model/Setup/SubProcessor/SubProcessorPool.php
+++ b/Model/Setup/SubProcessor/SubProcessorPool.php
@@ -22,8 +22,10 @@ class SubProcessorPool
     private $subProcessors = [];
 
     /**
-     * @param array       $subProcessors
+     * SubProcessorPool constructor.
+     *
      * @param TMapFactory $tmapFactory
+     * @param array $subProcessors
      */
     public function __construct(
         TMapFactory $tmapFactory,
diff --git a/Model/Setup/SubProcessor/SystemConfigSubProcessor.php b/Model/Setup/SubProcessor/SystemConfigSubProcessor.php
index b390303..865eb6b 100644
--- a/Model/Setup/SubProcessor/SystemConfigSubProcessor.php
+++ b/Model/Setup/SubProcessor/SystemConfigSubProcessor.php
@@ -16,6 +16,8 @@
 class SystemConfigSubProcessor extends AbstractSubProcessor
 {
     /**
+     * SystemConfigSubProcessor constructor.
+     *
      * @param WriterInterface $configWriter
      */
     public function __construct(WriterInterface $configWriter)
@@ -24,6 +26,8 @@ public function __construct(WriterInterface $configWriter)
     }
 
     /**
+     * Process
+     *
      * @param Config $config
      * @return void
      */
diff --git a/Model/Setup/SubProcessor/TaxSubProcessor.php b/Model/Setup/SubProcessor/TaxSubProcessor.php
index 3206599..8a21c42 100644
--- a/Model/Setup/SubProcessor/TaxSubProcessor.php
+++ b/Model/Setup/SubProcessor/TaxSubProcessor.php
@@ -10,11 +10,11 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Model\ResourceModel\Group\CollectionFactory as CustomerGroupCollectionFactory;
+use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Tax\Api\Data\TaxRuleInterfaceFactory;
 use Magento\Tax\Api\TaxRuleRepositoryInterface;
-use Magento\Eav\Setup\EavSetup;
 
 /**
  * Class TaxSubProcessor
@@ -75,6 +75,7 @@ class TaxSubProcessor extends AbstractSubProcessor
 
     /**
      * TaxSubProcessor constructor.
+     *
      * @param WriterInterface $configWriter
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param StoreManagerInterface $storeManager
@@ -83,7 +84,7 @@ class TaxSubProcessor extends AbstractSubProcessor
      * @param ProductCollectionFactory $productCollectionFactory
      * @param CustomerGroupCollectionFactory $customerGroupCollectionFactory
      * @param \FireGento\MageSetup\Model\System\Config $magesetupConfig
-     * @param \Magento\Eav\Setup\EavSetup $eavSetup
+     * @param EavSetup $eavSetup
      */
     public function __construct(
         WriterInterface $configWriter,
@@ -110,6 +111,8 @@ public function __construct(
     }
 
     /**
+     * Process
+     *
      * @param Config $config
      * @return void
      */
@@ -179,7 +182,9 @@ public function process(Config $config)
     }
 
     /**
-     * @param $tableAlias
+     * Get table
+     *
+     * @param string $tableAlias
      * @return string
      */
     private function getTable($tableAlias)
@@ -188,7 +193,9 @@ private function getTable($tableAlias)
     }
 
     /**
-     * @param $table
+     * Truncate table
+     *
+     * @param string $table
      */
     private function truncateTable($table)
     {
@@ -197,8 +204,10 @@ private function truncateTable($table)
     }
 
     /**
-     * @param $table
-     * @param $data
+     * Insert into table
+     *
+     * @param string $table
+     * @param mixed $data
      */
     private function insertIntoTable($table, $data)
     {
@@ -207,7 +216,9 @@ private function insertIntoTable($table, $data)
     }
 
     /**
-     * @param $table
+     * Get last insert id
+     *
+     * @param string $table
      * @return mixed
      */
     private function getLastInsertId($table)
@@ -218,6 +229,8 @@ private function getLastInsertId($table)
     }
 
     /**
+     * Get countries
+     *
      * @return array|string
      */
     private function getCountries()
@@ -230,7 +243,9 @@ private function getCountries()
     }
 
     /**
-     * @param $rateData
+     * Create tax calculation rate
+     *
+     * @param mixed $rateData
      * @return mixed
      */
     private function createTaxCalculationRate($rateData)
@@ -261,7 +276,9 @@ private function createTaxCalculationRate($rateData)
     }
 
     /**
-     * @param $taxClasses
+     * Save tax class relations
+     *
+     * @param mixed $taxClasses
      */
     private function saveTaxClassRelations($taxClasses)
     {
diff --git a/Model/System/Config.php b/Model/System/Config.php
index 283bedc..8d11815 100644
--- a/Model/System/Config.php
+++ b/Model/System/Config.php
@@ -36,9 +36,11 @@ class Config
     private $pageFactory;
 
     /**
-     * @param \Magento\Framework\App\Helper\Context      $context
+     * Config constructor.
+     *
+     * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param PageFactory                                $pageFactory
+     * @param PageFactory $pageFactory
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -75,6 +77,8 @@ public function getEuCountries()
     }
 
     /**
+     * Including shipping costs
+     *
      * @return bool
      */
     public function isIncludingShippingCosts()
@@ -83,6 +87,8 @@ public function isIncludingShippingCosts()
     }
 
     /**
+     * Get shipping cost url
+     *
      * @return string|bool
      */
     public function getShippingCostUrl()
@@ -105,6 +111,8 @@ public function getShippingCostUrl()
     }
 
     /**
+     * Display delivery time in product listing
+     *
      * @return bool
      */
     public function isDisplayDeliveryTimeOnProductListing()
diff --git a/Observer/AddProductAttributeVisibleCheckoutObserver.php b/Observer/AddProductAttributeVisibleCheckoutObserver.php
index 09ad113..19a1099 100644
--- a/Observer/AddProductAttributeVisibleCheckoutObserver.php
+++ b/Observer/AddProductAttributeVisibleCheckoutObserver.php
@@ -31,7 +31,7 @@ public function __construct(Yesno $yesNo)
     }
 
     /**
-     * lala
+     * Add product attribute visible checkout observer
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
diff --git a/Plugin/Agreements/AfterGetContent.php b/Plugin/Agreements/AfterGetContent.php
index 64427b9..34c0b77 100644
--- a/Plugin/Agreements/AfterGetContent.php
+++ b/Plugin/Agreements/AfterGetContent.php
@@ -20,6 +20,8 @@ class AfterGetContent
     private $templateFilter;
 
     /**
+     * AfterGetContent constructor.
+     *
      * @param TemplateFilter $templateFilter
      */
     public function __construct(TemplateFilter $templateFilter)
@@ -28,9 +30,11 @@ public function __construct(TemplateFilter $templateFilter)
     }
 
     /**
+     * After get content
+     *
      * @param \Magento\CheckoutAgreements\Model\Agreement $agreement
-     * @param string                                      $result
-     * @return string
+     * @param string $result
+     * @return mixed
      */
     public function afterGetContent(\Magento\CheckoutAgreements\Model\Agreement $agreement, $result)
     {
diff --git a/Plugin/Catalog/Helper/Product/Configuration/AroundGetCustomOptionsPlugin.php b/Plugin/Catalog/Helper/Product/Configuration/AroundGetCustomOptionsPlugin.php
index c21634a..905744c 100644
--- a/Plugin/Catalog/Helper/Product/Configuration/AroundGetCustomOptionsPlugin.php
+++ b/Plugin/Catalog/Helper/Product/Configuration/AroundGetCustomOptionsPlugin.php
@@ -30,10 +30,12 @@ public function __construct(GetVisibleCheckoutAttributesServiceInterface $getVis
     }
 
     /**
-     * @param \Magento\Catalog\Helper\Product\Configuration                   $subject
-     * @param \Closure                                                        $proceed
+     * Around get custom options
+     *
+     * @param \Magento\Catalog\Helper\Product\Configuration $subject
+     * @param \Closure $proceed
      * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item
-     * @return array
+     * @return array|mixed
      */
     public function aroundGetCustomOptions(
         \Magento\Catalog\Helper\Product\Configuration $subject,
diff --git a/Plugin/Catalog/ListProductPlugin.php b/Plugin/Catalog/ListProductPlugin.php
index 9ffbb85..00a64b0 100644
--- a/Plugin/Catalog/ListProductPlugin.php
+++ b/Plugin/Catalog/ListProductPlugin.php
@@ -5,6 +5,11 @@
  */
 namespace FireGento\MageSetup\Plugin\Catalog;
 
+/**
+ * Class ListProductPlugin
+ *
+ * @package FireGento\MageSetup\Plugin\Catalog
+ */
 class ListProductPlugin
 {
     /**
@@ -14,6 +19,8 @@ class ListProductPlugin
     protected $_scopeConfig;
 
     /**
+     * ListProductPlugin constructor.
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
@@ -24,10 +31,10 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
     /**
      * Retrieve product details html
      *
-     * @param \Magento\Catalog\Block\Product\ListProduct
+     * @param \Magento\Catalog\Block\Product\ListProduct $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Model\Product $product
-     * @return string
+     * @return mixed|string
      */
     public function aroundGetProductDetailsHtml(
         \Magento\Catalog\Block\Product\ListProduct $subject,
diff --git a/Plugin/Catalog/Model/Attribute/AroundGetAttributeNamesPlugin.php b/Plugin/Catalog/Model/Attribute/AroundGetAttributeNamesPlugin.php
index cac9db8..be9af65 100644
--- a/Plugin/Catalog/Model/Attribute/AroundGetAttributeNamesPlugin.php
+++ b/Plugin/Catalog/Model/Attribute/AroundGetAttributeNamesPlugin.php
@@ -32,6 +32,8 @@ public function __construct(GetVisibleCheckoutAttributesServiceInterface $getVis
     }
 
     /**
+     *  Around get attribute names
+     *
      * @param \Magento\Catalog\Model\Attribute\Config $subject
      * @param \Closure $proceed
      * @param  string $groupName
diff --git a/Plugin/Email/Block/Adminhtml/Template/Edit/Form.php b/Plugin/Email/Block/Adminhtml/Template/Edit/Form.php
index 7ce0ad0..e080f24 100644
--- a/Plugin/Email/Block/Adminhtml/Template/Edit/Form.php
+++ b/Plugin/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -22,7 +22,9 @@ class Form
     private $variables;
 
     /**
-     * Constructor
+     * Form constructor.
+     *
+     * @param Variables $variables
      */
     public function __construct(\FireGento\MageSetup\Plugin\Email\Model\Source\Variables $variables)
     {
diff --git a/Plugin/Email/Model/Source/Variables.php b/Plugin/Email/Model/Source/Variables.php
index a7513c1..feafcb7 100644
--- a/Plugin/Email/Model/Source/Variables.php
+++ b/Plugin/Email/Model/Source/Variables.php
@@ -6,6 +6,7 @@
  * Can be removed after Magento 2.2 EOL
  */
 namespace FireGento\MageSetup\Plugin\Email\Model\Source;
+
 /**
  * Class Variables
  *
@@ -100,4 +101,4 @@ public function afterGetData(\Magento\Email\Model\Source\Variables $subject, $re
     {
         return array_merge($result, $this->getAdditionalConfigVariables());
     }
-}
\ No newline at end of file
+}
diff --git a/Plugin/Pricing/AroundRenderPlugin.php b/Plugin/Pricing/AroundRenderPlugin.php
index 253dd3b..b5fc95e 100644
--- a/Plugin/Pricing/AroundRenderPlugin.php
+++ b/Plugin/Pricing/AroundRenderPlugin.php
@@ -8,6 +8,7 @@
 
 /**
  * Class AroundRenderPlugin
+ *
  * @package FireGento\MageSetup\Model\Plugin
  */
 class AroundRenderPlugin
@@ -26,6 +27,8 @@ class AroundRenderPlugin
     protected $helper;
 
     /**
+     * AroundRenderPlugin constructor.
+     *
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \FireGento\MageSetup\Helper\Data $helper
      */
@@ -38,13 +41,14 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Framework\Pricing\Render            $subject
-     * @param \Closure                                     $proceed
-     * @param string                                       $priceCode
+     * Around render
+     *
+     * @param \Magento\Framework\Pricing\Render $subject
+     * @param \Closure $proceed
+     * @param mixed $priceCode
      * @param \Magento\Framework\Pricing\SaleableInterface $saleableItem
-     * @param array                                        $arguments
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param array $arguments
+     * @return mixed|string
      */
     public function aroundRender(
         \Magento\Framework\Pricing\Render $subject,
diff --git a/Service/GetVisibleCheckoutAttributesService.php b/Service/GetVisibleCheckoutAttributesService.php
index 1d1d759..79b0ba8 100644
--- a/Service/GetVisibleCheckoutAttributesService.php
+++ b/Service/GetVisibleCheckoutAttributesService.php
@@ -25,7 +25,7 @@ class GetVisibleCheckoutAttributesService implements GetVisibleCheckoutAttribute
      * GetVisibleCheckoutAttributesService constructor.
      *
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
-     * @param \Magento\Framework\Api\SearchCriteriaBuilder             $searchCriteriaBuilder
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
@@ -36,6 +36,8 @@ public function __construct(
     }
 
     /**
+     * Get visible checkout attributes
+     *
      * @return array|bool
      */
     public function execute()
diff --git a/Service/GetVisibleCheckoutAttributesServiceInterface.php b/Service/GetVisibleCheckoutAttributesServiceInterface.php
index 3d04020..e557067 100644
--- a/Service/GetVisibleCheckoutAttributesServiceInterface.php
+++ b/Service/GetVisibleCheckoutAttributesServiceInterface.php
@@ -13,6 +13,8 @@
 interface GetVisibleCheckoutAttributesServiceInterface
 {
     /**
+     * Get visible checkout attributes
+     *
      * @return array|bool
      */
     public function execute();
diff --git a/Service/SetupService.php b/Service/SetupService.php
index 8349497..0acd7de 100644
--- a/Service/SetupService.php
+++ b/Service/SetupService.php
@@ -43,10 +43,12 @@ class SetupService implements SetupServiceInterface
     private $output = null;
 
     /**
-     * @param Config           $config
-     * @param CacheManager     $cacheManager
+     * SetupService constructor.
+     *
+     * @param Config $config
+     * @param CacheManager $cacheManager
      * @param SubProcessorPool $subProcessorPool
-     * @param array            $subProcessorCodes
+     * @param array $subProcessorCodes
      */
     public function __construct(
         Config $config,
@@ -65,6 +67,8 @@ public function __construct(
     }
 
     /**
+     * Setup service
+     *
      * @return void
      */
     public function execute()
@@ -82,6 +86,8 @@ public function execute()
     }
 
     /**
+     * Set output
+     *
      * @param OutputInterface $output
      */
     public function setOutput(OutputInterface $output)
diff --git a/Service/SetupServiceInterface.php b/Service/SetupServiceInterface.php
index 540213e..888c58d 100644
--- a/Service/SetupServiceInterface.php
+++ b/Service/SetupServiceInterface.php
@@ -15,11 +15,15 @@
 interface SetupServiceInterface
 {
     /**
+     * Setup service
+     *
      * @return void
      */
     public function execute();
 
     /**
+     * Set output
+     *
      * @param OutputInterface $output
      */
     public function setOutput(OutputInterface $output);
diff --git a/Setup/InstallData.php b/Setup/InstallData.php
index 3c1ebcc..d3db3f6 100644
--- a/Setup/InstallData.php
+++ b/Setup/InstallData.php
@@ -33,6 +33,8 @@ class InstallData implements InstallDataInterface
     private $eavSetupFactory;
 
     /**
+     * InstallData constructor.
+     *
      * @param EavSetupFactory $eavSetupFactory
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
@@ -41,8 +43,10 @@ public function __construct(EavSetupFactory $eavSetupFactory)
     }
 
     /**
+     * Install method
+     *
      * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface   $context
+     * @param ModuleContextInterface $context
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
index d74a1d2..a51bc7d 100644
--- a/Setup/InstallSchema.php
+++ b/Setup/InstallSchema.php
@@ -18,7 +18,7 @@
 class InstallSchema implements InstallSchemaInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
index 5ce699f..f7f2708 100644
--- a/Setup/UpgradeData.php
+++ b/Setup/UpgradeData.php
@@ -33,6 +33,8 @@ class UpgradeData implements UpgradeDataInterface
     private $eavSetupFactory;
 
     /**
+     * UpgradeData constructor.
+     *
      * @param EavSetupFactory $eavSetupFactory
      */
     public function __construct(EavSetupFactory $eavSetupFactory)
@@ -40,6 +42,12 @@ public function __construct(EavSetupFactory $eavSetupFactory)
         $this->eavSetupFactory = $eavSetupFactory;
     }
 
+    /**
+     * Upgrade method
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param ModuleContextInterface $context
+     */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index 948a218..a02b11b 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -18,7 +18,7 @@
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php
index c71b61a..86b32c9 100644
--- a/Test/Unit/Model/ConfigTest.php
+++ b/Test/Unit/Model/ConfigTest.php
@@ -7,12 +7,6 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-if (version_compare(PHP_VERSION, '7.1.0') >= 0) {
-    class_alias('PHPUnit\Framework\TestCase', '\FireGento\MageSetup\TestCase');
-} else {
-    class_alias('\PHPUnit_Framework_TestCase', '\FireGento\MageSetup\TestCase');
-}
-
 /**
  * Class Config
  *
diff --git a/Test/Unit/Model/System/ConfigTest.php b/Test/Unit/Model/System/ConfigTest.php
index f241ad9..8a9d41b 100644
--- a/Test/Unit/Model/System/ConfigTest.php
+++ b/Test/Unit/Model/System/ConfigTest.php
@@ -7,8 +7,6 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-
-
 /**
  * Class Config
  *
@@ -49,7 +47,7 @@ public function setUp()
      */
     public function isCountryInEu()
     {
-        echo PHP_VERSION ;
+        echo PHP_VERSION;
         $this->assertTrue($this->config->isCountryInEu('DE'));
         $this->assertFalse($this->config->isCountryInEu('CH'));
     }
diff --git a/Test/Unit/Plugin/Catalog/ListProductPluginTest.php b/Test/Unit/Plugin/Catalog/ListProductPluginTest.php
index b65bb0e..847be6c 100644
--- a/Test/Unit/Plugin/Catalog/ListProductPluginTest.php
+++ b/Test/Unit/Plugin/Catalog/ListProductPluginTest.php
@@ -12,7 +12,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\LayoutInterface;
 
-
 class ListProductPluginTest extends \FireGento\MageSetup\TestCase
 {
     /** @var ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject */