diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index 5486d4ad8d29c..83f6c1bd3bd46 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -11,7 +11,6 @@
 /**
  * Catalog Product Eav Attributes abstract indexer resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
index 080e5b2e8de60..e9594ef6b54b5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
@@ -12,8 +12,6 @@
 
 /**
  * Catalog Product Eav Decimal Attributes Indexer resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Decimal extends AbstractEav
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 578e3099a2fde..417510a35a9e9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -14,8 +14,6 @@
  * For correctly work need define product type id
  *
  * @api
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  * @deprecated 102.0.6 Not used anymore for price indexation. Class left for backward compatibility
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
index 212b0ef51f0e0..d50401f88a446 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceInterface.php
@@ -9,8 +9,6 @@
  * Catalog Product Type Price Indexer interface
  *
  * @api
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 interface PriceInterface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
index ef3f83e5ffa7e..28921f0debb7d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
@@ -9,8 +9,6 @@
 
 /**
  * Catalog product link resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -22,14 +20,11 @@ class Link extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $_attributesTable;
 
     /**
-     * Catalog product relation
-     *
      * @var Relation
      */
     protected $_catalogProductRelation;
 
     /**
-     * Link constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param Relation $catalogProductRelation
      * @param string|null $connectionName
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
index da7fe6370f052..fc65b2d582e51 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Collection.php
@@ -9,7 +9,6 @@
  * Catalog product links collection
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index cac549e0a17c9..a861a3ba5bca3 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -37,7 +37,6 @@
  * Catalog product linked products collection
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index 80dd719794c18..ec9d04be15f7a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -41,8 +41,6 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $_config;
 
     /**
-     * Class constructor
-     *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
index 58e6290a820cd..9eb128500bc20 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php
@@ -9,7 +9,6 @@
  * Catalog product option values collection
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
index 76584ea2a65f3..d26bf7c4d59ee 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
@@ -13,8 +13,6 @@
 
 /**
  * Catalog Product Relations Resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Relation extends AbstractDb
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index f7c02cc93bf97..e7bb1d5b5a8d2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -7,8 +7,6 @@
 
 /**
  * Catalog url rewrite resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index bf624c3435103..931b630b12073 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -7,7 +7,6 @@
 /**
  * Catalog Template Filter Model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @todo        Needs to be reimplemented to get rid of the copypasted methods
  */
 namespace Magento\Catalog\Model\Template;
@@ -38,8 +37,6 @@ class Filter extends \Magento\Framework\Filter\Template
     protected $_assetRepo;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
index 4be778fbffe81..a3e5feedaf0e3 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog Inventory Backorders Config Backend Model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogInventory\Model\Config\Backend;
 
diff --git a/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php b/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
index 7537b6531cf09..257339342b369 100644
--- a/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
+++ b/app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog Inventory Manage Stock Config Backend Model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogInventory\Model\Config\Backend;
 
@@ -15,6 +13,7 @@ class Managestock extends AbstractValue
 {
     /**
      * After change Catalog Inventory Manage Stock value process
+     *
      * @return $this
      */
     public function afterSave()
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
index 71563c62d79e1..05d8102296dc8 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog.php
@@ -4,20 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog price rules
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogRule\Block\Adminhtml\Promo;
 
 /**
+ * Catalog price rules
+ *
  * @api
  * @since 100.0.2
  */
 class Catalog extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
index 87cb18253a107..42ff8deb6c08b 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
@@ -4,16 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Adminhtml sales order create search products block
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogRule\Block\Adminhtml\Promo\Widget\Chooser;
 
 use Magento\Backend\Block\Widget\Grid;
 use Magento\Backend\Block\Widget\Grid\Column;
 
+/**
+ * Adminhtml sales order create search products block
+ */
 class Sku extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
@@ -59,6 +57,8 @@ public function __construct(
     }
 
     /**
+     * Initialise the block
+     *
      * @return void
      */
     protected function _construct()
@@ -83,6 +83,8 @@ protected function _construct()
     }
 
     /**
+     * Add a column filter to the collection
+     *
      * @param Column $column
      * @return $this
      */
@@ -202,6 +204,8 @@ protected function _prepareColumns()
     }
 
     /**
+     * Return grid URL
+     *
      * @return string
      */
     public function getGridUrl()
@@ -213,6 +217,8 @@ public function getGridUrl()
     }
 
     /**
+     * Return selected products
+     *
      * @return mixed
      */
     protected function _getSelectedProducts()
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
index c0c4b5c6fa12c..0128502c248d5 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Backend Catalog Price Rules controller
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo;
 
 use Magento\Backend\App\Action;
