diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index e0bb6b62f0bf6..c805941fa0272 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -20,15 +20,15 @@ $_productCollection = $block->getLoadedProductCollection();
 /** @var \Magento\Catalog\Helper\Output $_helper */
 $_helper = $block->getData('outputHelper');
 ?>
-<?php if (!$_productCollection->count()):?>
+<?php if (!$_productCollection->count()): ?>
     <div class="message info empty">
         <div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div>
     </div>
-<?php else:?>
+<?php else: ?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
     <?php
-    if ($block->getMode() == 'grid') {
+    if ($block->getMode() === 'grid') {
         $viewMode = 'grid';
         $imageDisplayArea = 'category_page_grid';
         $showDescription = false;
@@ -47,7 +47,7 @@ $_helper = $block->getData('outputHelper');
     <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
-            <?php foreach ($_productCollection as $_product):?>
+            <?php foreach ($_productCollection as $_product): ?>
             <li class="item product product-item">
                 <div class="product-item-info"
                      id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
@@ -66,9 +66,7 @@ $_helper = $block->getData('outputHelper');
                         <?= $productImage->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
-                        <?php
-                            $_productNameStripped = $block->stripTags($_product->getName(), null, true);
-                        ?>
+                        <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
                                href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
@@ -77,9 +75,8 @@ $_helper = $block->getData('outputHelper');
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
                         <?= /* @noEscape */ $block->getProductPrice($_product) ?>
-                        <?php if ($_product->isAvailable()):?>
-                            <?= $block->getProductDetailsHtml($_product) ?>
-                        <?php endif; ?>
+
+                        <?= $block->getProductDetailsHtml($_product) ?>
 
                         <div class="product-item-inner">
                             <div class="product actions product-item-actions">
@@ -121,7 +118,7 @@ $_helper = $block->getData('outputHelper');
                                         'product-item-info_' . $_product->getId() . ' div.actions-primary'
                                     ) : '' ?>
                                 <div data-role="add-to-links" class="actions-secondary">
-                                    <?php if ($addToBlock = $block->getChildBlock('addto')):?>
+                                    <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
@@ -131,7 +128,7 @@ $_helper = $block->getData('outputHelper');
                                         'product-item-info_' . $_product->getId() . ' div.actions-secondary'
                                     ) : '' ?>
                             </div>
-                            <?php if ($showDescription):?>
+                            <?php if ($showDescription): ?>
                                 <div class="product description product-item-description">
                                     <?= /* @noEscape */ $_helper->productAttribute(
                                         $_product,
@@ -156,7 +153,7 @@ $_helper = $block->getData('outputHelper');
         </ol>
     </div>
     <?= $block->getToolbarHtml() ?>
-    <?php if (!$block->isRedirectToCartEnabled()):?>
+    <?php if (!$block->isRedirectToCartEnabled()): ?>
         <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 5838ba9625c6a..5a051d8ecf675 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -3,43 +3,50 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Catalog\Model\Product;
+use Magento\Swatches\Block\Product\Renderer\Listing\Configurable;
+use Magento\Swatches\ViewModel\Product\Renderer\Configurable as ConfigurableViewModel;
+
+/** @var Configurable $block */
+/** @var Product $product */
+$product = $block->getProduct()
 ?>
-<?php
-/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
-$productId = $block->getProduct()->getId();
-/** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */
-$configurableViewModel = $block->getConfigurableViewModel()
-?>
-<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
-     data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
+<?php if ($product && $product->isAvailable()): ?>
+    <?php $productId = $product->getId() ?>
+    <?php /** @var ConfigurableViewModel $configurableViewModel */ ?>
+    <?php $configurableViewModel = $block->getConfigurableViewModel() ?>
+    <div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
+         data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
 
-<script type="text/x-magento-init">
-    {
-        "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
-            "Magento_Swatches/js/swatch-renderer": {
-                "selectorProduct": ".product-item-details",
-                "onlySwatches": true,
-                "enableControlLabel": false,
-                "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
-                "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
-                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
-                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
-                "showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
+    <script type="text/x-magento-init">
+        {
+            "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
+                "Magento_Swatches/js/swatch-renderer": {
+                    "selectorProduct": ".product-item-details",
+                    "onlySwatches": true,
+                    "enableControlLabel": false,
+                    "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
+                    "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
+                    "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
+                    "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
+                    "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
+                    "showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
+                }
             }
         }
-    }
-</script>
+    </script>
 
-<script type="text/x-magento-init">
-    {
-        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
-            "priceBox": {
-                "priceConfig": {
-                    "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson(); ?>,
-                    "prices": <?= /* @noEscape */ $block->getPricesJson(); ?>
+    <script type="text/x-magento-init">
+        {
+            "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
+                "priceBox": {
+                    "priceConfig": {
+                        "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson() ?>,
+                        "prices": <?= /* @noEscape */ $block->getPricesJson() ?>
+                    }
                 }
             }
         }
-    }
-</script>
+    </script>
+<?php endif; ?>