diff --git a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
index 75a0228e1785f..cde7aa5ddbd91 100644
--- a/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
+++ b/app/code/Magento/Catalog/Block/Product/View/BaseImage.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Block\Product\View;
 
 /**
  * Simple product data view
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class BaseImage extends \Magento\Catalog\Block\Product\View\AbstractView
 {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Description.php b/app/code/Magento/Catalog/Block/Product/View/Description.php
index 5296f95ec6099..134eb10dade9e 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Description.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Description.php
@@ -1,19 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
-/**
- * Product description block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
 
 /**
+ * Product description block
+ *
  * @api
  * @since 100.0.2
  */
@@ -25,8 +22,6 @@ class Description extends \Magento\Framework\View\Element\Template
     protected $_product = null;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
@@ -46,6 +41,8 @@ public function __construct(
     }
 
     /**
+     * Return the product
+     *
      * @return Product
      */
     public function getProduct()
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
index 83380bdac6462..a55429965b89e 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
@@ -24,22 +24,16 @@ class Options extends \Magento\Framework\View\Element\Template
     protected $_product;
 
     /**
-     * Product option
-     *
      * @var \Magento\Catalog\Model\Product\Option
      */
     protected $_option;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_registry = null;
 
     /**
-     * Product
-     *
      * @var Product
      */
     protected $_catalogProduct;
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index a81650df3216c..7529c75c13e9c 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -6,8 +6,6 @@
 
 /**
  * Product options abstract type block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 namespace Magento\Catalog\Block\Product\View\Options;
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
index d28dcdf205f89..00b45327bdfee 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Simple.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Simple product data view
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Product\View\Type;
 
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
index 69dd82da76eda..30e2fc61e3d38 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Virtual.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Simple product data view
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Product\View\Type;
 
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
index 0e50d1fb3ff97..7450f4823e963 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
@@ -1,21 +1,17 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 
+namespace Magento\Catalog\Block\Product\Widget\Html;
+
 /**
  * New products widget pager block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Catalog\Block\Product\Widget\Html;
-
 class Pager extends \Magento\Theme\Block\Html\Pager
 {
     /**
-     * Collection size
-     *
      * Size of collection which may has a manual limitation
      *
      * @var int
@@ -23,15 +19,11 @@ class Pager extends \Magento\Theme\Block\Html\Pager
     protected $_collectionSize;
 
     /**
-     * Current page
-     *
      * @var int
      */
     protected $_currentPage;
 
     /**
-     * Last page
-     *
      * @var int
      */
     protected $_lastPage;
@@ -206,6 +198,9 @@ public function getPages()
             } elseif ($this->getCurrentPage() > $this->getLastPageNum() - $half) {
                 $finish = $this->getLastPageNum();
                 $start = $finish - $this->_displayPages + 1;
+            } else {
+                $start = 1;
+                $finish = $this->_displayPages;
             }
             $pages = range($start, $finish);
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
index 4feaa706d42fb..934d637aa705e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
@@ -9,8 +9,6 @@
 
 /**
  * Catalog category widgets controller for CMS WYSIWYG
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 abstract class Widget extends \Magento\Backend\App\Action
 {
@@ -19,7 +17,7 @@ abstract class Widget extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::categories';
+    public const ADMIN_RESOURCE = 'Magento_Catalog::categories';
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
@@ -39,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Return the category tree block
+     *
      * @return BlockInterface
      */
     protected function _getCategoryTreeBlock()
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
index 5231bdd340650..cf73c58dca694 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
 /**
  * Adminhtml entity sets controller
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 abstract class Set extends \Magento\Backend\App\Action
 {
@@ -17,11 +15,9 @@ abstract class Set extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::sets';
+    public const ADMIN_RESOURCE = 'Magento_Catalog::sets';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;
diff --git a/app/code/Magento/Catalog/Helper/Catalog.php b/app/code/Magento/Catalog/Helper/Catalog.php
index 83535fa19e969..abba939e993a4 100644
--- a/app/code/Magento/Catalog/Helper/Catalog.php
+++ b/app/code/Magento/Catalog/Helper/Catalog.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Helper;
 
 /**
  * Adminhtml Catalog helper
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index 75b37107ee9c4..cca59a7005cde 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Helper\Product;
 
@@ -18,23 +18,17 @@
  * Adminhtml catalog product composite helper
  *
  * @api
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Composite extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
-     * Core registry
-     *
      * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * Catalog product
-     *
      * @var Product
      */
     protected $_catalogProduct = null;
