diff --git a/1 b/1
deleted file mode 100644
index 63a2414..0000000
--- a/1
+++ /dev/null
@@ -1,6 +0,0 @@
-
-version 7c
-#
-# Write a message for tag:
-#   0.0.7b
-# Lines starting with '#' will be ignored.
diff --git a/Block/Product/CustomRatingSnippet.php b/Block/Product/CustomRatingSnippet.php
index 7a20d27..d229834 100644
--- a/Block/Product/CustomRatingSnippet.php
+++ b/Block/Product/CustomRatingSnippet.php
@@ -4,17 +4,15 @@
 
 use Magento\Framework\View\Element\Template;
 
-class CustomRatingSnippet extends \Reviewscouk\Reviews\Block\Product\RatingSnippet
+class CustomRatingSnippet extends RatingSnippet
 {
     /**
-     * Get the template for the block based on the admin setting
-     *
      * @return string
      */
     public function getTemplate()
     {
         $isEnabled = $this->_scopeConfig->isSetFlag('reviewscouk_reviews_onpage/widget/category_rating_snippet_widget_enabled');
-   
+
         if ($isEnabled) {
             return 'Reviewscouk_Reviews::category/list.phtml';
         }
diff --git a/Block/Product/RatingSnippet.php b/Block/Product/RatingSnippet.php
index c6227aa..eea1433 100644
--- a/Block/Product/RatingSnippet.php
+++ b/Block/Product/RatingSnippet.php
@@ -2,51 +2,41 @@
 
 namespace Reviewscouk\Reviews\Block\Product;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Block\Product\ListProduct;
-use Framework\Registry as Registry;
-use Magento\Framework\Escaper as Escaper;
-// use Reviewscouk\Reviews\Helper\Config as ReviewsConfig;
-use Magento\Framework as Framework;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Helper\PostHelper;
+use Magento\Framework\Escaper;
+use Magento\Framework\Url\Helper\Data;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Helper\Context as ContextHelper;
-use \Reviewscouk\Reviews\Helper\Config as ReviewsConfig;
-
+use Reviewscouk\Reviews\Helper\Config as ReviewsConfig;
 
 class RatingSnippet extends ListProduct
 {
     protected $_customerSession;
     protected $categoryFactory;
-    //protected $reviewsConfig = Reviews\Helper\Config;
-    // protected $_storeManager = StoreManagerInterface::class;
     protected $store;
     protected $reviewsConfig;
-    /**
-     * ListProduct constructor.
-     * @param \Magento\Catalog\Block\Product\Context $context
-     * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
-     * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
-     * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
-     * @param \Magento\Framework\Url\Helper\Data $urlHelper
-     * @param Helper $helper
-     * @param array $data
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     */
+
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
-        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
+        Context $context,
+        PostHelper $postDataHelper,
+        Resolver $layerResolver,
+        CategoryRepositoryInterface $categoryRepository,
+        Data $urlHelper,
         array $data = [],
-        \Magento\Customer\Model\Session $customerSession = null,
-        \Magento\Catalog\Model\CategoryFactory $categoryFactory = null,
+        Session $customerSession = null,
+        CategoryFactory $categoryFactory = null,
         ReviewsConfig $reviewsConfigHelper = null,
         StoreManagerInterface $storeManager = null
     ) {
         $this->_customerSession = $customerSession;
         $this->categoryFactory = $categoryFactory;
-        $this->reviewsConfig = $reviewsConfigHelper ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ReviewsConfig::class);
+        $this->reviewsConfig = $reviewsConfigHelper ?: ObjectManager::getInstance()->get(ReviewsConfig::class);
         $this->store = $storeManager;
 
         parent::__construct(
@@ -63,22 +53,24 @@ public function __construct(
     private function getProductSkus($product)
     {
         $sku = $product->getSku();
-        $type = $product->getTypeID();
+        $type = (string) $product->getTypeID();
 
         $productSkus = [$sku];
-        if ($type == 'configurable') {
+
+        if ($type === 'configurable') {
             $usedProducts = $product->getTypeInstance()->getUsedProducts($product);
             foreach ($usedProducts as $usedProduct) {
                 $productSkus[] = $usedProduct->getSku();
             }
         }
 
-        if ($type == 'grouped') {
+        if ($type === 'grouped') {
             $usedProducts = $product->getTypeInstance()->getAssociatedProducts($product);
             foreach ($usedProducts as $usedProduct) {
                 $productSkus[] = $usedProduct->getSku();
             }
         }
+
         return $productSkus;
     }
 
@@ -88,9 +80,11 @@ public function getRatingSnippet($product)
         $ratingSnippetEnabled = $this->reviewsConfig->isCategoryRatingSnippetWidgetEnabled($this->store);
         $skus = $this->getProductSkus($product);
         $html = '';
-        if($ratingSnippetEnabled) {
+
+        if ($ratingSnippetEnabled) {
             $html = '<div class="ruk_rating_snippet" data-sku="' . $escaper->escapeHtml((!empty($skus) ? implode(';', $skus) : '')) . '"></div>';
         }
+
         return $html;
     }
 
diff --git a/Block/Product/Reviewwidget.php b/Block/Product/Reviewwidget.php
index f7984b6..e2a022c 100755
--- a/Block/Product/Reviewwidget.php
+++ b/Block/Product/Reviewwidget.php
@@ -2,12 +2,11 @@
 
 namespace Reviewscouk\Reviews\Block\Product;
 
-use Reviewscouk\Reviews as Reviews;
-use Magento\Framework as Framework;
+use Reviewscouk\Reviews;
+use Magento\Framework;
 
 class Reviewwidget extends Framework\View\Element\Template
 {
-
     private $configHelper;
     private $dataHelper;
     private $registry;
@@ -126,7 +125,7 @@ protected function getWidgetColor()
     {
         $colour = $this->configHelper->getProductWidgetColour($this->store->getId());
         // people will sometimes put hash and sometimes they will forgot so we need to check for this error
-        if (isset($colour) && strpos($colour, '#') === false) {
+        if (isset($colour) && !str_contains($colour, '#')) {
             $colour = '#' . $colour;
         }
         // checking to see if we hare a valid colour. If not then we change it to reviews default hex colour
@@ -140,9 +139,11 @@ protected function getWidgetURL()
     {
         $region = $this->configHelper->getRegion($this->store->getId());
         $api_url = 'widget.reviews.co.uk';
+
         if ($region == 'US') {
             $api_url = 'widget.reviews.io';
         }
+
         return $api_url;
     }
 }
diff --git a/Block/Richsnippet.php b/Block/Richsnippet.php
index 2097f2f..22ba158 100755
--- a/Block/Richsnippet.php
+++ b/Block/Richsnippet.php
@@ -2,10 +2,10 @@
 
 namespace Reviewscouk\Reviews\Block;
 
-use Magento\Backend as Backend;
-use Magento\Directory as Directory;
-use Magento\Framework as Framework;
-use Reviewscouk\Reviews as Reviews;
+use Magento\Backend;
+use Magento\Directory;
+use Magento\Framework;
+use Reviewscouk\Reviews;
 
 class Richsnippet extends Framework\View\Element\Template
 {
@@ -21,8 +21,6 @@ public function __construct(
         Reviews\Helper\Data $dataHelper,
         Framework\View\Element\Template\Context $context,
         Framework\Registry $registry,
-        Backend\Block\Template\Context $backend,
-
         Directory\Model\Currency $currency,
 
         array $data = []
@@ -30,9 +28,9 @@ public function __construct(
         parent::__construct($context, $data);
 
         $this->configHelper = $config;
-        $this->dataHelper   = $dataHelper;
-        $this->registry     = $registry;
-        $this->currency     = $currency;
+        $this->dataHelper = $dataHelper;
+        $this->registry = $registry;
+        $this->currency = $currency;
 
         $this->store = $this->_storeManager->getStore();
     }
@@ -40,7 +38,7 @@ public function __construct(
     public function autoRichSnippet()
     {
         $merchant_enabled = $this->configHelper->isMerchantRichSnippetsEnabled($this->store->getId());
-        $product_enabled  = $this->configHelper->isProductRichSnippetsEnabled($this->store->getId());
+        $product_enabled = $this->configHelper->isProductRichSnippetsEnabled($this->store->getId());
 
         $current_product = $this->registry->registry('current_product');
 
@@ -56,19 +54,20 @@ public function autoRichSnippet()
             }
 
             $product = [
-                'availability'  => $productAvailability,
-                'price'         => $current_product->getFinalPrice(),
-                'url'         => $current_product->getProductUrl(),
-                'description'         => $current_product->getMetaDescription(),
+                'availability' => $productAvailability,
+                'price' => $current_product->getFinalPrice(),
+                'url' => $current_product->getProductUrl(),
+                'description' => $current_product->getMetaDescription(),
                 'mpn' => ($current_product->hasData('mpn') ? $current_product->getData('mpn') : $current_product->getSku()),
                 'priceCurrency' => $this->store->getDefaultCurrencyCode(),
                 'brand' => ($current_product->hasData('manufacturer') ? $current_product->getAttributeText('manufacturer') : ($current_product->hasData('brand') ? $current_product->getAttributeText('brand') : 'Not Available')),
             ];
 
             return $this->getRichSnippet($sku, $product);
-        } else if ($merchant_enabled) {
+        } elseif ($merchant_enabled) {
             return $this->getRichSnippet();
         }
+
         return '';
     }
 
@@ -78,9 +77,9 @@ public function getRichSnippet($sku = null, $product = null)
             $sku = implode(';', $sku);
         }
 
-        $region    = $this->configHelper->getRegion($this->store->getId());
+        $region = $this->configHelper->getRegion($this->store->getId());
         $storeName = $this->configHelper->getStoreId($this->store->getId());
-        $url       = $region == 'us' ? 'https://widget.reviews.io/rich-snippet/dist.js' : 'https://widget.reviews.co.uk/rich-snippet/dist.js';
+        $url = $region == 'us' ? 'https://widget.reviews.io/rich-snippet/dist.js' : 'https://widget.reviews.co.uk/rich-snippet/dist.js';
 
         $output = '<script src="' . $url . '"></script>';
         $output .= '<script>
diff --git a/Controller/Index/API.php b/Controller/Index/API.php
index 3fd889f..3f260ae 100644
--- a/Controller/Index/API.php
+++ b/Controller/Index/API.php
@@ -2,130 +2,151 @@
 
 namespace Reviewscouk\Reviews\Controller\Index;
 
-use Magento\Framework as Framework;
-use Magento\Catalog as Catalog;
-use Magento\CatalogInventory as CatalogInventory;
-use Magento\Store as Store;
-use Reviewscouk\Reviews as Reviews;
-
-class API extends Framework\App\Action\Action
+use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Reviewscouk\Reviews\Helper\Config;
+
+class API implements HttpGetActionInterface
 {
-
-    private $configHelper;
-    private $cache;
-    private $productModel;
-    private $stockModel;
-    private $imageHelper;
-    private $storeModel;
-
     public function __construct(
-        Framework\App\Action\Context $context,
-        Framework\Cache\Core $core,
-        Catalog\Model\Product $product,
-        CatalogInventory\Api\StockRegistryInterface $stockRegistryInterface,
-        Catalog\Helper\Image $image,
-        Store\Model\StoreManagerInterface $storeManagerInterface,
-        Reviews\Helper\Config $config,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-     )
-    {
-        parent::__construct($context);
-
-        $this->configHelper = $config;
-        $this->cache = $core;
-        $this->productModel = $product;
-        $this->stockModel = $stockRegistryInterface;
-        $this->imageHelper = $image;
-        $this->storeModel = $storeManagerInterface;
-        $this->productCollectionFactory = $productCollectionFactory;
-    }
-
-    private function getProductCollection($page, $perPage)
-    {
-        $collection = $this->productCollectionFactory->create();
-            /* Addtional */
-            $collection
-                ->addMinimalPrice()
-                ->addFinalPrice()
-                ->addTaxPercents()
-                ->addAttributeToSelect('*')
-                ->addUrlRewrite()
-                ->setPageSize($perPage)
-                ->setCurPage($page);
-            return $collection;
+        private readonly StockRegistryInterface $stockModel,
+        private readonly Image $imageHelper,
+        private readonly StoreManagerInterface $storeModel,
+        private readonly Config $configHelper,
+        private readonly CollectionFactory $productCollectionFactory,
+        private readonly Http $request,
+        private readonly CategoryCollectionFactory $categoryCollectionFactory,
+        private readonly ResultFactory $resultFactory,
+    ) {
     }
 
     public function execute()
     {
-        ob_start();
-        set_time_limit(0);
-
         $store = $this->storeModel->getStore();
         $productFeedEnabled = $this->configHelper->isProductFeedEnabled($store->getId());
-        $auth['actual_key'] = $this->configHelper->getApiKey($store->getId());
 
-        if ($productFeedEnabled) {
+        if (!$productFeedEnabled) {
+            $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+            $result->setContents(
+                json_encode(
+                    ['success' => false, 'message' => 'API disabled.'],
+                    JSON_THROW_ON_ERROR
+                )
+            );
 
-            $auth['page'] = !empty($_GET['page']) ? $_GET['page'] : '1';
-            $auth['per_page'] = !empty($_GET['per_page']) ? (int) $_GET['per_page'] : 100;
-            $auth['submitted_key'] = !empty($_GET['key']) ? $_GET['key'] : '';
+            return $result;
+        }
 
-            //Authenticate
-            if(!isset($auth['submitted_key'], $auth['actual_key']) || $auth['actual_key'] != $auth['submitted_key']) {
-              echo json_encode(array('success' => false, 'message' => 'Unauthenticated.'));
-              die();
-            }
+        if ($this->canAccessResource($store->getId())) {
+            $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+            $result->setContents(
+                json_encode(
+                    ['success' => false, 'message' => 'Unauthenticated.'],
+                    JSON_THROW_ON_ERROR
+                )
+            );
 
-            $products = $this->getProductCollection($auth['page'], $auth['per_page']);
-
-            $collection = [];
-
-            foreach ($products as $product) {
-                // Load image url via helper.
-                $imageUrl = $this->imageHelper->init($product, 'product_page_image_large')->getUrl();
-                $brand = $product->hasData('manufacturer') ? $product->getAttributeText('manufacturer') : ($product->hasData('brand') ? $product->getAttributeText('brand') : 'Not Available');
-                $price = $product->getPrice();
-
-                $finalPrice = $product->getFinalPrice();
-
-                $item = [
-                  'id' => $product->getSku(),
-                  'title' => $product->getName(),
-                  'link' => $product->getProductUrl(),
-                  'price' => (!empty($price) ? number_format($price, 2) . " " . $store->getCurrentCurrency()->getCode() : ''),
-                  'sale_price' => (!empty($finalPrice) ? number_format($finalPrice, 2) . " " . $store->getCurrentCurrency()->getCode() : ''),
-                  'image_link' => $imageUrl,
-                  'brand' => $brand,
-                  'mpn' => ($product->hasData('mpn') ? $product->getData('mpn') : $product->getSku()),
-                  'gtin' => ($product->hasData('gtin') ? $product->getData('gtin') : ($product->hasData('upc') ? $product->getData('upc') : '')),
-                  'product_type' => $product->getTypeID(),
-                ];
-
-                $item['category'] = [];
-
-                $categoryCollection = $product->getCategoryCollection();
-                if (count($categoryCollection) > 0) {
-                    foreach ($categoryCollection as $category) {
-                        $item['category'][] =  $category->getName();
-                    }
-                }
+            return $result;
+        }
 
-                $stock = $this->stockModel->getStockItem(
-                    $product->getId(),
-                    $product->getStore()->getWebsiteId()
-                );
+        ob_start();
+        set_time_limit(0);
 
-                $item['in_stock'] = $stock->getIsInStock() ? true : false;
+        $products = $this->getProductCollection();
+        $collection = [];
+
+        foreach ($products as $product) {
+            // Load image url via helper. Refers to every occurrence in module
+            $imageUrl = $this->imageHelper->init($product, 'product_page_image_large')->getUrl();
+            # Nested ternary operator should not be used. Change to if or so.
+            $brand = $product->hasData('manufacturer')
+                ?: ($product->hasData('brand') ? $product->getAttributeText('brand') : 'Not Available');
+            $price = $product->getPrice();
+            $finalPrice = $product->getFinalPrice();
+
+            $item = [
+                'id' => $product->getSku(),
+                'title' => $product->getName(),
+                'link' => $product->getProductUrl(),
+                'price' => !empty($price)
+                    ? number_format($price, 2) . " " . $store->getCurrentCurrency()->getCode() : '',
+                'sale_price' => !empty($finalPrice)
+                    ? number_format($finalPrice, 2) . " " . $store->getCurrentCurrency()->getCode() : '',
+                'image_link' => $imageUrl,
+                'brand' => $brand,
+                'mpn' => $product->hasData('mpn') ?: $product->getSku(),
+                'gtin' => $product->hasData('gtin') ?: ($product->hasData('upc') ?: ''),
+                'product_type' => $product->getTypeID(),
+            ];
+
+            $item['category'] = [];
+
+            # Basically the same as for Feed. Moreover, it can be moved to Model or Service - Its used by Api and Feed
+            $categoryIds = $product->getCategoryIds();
+            try {
+                $categoryCollection = $this->categoryCollectionFactory->create()
+                    ->addAttributeToSelect(['name'])
+                    ->addAttributeToFilter('entity_id', $categoryIds);
+            } catch (\Exception $e) {
+                $categoryCollection = null;
+            }
 
-                $collection[] = $item;
+            if ($categoryCollection !== null && count($categoryCollection) > 0) {
+                foreach ($categoryCollection as $category) {
+                    $item['category'][] = $category->getName();
+                }
             }
 
-            echo json_encode(array('success' => true, 'products' => $collection, 'total' => count($collection)));
-            die();
+            # Basically the same as for Feed. Moreover, it can be moved to Model or Service - Its used by Api and Feed
+            $stock = $this->stockModel->getStockItem(
+                $product->getId(),
+                $product->getStore()->getWebsiteId()
+            );
+            $item['in_stock'] = (bool)$stock->getIsInStock();
 
-        } else {
-          echo json_encode(array('success' => false, 'message' => 'API disabled.'));
-          die();
+            $collection[] = $item;
         }
+
+        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+        $result->setContents(
+            json_encode(
+                ['success' => true, 'products' => $collection, 'total' => count($collection)],
+                JSON_THROW_ON_ERROR
+            )
+        );
+
+        return $result;
+    }
+
+    private function canAccessResource(int $storeId): bool
+    {
+        $auth['actual_key'] = $this->configHelper->getApiKey($storeId);
+        $auth['submitted_key'] = $this->request->getParam('key') ?: '';
+        return !(!isset($auth['submitted_key'], $auth['actual_key']) || $auth['actual_key'] != $auth['submitted_key']);
+    }
+
+    private function getProductCollection(): Collection
+    {
+        $page = $this->request->getParam('page') ?: 0;
+        $perPage = $this->request->getParam('per_page') ?: 100;
+
+        $collection = $this->productCollectionFactory->create();
+        $collection
+            ->addMinimalPrice()
+            ->addFinalPrice()
+            ->addTaxPercents()
+            ->addAttributeToSelect(['name', 'manufacturer', 'gtin', 'brand', 'image', 'upc', 'mpn'])
+            ->addUrlRewrite()
+            ->setPageSize($perPage)
+            ->setCurPage($page);
+
+        return $collection;
     }
 }
diff --git a/Controller/Index/Feed.php b/Controller/Index/Feed.php
index 9afc598..924ce77 100755
--- a/Controller/Index/Feed.php
+++ b/Controller/Index/Feed.php
@@ -2,225 +2,239 @@
 
 namespace Reviewscouk\Reviews\Controller\Index;
 
-use Magento\Framework as Framework;
-use Magento\Catalog as Catalog;
-use Magento\CatalogInventory as CatalogInventory;
-use Magento\Store as Store;
-use Reviewscouk\Reviews as Reviews;
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-use Magento\Framework\Cache\Core;
-use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Exception;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterfaceFactory;
 use Magento\Catalog\Helper\Image;
-use Magento\Store\Model\StoreManagerInterface;
-use Reviewscouk\Reviews\Helper\Config;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\HTTP\Client\Curl;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableTypeResourceModel;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\Store\Model\StoreManagerInterface;
+use Reviewscouk\Reviews\Helper\Config;
 
 class Feed implements HttpGetActionInterface
 {
-    protected $configHelper;
-    protected $cache;
-    protected $productModel;
-    protected $stockModel;
-    protected $imageHelper;
-    protected $storeModel;
-    protected $productCollectionFactory;
-    protected $configurableType;
-    protected $curl;
-    protected $resultFactory;
-
     public function __construct(
-        //Framework\App\Action\Context $context,
-        Core $core,
-        Product $product,
-        StockRegistryInterface $stockRegistryInterface,
-        Image $image,
-        StoreManagerInterface $storeManagerInterface,
-        Config $config,
-        CollectionFactory $productCollectionFactory,
-        Configurable $configurableType,
-        Curl $curl,
-        ResultFactory $resultFactory
+        private readonly StockRegistryInterface $stockModel, # StockRegistryInterface is deprecated.
+        private readonly Image $imageHelper,
+        private readonly StoreManagerInterface $storeModel,
+        private readonly Config $configHelper,
+        private readonly CollectionFactory $productCollectionFactory,
+        private readonly ResultFactory $resultFactory,
+        private readonly Grouped $groupedProductModel,
+        private readonly ConfigurableTypeResourceModel $configurableProductModel,
+        private readonly ProductRepositoryInterfaceFactory $productRepositoryFactory,
+        private readonly CategoryCollectionFactory $categoryCollectionFactory,
+        private readonly Http $request,
     ) {
-        // parent::__construct($context);
-
-        $this->configHelper = $config;
-        $this->cache = $core;
-        $this->productModel = $product;
-        $this->stockModel = $stockRegistryInterface;
-        $this->imageHelper = $image;
-        $this->storeModel = $storeManagerInterface;
-        $this->productCollectionFactory = $productCollectionFactory;
-        $this->configurableType = $configurableType;
-        $this->curl = $curl;
-        $this->resultFactory = $resultFactory;
     }
 
-    private function getProductCollection()
-    {
-        $collection = $this->productCollectionFactory->create();
-        /* Addtional */
-        $collection
-            ->addMinimalPrice()
-            ->addFinalPrice()
-            ->addTaxPercents()
-            ->addAttributeToSelect('*')
-            ->addUrlRewrite();
-        return $collection;
-    }
-
-    private function validateImageUrl($imageUrl)
+    public function execute()
     {
-        $options = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HEADER => true,
-            CURLOPT_NOBODY => true,
-        ];
-
-        if (strpos($imageUrl, "Magento_Catalog/images/product/placeholder/image.jpg") !== false) {
-            return false;
-        }
+        $store = $this->storeModel->getStore();
 
-        return true;
-    }
+        if (!$this->configHelper->isProductFeedEnabled($store->getId())) {
+            $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+            $result->setContents("Product Feed is disabled");
 
-    private function validateVariantUrl($url)
-    {
-        $options = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HEADER => true,
-            CURLOPT_NOBODY => true,
-        ];
-
-        try {
-            $this->curl->get($url);
-            $this->curl->setOptions($options);
-
-            if ($this->curl->getStatus() == 200) {
-                return true;
-            }
-        } catch (\Exception $e) {
-            return false;
+            return $result;
         }
-    }
 
-    public function execute()
-    {
         // Set timelimit to 0 to avoid timeouts when generating feed.
         ob_start();
         set_time_limit(0);
-
-        $store = $this->storeModel->getStore();
-
-        $productFeedEnabled = $this->configHelper->isProductFeedEnabled($store->getId());
-        if ($productFeedEnabled) {
-            // TODO:- Implement caching of Feed
-            $productFeed = "<?xml version='1.0'?>
-                    <rss version ='2.0' xmlns:g='http://base.google.com/ns/1.0'>
-                    <channel>
-                    <title><![CDATA[" . $store->getName() . "]]></title>
-                    <link>" . $store->getBaseUrl() . "</link>";
-
-            $products = $this->getProductCollection();
-
-            foreach ($products as $product) {
-                $parentProductId = null;
-                $groupedParentId = null;
-                $configurableParentId = null;
-                $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-
-                if ($objectManager->create('Magento\GroupedProduct\Model\Product\Type\Grouped')->getParentIdsByChild($product->getId())) {
-                    $groupedParentId = $objectManager->create('Magento\GroupedProduct\Model\Product\Type\Grouped')->getParentIdsByChild($product->getId());
-                }
-                if ($objectManager->create('Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable')->getParentIdsByChild($product->getId())) {
-                    $configurableParentId = $objectManager->create('Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable')->getParentIdsByChild($product->getId());
-                }
-
-                $parentId = null;
-                $parentProduct = null;
-
-                if (isset($groupedParentId[0])) {
-                    $parentId = $groupedParentId[0];
-                } else if (isset($configurableParentId[0])) {
-                    $parentId = $configurableParentId[0];
-                }
-
+        # Basically not good solution. Even with that, timeout can be thrown with many products.
+        # Consider using pagination as for API Controller and remove the ob_start and set_time_limit
+        # Eventually create cron, that would create the Feed in the background and the controller would only display it
+
+        // TODO:- Implement caching of Feed
+        $productFeed = "<?xml version='1.0'?>
+<rss version ='2.0' xmlns:g='http://base.google.com/ns/1.0'>
+    <channel>
+        <title><![CDATA[" . $store->getName() . "]]></title>
+        <link>" . $store->getBaseUrl() . "</link>";
+
+        $page = $this->request->getParam('page') ?: 0;
+        # If You will use Pages and PageSizes, then remove `do / while` block, and use it as in API Controller.
+        do {
+            $productCollection = $this->getProductCollection($page);
+
+            /** @var ProductInterface $product */
+            foreach ($productCollection as $product) {
                 // Load image url via helper.
                 $productImageUrl = $this->imageHelper->init($product, 'product_page_image_large')->getUrl();
                 $imageLink = $productImageUrl;
                 $productUrl = $product->getProductUrl();
 
-                if (isset($parentId)) {
-                    $parentProduct = $objectManager->create('Magento\Catalog\Model\Product')->load($parentId);
+                /** @var ProductInterface $parentProduct */
+                $parentProduct = $this->provideParentProduct($product);
+                if ($parentProduct !== null) {
+                    $parentProductImageUrl = $this->imageHelper
+                        ->init($parentProduct, 'product_page_image_large')->getUrl();
 
-                    $parentProductImageUrl = $this->imageHelper->init($parentProduct, 'product_page_image_large')->getUrl();
-                    $validVariantImage = $this->validateImageUrl($productImageUrl);
-                    if (!$validVariantImage) {
+                    if (!$this->validateImageUrl($productImageUrl)) {
                         $imageLink = $parentProductImageUrl;
                     }
 
                     $productUrl = $parentProduct->getProductUrl();
                 }
 
-                $brand = $product->hasData('manufacturer') ? $product->getAttributeText('manufacturer') : ($product->hasData('brand') ? $product->getAttributeText('brand') : 'Not Available');
+                if ($product->hasData('brand')) {
+                    $brand = $product->hasData('manufacturer') ? $product->getAttributeText('manufacturer')
+                        : ($product->getAttributeText('brand'));
+                } else {
+                    $brand = $product->hasData('manufacturer') ? $product->getAttributeText('manufacturer')
+                        : ('Not Available');
+                }
+
                 $price = $product->getPrice();
                 $finalPrice = $product->getFinalPrice();
 
-                $productFeed .= "<item>
-                        <g:id><![CDATA[" . $product->getSku() . "]]></g:id>
-                        <title><![CDATA[" . $product->getName() . "]]></title>
-                        <link><![CDATA[" . $productUrl . "]]></link>
-                        <g:price>" . (!empty($price) ? number_format($price, 2) . " " . $store->getCurrentCurrency()->getCode() : '') . "</g:price>
-                        <g:sale_price>" . (!empty($finalPrice) ? number_format($finalPrice, 2) . " " . $store->getCurrentCurrency()->getCode() : '') . "</g:sale_price>
-                        <description><![CDATA[]]></description>
-                        <g:condition>new</g:condition>
-                        <g:image_link><![CDATA[" . $imageLink . "]]></g:image_link>
-                        <g:brand><![CDATA[" . $brand . "]]></g:brand>
-                        <g:mpn><![CDATA[" . ($product->hasData('mpn') ? $product->getData('mpn') : $product->getSku()) . "]]></g:mpn>
-                        <g:gtin><![CDATA[" . ($product->hasData('gtin') ? $product->getData('gtin') : ($product->hasData('upc') ? $product->getData('upc') : '')) . "]]></g:gtin>
-                        <g:product_type><![CDATA[" . $product->getTypeID() . "]]></g:product_type>
-                        <g:shipping>
-                        <g:country>UK</g:country>
-                        <g:service>Standard Free Shipping</g:service>
-                        <g:price>0 GBP</g:price>
-                        </g:shipping>";
-
-                $categoryCollection = $product->getCategoryCollection();
-                if (count($categoryCollection) > 0) {
+                # I dont think, UK should be hardcoded as Shipping. The implementation of it is not very pretty.
+                $productFeed .= "
+        <item>
+            <g:id><![CDATA[" . $product->getSku() . "]]></g:id>
+            <title><![CDATA[" . $product->getName() . "]]></title>
+            <link><![CDATA[" . $productUrl . "]]></link>
+            <g:price>" . (!empty($price) ? number_format($price,
+                            2) . " " . $store->getCurrentCurrency()->getCode() : '') . "</g:price>
+            <g:sale_price>" . (!empty($finalPrice) ? number_format($finalPrice,
+                            2) . " " . $store->getCurrentCurrency()->getCode() : '') . "</g:sale_price>
+            <description><![CDATA[]]></description>
+            <g:condition>new</g:condition>
+            <g:image_link><![CDATA[" . $imageLink . "]]></g:image_link>
+            <g:brand><![CDATA[" . $brand . "]]></g:brand>
+            <g:mpn><![CDATA[" . ($product->hasData('mpn') ?: $product->getSku()) . "]]></g:mpn>
+            <g:gtin><![CDATA[" . ($product->hasData('gtin') ?: ($product->hasData('upc') ?: '')) . "]]></g:gtin>
+            <g:product_type><![CDATA[" . $product->getTypeID() . "]]></g:product_type>
+            <g:shipping>
+            <g:country>UK</g:country>
+            <g:service>Standard Free Shipping</g:service>
+            <g:price>0 GBP</g:price>
+            </g:shipping>";
+
+                # If You really need to provide also Category names, the Category collection have to be loaded as well.
+                # It is not very optimized for many products.
+                $categoryIds = $product->getCategoryIds();
+                try {
+                    $categoryCollection = $this->categoryCollectionFactory->create()
+                        ->addAttributeToSelect(['name'])
+                        ->addAttributeToFilter('entity_id', $categoryIds);
+                } catch (Exception $e) {
+                    $categoryCollection = null;
+                }
+
+                if ($categoryCollection !== null && count($categoryCollection) > 0) {
                     foreach ($categoryCollection as $category) {
-                        $productFeed .= "<g:google_product_category><![CDATA[" . $category->getName() . "]]></g:google_product_category>";
+                        $productFeed .= sprintf(
+                            "\n\t\t\t<g:google_product_category><![CDATA[%s]]></g:google_product_category>",
+                            $category->getName()
+                        );
                     }
                 }
 
+                # The StockRegistryInterface is deprecated. Implemented logic will not reflect real Stock Status.
+                # See https://developer.adobe.com/commerce/php/development/components/web-api/inventory-management/
+                # For quicker resolve, consider using $product->isSalable() instead $stock->getIsInStock()
+                # Otherwise if Shop uses MSI load StockInventories and check availability there
                 $stock = $this->stockModel->getStockItem(
                     $product->getId(),
                     $product->getStore()->getWebsiteId()
                 );
                 if ($stock->getIsInStock()) {
-                    $productFeed .= "<g:availability>in stock</g:availability>";
+                    #if ($product->isSalable()) {
+                    $productFeed .= "\n\t\t\t<g:availability>in stock</g:availability>";
                 } else {
-                    $productFeed .= "<g:availability>out of stock</g:availability>";
+                    $productFeed .= "\n\t\t\t<g:availability>out of stock</g:availability>";
                 }
 
-                $productFeed .= "</item>";
-                $parentProduct = null;
+                $productFeed .= "\n\t\t</item>";
             }
 
-            $productFeed .= "</channel></rss>";
+            $page++;
+        } while ($productCollection->count());
 
-            // TODO:- Implement caching of feed
+        $productFeed .= "\n\t</channel>\n</rss>";
 
-            $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
-            $result->setContents($productFeed);
+        // TODO:- Implement caching of feed
+        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+        $result->setContents($productFeed);
 
-            return $result;
-            // exit();
-        } else {
-            print "Product Feed is disabled.";
+        ob_end_clean(); #Should occur when using ob_start
+
+        return $result;
+    }
+
+    /**
+     * @param int $page
+     * @return Collection
+     */
+    private function getProductCollection(int $page): Collection
+    {
+        $perPage = $this->request->getParam('per_page') ?: 100;
+
+        $collection = $this->productCollectionFactory->create();
+        # If You want to use Collection, do not load all Attributes if not required. Especially with big collection.
+        # Add just required attributes.
+        $collection
+            ->addMinimalPrice()
+            ->addFinalPrice()
+            ->addTaxPercents()
+            ->addAttributeToSelect(['name', 'manufacturer', 'gtin', 'brand', 'image', 'upc', 'mpn'])
+            ->addUrlRewrite()
+            ->setPageSize($perPage)
+            ->setCurPage($page);
+
+        return $collection;
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @return ProductInterface|null
+     */
+    private function provideParentProduct(ProductInterface $product): ?ProductInterface
+    {
+        $parentId = null;
+        if ($this->groupedProductModel->getParentIdsByChild($product->getId())) {
+            $groupedParentId = $this->groupedProductModel->getParentIdsByChild($product->getId());
+            if (isset($groupedParentId[0])) {
+                $parentId = $groupedParentId[0];
+            }
+        }
+        if ($this->configurableProductModel->getParentIdsByChild($product->getId())) {
+            $configurableParentId = $this->configurableProductModel->getParentIdsByChild($product->getId());
+            if (isset($configurableParentId[0])) {
+                $parentId = $configurableParentId[0];
+            }
         }
+
+        $parentProduct = null;
+        if (isset($parentId)) {
+            try {
+                $parentProduct = $this->productRepositoryFactory->create()->getById($parentId);
+            } catch (Exception $exception) {
+            }
+        }
+
+        return $parentProduct;
+    }
+
+    /**
+     * @param string $imageUrl
+     * @return bool
+     */
+    private function validateImageUrl(string $imageUrl): bool
+    {
+        if (str_contains($imageUrl, 'Magento_Catalog/images/product/placeholder/image.jpg')) {
+            return false;
+        }
+
+        return true;
     }
 }
diff --git a/Helper/Config.php b/Helper/Config.php
index b956d3f..3152fdd 100755
--- a/Helper/Config.php
+++ b/Helper/Config.php
@@ -2,20 +2,20 @@
 
 namespace Reviewscouk\Reviews\Helper;
 
-use Magento\Framework as Framework;
-use Magento\Store as Store;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Store;
 
-class Config extends Framework\App\Helper\AbstractHelper
+class Config extends AbstractHelper
 {
-
-    const XML_CONFIG_REVIEWS_REGION = "reviewscouk_reviews_setup/settings/region";
+    const XML_CONFIG_REVIEWS_REGION = 'reviewscouk_reviews_setup/settings/region';
     const XML_CONFIG_API_KEY = 'reviewscouk_reviews_setup/settings/api_key';
     const XML_CONFIG_STORE_ID = 'reviewscouk_reviews_setup/settings/store_id';
     const XML_CONFIG_PRODUCT_WIDGET_ENABLED = 'reviewscouk_reviews_onpage/widget/product_widget_enabled';
     const XML_CONFIG_PRODUCT_RATING_SNIPPET_WIDGET_ENABLED = 'reviewscouk_reviews_onpage/widget/product_rating_snippet_widget_enabled';
     const XML_CONFIG_CATEGORY_RATING_SNIPPET_WIDGET_ENABLED = 'reviewscouk_reviews_onpage/widget/category_rating_snippet_widget_enabled';
     const XML_CONFIG_PRODUCT_WIDGET_VERSION = 'reviewscouk_reviews_onpage/widget/product_widget_version';
-    const XML_CONFIG_USE_TAB_MODE = "reviewscouk_reviews_onpage/widget/tab_mode_enabled";
+    const XML_CONFIG_USE_TAB_MODE = 'reviewscouk_reviews_onpage/widget/tab_mode_enabled';
 
     const XML_CONFIG_PRODUCT_WIDGET_COLOUR = 'reviewscouk_reviews_onpage/widget/product_widget_colour';
     const XML_CONFIG_QUESTION_WIDGET_ENABLED = 'reviewscouk_reviews_onpage/widget/question_widget_enabled';
@@ -24,12 +24,12 @@ class Config extends Framework\App\Helper\AbstractHelper
     const XML_CONFIG_PRODUCT_RICH_SNIPPETS_ENABLED = 'reviewscouk_reviews_onpage/richsnippets/product_enabled';
     const XML_CONFIG_PRODUCT_REVIEWS_ENABLED = 'reviewscouk_reviews_automation/collection/product_enabled';
     const XML_CONFIG_PRODUCT_FEED_ENABLED = 'reviewscouk_reviews_automation/product_feed/product_feed_enabled';
-    const XML_CONFIG_USE_GROUP_SKU = "reviewscouk_reviews_advanced/settings/used_grouped_skus";
+    const XML_CONFIG_USE_GROUP_SKU = 'reviewscouk_reviews_advanced/settings/used_grouped_skus';
 
 
     private $config;
 
-    public function __construct(Framework\App\Config\ScopeConfigInterface $scopeConfigInterface)
+    public function __construct(ScopeConfigInterface $scopeConfigInterface)
     {
         $this->config = $scopeConfigInterface;
     }
@@ -115,14 +115,8 @@ public function isProductFeedEnabled($magentoStore)
         return $this->getValue(self::XML_CONFIG_PRODUCT_FEED_ENABLED, $magentoStore);
     }
 
-    /**
-     * @param $code
-     * @param $magentoStore
-     * @return mixed
-     */
     private function getValue($code, $magentoStore)
     {
-        $value = $this->config->getValue($code, Store\Model\ScopeInterface::SCOPE_STORE, $magentoStore);
-        return $value;
+        return $this->config->getValue($code, Store\Model\ScopeInterface::SCOPE_STORE, $magentoStore);
     }
 }
diff --git a/Helper/Data.php b/Helper/Data.php
index 8b3c5ae..660c416 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -11,17 +11,17 @@ class Data extends Framework\App\Helper\AbstractHelper
     public function getProductSkus($product)
     {
         $sku = $product->getSku();
-        $type = $product->getTypeID();
+        $type = (string) $product->getTypeID();
 
         $productSkus = [$sku];
-        if ($type == 'configurable') {
+        if ($type === 'configurable') {
             $usedProducts = $product->getTypeInstance()->getUsedProducts($product);
             foreach ($usedProducts as $usedProduct) {
                 $productSkus[] = $usedProduct->getSku();
             }
         }
 
-        if ($type == 'grouped') {
+        if ($type === 'grouped') {
             $usedProducts = $product->getTypeInstance()->getAssociatedProducts($product);
             foreach ($usedProducts as $usedProduct) {
                 $productSkus[] = $usedProduct->getSku();
diff --git a/Model/Api.php b/Model/Api.php
index dee0a0e..20ecc0a 100755
--- a/Model/Api.php
+++ b/Model/Api.php
@@ -2,13 +2,12 @@
 
 namespace Reviewscouk\Reviews\Model;
 
-use Reviewscouk\Reviews as Reviews;
-use Magento\Framework as Framework;
-use Magento\Store as Store;
+use Reviewscouk\Reviews;
+use Magento\Framework;
+use Magento\Store;
 
 class Api extends Framework\Model\AbstractModel
 {
-
     private $configHelper;
     private $messageInterface;
     private $store;
diff --git a/Model/Config/Source/QuestionWidgetVersion.php b/Model/Config/Source/QuestionWidgetVersion.php
index df23697..7835467 100755
--- a/Model/Config/Source/QuestionWidgetVersion.php
+++ b/Model/Config/Source/QuestionWidgetVersion.php
@@ -1,35 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Reviewscouk\Reviews\Model\Config\Source;
 
-use Magento\Framework as Framework;
+use Magento\Framework\Data\OptionSourceInterface;
 
-class QuestionWidgetVersion implements Framework\Option\ArrayInterface
+class QuestionWidgetVersion implements OptionSourceInterface
 {
-
-    /**
-     * Options getter
-     *
-     * @return array
-     */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return [
             ['value' => '2', 'label' => __('Questions tab on Product Reviews Widget')],
             ['value' => '1', 'label' => __('Legacy Question Widget')],
         ];
     }
-
-    /**
-     * Get options in "key-value" format
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            '2' => __('Questions tab on Product Reviews Widget'),
-            '1' => __('Legacy Question Widget'),
-        ];
-    }
 }
diff --git a/Model/Config/Source/Region.php b/Model/Config/Source/Region.php
index 96a1214..aa4f829 100755
--- a/Model/Config/Source/Region.php
+++ b/Model/Config/Source/Region.php
@@ -2,34 +2,15 @@
 
 namespace Reviewscouk\Reviews\Model\Config\Source;
 
-use Magento\Framework as Framework;
+use Magento\Framework\Data\OptionSourceInterface;
 
-class Region implements Framework\Option\ArrayInterface
+class Region implements OptionSourceInterface
 {
-
-    /**
-     * Options getter
-     *
-     * @return array
-     */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return [
             ['value' => 'UK', 'label' => __('UK')],
             ['value' => 'US', 'label' => __('US')]
         ];
     }
-
-    /**
-     * Get options in "key-value" format
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            'UK' => __('UK'),
-            'US' => __('US')
-        ];
-    }
 }
diff --git a/Model/Config/Source/Widgetversion.php b/Model/Config/Source/Widgetversion.php
index 9ab213e..456fbc5 100755
--- a/Model/Config/Source/Widgetversion.php
+++ b/Model/Config/Source/Widgetversion.php
@@ -2,17 +2,11 @@
 
 namespace Reviewscouk\Reviews\Model\Config\Source;
 
-use Magento\Framework as Framework;
+use Magento\Framework\Data\OptionSourceInterface;
 
-class Widgetversion implements Framework\Option\ArrayInterface
+class Widgetversion implements OptionSourceInterface
 {
-
-    /**
-     * Options getter
-     *
-     * @return array
-     */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return [
             ['value' => '3', 'label' => __('Product Reviews Widget')],
@@ -20,18 +14,4 @@ public function toOptionArray()
             ['value' => '2', 'label' => __('Legacy Static Content Widget')],
         ];
     }
-
-    /**
-     * Get options in "key-value" format
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            '1' => __('V1 - Javascript Widget'),
-            '2' => __('V2 - Static Content'),
-            '3' => __('V3 - Product Reviews Widget'),
-        ];
-    }
 }
diff --git a/Observer/SendOrderDetails.php b/Observer/SendOrderDetails.php
index c151a5a..deeba20 100755
--- a/Observer/SendOrderDetails.php
+++ b/Observer/SendOrderDetails.php
@@ -1,91 +1,144 @@
 <?php
+/**
+ * Add Your COPPYRIGHTS here
+ *
+ * See COPYING.txt for license details.
+ */
 
 namespace Reviewscouk\Reviews\Observer;
 
-use Magento\Framework as Framework;
-use Reviewscouk\Reviews as Reviews;
-use Magento\Catalog as Catalog;
-use Magento\ConfigurableProduct as ConfigurableProduct;
-use Magento\Store as Store;
+use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Reviewscouk\Reviews\Helper\Config;
+use Reviewscouk\Reviews\Model\Api;
 
-class SendOrderDetails implements Framework\Event\ObserverInterface
+/**
+ * Observer class SendOrderDetails.
+ *
+ * Prepare and send info about bought items
+ */
+class SendOrderDetails implements ObserverInterface
 {
-
-    private $configHelper;
-    private $apiModel;
-    private $productModel;
-    private $imageHelper;
-    private $configProductModel;
-
+    /**
+     * SendOrderDetails Constructor
+     *
+     * @param Config            $configHelper
+     * @param Api               $apiModel
+     * @param Image             $imageHelper
+     * @param CollectionFactory $productCollectionFactory
+     */
     public function __construct(
-        Reviews\Helper\Config $config,
-        Reviews\Model\Api $api,
-        Catalog\Model\ProductFactory $product,
-        Catalog\Helper\Image $image,
-        ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurable
+        private readonly Config            $configHelper,
+        private readonly Api               $apiModel,
+        private readonly Image             $imageHelper,
+        private readonly CollectionFactory $productCollectionFactory,
     ) {
-        $this->configHelper = $config;
-        $this->apiModel = $api;
-        $this->productModel = $product;
-        $this->imageHelper = $image;
-        $this->configProductModel = $configurable;
     }
 
-    public function execute(Framework\Event\Observer $observer)
+    /**
+     * @inheritDoc
+     */
+    public function execute(Observer $observer)
     {
         $shipment = $observer->getEvent()->getShipment();
+        /** @var OrderInterface $order */
         $order = $shipment->getOrder();
-        $this->dispatchNotification($order);
+
+        if ($this->canSendOrderDetails($order)) {
+            $this->dispatchNotification($order);
+        }
     }
 
-    public function dispatchNotification($order)
+    /**
+     * Send Order data to Review
+     *
+     * @param OrderInterface $order
+     *
+     * @return void
+     */
+    public function dispatchNotification(OrderInterface $order): void
     {
-        try {
-            $magento_store_id = $order->getStoreId();
+        $storeId = $order->getStoreId();
+        /** @var OrderItemInterface[] $items */
+        $orderItems = $order->getAllVisibleItems();
 
-            if ($this->configHelper->getStoreId($magento_store_id) && $this->configHelper->getApiKey($magento_store_id) && $this->configHelper->isProductReviewsEnabled($magento_store_id)) {
-                $items = $order->getAllVisibleItems();
-                $p = array();
-                foreach ($items as $item) {
+        $itemIds = [];
+        /** @var OrderItemInterface $orderItem */
+        foreach ($orderItems as $orderItem) {
+            $itemIds[] = $orderItem->getProductId();
+        }
+        $productCollection = $this->productCollectionFactory->create()
+            ->addAttributeToSelect(['name', 'url', 'image'])
+            ->addAttributeToFilter('entity_id', ['in' => $itemIds]);
 
-                    if ($this->configHelper->isUsingGroupSkus($magento_store_id)) {
-                        // If product is part of a configurable product, use the configurable product details.
-                        if ($item->getProduct()->getTypeId() == 'simple' || $item->getProduct()->getTypeId() == \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
-                            $productId = $item->getProduct()->getId();
-                            $model = $this->productModel->create();
-                            $item = $model->load($productId);
-                        }
-                    }
-                    $imageUrl = $this->imageHelper->init($item, 'product_page_image_large')->getUrl();
-                    $p[] = [
-                        'image' => $imageUrl,
-                        'id' => $item->getId(),
-                        'sku' => $item->getSku(),
-                        'name' => $item->getName(),
-                        'pageUrl' => $item->getProductUrl()
-                    ];
-                }
+        $productData = [];
+        foreach ($productCollection as $item) {
+            # The whole IF makes no sense. Right now, if the isUsingGroupSkus is true, then literally:
+            # Check if Product is Simple OR Config. If yes, then load Product via repository (->getProduct())
+            # If not, use OrderItemInterface $Item from Order.
+            # Just to check its Id. Then load the same product via Model. Also the comment is not accurate at all.
+            # Especially using `$order->getAllVisibleItems()`. The child products will not be provided here.
+            # Consider removing that IF or refactor it to something useful.
+            # And for God’s sake, do not use deprecated methods like $model->load($productId)
+//                if ($this->configHelper->isUsingGroupSkus($storeId)) {
+//                    // If product is part of a configurable product, use the configurable product details.
+//                    if ($item->getProduct()->getTypeId() == 'simple' || $item->getProduct()->getTypeId() == Configurable::TYPE_CODE) {
+//                        $productId = $item->getProduct()->getId();
+//                        $model = $this->productModel->create();
+//                        $item = $model->load($productId);
+//                    }
+//                }
 
-                $name = $order->getCustomerName();
+            $imageUrl = $this->imageHelper->init($item, 'product_page_image_large')->getUrl();
+            $productData[] = [
+                'image' => $imageUrl,
+                'id' => $item->getId(),
+                'sku' => $item->getSku(),
+                'name' => $item->getName(),
+                'pageUrl' => $item->getProductUrl()
+            ];
+        }
 
-                if ($order->getCustomerIsGuest()) {
-                    $name = $order->getBillingAddress()->getFirstName();
-                }
+        $name = $order->getCustomerName();
 
-                $productResponse = $this->apiModel->apiPost('/invitation', [
-                    'source'       => 'magento',
-                    'name'         => $name,
-                    'email'        => $order->getCustomerEmail(),
-                    'order_id'     => $order->getRealOrderId(),
-                    'country_code' => $order->getShippingAddress()->getCountryId(),
-                    'phone'        => $order->getBillingAddress()->getTelephone(),
-                    'products'     => $p
-                ], $magento_store_id);
+        if ($order->getCustomerIsGuest()) {
+            $name = $order->getBillingAddress()->getFirstName();
+        }
 
-                $this->apiModel->addStatusMessage($productResponse, "Product Review Invitation");
+        try {
+            $productResponse = $this->apiModel->apiPost('/invitation', [
+                'source'       => 'magento',
+                'name'         => $name,
+                'email'        => $order->getCustomerEmail(),
+                'order_id'     => $order->getRealOrderId(),
+                'country_code' => $order->getShippingAddress()->getCountryId(),
+                'products'     => $productData
+            ], $storeId);
 
-            }
+            $this->apiModel->addStatusMessage($productResponse, "Product Review Invitation");
         } catch (\Exception $e) {
         }
     }
+
+    /**
+     * Check if Order can be sent to Review
+     *
+     * @param OrderInterface $order
+     *
+     * @return bool
+     */
+    private function canSendOrderDetails(OrderInterface $order): bool
+    {
+        if ($this->configHelper->getStoreId($order->getStoreId())
+            && $this->configHelper->getApiKey($order->getStoreId())
+            && $this->configHelper->isProductReviewsEnabled($order->getStoreId())
+        ) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/README.md b/README.md
index 745bd08..550e27a 100755
--- a/README.md
+++ b/README.md
@@ -13,19 +13,21 @@ You'll need to sign up at [Reviews.co.uk](https://www.reviews.co.uk "Reviews.co.
 
 # Installation
 
-1. Via command line, `cd` to Magento2 root folder
-
-2. As this plugin is hosted on [packagist.org](http://packagist.org), you simply use the following to instruct composer to fetch and install the module:
-
-    ```bash
-    composer require reviewscouk/reviews:0.0.62
-    ```
-
-3. When this is complete, `cd` to `/bin` and run the following:
+1. Add repository in  composer.json
+
+    ```json
+    "repositories": [
+        ...
+        "reviewscouk-reviews":{
+            "type": "vcs",
+            "url": "git@github.com:WeareJH/reviews-co-uk-magento2-module.git"
+        }
+   ```
+2. Run the following command in your Magento 2 root directory:
 
     ```bash
-    ./magento module:enable Reviewscouk_Reviews --clear-static-content
-    ./magento setup:upgrade
+   composer require reviewscouk/reviews
+   bin/magento setup:upgrade
     ```
 
 ## Basic Configuration
diff --git a/composer.json b/composer.json
index 53b7392..8d900f4 100755
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,12 @@
       "registration.php"
     ]
   },
+  "require": {
+    "magento/module-sales": "*",
+    "magento/module-catalog": "*",
+    "magento/framework": "*",
+    "php": ">=8.1"
+  },
   "description": "Reviews.co.uk Magento 2 Integration",
   "type": "magento2-module",
   "authors": [
diff --git a/etc/module.xml b/etc/module.xml
index 2803951..248baa5 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -3,7 +3,8 @@
     xsi:noNamespaceSchemaLocation="urn:magento:framework:Framework/Module/etc/module.xsd">
     <module name="Reviewscouk_Reviews" setup_version="0.0.7b">
         <sequence>
-            <module name="Magento_Catalog" /> <!-- Make sure to include the module you want to extend -->
+            <module name="Magento_Catalog" />
+            <module name="Magento_Sales" />
         </sequence>
     </module>
-</config>
\ No newline at end of file
+</config>
diff --git a/modman b/modman
deleted file mode 100755
index 715b768..0000000
--- a/modman
+++ /dev/null
@@ -1,3 +0,0 @@
-# Modman configuration file
-
-/   app/code/Reviewscouk/Reviews
\ No newline at end of file
diff --git a/view/frontend/layout/catalog_category_view.xml b/view/frontend/layout/catalog_category_view.xml
index 268a98e..27d1766 100755
--- a/view/frontend/layout/catalog_category_view.xml
+++ b/view/frontend/layout/catalog_category_view.xml
@@ -2,8 +2,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceBlock name="category.products.list"
-            class="Reviewscouk\Reviews\Block\Product\CustomRatingSnippet">
-        </referenceBlock>
+        <referenceBlock name="category.products.list" class="Reviewscouk\Reviews\Block\Product\CustomRatingSnippet"/>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index fc9c837..09bf7ec 100755
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -9,7 +9,7 @@
                    template="Reviewscouk_Reviews::product/review_widget.phtml"
                    group="detailed_info">
                    <arguments>
-                    <argument translate="true" name="title" xsi:type="string">Reviews</argument>
+                       <argument translate="true" name="title" xsi:type="string">Reviews</argument>
                   </arguments>
             </block>
 
@@ -18,7 +18,7 @@
                    template="Reviewscouk_Reviews::product/questions_widget.phtml"
                    group="detailed_info">
                    <arguments>
-                    <argument translate="true" name="title" xsi:type="string">Product Questions</argument>
+                       <argument translate="true" name="title" xsi:type="string">Product Questions</argument>
                   </arguments>
             </block>
         </referenceContainer>
diff --git a/view/frontend/templates/product/rating_snippet_element.phtml b/view/frontend/templates/product/rating_snippet_element.phtml
index ede7a6a..0b1422c 100644
--- a/view/frontend/templates/product/rating_snippet_element.phtml
+++ b/view/frontend/templates/product/rating_snippet_element.phtml
@@ -1,8 +1,16 @@
 <?php
-if ($block->isProductRatingSnippetWidgetEnabled()) {
-    $_data = $block->getSettings();
-    $_skus = $block->getProductSkus();
-?>
-    <div class="ruk_rating_snippet" data-sku="<?php print $block->escapeHtml((!empty($_skus) ? implode(';', $_skus) : '')) ?>"></div>
-<?php
-}
+
+use Magento\Framework\Escaper;
+use Reviewscouk\Reviews\Block\Product\Reviewwidget;
+
+/**
+ * @var $escaper Escaper
+ * @var Reviewwidget $block
+ */
+
+if ($block->isProductRatingSnippetWidgetEnabled()):
+    $data = $block->getSettings();
+    $skus = $block->getProductSkus();
+    ?>
+    <div class="ruk_rating_snippet" data-sku="<?= $escaper->escapeHtml((!empty($skus) ? implode(';', $skus) : '')) ?>"></div>
+<?php endif; ?>
diff --git a/view/frontend/templates/product/review_widget.phtml b/view/frontend/templates/product/review_widget.phtml
index b6325fc..bc68088 100755
--- a/view/frontend/templates/product/review_widget.phtml
+++ b/view/frontend/templates/product/review_widget.phtml
@@ -1,16 +1,35 @@
 <?php
-if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
-    if ($block->isIframeWidget()) {
-        $_data = $block->getSettings();
-        $_skus = $block->getProductSkus();
-?>
-        <script src="https://<?php /* @escapeNotVerified */ print $_data['api_url']; ?>/product/dist.js"></script>
+
+use Magento\Framework\Escaper;
+use Reviewscouk\Reviews\Block\Product\Reviewwidget;
+
+/**
+ * @var $block Reviewwidget
+ * @var $escaper Escaper
+ */
+
+if (!isset($escaper)) {
+    $escaper = $block;
+}
+
+if (!($block->isProductWidgetEnabled() && $block->isTabMode())):
+    print $block->getStaticWidget();
+else:
+    $_data = $block->getSettings();
+    $_skus = $block->getProductSkus();
+
+    if ($block->isIframeWidget()):
+        ?>
+        <!-- Why no verified? The Url is basically provided by Block. Cant it return the whole url or at least the part with `https`?
+            Verify every possible output. Even plain text can be verified with $escaper->escapeHtml()-->
+        <script src="https://<?= $_data['api_url'] ?>/product/dist.js"></script>
         <div id="widget"></div>
+        <!--  Seems like this part can be re-usage as well. You can create another phtml temp;late and call it as child in every place it will be required -->
         <script type="text/javascript">
             productWidget("widget", {
-                store: '<?php print $block->escapeHtml($_data['store_id']); ?>',
-                sku: '<?php print $block->escapeHtml(implode(';', $_skus)); ?>', // Multiple SKU"s Seperated by Semi-Colons
-                primaryClr: "<?php /* @noEscape */ print $_data['colour']; ?>",
+                store: '<?= $escaper->escapeHtml($_data['store_id']) ?>',
+                sku: '<?= $escaper->escapeHtml(implode(';', $_skus)) ?>', // Multiple SKU"s Seperated by Semi-Colons
+                primaryClr: "<?= /* @noEscape */ $_data['colour'] ?>",
                 neutralClr: "#EBEBEB",
                 buttonClr: "#EEE",
                 textClr: "#333",
@@ -19,33 +38,31 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                 showTabs: true,
                 ratingStars: false,
                 showAvatars: true,
-                translateAverage: '<?php /* @escapeNotVerified */ print __("Average"); ?>',
-                translateReviews: '<?php /* @escapeNotVerified */ print __("Reviews"); ?>',
-                translateNoReviews: '<?php /* @escapeNotVerified */ print __("No Reviews"); ?>',
-                translateMoreRatings: '<?php /* @escapeNotVerified */ print __("More Ratings"); ?>',
-                translateNoComments: '<?php /* @escapeNotVerified */ print __("This review has no comments"); ?>',
-                translateReplyFrom: '<?php /* @escapeNotVerified */ print __("Reply from"); ?>',
-                translatePosted: '<?php /* @escapeNotVerified */ print __("Posted"); ?>',
-                translateWriteReview: '<?php /* @escapeNotVerified */ print __("Write a Review"); ?>',
-                translateShow: '<?php /* @escapeNotVerified */ print __("Show"); ?>',
-                translateDetails: '<?php /* @escapeNotVerified */ print __("Details"); ?>'
+                translateAverage: '<?= __('Average') ?>',
+                translateReviews: '<?= __('Reviews') ?>',
+                translateNoReviews: '<?= __('No Reviews') ?>',
+                translateMoreRatings: '<?= __('More Ratings') ?>',
+                translateNoComments: '<?= __('This review has no comments') ?>',
+                translateReplyFrom: '<?= __('Reply from') ?>',
+                translatePosted: '<?= __('Posted') ?>',
+                translateWriteReview: '<?= __('Write a Review') ?>',
+                translateShow: '<?= __('Show') ?>',
+                translateDetails: '<?= __('Details') ?>'
             });
         </script>
-    <?php
-    } elseif ($block->isPolarisWidget()) {
-
-        $_data = $block->getSettings();
-        $_skus = $block->getProductSkus();
 
-    ?>
+    <?php elseif ($block->isPolarisWidget()): ?>
         <div id='ReviewsWidget'></div>
 
-        <script src="https://<?php /* @escapeNotVerified */ print $_data['api_url']; ?>/polaris/build.js"></script>
+        <script src="https://<?= $_data['api_url'] ?>/polaris/build.js"></script>
 
+        <!--  Seems like this part of code is reusable. In my opinion it makes more sense to put it somewhere else and reuse as JS.
+                Eventually You can create this as part of phtml and call it as child template
+                BTW Especially the Styles should not be defined here like that. Its not pretty :) -->
         <script>
             new ReviewsWidget(('#ReviewsWidget'), {
                 //Your REVIEWS.io account ID and widget type:
-                store: '<?php print $block->escapeHtml($_data['store_id']); ?>',
+                store: '<?= $escaper->escapeHtml($_data['store_id']) ?>',
                 widget: 'polaris',
 
                 //Content settings (store_review,product_review,questions). Choose what to display in this widget:
@@ -59,7 +76,7 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                     //Product specific settings. Provide product SKU for which reviews should be displayed:
                     product_review: {
                         //Display product reviews - include multiple product SKUs seperated by Semi-Colons (Main Indentifer in your product catalog )
-                        sku: '<?php print $block->escapeHtml(implode(';', $_skus)); ?>',
+                        sku: '<?= $escaper->escapeHtml(implode(';', $_skus)) ?>',
                         hide_if_no_results: false,
                         enable_rich_snippets: false,
                     },
@@ -69,7 +86,7 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                         enable_ask_question: true,
                         show_dates: true,
                         //Display group questions by providing a grouping variable, new questions will be assigned to this group.
-                        grouping: '<?php print $block->escapeHtml(implode(';', $_skus)); ?>',
+                        grouping: '<?= $escaper->escapeHtml(implode(';', $_skus)) ?>',
                     },
 
                     //Header settings:
@@ -144,7 +161,7 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                     '--secondary-button-text-color': '#0E1311',
 
                     //Star styles:
-                    '--common-star-color': '<?php /* @noEscape */ print $_data["colour"]; ?>',
+                    '--common-star-color': '<?= /* @noEscape */ $_data['colour'] ?>',
                     '--common-star-disabled-color': 'rgba(0,0,0,0.25)',
                     '--medium-star-size': '22px',
                     '--small-star-size': '19px',
@@ -228,13 +245,5 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                 },
             });
         </script>
-
-
-<?php
-
-    } else {
-
-        print $block->getStaticWidget();
-    }
-}
-?>
\ No newline at end of file
+    <?php endif; ?>
+<?php endif; ?>