@@ -16,6 +11,9 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 
+/**
+ * Backend Catalog Price Rules controller
+ */
 abstract class Catalog extends Action
 {
     /**
@@ -23,33 +21,24 @@ abstract class Catalog extends Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_CatalogRule::promo_catalog';
+    public const ADMIN_RESOURCE = 'Magento_CatalogRule::promo_catalog';
 
     /**
-     * Dirty rules notice message
-     *
-     *
      * @var string
      */
     protected $_dirtyRulesNoticeMessage;
 
     /**
-     * Core registry
-     *
      * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * Date filter instance
-     *
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
      */
     protected $_dateFilter;
 
     /**
-     * Constructor
-     *
      * @param Context $context
      * @param Registry $coreRegistry
      * @param Date $dateFilter
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
index 45a9d27076ff4..07edc47ff10cf 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
@@ -1,14 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog rules resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogRule\Model\ResourceModel;
 
 use Magento\Catalog\Model\Product;
@@ -18,6 +14,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Catalog rules resource model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
@@ -87,7 +85,6 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
     protected $_associatedEntitiesMap = [];
 
     /**
-     * Rule constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Product\ConditionFactory $conditionFactory
@@ -101,6 +98,7 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
      * @param string|null $connectionName
      * @param EntityManager|null $entityManager
      * @param \Magento\Framework\DataObject|null $associatedEntityMap
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -154,6 +152,7 @@ protected function _construct()
      * @param int $wId
      * @param int $gId
      * @param int $pId
+     *
      * @return float|false
      */
     public function getRulePrice($date, $wId, $gId, $pId)
@@ -175,6 +174,7 @@ public function getRulePrice($date, $wId, $gId, $pId)
      * @param int $websiteId
      * @param int $customerGroupId
      * @param array $productIds
+     *
      * @return array
      */
     public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGroupId, $productIds)
@@ -197,6 +197,7 @@ public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGro
      * @param int $websiteId
      * @param int $customerGroupId
      * @param int $productId
+     *
      * @return array
      */
     public function getRulesFromProduct($date, $websiteId, $customerGroupId, $productId)
