diff --git a/1 b/1
index 63a2414..a312832 100644
--- a/1
+++ b/1
@@ -4,3 +4,4 @@ version 7c
 # Write a message for tag:
 #   0.0.7b
 # Lines starting with '#' will be ignored.
+# is it even required? I guess the file can be removed.
diff --git a/Controller/Index/API.php b/Controller/Index/API.php
index 3fd889f..6499697 100644
--- a/Controller/Index/API.php
+++ b/Controller/Index/API.php
@@ -1,131 +1,199 @@
 <?php
+/**
+ * Add Your COPPYRIGHTS here
+ *
+ * See COPYING.txt for license details.
+ */
 
 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;
+
+/**
+ * Api Controller - prepare list of products and format it to json format
+ */
+class API implements HttpGetActionInterface
 {
-
-    private $configHelper;
-    private $cache;
-    private $productModel;
-    private $stockModel;
-    private $imageHelper;
-    private $storeModel;
-
+    /**
+     * API Constructor
+     *
+     * @param StockRegistryInterface    $stockModel
+     * @param Image                     $imageHelper
+     * @param StoreManagerInterface     $storeModel
+     * @param Config                    $configHelper
+     * @param CollectionFactory         $productCollectionFactory
+     * @param Http                      $request
+     * @param CategoryCollectionFactory $categoryCollectionFactory
+     * @param ResultFactory             $resultFactory
+     */
     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,
+    ) {
     }
 
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \JsonException
+     */
     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
+                )
+            );
+
+            return $result;
+        }
+
+        if ($this->canAccessResource($store->getId())) {
+            $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+            $result->setContents(
+                json_encode(
+                    ['success' => false, 'message' => 'Unauthenticated.'],
+                    JSON_THROW_ON_ERROR
+                )
+            );
+
+            return $result;
+        }
 
-            $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'] : '';
+        ob_start();
+        set_time_limit(0);
 
-            //Authenticate
-            if(!isset($auth['submitted_key'], $auth['actual_key']) || $auth['actual_key'] != $auth['submitted_key']) {
-              echo json_encode(array('success' => false, 'message' => 'Unauthenticated.'));
-              die();
+        $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;
             }
 
-            $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();
-                    }
+            if ($categoryCollection !== null && count($categoryCollection) > 0) {
+                foreach ($categoryCollection as $category) {
+                    $item['category'][] =  $category->getName();
                 }
+            }
 
-                $stock = $this->stockModel->getStockItem(
-                    $product->getId(),
-                    $product->getStore()->getWebsiteId()
-                );
+            # 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();
 
-                $item['in_stock'] = $stock->getIsInStock() ? true : false;
+            $collection[] = $item;
+        }
 
-                $collection[] = $item;
-            }
+        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+        $result->setContents(
+            json_encode(
+                ['success' => true, 'products' => $collection, 'total' => count($collection)],
+                JSON_THROW_ON_ERROR
+            )
+        );
 
-            echo json_encode(array('success' => true, 'products' => $collection, 'total' => count($collection)));
-            die();
+        return $result;
+    }
 
