diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
index 40fd00d6143a5..48e84b3486198 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
@@ -4,21 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist customer sharing block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer;
 
 use Magento\Captcha\Block\Captcha;
 
 /**
- * Class Sharing
+ * Wishlist customer sharing block
  *
  * @api
  * @since 100.0.2
- * @package Magento\Wishlist\Block\Customer
  */
 class Sharing extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index bc94f53a7625a..8d754bc73342d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer;
 
 /**
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
index d5c77aa5cd6a6..510cffde0e88b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php
@@ -4,29 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist block customer item cart column
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist;
 
 /**
+ * Wishlist block customer item cart column
+ *
  * @api
  * @since 100.0.2
  */
 class Button extends \Magento\Framework\View\Element\Template
 {
     /**
-     * Wishlist config
-     *
      * @var \Magento\Wishlist\Model\Config
      */
     protected $_wishlistConfig;
 
     /**
-     * Wishlist data
-     *
      * @var \Magento\Wishlist\Helper\Data
      */
     protected $_wishlistData = null;
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index db92a10907d39..cd5ecdffc9ca1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
@@ -14,6 +11,7 @@
  *
  * @api
  * @deprecated 101.1.2
+ * @see no longer used
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 57d182dee4e1c..276d5a6c1cac2 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
@@ -14,6 +11,7 @@
  *
  * @api
  * @deprecated 101.1.2
+ * @see no longer used
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index f41146051ae96..80b09920d8ac0 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
@@ -14,6 +11,7 @@
  *
  * @api
  * @deprecated 101.1.2
+ * @see no longer used
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 092ede9ceb016..61a6a882c422d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
@@ -14,6 +11,7 @@
  *
  * @api
  * @deprecated 101.1.2
+ * @see no longer used
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 472cd3cc70f09..ad6d84280d35a 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
@@ -14,6 +11,7 @@
  *
  * @api
  * @deprecated 101.1.2
+ * @see no longer used
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Share/Wishlist.php b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
index 889fb363a2070..5ac40885e75c0 100644
--- a/app/code/Magento/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
@@ -6,8 +6,6 @@
 
 /**
  * Wishlist block shared items
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Share;
 
@@ -53,7 +51,6 @@ public function __construct(
      * Prepare global layout
      *
      * @return $this
-     *
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 3dab51c78cd3a..c25804b104d54 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -21,7 +21,6 @@
 /**
  * Wishlist Data Helper
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  *
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
index 1cf7ffb3f4bdf..c56e960ab79c0 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item.php
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist item model resource
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Model\ResourceModel;
 
 /**
+ * Wishlist item model resource
+ *
  * @api
  * @since 100.0.2
  */
@@ -56,7 +53,7 @@ public function loadByProductWishlist($object, $wishlistId, $productId, $sharedS
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
index 43d320b1821d8..ffec9a86327e9 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php
@@ -4,20 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist item option resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Model\ResourceModel\Item;
 
 /**
+ * Wishlist item option resource model
+ *
  * @api
  * @since 100.0.2
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
+     * Initialise the resource model
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
index dbbe6170ab19c..c1f8072cd0fb3 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php
@@ -6,8 +6,6 @@
 
 /**
  * Wishlist item option collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Model\ResourceModel\Item\Option;
 
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
index 27953b03aacfb..e2047faa6dbb2 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Model\ResourceModel;
 
 /**
+ * Wishlist resource model
+ *
  * @api
  * @since 100.0.2
  */
@@ -81,7 +78,7 @@ public function setCustomerIdFieldName($fieldName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
index a313b5df07167..365625bbd9909 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php
@@ -6,8 +6,6 @@
 
 /**
  * Wishlist model collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Model\ResourceModel\Wishlist;