diff --git a/app/code/Magento/Catalog/Model/Factory.php b/app/code/Magento/Catalog/Model/Factory.php
index 184241ef7cc14..16ff16356c0d1 100644
--- a/app/code/Magento/Catalog/Model/Factory.php
+++ b/app/code/Magento/Catalog/Model/Factory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Model factory
  */
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index 7d52a6df52bb1..6a9c37e06a7e2 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Catalog\Model\Layer\Filter\Dynamic;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -48,8 +46,11 @@ class AlgorithmFactory
      * @param ScopeConfigInterface $scopeConfig
      * @param array $algorithms
      */
-    public function __construct(ObjectManagerInterface $objectManager, ScopeConfigInterface $scopeConfig, array $algorithms)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ScopeConfigInterface $scopeConfig,
+        array $algorithms
+    ) {
         $this->objectManager = $objectManager;
         $this->scopeConfig = $scopeConfig;
         $this->algorithms = $algorithms;
@@ -64,7 +65,10 @@ public function __construct(ObjectManagerInterface $objectManager, ScopeConfigIn
      */
     public function create(array $data = [])
     {
-        $calculationType = $this->scopeConfig->getValue(self::XML_PATH_RANGE_CALCULATION, ScopeInterface::SCOPE_STORE);
+        $calculationType = $this->scopeConfig->getValue(
+            self::XML_PATH_RANGE_CALCULATION,
+            ScopeInterface::SCOPE_STORE
+        );
 
         if (!isset($this->algorithms[$calculationType])) {
             throw new LocalizedException(__('%1 was not found in algorithms', $calculationType));
diff --git a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
index e78f2cd9d4b2b..3ceee018c59a5 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Template filter factory
  */
diff --git a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
index ee7e936f23c84..d9d72edbfcb14 100644
--- a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
+++ b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
@@ -1,27 +1,21 @@
 <?php
 /**
- * Customer Form Element Factory
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/**
+ * Customer Form Element Factory
+ */
 namespace Magento\Customer\Model\Metadata;
 
 class ElementFactory
 {
     const OUTPUT_FORMAT_JSON = 'json';
-
     const OUTPUT_FORMAT_TEXT = 'text';
-
     const OUTPUT_FORMAT_HTML = 'html';
-
     const OUTPUT_FORMAT_PDF = 'pdf';
-
     const OUTPUT_FORMAT_ONELINE = 'oneline';
-
     const OUTPUT_FORMAT_ARRAY = 'array';
 
     // available only for multiply attributes
@@ -40,8 +34,10 @@ class ElementFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Stdlib\StringUtils $string
      */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, \Magento\Framework\Stdlib\StringUtils $string)
-    {
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        \Magento\Framework\Stdlib\StringUtils $string
+    ) {
         $this->_objectManager = $objectManager;
         $this->_string = $string;
     }
@@ -64,7 +60,7 @@ public function create(
         $dataModelClass = $attribute->getDataModel();
         $params = [
             'entityTypeCode' => $entityTypeCode,
-            'value' => is_null($value) ? false : $value,
+            'value' => $value === null ? false : $value,
             'isAjax' => $isAjax,
             'attribute' => $attribute,
         ];
diff --git a/app/code/Magento/Eav/Model/AttributeDataFactory.php b/app/code/Magento/Eav/Model/AttributeDataFactory.php
index 94f8df04a6b44..bc027bb821410 100644
--- a/app/code/Magento/Eav/Model/AttributeDataFactory.php
+++ b/app/code/Magento/Eav/Model/AttributeDataFactory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Eav\Model;
 
 /**
@@ -16,15 +14,10 @@
 class AttributeDataFactory
 {
     const OUTPUT_FORMAT_JSON = 'json';
-
     const OUTPUT_FORMAT_TEXT = 'text';
-
     const OUTPUT_FORMAT_HTML = 'html';
-
     const OUTPUT_FORMAT_PDF = 'pdf';
-
     const OUTPUT_FORMAT_ONELINE = 'oneline';
-
     const OUTPUT_FORMAT_ARRAY = 'array';
 
     // available only for multiply attributes
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
index a08da8e24f0e8..fba9b0494283f 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Export entity factory
  */
@@ -30,7 +28,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
 
     /**
      * @param string $className
-     * @return \Magento\ImportExport\Model\Export\Entity\AbstractEntity|\Magento\ImportExport\Model\Export\AbstractEntity
+     * @return AbstractEntity|\Magento\ImportExport\Model\Export\AbstractEntity
      * @throws \InvalidArgumentException
      */
     public function create($className)
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
index 7360149f28d28..b7e2205683e30 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Import entity factory
  */
@@ -30,7 +28,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
 
     /**
      * @param string $className
-     * @return \Magento\ImportExport\Model\Import\Entity\AbstractEntity|\Magento\ImportExport\Model\Import\AbstractEntity
+     * @return AbstractEntity|\Magento\ImportExport\Model\Import\AbstractEntity
      * @throws \InvalidArgumentException
      */
     public function create($className)