diff --git a/src/PhpSpreadsheet/Calculation/FormulaParser.php b/src/PhpSpreadsheet/Calculation/FormulaParser.php
index 3350ba56..da2bc7c4 100644
--- a/src/PhpSpreadsheet/Calculation/FormulaParser.php
+++ b/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -2,28 +2,28 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-/*
-PARTLY BASED ON:
-    Copyright (c) 2007 E. W. Bachtal, Inc.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-    and associated documentation files (the "Software"), to deal in the Software without restriction,
-    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial
-      portions of the Software.
-
-    The software is provided "as is", without warranty of any kind, express or implied, including but not
-    limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-    no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-    whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-    software or the use or other dealings in the software.
-
-    http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-    http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
+/**
+ * PARTLY BASED ON:
+ * Copyright (c) 2007 E. W. Bachtal, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * The software is provided "as is", without warranty of any kind, express or implied, including but not
+ * limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+ * no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+ * whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+ * software or the use or other dealings in the software.
+ *
+ * http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+ * http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+ */
 class FormulaParser
 {
     // Character constants
@@ -495,10 +495,10 @@ class FormulaParser
             }
 
             if (!(
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                    )) {
+                (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+            )) {
                 continue;
             }
 
@@ -507,10 +507,10 @@ class FormulaParser
             }
 
             if (!(
-                    (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
-                    (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
-                    ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                    )) {
+                (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
+                (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
+                ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+            )) {
                 continue;
             }
 
@@ -543,9 +543,9 @@ class FormulaParser
                 if ($i == 0) {
                     $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
                 } elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
-                    ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
-                    ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
@@ -562,9 +562,9 @@ class FormulaParser
                 if ($i == 0) {
                     continue;
                 } elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
-                    ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
-                    ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
diff --git a/src/PhpSpreadsheet/Calculation/FormulaToken.php b/src/PhpSpreadsheet/Calculation/FormulaToken.php
index 61c89b90..2129615b 100644
--- a/src/PhpSpreadsheet/Calculation/FormulaToken.php
+++ b/src/PhpSpreadsheet/Calculation/FormulaToken.php
@@ -2,29 +2,28 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-/*
-PARTLY BASED ON:
-    Copyright (c) 2007 E. W. Bachtal, Inc.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-    and associated documentation files (the "Software"), to deal in the Software without restriction,
-    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial
-      portions of the Software.
-
-    The software is provided "as is", without warranty of any kind, express or implied, including but not
-    limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-    no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-    whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-    software or the use or other dealings in the software.
-
-    http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-    http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
+/**
+ * PARTLY BASED ON:
+ * Copyright (c) 2007 E. W. Bachtal, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * The software is provided "as is", without warranty of any kind, express or implied, including but not
+ * limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+ * no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+ * whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+ * software or the use or other dealings in the software.
+ *
+ * http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+ * http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+ */
 class FormulaToken
 {
     // Token types
diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php
index da7b86e9..aedc4325 100644
--- a/src/PhpSpreadsheet/Shared/Date.php
+++ b/src/PhpSpreadsheet/Shared/Date.php
@@ -15,11 +15,10 @@ class Date
     const CALENDAR_WINDOWS_1900 = 1900; //    Base date of 1st Jan 1900 = 1.0
     const CALENDAR_MAC_1904 = 1904; //    Base date of 2nd Jan 1904 = 1.0
 
-    /*
+    /**
      * Names of the months of the year, indexed by shortname
-     * Planned usage for locale settings
+     * Planned usage for locale settings.
      *
-     * @public
      * @var string[]
      */
     public static $monthNames = [
@@ -37,8 +36,7 @@ class Date
         'Dec' => 'December',
     ];
 
-    /*
-     * @public
+    /**
      * @var string[]
      */
     public static $numberSuffixes = [
@@ -48,19 +46,17 @@ class Date
         'th',
     ];
 
-    /*
+    /**
      * Base calendar year to use for calculations
-     * Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904)
+     * Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904).
      *
-     * @private
      * @var int
      */
     protected static $excelCalendar = self::CALENDAR_WINDOWS_1900;
 
-    /*
-     * Default timezone to use for DateTime objects
+    /**
+     * Default timezone to use for DateTime objects.
      *
-     * @private
      * @var null|\DateTimeZone
      */
     protected static $defaultTimeZone;
diff --git a/src/PhpSpreadsheet/Shared/File.php b/src/PhpSpreadsheet/Shared/File.php
index d24b63d7..239c8375 100644
--- a/src/PhpSpreadsheet/Shared/File.php
+++ b/src/PhpSpreadsheet/Shared/File.php
@@ -7,13 +7,11 @@ use ZipArchive;
 
 class File
 {
-    /*
-     * Use Temp or File Upload Temp for temporary files
+    /**
+     * Use Temp or File Upload Temp for temporary files.
      *
-     * @protected
-     * @var boolean
+     * @var bool
      */
-
     protected static $useUploadTempDirectory = false;
 
     /**
diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index 956d2dbc..5794ccac 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -2,20 +2,22 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
 
-/*
- *    Matrix class
- *
- *    @author Paul Meagher
- *    @author Michael Bommarito
- *    @author Lukasz Karapuda
- *    @author Bartek Matosiuk
- *    @version 1.8
- *    @see http://math.nist.gov/javanumerics/jama/
- */
 use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
+/**
+ * Matrix class.
+ *
+ * @author Paul Meagher
+ * @author Michael Bommarito
+ * @author Lukasz Karapuda
+ * @author Bartek Matosiuk
+ *
+ * @version 1.8
+ *
+ * @see http://math.nist.gov/javanumerics/jama/
+ */
 class Matrix
 {
     const POLYMORPHIC_ARGUMENT_EXCEPTION = 'Invalid argument pattern for polymorphic function.';
diff --git a/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
index a461ade4..328d4fac 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
@@ -191,15 +191,7 @@ class QRDecomposition
                 }
             }
         }
-        /*
-        for($i = 0; $i < count($Q); ++$i) {
-            for($j = 0; $j < count($Q); ++$j) {
-                if (! isset($Q[$i][$j]) ) {
-                    $Q[$i][$j] = 0;
-                }
-            }
-        }
-        */
+
         return new Matrix($Q);
     }
 
diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php
index c3f6b128..0320849a 100644
--- a/src/PhpSpreadsheet/Shared/OLE.php
+++ b/src/PhpSpreadsheet/Shared/OLE.php
@@ -21,14 +21,15 @@ namespace PhpOffice\PhpSpreadsheet\Shared;
 // +----------------------------------------------------------------------+
 //
 
-/*
-* Array for storing OLE instances that are accessed from
-* OLE_ChainedBlockStream::stream_open().
-* @var  array
-*/
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Shared\OLE\ChainedBlockStream;
 
+/*
+ * Array for storing OLE instances that are accessed from
+ * OLE_ChainedBlockStream::stream_open().
+ *
+ * @var array
+ */
 $GLOBALS['_OLE_INSTANCES'] = [];
 
 /**
@@ -373,12 +374,12 @@ class OLE
     public function _ppsTreeComplete($index)
     {
         return isset($this->_list[$index]) &&
-               ($pps = $this->_list[$index]) &&
-               ($pps->PrevPps == -1 ||
+            ($pps = $this->_list[$index]) &&
+            ($pps->PrevPps == -1 ||
                 $this->_ppsTreeComplete($pps->PrevPps)) &&
-               ($pps->NextPps == -1 ||
+            ($pps->NextPps == -1 ||
                 $this->_ppsTreeComplete($pps->NextPps)) &&
-               ($pps->DirPps == -1 ||
+            ($pps->DirPps == -1 ||
                 $this->_ppsTreeComplete($pps->DirPps));
     }
 
@@ -482,7 +483,7 @@ class OLE
         $iMax = strlen($ascii);
         for ($i = 0; $i < $iMax; ++$i) {
             $rawname .= $ascii[$i]
-            . "\x00";
+                . "\x00";
         }
 
         return $rawname;
diff --git a/src/PhpSpreadsheet/Shared/TimeZone.php b/src/PhpSpreadsheet/Shared/TimeZone.php
index cb007d21..d27deda3 100644
--- a/src/PhpSpreadsheet/Shared/TimeZone.php
+++ b/src/PhpSpreadsheet/Shared/TimeZone.php
@@ -7,10 +7,9 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
 class TimeZone
 {
-    /*
-     * Default Timezone used for date/time conversions
+    /**
+     * Default Timezone used for date/time conversions.
      *
-     * @private
      * @var string
      */
     protected static $timezone = 'UTC';
diff --git a/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php b/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
index 3004930c..7c54e8bd 100644
--- a/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
+++ b/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
@@ -17,8 +17,6 @@ class PolynomialBestFit extends BestFit
     /**
      * Polynomial order.
      *
-     * @protected
-     *
      * @var int
      **/
     protected $order = 0;
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
index bb6ed53f..c1cf646a 100644
--- a/src/PhpSpreadsheet/Style/Color.php
+++ b/src/PhpSpreadsheet/Style/Color.php
@@ -187,8 +187,6 @@ class Color extends Supervisor
     /**
      * Get a specified colour component of an RGB value.
      *
-     * @private
-     *
      * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
      * @param int $offset Position within the RGB value to extract
      * @param bool $hex Flag indicating whether the component should be returned as a hex or a