@@ -91,8 +85,9 @@ protected function _initUpdateResultLayout()
     }
 
     /**
-     * Prepares and render result of composite product configuration update for a case
-     * when single configuration submitted
+     * Prepares and render result of composite product configuration update
+     *
+     * This is for a case when single configuration was submitted
      *
      * @param \Magento\Framework\DataObject $updateResult
      * @return \Magento\Framework\View\Result\Layout
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 8286e53a7e487..49576489f27f3 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -13,7 +13,6 @@
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensibleModel
@@ -46,8 +45,6 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
     protected $_isDeleteable = true;
 
     /**
-     * Is model readonly
-     *
      * @var boolean
      */
     protected $_isReadonly = false;
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
index 03e9fbb1e9132..399dee33a8e65 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
@@ -1,31 +1,24 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Attribute\Backend;
 
 /**
- *
  * Special Start Date attribute backend
  *
  * @api
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime
 {
     /**
-     * Date model
-     *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
      */
     protected $_date;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      */
@@ -53,6 +46,7 @@ protected function _getValueForSave($object)
 
     /**
      * Before save hook.
+     *
      * Prepare attribute value for save
      *
      * @param \Magento\Framework\DataObject $object
@@ -72,6 +66,7 @@ public function beforeSave($object)
 
     /**
      * Product from date attribute validate function.
+     *
      * In case invalid data throws exception.
      *
      * @param \Magento\Framework\DataObject $object
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index c1cfbdade3403..991fa3336d0fa 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Category\Attribute\Backend;
@@ -10,8 +10,6 @@
  * Catalog Category Attribute Default and Available Sort By Backend Model
  *
  * @api
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 486263f3de5a6..f369c49c1d776 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Category\Attribute\Source;
 
+use Magento\Theme\Model\PageLayout\Config\Builder;
+
 /**
  * Catalog category landing page attribute source
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -19,7 +19,9 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 
     /**
      * @inheritdoc
-     * @deprecated 103.0.1 since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     * @var array
+     * @deprecated 103.0.1 since the cache is now handled by Builder::$configFiles
+     * @see Builder::$configFiles
      */
     protected $_options = null;
 
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
index 6a6c228e63fd6..7adb86fdecb58 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Mode.php
@@ -1,19 +1,17 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Category\Attribute\Source;
 
 /**
  * Catalog category landing page attribute source
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mode extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      * @codeCoverageIgnore
      */
     public function getAllOptions()
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
index 4dda2fe5786e3..c13640faa2700 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
@@ -1,27 +1,21 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Category\Attribute\Source;
 
 /**
  * Catalog Category *_sort_by Attributes Source Model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Sortby extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
-     * Catalog config
-     *
      * @var \Magento\Catalog\Model\Config
      */
     protected $_catalogConfig;
 
     /**
-     * Construct
-     *
      * @param \Magento\Catalog\Model\Config $catalogConfig
      */
     public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