-        } else {
-          echo json_encode(array('success' => false, 'message' => 'API disabled.'));
-          die();
+    /**
+     * Check if Controller can be accessed.
+     *
+     * @param int $storeId
+     *
+     * @return bool
+     */
+    private function canAccessResource(int $storeId): bool
+    {
+        $auth['actual_key'] = $this->configHelper->getApiKey($storeId);
+        $auth['submitted_key'] = $this->request->getParam('key') ?: '';
+
+        //Authenticate
+        if (!isset($auth['submitted_key'], $auth['actual_key']) || $auth['actual_key'] != $auth['submitted_key']) {
+            return false;
         }
+
+        return true;
+    }
+
+    /**
+     * Provide page of product collection
+     *
+     * # Basically the same as for Feed. Can be moved to Model
+     *
+     * @return Collection
+     */
+    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..aa92f43 100755
--- a/Controller/Index/Feed.php
+++ b/Controller/Index/Feed.php
@@ -1,226 +1,272 @@
 <?php
+/**
+ * Add Your COPPYRIGHTS here
+ *
+ * See COPYING.txt for license details.
+ */
 
 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 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;
 
+/**
+ * Feed Controller - prepare list of products and format it to xml format
+ */
 class Feed implements HttpGetActionInterface
 {
-    protected $configHelper;
-    protected $cache;
-    protected $productModel;
-    protected $stockModel;
-    protected $imageHelper;
-    protected $storeModel;
-    protected $productCollectionFactory;
-    protected $configurableType;
-    protected $curl;
-    protected $resultFactory;
-
+    /**
+     * Constructor for Feed
+     *
+     * @param StockRegistryInterface            $stockModel
+     * @param Image                             $imageHelper
+     * @param StoreManagerInterface             $storeModel
+     * @param Config                            $configHelper
+     * @param CollectionFactory                 $productCollectionFactory
+     * @param ResultFactory                     $resultFactory
+     * @param Grouped                           $groupedProductModel
+     * @param ConfigurableTypeResourceModel     $configurableProductModel
+     * @param ProductRepositoryInterfaceFactory $productRepositoryFactory
+     * @param CategoryCollectionFactory         $categoryCollectionFactory
+     * @param Http                              $request
+     */
     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)
+    /**
+     * @inheritDoc
+     */
+    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;
+    }
+
+    /**
+     * Provide page of product collection
+     *
+     * @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;
+    }
+
+    /**
+     * Provide Parent Product if available
+     *
+     * @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 $e) {
+            }
+        }
+
+        return $parentProduct;
+    }
+
+    /**
+     * Validate Image Url
+     *
+     * @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/Observer/SendOrderDetails.php b/Observer/SendOrderDetails.php
index 45c2431..deeba20 100755
--- a/Observer/SendOrderDetails.php
+++ b/Observer/SendOrderDetails.php
@@ -1,90 +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(),
-                    '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/composer.json b/composer.json
index 53b7392..04d71fc 100755
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,12 @@
       "registration.php"
     ]
   },
+    "require": {
+        "magento/module-sales": "^102.0.0 || ^103.0.0",
+        "magento/module-catalog": "^102.0.0 || ^103.0.0",
+        "magento/framework": "^102.0.0 || ^103.0.0",
+        "php": "~8.1"
+    },
   "description": "Reviews.co.uk Magento 2 Integration",
   "type": "magento2-module",
   "authors": [
diff --git a/etc/events.xml b/etc/events.xml
index 2c489d1..1e170b4 100755
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+   <!-- The event may not work for Project, when Shipping is not handled in Magento.
+        Consider using event corresponding to marking order as Complete or paid OR Plugin.
+        However, best approach would be to create Cron, running once per eg 5 or 15 mins and process the logic for all the orders that were marked as complete during that interval.
+        Additional column like `sent_to_reviewio` in `sales_order` will be required, to mark already sent orders.
+        Right now, when order would be placed with a lot of products, Timeout may be thrown for the event -->
     <event name="sales_order_shipment_save_after">
         <observer name="reviewscouk_reviews" instance="Reviewscouk\Reviews\Observer\SendOrderDetails"/>
     </event>
diff --git a/etc/module.xml b/etc/module.xml
index 2803951..d31d8b8 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -4,6 +4,8 @@
     <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_Sales" />
+            <module name="Magento_Store" />
         </sequence>
     </module>
-</config>
\ No newline at end of file
+</config>
diff --git a/modman b/modman
index 715b768..a86ae1c 100755
--- a/modman
+++ b/modman
@@ -1,3 +1,4 @@
 # Modman configuration file
+# is MOdman still in use? I gues it may be removed
 
-/   app/code/Reviewscouk/Reviews
\ No newline at end of file
+/   app/code/Reviewscouk/Reviews
diff --git a/view/frontend/templates/product/rating_snippet_element.phtml b/view/frontend/templates/product/rating_snippet_element.phtml
index ede7a6a..493db98 100644
--- a/view/frontend/templates/product/rating_snippet_element.phtml
+++ b/view/frontend/templates/product/rating_snippet_element.phtml
@@ -1,8 +1,10 @@
 <?php
-if ($block->isProductRatingSnippetWidgetEnabled()) {
+# add copyright block.
+# Add definition of Block.
+# Use escaper instead of $block for escaping
+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
-}
+<?php endif; # never ending php?? ?>
diff --git a/view/frontend/templates/product/review_widget.phtml b/view/frontend/templates/product/review_widget.phtml
index b6325fc..0436be3 100755
--- a/view/frontend/templates/product/review_widget.phtml
+++ b/view/frontend/templates/product/review_widget.phtml
@@ -1,15 +1,38 @@
 <?php
-if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
-    if ($block->isIframeWidget()) {
-        $_data = $block->getSettings();
-        $_skus = $block->getProductSkus();
+/**
+ * Add Your COPPYRIGHTS here
+ *
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var $block \Reviewscouk\Reviews\Block\Product\Reviewwidget
+ * @var $escaper \Magento\Framework\Escaper
+ */
+if (!isset($escaper)) {
+    $escaper = $block;
+}
+
+# In phtml templates do not use normal `if () {}` statements. Also, reduce the length of ifs and complicity as much as possible.
+# It would be much better to prepare the Child Templates and call them inside IFS, to have separated templates per different Widget
+# Also be consistent in using it. Some templates use `if():` statements, some `if(){}`...
+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://<?php /* @escapeNotVerified */ print $_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
+                store: '<?php print $escaper->escapeHtml($_data['store_id']); ?>',
+                sku: '<?php print $escaper->escapeHtml(implode(';', $_skus)); ?>', // Multiple SKU"s Seperated by Semi-Colons
                 primaryClr: "<?php /* @noEscape */ print $_data['colour']; ?>",
                 neutralClr: "#EBEBEB",
                 buttonClr: "#EEE",
@@ -31,21 +54,19 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                 translateDetails: '<?php /* @escapeNotVerified */ print __("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>
 
+<!--  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: '<?php print $escaper->escapeHtml($_data['store_id']); ?>',
                 widget: 'polaris',
 
                 //Content settings (store_review,product_review,questions). Choose what to display in this widget:
@@ -59,7 +80,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: '<?php print $escaper->escapeHtml(implode(';', $_skus)); ?>',
                         hide_if_no_results: false,
                         enable_rich_snippets: false,
                     },
@@ -69,7 +90,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: '<?php print $escaper->escapeHtml(implode(';', $_skus)); ?>',
                     },
 
                     //Header settings:
@@ -228,13 +249,5 @@ if ($block->isProductWidgetEnabled() && $block->isTabMode()) {
                 },
             });
         </script>
-
-
-<?php
-
-    } else {
-
-        print $block->getStaticWidget();
-    }
-}
-?>
\ No newline at end of file
+    <?php endif; ?>
+<?php endif; ?>