diff --git a/src/Spout/Reader/ODS/SheetIterator.php b/src/Spout/Reader/ODS/SheetIterator.php
index f35b852..c7b8cd9 100644
--- a/src/Spout/Reader/ODS/SheetIterator.php
+++ b/src/Spout/Reader/ODS/SheetIterator.php
@@ -28,13 +28,13 @@ class SheetIterator implements IteratorInterface
     const XML_ATTRIBUTE_TABLE_STYLE_NAME = 'table:style-name';
     const XML_ATTRIBUTE_TABLE_DISPLAY = 'table:display';
 
-    /** @var string $filePath Path of the file to be read */
+    /** @var string Path of the file to be read */
     protected $filePath;
 
     /** @var \Box\Spout\Common\Manager\OptionsManagerInterface Reader's options manager */
     protected $optionsManager;
 
-    /** @var InternalEntityFactory $entityFactory Factory to create entities */
+    /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
     /** @var XMLReader The XMLReader object that will help read sheet's XML data */
diff --git a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php
index caaeed7..8850a69 100644
--- a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php
+++ b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php
@@ -43,7 +43,7 @@ class SharedStringsManager
     /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory Factory to create helpers */
+    /** @var HelperFactory Factory to create helpers */
     protected $helperFactory;
 
     /** @var CachingStrategyFactory Factory to create shared strings caching strategies */
diff --git a/src/Spout/Reader/XLSX/RowIterator.php b/src/Spout/Reader/XLSX/RowIterator.php
index 4af4530..a54b8b1 100644
--- a/src/Spout/Reader/XLSX/RowIterator.php
+++ b/src/Spout/Reader/XLSX/RowIterator.php
@@ -35,7 +35,7 @@ class RowIterator implements IteratorInterface
     /** @var string Path of the XLSX file being read */
     protected $filePath;
 
-    /** @var string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml */
+    /** @var string Path of the sheet data XML file as in [Content_Types].xml */
     protected $sheetDataXMLFilePath;
 
     /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */
diff --git a/src/Spout/Writer/Common/Entity/Sheet.php b/src/Spout/Writer/Common/Entity/Sheet.php
index 4a6d99a..3407ec7 100644
--- a/src/Spout/Writer/Common/Entity/Sheet.php
+++ b/src/Spout/Writer/Common/Entity/Sheet.php
@@ -27,9 +27,9 @@ class Sheet
     /** @var SheetManager Sheet manager */
     private $sheetManager;
 
-    /** @var $mergeRanges merge cell */
+    /** @var merge cell */
     private $mergeRanges;
-    
+
     /**
      * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
      * @param string $associatedWorkbookId ID of the sheet's associated workbook
@@ -111,10 +111,10 @@ class Sheet
 
         return $this;
     }
-    
+
     /**
-     * @return merge 
-     */ 
+     * @return merge
+     */
     public function getMergeRanges()
     {
         return $this->mergeRanges;
@@ -128,5 +128,4 @@ class Sheet
     {
         return $this->mergeRanges = $mergeRanges;
     }
-    
 }
diff --git a/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
index b513555..653778c 100644
--- a/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
+++ b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
@@ -44,7 +44,7 @@ abstract class WorkbookManagerAbstract implements WorkbookManagerInterface
     /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
-    /** @var ManagerFactoryInterface $managerFactory Factory to create managers */
+    /** @var ManagerFactoryInterface Factory to create managers */
     protected $managerFactory;
 
     /** @var Worksheet The worksheet where data will be written to */
diff --git a/src/Spout/Writer/ODS/Creator/ManagerFactory.php b/src/Spout/Writer/ODS/Creator/ManagerFactory.php
index f38c500..a5b77ee 100644
--- a/src/Spout/Writer/ODS/Creator/ManagerFactory.php
+++ b/src/Spout/Writer/ODS/Creator/ManagerFactory.php
@@ -22,7 +22,7 @@ class ManagerFactory implements ManagerFactoryInterface
     /** @var InternalEntityFactory */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /**
diff --git a/src/Spout/Writer/WriterAbstract.php b/src/Spout/Writer/WriterAbstract.php
index d96a628..bbaa735 100644
--- a/src/Spout/Writer/WriterAbstract.php
+++ b/src/Spout/Writer/WriterAbstract.php
@@ -33,7 +33,7 @@ abstract class WriterAbstract implements WriterInterface
     /** @var GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /** @var OptionsManagerInterface Writer options manager */
diff --git a/src/Spout/Writer/XLSX/Creator/ManagerFactory.php b/src/Spout/Writer/XLSX/Creator/ManagerFactory.php
index f27a2f2..aa3bcd5 100644
--- a/src/Spout/Writer/XLSX/Creator/ManagerFactory.php
+++ b/src/Spout/Writer/XLSX/Creator/ManagerFactory.php
@@ -24,7 +24,7 @@ class ManagerFactory implements ManagerFactoryInterface
     /** @var InternalEntityFactory */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /**
diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
index 7e99e38..764b52f 100644
--- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
@@ -273,14 +273,14 @@ EOD;
         \fwrite($worksheetFilePointer, '</sheetData>');
         // do sth to merging cells
         $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges();
-        if(!empty($mergeRanges)) {
+        if (!empty($mergeRanges)) {
             $startLine = '<mergeCells count="1">';
             $rangeLine = '';
             foreach ($mergeRanges as $key => $range) {
                 $rangeLine .= '<mergeCell ref="' . $range . '"/>';
             }
             $endLine = '</mergeCells>';
-            \fwrite($worksheetFilePointer, $startLine.$rangeLine.$endLine);
+            \fwrite($worksheetFilePointer, $startLine . $rangeLine . $endLine);
         }
         \fwrite($worksheetFilePointer, '</worksheet>');
         \fclose($worksheetFilePointer);
diff --git a/tests/Spout/Reader/CSV/SpoutTestStream.php b/tests/Spout/Reader/CSV/SpoutTestStream.php
index 3bfd06e..d66e811 100644
--- a/tests/Spout/Reader/CSV/SpoutTestStream.php
+++ b/tests/Spout/Reader/CSV/SpoutTestStream.php
@@ -14,10 +14,10 @@ class SpoutTestStream
     const PATH_TO_CSV_RESOURCES = 'tests/resources/csv/';
     const CSV_EXTENSION = '.csv';
 
-    /** @var int $position */
+    /** @var int */
     private $position;
 
-    /** @var resource $fileHandle */
+    /** @var resource */
     private $fileHandle;
 
     /**