diff --git a/app/code/Magento/Catalog/Model/Config/Backend/Category.php b/app/code/Magento/Catalog/Model/Config/Backend/Category.php
index c74019f333907..01a15ae27386c 100644
--- a/app/code/Magento/Catalog/Model/Config/Backend/Category.php
+++ b/app/code/Magento/Catalog/Model/Config/Backend/Category.php
@@ -7,7 +7,6 @@
 
 /**
  * Config category field backend
- *
  */
 class Category extends \Magento\Framework\App\Config\Value
 {
@@ -17,8 +16,6 @@ class Category extends \Magento\Framework\App\Config\Value
     protected $_catalogCategory;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
@@ -43,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
index cad1e664b6cb0..0cda718ccf10a 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Config\Source;
 
 /**
  * Catalog products per page on Grid mode source
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class GridPerPage implements \Magento\Framework\Option\ArrayInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
index 18acb2f137263..d807a54f6b2b5 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Config\Source;
 
 /**
  * Catalog products per page on List mode source
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class ListPerPage implements \Magento\Framework\Option\ArrayInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
index 5cd2297fd7cbc..7f1134da1b742 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php
@@ -1,28 +1,22 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Catalog Product List Sortable allowed sortable attributes source
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Config\Source;
 
 class ListSort implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * Catalog config
-     *
      * @var \Magento\Catalog\Model\Config
      */
     protected $_catalogConfig;
 
     /**
-     * Construct
-     *
      * @param \Magento\Catalog\Model\Config $catalogConfig
      */
     public function __construct(\Magento\Catalog\Model\Config $catalogConfig)
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
index bd00ba0a73fbc..5b8e3101c1bae 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Config\Source\Product\Options;
 
@@ -9,14 +9,10 @@
 
 /**
  * Price types mode source
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Price implements ProductPriceOptionsInterface
 {
     /**
-     * Store manager.
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
@@ -30,7 +26,7 @@ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeMan
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      *
      * @codeCoverageIgnore
      */
diff --git a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
index 83f4313724694..68087d623e86e 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Watermark position config source model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Config\Source\Watermark;
 
diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
index 0eb81cce21807..7045cb8cfa223 100644
--- a/app/code/Magento/Catalog/Model/Design.php
+++ b/app/code/Magento/Catalog/Model/Design.php
@@ -24,7 +24,6 @@
  * Catalog Custom Category design Model
  *
  * @api
- *
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
@@ -32,7 +31,6 @@
 class Design extends \Magento\Framework\Model\AbstractModel
 {
     public const APPLY_FOR_PRODUCT = 1;
-
     public const APPLY_FOR_CATEGORY = 2;
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
index d9893be3125fe..704a178791d6d 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Catalog\Model\Entity\Product\Attribute\Design\Options;
 
 /**
  * Entity/Attribute/Model - select product design options container from config
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Container extends \Magento\Eav\Model\Entity\Attribute\Source\Config
 {
@@ -29,7 +27,7 @@ public function getOptionText($value)
             }
         }
         if (isset($options[$value])) {
-            return $option[$value];
+            return $options[$value];
         }
         return false;
     }
diff --git a/app/code/Magento/Catalog/Model/Layer/State.php b/app/code/Magento/Catalog/Model/Layer/State.php
index c404e5539d209..f51e156971477 100644
--- a/app/code/Magento/Catalog/Model/Layer/State.php
+++ b/app/code/Magento/Catalog/Model/Layer/State.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Layer;
@@ -14,7 +14,6 @@
  * Layered navigation state model
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class State extends DataObject
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index 3953fab25e830..42e67c66fb496 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -10,7 +10,6 @@
  * Catalog Product Mass Action processing model
  *
  * @api
- *
  * @since 100.0.2
  */
 class Action extends \Magento\Framework\Model\AbstractModel
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
index be1e523960f27..654cdd46075e0 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,8 +11,6 @@
 
 /**
  * Product attribute for enable/disable option
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
index 609d35a105c1a..c128c2c9acb94 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Category.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Catalog product categories backend attribute model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 1cb586b3351a7..ebc635a0c9da3 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -12,14 +12,11 @@
  * Backend model for set of EAV attributes with 'frontend_input' equals 'price'.
  *
  * @api
- *
  * @since 100.0.2
  */
 class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
-     * Catalog helper
-     *
      * @var \Magento\Catalog\Helper\Data
      */
     protected $_helper;
@@ -108,6 +105,7 @@ public function setScope($attribute)
 
     /**
      * After Save Price Attribute manipulation
+     *
      * Processes product price attributes if price scoped to website and updates data when:
      * * Price changed for non-default store view - will update price for all stores assigned to current website.
      * * Price will be changed according to store currency even if price changed in product with default store id.
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 1fd2a76275f6c..193abca0adba1 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -6,8 +6,6 @@
 
 /**
  * Catalog product tier price backend attribute model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
index c75362750cbe8..7553ec9bdf2be 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Catalog product weight backend attribute model
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Product\Attribute\Backend;