@@ -205,6 +206,7 @@ public function getRulesFromProduct($date, $websiteId, $customerGroupId, $produc
         if (is_string($date)) {
             $date = strtotime($date);
         }
+
         $select = $connection->select()
             ->from($this->getTable('catalogrule_product'))
             ->where('website_id = ?', $websiteId)
@@ -240,7 +242,9 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
      * Delete the object
      *
      * @param \Magento\Framework\Model\AbstractModel $object
+     *
      * @return $this
+     *
      * @throws \Exception
      */
     public function delete(AbstractModel $object)
@@ -253,6 +257,7 @@ public function delete(AbstractModel $object)
      * Get product ids matching specified rules
      *
      * @param array $ruleIds
+     *
      * @return array
      */
     public function getProductIdsByRuleIds(array $ruleIds): array
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
index a8ecdd069aba0..c93451e9aeef0 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Product/Price.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog Rule Product Aggregated Price per date Resource Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogRule\Model\ResourceModel\Rule\Product;
 
@@ -32,7 +30,7 @@ protected function _construct()
      * @param string $entityId
      * @param string $customerGroupId
      * @param string $websiteId
-     * @param array $updateFields       the array of fields for compare with rule price and update
+     * @param array $updateFields the array of fields for compare with rule price and update
      * @param string $websiteDate
      * @return \Magento\CatalogRule\Model\ResourceModel\Rule\Product\Price
      */
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php
index 225b51530f719..25920aca10a2b 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Job.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php
@@ -20,8 +20,6 @@
  * @method bool hasSuccess()
  * @method bool hasError()
  *
- * @author Magento Core Team <core@magentocommerce.com>
- *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php b/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
index 2d55189017be3..8528464fcb10a 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Product/Price.php
@@ -21,8 +21,6 @@
  * @method \Magento\CatalogRule\Model\Rule\Product\Price setLatestStartDate(string $value)
  * @method string getEarliestEndDate()
  * @method \Magento\CatalogRule\Model\Rule\Product\Price setEarliestEndDate(string $value)
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\CatalogRule\Model\Rule\Product;
 
@@ -48,7 +46,7 @@ protected function _construct()
      * @param string $entityId
      * @param string $customerGroupId
      * @param string $websiteId
-     * @param array $updateFields       the array fields for compare with rule price and update
+     * @param array $updateFields the array fields for compare with rule price and update
      * @param string $websiteDate
      * @return $this
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 383a0093f8412..e5afac7fe890e 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -43,7 +43,6 @@
  * @method string getUpdatedAt()
  * @method \Magento\CatalogSearch\Model\Advanced setUpdatedAt(string $value)
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index 07b95c0769f3a..87e30d98e82c9 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -24,7 +24,6 @@
  * Cart crosssell list
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -133,9 +132,7 @@ public function getItems()
                 if ($lastAddedProduct) {
                     $collection = $this->_getCollection()
                         ->addProductFilter($lastAddedProduct->getData($this->getProductLinkField()));
-                    if (!empty($ninProductIds)) {
-                        $collection->addExcludeProductFilter($ninProductIds);
-                    }
+                    $collection->addExcludeProductFilter($ninProductIds);
                     $collection->setPositionOrder()->load();
 
                     foreach ($collection as $item) {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 830191bd13c40..d6c2a9614453e 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -18,7 +18,6 @@
  * Shopping cart item render block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  *
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setProductName(string)
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
diff --git a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
index b0f5a6b51a158..1ad3ae2962369 100644
--- a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
@@ -11,7 +11,6 @@
  * Item price render block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Renderer extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/Checkout/Block/Onepage/Link.php b/app/code/Magento/Checkout/Block/Onepage/Link.php
index de26fe68287de..e2b3e2bab77e9 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Link.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Link.php
@@ -9,7 +9,6 @@
  * One page checkout cart link
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Link extends \Magento\Framework\View\Element\Template
@@ -43,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Return URL for checkout
+     *
      * @return string
      */
     public function getCheckoutUrl()
@@ -51,6 +52,8 @@ public function getCheckoutUrl()
     }
 
     /**
+     * Return true if Onepage Checkout is disabled
+     *
      * @return bool
      */
     public function isDisabled()
@@ -59,6 +62,8 @@ public function isDisabled()
     }
 
     /**
+     * Return true if it is possible to use the Onepage Checkout
+     *
      * @return bool
      */
     public function isPossibleOnepageCheckout()
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 34c06cbf3e882..cc14989b9f695 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -7,25 +7,23 @@
 
 /**
  * Shopping cart helper
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Cart extends \Magento\Framework\Url\Helper\Data
 {
     /**
      * Path to controller to delete item from cart
      */
-    const DELETE_URL = 'checkout/cart/delete';
+    public const DELETE_URL = 'checkout/cart/delete';
 
     /**
      * Path for redirect to cart
      */
-    const XML_PATH_REDIRECT_TO_CART = 'checkout/cart/redirect_to_cart';
+    public const XML_PATH_REDIRECT_TO_CART = 'checkout/cart/redirect_to_cart';
 
     /**
      * Maximal coupon code length according to database table definitions (longer codes are truncated)
      */
-    const COUPON_CODE_MAX_LENGTH = 255;
+    public const COUPON_CODE_MAX_LENGTH = 255;
 
     /**
      * @var \Magento\Checkout\Model\Cart
@@ -69,7 +67,7 @@ public function getCart()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $additional
-     * @return  string
+     * @return string
      */
     public function getAddUrl($product, $additional = [])
     {
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 40bdf93d161ed..c0f69e930e2ef 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -14,14 +14,12 @@
 /**
  * Checkout default helper
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    const XML_PATH_GUEST_CHECKOUT = 'checkout/options/guest_checkout';
-
-    const XML_PATH_CUSTOMER_MUST_BE_LOGGED = 'checkout/options/customer_must_be_logged';
+    public const XML_PATH_GUEST_CHECKOUT = 'checkout/options/guest_checkout';
+    public const XML_PATH_CUSTOMER_MUST_BE_LOGGED = 'checkout/options/customer_must_be_logged';
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
index d8264e5535497..5bd83efac0c0c 100644
--- a/app/code/Magento/Checkout/Model/Cart/CartInterface.php
+++ b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
@@ -11,7 +11,6 @@
  * Shopping cart interface
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @deprecated 100.1.0 Use \Magento\Quote\Api\Data\CartInterface instead
  * @see \Magento\Quote\Api\Data\CartInterface
  * @since 100.0.2
diff --git a/app/code/Magento/Checkout/Model/ResourceModel/Cart.php b/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
index add1966b819a1..3e9d40ac85db4 100644
--- a/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
+++ b/app/code/Magento/Checkout/Model/ResourceModel/Cart.php
@@ -7,8 +7,6 @@
 
 /**
  * Resource model for Checkout Cart
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Cart extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {