diff --git a/README.md b/README.md
index d18561d7..00babe5f 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ $objWriter->save('helloWorld.html');
 /* Note: we skip RTF, because it's not XML-based and requires a different example. */
 /* Note: we skip PDF, because "HTML-to-PDF" approach is used to create PDF documents. */
 ```
-:warning: Escape any string you pass to OOXML/ODF/HTML document, otherwise it may get broken.
+:warning: Escape any string you pass to ODF/HTML document, otherwise it may get broken.
 
 More examples are provided in the [samples folder](samples/). You can also read the [Developers' Documentation](http://phpword.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPWord/docs/master/) for more detail.
 
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index 7055da31..37b82dff 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Escaper;
  * 
  * @codeCoverageIgnore
  */
-abstract class AbstractEscaper implements EscaperInterface 
+abstract class AbstractEscaper implements EscaperInterface
 {
     /**
      * @param string $subject
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index 5d2e7302..dc498ddf 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -16,6 +16,7 @@
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
 use PhpOffice\PhpWord\Settings;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index b504a94b..46ef28e7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -16,6 +16,7 @@
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
 use PhpOffice\PhpWord\Settings;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 5c1c493b..4c5c90bf 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -16,6 +16,7 @@
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
 use PhpOffice\PhpWord\Settings;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 97fd1775..0c1ff8b2 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -16,6 +16,7 @@
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
 use PhpOffice\PhpWord\Settings;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 3865f59a..b662572e 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -16,6 +16,7 @@
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
 use PhpOffice\PhpWord\Settings;
 
 /**