diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index 224cd71538b7b..a770ae864a74c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -20,9 +20,9 @@ $isElementReadonly = $block->getElement()
     ->getReadonly();
 ?>
 
-<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) { ?>
+<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)): ?>
     <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
-<?php } ?>
+<?php endif; ?>
 
 <?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
 
@@ -43,13 +43,13 @@ $isElementReadonly = $block->getElement()
                 } else {
                     if ($attribute) {
                         <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
-                                && $block->getProduct()->isObjectNew()) { ?>
+                                && $block->getProduct()->isObjectNew()): ?>
                             <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
                             $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice ?>;
-                        <?php } else { ?>
+                        <?php else: ?>
                             $attribute.disabled = false;
                             $attribute.addClassName('required-entry');
-                        <?php } ?>
+                        <?php endif; ?>
                     }
                     if ($('dynamic-price-warning')) {
                         $('dynamic-price-warning').hide();
@@ -58,9 +58,9 @@ $isElementReadonly = $block->getElement()
             }
 
             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
-                    && !$block->getProduct()->isObjectNew())) { ?>
+                    && !$block->getProduct()->isObjectNew())): ?>
                 $('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change);
-            <?php } ?>
+            <?php endif; ?>
             Event.observe(window, 'load', function(){
                 <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change();
             });
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 3492f83fd1828..d817000f7bc46 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -17,7 +17,7 @@
             <a href="<?= /* @escapeNotVerified */ $label['link'] ?>"
                aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                class="swatch-option-link-layered">
-                <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
+                <?php if (isset($swatchData['swatches'][$option]['type'])): ?>
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
@@ -32,10 +32,8 @@
                             <?php    break;
                         case '2':
                             ?>
-                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb',
-                            $swatchData['swatches'][$option]['value']); ?>
-                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
-                            $swatchData['swatches'][$option]['value']); ?>
+                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb', $swatchData['swatches'][$option]['value']); ?>
+                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image', $swatchData['swatches'][$option]['value']); ?>
                             <div class="swatch-option image <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="2"
@@ -69,7 +67,7 @@
                                     ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
                             <?php    break;
                     } ?>
-                <?php } ?>
+                <?php endif; ?>
             </a>
         <?php endforeach; ?>
     </div>
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index 05a537b9a6559..78e73e0cd9a69 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -13,14 +13,14 @@
 
     <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
         <ul class="nav-bar">
-            <?php foreach ($block->getSteps() as $step) { ?>
+            <?php foreach ($block->getSteps() as $step): ?>
                 <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= /* @escapeNotVerified */  $step->getComponentName() ?>'}">
                     <a href="#<?= /* @escapeNotVerified */  $step->getComponentName() ?>"
                        data-bind="click: showSpecificStep">
                         <?= /* @escapeNotVerified */  $step->getCaption() ?>
                     </a>
                 </li>
-            <?php } ?>
+            <?php endforeach; ?>
         </ul>
         <div class="nav-bar-outer-actions">
             <div class="action-wrap" data-role="closeBtn">
@@ -45,13 +45,13 @@
         </div>
     </div>
     <div data-role="steps-wizard-tab">
-        <?php foreach ($block->getSteps() as $step) { ?>
+        <?php foreach ($block->getSteps() as $step): ?>
             <div data-bind="visible: selectedStep() == $element.id, css: {'no-display':false}"
                  class="content no-display" id="<?= /* @escapeNotVerified */ $step->getComponentName() ?>"
                  data-role="content">
                 <?= /* @escapeNotVerified */  $step->getContent() ?>
             </div>
-        <?php } ?>
+        <?php endforeach; ?>
     </div>
 </div>