diff --git a/Block/Adminhtml/System/Config/Fieldset/Payment.php b/Block/Adminhtml/System/Config/Fieldset/Payment.php
index d145672..35f5b7f 100644
--- a/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -38,7 +38,7 @@ protected function _getFrontendClass($element)
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings("PHPMD.NPathComplexity")
      */
     protected function _getHeaderTitleHtml($element)
     {
@@ -77,7 +77,7 @@ protected function _getHeaderTitleHtml($element)
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     protected function _getHeaderCommentHtml($element)
     {
@@ -87,7 +87,7 @@ protected function _getHeaderCommentHtml($element)
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return false
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     protected function _isCollapseState($element)
     {
@@ -97,7 +97,7 @@ protected function _isCollapseState($element)
     /**
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     protected function _getExtraJs($element)
     {
diff --git a/Block/Onepage/ContinueCvv.php b/Block/Onepage/ContinueCvv.php
index 5ffedaf..f9e4dd3 100644
--- a/Block/Onepage/ContinueCvv.php
+++ b/Block/Onepage/ContinueCvv.php
@@ -28,7 +28,7 @@ class ContinueCvv extends Template
     private $checkoutSession;
 
     /**
-     * @var CustomerSession\
+     * @var CustomerSession
      */
     private $customerSession;
 
diff --git a/Controller/Data/GetPostPlaceOrderData.php b/Controller/Data/GetPostPlaceOrderData.php
index 5feb2e1..4261d09 100755
--- a/Controller/Data/GetPostPlaceOrderData.php
+++ b/Controller/Data/GetPostPlaceOrderData.php
@@ -35,7 +35,7 @@ public function execute()
         $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
 
         try {
-            /** @var $payment \Magento\Sales\Model\Order\Payment */
+            /** @var \Magento\Sales\Model\Order\Payment $payment */
             $payment = $this->checkoutSession->getLastRealOrder()->getPayment();
             $paymentInformation = $payment->getAdditionalInformation();
             if (is_array($paymentInformation) &&
diff --git a/Plugin/Block/Widget/Button/ToolbarPlugin.php b/Plugin/Block/Widget/Button/ToolbarPlugin.php
index d2a1f39..d79df45 100644
--- a/Plugin/Block/Widget/Button/ToolbarPlugin.php
+++ b/Plugin/Block/Widget/Button/ToolbarPlugin.php
@@ -28,7 +28,7 @@ class ToolbarPlugin
     /**
      * Before Push Button Plugin change url for accept payment and deny payment for PayU payment methods
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function beforePushButtons(ToolbarInterface $subject, AbstractBlock $context, ButtonList $buttonList): void
     {
diff --git a/view/frontend/templates/account/storedcards.phtml b/view/frontend/templates/account/storedcards.phtml
index 8db38f8..1155c34 100644
--- a/view/frontend/templates/account/storedcards.phtml
+++ b/view/frontend/templates/account/storedcards.phtml
@@ -2,12 +2,12 @@
 /**
  * View for stored cards in my account
  *
- * @var \Payu\PaymentGateway\Block\Account\StoredCards $this
+ * @var \PayU\PaymentGateway\Block\Account\StoredCards $block
  * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php
-$storedCards = $this->getStoredCards();
+$storedCards = $block->getStoredCards();
 ?>
 <div class="block block-payu-cards payu__cards">
     <div class="block-content payu-cards__wrapper">
@@ -41,7 +41,7 @@ $storedCards = $this->getStoredCards();
                             </td>
                             <td class="col card__action">
                                 <form action="<?= $escaper->escapeHtml(
-                                    $this->getUrl('customer/account/deletestoredcard/')
+                                    $block->getUrl('customer/account/deletestoredcard/')
                                 );
                                 ?>" method="post">
                                     <?php echo $block->getBlockHtml('formkey') ?>
diff --git a/view/frontend/templates/checkout/continueccv.phtml b/view/frontend/templates/checkout/continueccv.phtml
index bf867e3..9da695c 100644
--- a/view/frontend/templates/checkout/continueccv.phtml
+++ b/view/frontend/templates/checkout/continueccv.phtml
@@ -1,10 +1,10 @@
 <?php
 /**
- * @var \Payu\PaymentGateway\Block\Onepage\ContinueCvv|\Payu\PaymentGateway\Block\Order\Repay\ContinueCvv $this
+ * @var \PayU\PaymentGateway\Block\Onepage\ContinueCvv|\PayU\PaymentGateway\Block\Order\Repay\ContinueCvv $block
  */
 ?>
 <?php
-$widgetConfig = $this->getWidgetCvvConfig();
+$widgetConfig = $block->getWidgetCvvConfig();
 if ($widgetConfig): ?>
     <div class="payu-block">
         <div class="payu-block__wrapper">
@@ -20,7 +20,7 @@ if ($widgetConfig): ?>
     </div>
     <script type="text/javascript">
         window.payuConfig = {
-            env: "<?php echo $this->getEnv(); ?>"
+            env: "<?php echo $block->getEnv(); ?>"
         }
     </script>
     <script type="text/x-magento-init">
diff --git a/view/frontend/templates/credit_widget/head_script.phtml b/view/frontend/templates/credit_widget/head_script.phtml
index d54fd9d..ce03bfc 100644
--- a/view/frontend/templates/credit_widget/head_script.phtml
+++ b/view/frontend/templates/credit_widget/head_script.phtml
@@ -8,4 +8,3 @@ $configKey = $block->getData('configKey');
 <?php if ($viewModel->isWidgetEnabled($configKey)): ?>
 <script src="<?= $escaper->escapeUrl($viewModel->getScriptUrl()) ?>" type="text/javascript"></script>
 <?php endif; ?>
-
diff --git a/view/frontend/templates/order/history/payu_data.phtml b/view/frontend/templates/order/history/payu_data.phtml
index b586b36..e1a36c4 100644
--- a/view/frontend/templates/order/history/payu_data.phtml
+++ b/view/frontend/templates/order/history/payu_data.phtml
@@ -1,5 +1,5 @@
 <?php
-/** @var \Payu\PaymentGateway\Block\Order\Grid\Action $block */
+/** @var \PayU\PaymentGateway\Block\Order\Grid\Action $block */
 ?>
 <?php $_orderId = $block->getOrder()->getEntityId() ?>
 <?php if ($block->isPayuCanRepay()): ?>
diff --git a/view/frontend/templates/order/history/payu_header.phtml b/view/frontend/templates/order/history/payu_header.phtml
index 6c440b2..a802003 100644
--- a/view/frontend/templates/order/history/payu_header.phtml
+++ b/view/frontend/templates/order/history/payu_header.phtml
@@ -1,5 +1,5 @@
 <?php
-/** @var \Payu\PaymentGateway\Block\Order\Grid\Action $block */
+/** @var \PayU\PaymentGateway\Block\Order\Grid\Action $block */
 ?>
 
 <?php if ($block->isPayuCanRepay()): ?>
diff --git a/view/frontend/templates/order/repay/paymentmethods.phtml b/view/frontend/templates/order/repay/paymentmethods.phtml
index 68e5d5a..f8a5cb3 100644
--- a/view/frontend/templates/order/repay/paymentmethods.phtml
+++ b/view/frontend/templates/order/repay/paymentmethods.phtml
@@ -1,11 +1,11 @@
 <?php
 /**
- * @var \Payu\PaymentGateway\Block\Order\Repay\PaymentMethods $this
+ * @var \PayU\PaymentGateway\Block\Order\Repay\PaymentMethods $block
  */
 ?>
 <?php
-$config = $this->getPaymentGatewayConfig();
-$cardConfig = $this->getCardPaymentGatewayConfig();
+$config = $block->getPaymentGatewayConfig();
+$cardConfig = $block->getCardPaymentGatewayConfig();
 ?>
     <div class="payu-repay repay">
         <div class="repay__header">
@@ -40,7 +40,7 @@ if (!empty($cardConfig)):
     ?>
     <script type="text/javascript">
         window.payuConfig = {
-            env: "<?=  $this->getCardEnv(); ?>"
+            env: "<?=  $block->getCardEnv(); ?>"
         }
     </script>
     <script type="text/x-magento-init">