diff --git a/src/PhpWord/Reader/ODText.php b/src/PhpWord/Reader/ODText.php
index 69e2aab3..db4708b4 100644
--- a/src/PhpWord/Reader/ODText.php
+++ b/src/PhpWord/Reader/ODText.php
@@ -10,7 +10,6 @@
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 8daf238f..ac93e62a 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -18,12 +18,16 @@ class Settings
 {
     /**
      * Zip libraries
+     *
+     * @const string
      */
     const PCLZIP     = 'PhpOffice\\PhpWord\\Shared\\ZipArchive';
     const ZIPARCHIVE = 'ZipArchive';
 
     /**
      * PDF rendering libraries
+     *
+     * @const string
      */
     const PDF_RENDERER_DOMPDF = 'DomPDF';
 
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index 3af10f79..13230863 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -89,7 +89,7 @@ class Border extends AbstractStyle
     /**
      * Get border size
      *
-     * @return array
+     * @return int[]
      */
     public function getBorderSize()
     {
diff --git a/src/PhpWord/Style/LineNumbering.php b/src/PhpWord/Style/LineNumbering.php
index fafa35e3..a1b70147 100644
--- a/src/PhpWord/Style/LineNumbering.php
+++ b/src/PhpWord/Style/LineNumbering.php
@@ -55,7 +55,7 @@ class LineNumbering extends AbstractStyle
      *
      * @param array $style
      */
-    public function __construct($style = null)
+    public function __construct($style = array())
     {
         $this->setStyleByArray($style);
     }
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index 89caca7e..de99ffe0 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -9,8 +9,6 @@
 
 namespace PhpOffice\PhpWord\Style;
 
-use PhpOffice\PhpWord\Shared\String;
-
 /**
  * Section settings
  */
@@ -18,11 +16,16 @@ class Section extends Border
 {
     /**
      * Page orientation
+     *
+     * @const string
      */
     const ORIENTATION_PORTRAIT = 'portrait';
     const ORIENTATION_LANDSCAPE = 'landscape';
+
     /**
      * Page default constants
+     *
+     * @const int|float
      */
     const DEFAULT_WIDTH = 11906; // In twip
     const DEFAULT_HEIGHT = 16838; // In twip
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 8cd8ccb3..d45211c8 100755
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -187,7 +187,7 @@ class Table extends Border
     /**
      * Get TLRBVH Border Size
      *
-     * @return array
+     * @return int[]
      */
     public function getBorderSize()
     {
@@ -218,7 +218,7 @@ class Table extends Border
     /**
      * Get TLRB Border Color
      *
-     * @return array
+     * @return string[]
      */
     public function getBorderColor()
     {
@@ -408,7 +408,7 @@ class Table extends Border
     /**
      * Get cell margin
      *
-     * @return array
+     * @return int[]
      */
     public function getCellMargin()
     {
diff --git a/src/PhpWord/Writer/ODText/Element/TextRun.php b/src/PhpWord/Writer/ODText/Element/TextRun.php
index be4de239..f97d9c8c 100644
--- a/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -10,8 +10,6 @@
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Element\Text as TextElement;
-use PhpOffice\PhpWord\Element\Link as LinkElement;
-use PhpOffice\PhpWord\Writer\ODText\Element\Element as ElementWriter;
 
 /**
  * TextRun element writer
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 51926b9e..afa84caf 100755
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -10,7 +10,6 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Element\AbstractElement;
 use PhpOffice\PhpWord\Element\TextBreak;
 use PhpOffice\PhpWord\Exception\Exception;