diff --git a/rector.php b/rector.php
index 1aad037f..5d5ce730 100644
--- a/rector.php
+++ b/rector.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Rector\Core\Configuration\Option;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
diff --git a/src/Gedcom.php b/src/Gedcom.php
index efff3d54..20cca366 100644
--- a/src/Gedcom.php
+++ b/src/Gedcom.php
@@ -93,7 +93,7 @@ class Gedcom
     /**
      * Retrieves the header record of the GEDCOM file.
      */
-    public function setHead (\Gedcom\Record\Head $head)
+    public function setHead(\Gedcom\Record\Head $head)
     {
         $this->head = $head;
     }
@@ -101,7 +101,7 @@ public function setHead (\Gedcom\Record\Head $head)
     /**
      * Retrieves the submission record of the GEDCOM file.
      */
-    public function setSubn (\Gedcom\Record\Subn $subn)
+    public function setSubn(\Gedcom\Record\Subn $subn)
     {
         $this->subn = $subn;
     }
@@ -109,7 +109,7 @@ public function setSubn (\Gedcom\Record\Subn $subn)
     /**
      * Adds a source to the collection of sources.
      */
-    public function addSour (\Gedcom\Record\Sour $sour)
+    public function addSour(\Gedcom\Record\Sour $sour)
     {
         $this->sour[$sour->getSour()] = $sour;
     }
@@ -117,7 +117,7 @@ public function addSour (\Gedcom\Record\Sour $sour)
     /**
      * Adds an individual to the collection of individuals.
      */
-    public function addIndi (\Gedcom\Record\Indi $indi)
+    public function addIndi(\Gedcom\Record\Indi $indi)
     {
         $this->indi[$indi->getId()] = $indi;
         if ($indi->getUid()) {
@@ -128,7 +128,7 @@ public function addIndi (\Gedcom\Record\Indi $indi)
     /**
      * Adds a family to the collection of families.
      */
-    public function addFam (\Gedcom\Record\Fam $fam)
+    public function addFam(\Gedcom\Record\Fam $fam)
     {
         $this->fam[$fam->getId()] = $fam;
     }
@@ -136,7 +136,7 @@ public function addFam (\Gedcom\Record\Fam $fam)
     /**
      * Adds a note to the collection of notes.
      */
-    public function addNote (\Gedcom\Record\Note $note)
+    public function addNote(\Gedcom\Record\Note $note)
     {
         $this->note[$note->getId()] = $note;
     }
@@ -144,7 +144,7 @@ public function addNote (\Gedcom\Record\Note $note)
     /**
      * Adds a repository to the collection of repositories.
      */
-    public function addRepo (\Gedcom\Record\Repo $repo)
+    public function addRepo(\Gedcom\Record\Repo $repo)
     {
         $this->repo[$repo->getRepo()] = $repo;
     }
@@ -152,7 +152,7 @@ public function addRepo (\Gedcom\Record\Repo $repo)
     /**
      * Adds an object to the collection of objects.
      */
-    public function addObje (\Gedcom\Record\Obje $obje)
+    public function addObje(\Gedcom\Record\Obje $obje)
     {
         $this->obje[$obje->getId()] = $obje;
     }
@@ -160,7 +160,7 @@ public function addObje (\Gedcom\Record\Obje $obje)
     /**
      * Adds a submitter record to the collection of submitters.
      */
-    public function addSubm (\Gedcom\Record\Subm $subm)
+    public function addSubm(\Gedcom\Record\Subm $subm)
     {
         $this->subm[$subm->getSubm()] = $subm;
     }
diff --git a/src/Parser.php b/src/Parser.php
index 7a9e959f..3c3ee40c 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -239,23 +239,23 @@ public function parse($fileName)
                 }
 
                 if (isset($record[1]) && trim($record[1]) == 'HEAD') {
-                     \Gedcom\Parser\Head::parse($this);
+                    \Gedcom\Parser\Head::parse($this);
                 } elseif (isset($record[2]) && trim($record[2]) == 'SUBN') {
-                     \Gedcom\Parser\Subn::parse($this);
+                    \Gedcom\Parser\Subn::parse($this);
                 } elseif (isset($record[2]) && trim($record[2]) == 'SUBM') {
-                     \Gedcom\Parser\Subm::parse($this);
+                    \Gedcom\Parser\Subm::parse($this);
                 } elseif (isset($record[2]) && $record[2] == 'SOUR') {
-                     \Gedcom\Parser\Sour::parse($this);
+                    \Gedcom\Parser\Sour::parse($this);
                 } elseif (isset($record[2]) && $record[2] == 'INDI') {
-                     \Gedcom\Parser\Indi::parse($this);
+                    \Gedcom\Parser\Indi::parse($this);
                 } elseif (isset($record[2]) && $record[2] == 'FAM') {
-                     \Gedcom\Parser\Fam::parse($this);
+                    \Gedcom\Parser\Fam::parse($this);
                 } elseif (isset($record[2]) && substr(trim($record[2]), 0, 4) == 'NOTE') {
-                     \Gedcom\Parser\Note::parse($this);
+                    \Gedcom\Parser\Note::parse($this);
                 } elseif (isset($record[2]) && $record[2] == 'REPO') {
-                     \Gedcom\Parser\Repo::parse($this);
+                    \Gedcom\Parser\Repo::parse($this);
                 } elseif (isset($record[2]) && $record[2] == 'OBJE') {
-                     \Gedcom\Parser\Obje::parse($this);
+                    \Gedcom\Parser\Obje::parse($this);
                 } elseif (isset($record[1]) && trim($record[1]) == 'TRLR') {
                     // EOF
                     break;
diff --git a/src/Parser/Date.php b/src/Parser/Date.php
index 1154905d..df8ef1f7 100644
--- a/src/Parser/Date.php
+++ b/src/Parser/Date.php
@@ -23,7 +23,7 @@ public static function parse(\Gedcom\Parser $parser)
 
         $parser->forward();
         $record = $parser->getCurrentLineRecord();
-        
+
         if (isset($record[1])) {
             $dat = new \Gedcom\Record\Date();
             if (!empty($record[2])) {
@@ -34,9 +34,9 @@ public static function parse(\Gedcom\Parser $parser)
 
             return null;
         }
-        
+
         if ($dat->getYear() && $dat->getMonth() && $dat->getDay()) {
-            return $dat->getYear() .'-'. substr("0{$dat->getMonth()}", -2) .'-'. substr("0{$dat->getDay()}", -2);
+            return $dat->getYear().'-'.substr("0{$dat->getMonth()}", -2).'-'.substr("0{$dat->getDay()}", -2);
         }
 
         return null;
diff --git a/src/Parser/Indi/Even.php b/src/Parser/Indi/Even.php
index d7667c32..bc8db5bf 100644
--- a/src/Parser/Indi/Even.php
+++ b/src/Parser/Indi/Even.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Parser\Indi;
 
-use \Gedcom\Parser\Chan;
-
 class Even extends \Gedcom\Parser\Component
 {
     public static function parse(\Gedcom\Parser $parser)
diff --git a/src/Record/Addr.php b/src/Record/Addr.php
index 8223b414..0830aab3 100644
--- a/src/Record/Addr.php
+++ b/src/Record/Addr.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Addr.
  */
diff --git a/src/Record/Caln.php b/src/Record/Caln.php
index 98ed34da..5927b008 100644
--- a/src/Record/Caln.php
+++ b/src/Record/Caln.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Caln.
  */
diff --git a/src/Record/Chan.php b/src/Record/Chan.php
index 89ac85de..1d6a3542 100644
--- a/src/Record/Chan.php
+++ b/src/Record/Chan.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
+use Gedcom\Record;
 
 /**
  * Class Chan.
diff --git a/src/Record/Data.php b/src/Record/Data.php
index 1b48e3aa..e600d5ce 100644
--- a/src/Record/Data.php
+++ b/src/Record/Data.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Data.
  */
diff --git a/src/Record/Date.php b/src/Record/Date.php
index d8eb29e2..6a8799ad 100644
--- a/src/Record/Date.php
+++ b/src/Record/Date.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Date.
  */
diff --git a/src/Record/Fam/Even.php b/src/Record/Fam/Even.php
index df6c90dc..c0cdb614 100644
--- a/src/Record/Fam/Even.php
+++ b/src/Record/Fam/Even.php
@@ -14,16 +14,16 @@
 
 namespace Gedcom\Record\Fam;
 
-use \Gedcom\Record\Noteable;
-use \Gedcom\Record\Objectable;
-use \Gedcom\Record\Sourceable;
+use Gedcom\Record\Noteable;
+use Gedcom\Record\Objectable;
+use Gedcom\Record\Sourceable;
 
 /**
  * Event record.
  *
- * @method mixed                  getType()
+ * @method mixed        getType()
  * @method \Record\Date getDate()
- * @method string                 getPlac()
+ * @method string       getPlac()
  */
 class Even extends \Gedcom\Record implements Objectable, Sourceable, Noteable
 {
diff --git a/src/Record/Fam/Slgs.php b/src/Record/Fam/Slgs.php
index ce470b21..7d230947 100644
--- a/src/Record/Fam/Slgs.php
+++ b/src/Record/Fam/Slgs.php
@@ -14,8 +14,8 @@
 
 namespace Gedcom\Record\Fam;
 
-use \Gedcom\Record\Noteable;
-use \Gedcom\Record\Sourceable;
+use Gedcom\Record\Noteable;
+use Gedcom\Record\Sourceable;
 
 class Slgs extends \Gedcom\Record implements Sourceable, Noteable
 {
diff --git a/src/Record/Head.php b/src/Record/Head.php
index d445a15b..4553a053 100644
--- a/src/Record/Head.php
+++ b/src/Record/Head.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Stores the data from the HEAD section of a GEDCOM 5.5 file.
  */
diff --git a/src/Record/Indi.php b/src/Record/Indi.php
index 6e9d8c7b..a4f36946 100644
--- a/src/Record/Indi.php
+++ b/src/Record/Indi.php
@@ -14,9 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
-
 /**
  * Class Indi.
  */
@@ -138,16 +135,16 @@ class Indi extends \Gedcom\Record implements Noteable, Objectable, Sourceable
      * @var Indi\Asso[]
      */
     protected $asso = [];
-    
+
     protected $birthday;
-    
+
     public function setBirthday($birthday = '')
     {
         $this->birthday = $birthday;
-        
+
         return $this;
     }
-    
+
     public function getBirthday()
     {
         return $this->birthday;
diff --git a/src/Record/Indi/Asso.php b/src/Record/Indi/Asso.php
index 02ad6580..fac6ef1d 100644
--- a/src/Record/Indi/Asso.php
+++ b/src/Record/Indi/Asso.php
@@ -14,8 +14,8 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record\Noteable;
-use \Gedcom\Record\Sourceable;
+use Gedcom\Record\Noteable;
+use Gedcom\Record\Sourceable;
 
 class Asso extends \Gedcom\Record implements Sourceable, Noteable
 {
diff --git a/src/Record/Indi/Attr.php b/src/Record/Indi/Attr.php
index b041f7c1..cd40ea13 100644
--- a/src/Record/Indi/Attr.php
+++ b/src/Record/Indi/Attr.php
@@ -14,9 +14,9 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record\Noteable;
-use \Gedcom\Record\Objectable;
-use \Gedcom\Record\Sourceable;
+use Gedcom\Record\Noteable;
+use Gedcom\Record\Objectable;
+use Gedcom\Record\Sourceable;
 
 class Attr extends \Gedcom\Record\Indi\Even implements Sourceable, Noteable, Objectable
 {
diff --git a/src/Record/Indi/Even.php b/src/Record/Indi/Even.php
index fa81d105..3c8c177e 100644
--- a/src/Record/Indi/Even.php
+++ b/src/Record/Indi/Even.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record;
+use Gedcom\Record;
 
 /**
  * Class Even.
diff --git a/src/Record/Indi/Even/Plac.php b/src/Record/Indi/Even/Plac.php
index 9b234317..92421686 100644
--- a/src/Record/Indi/Even/Plac.php
+++ b/src/Record/Indi/Even/Plac.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Indi\Even;
 
-use \Gedcom\Record;
+use Gedcom\Record;
 
 /**
  * Class Plac.
diff --git a/src/Record/Indi/Famc.php b/src/Record/Indi/Famc.php
index 3ae88ef4..0429b984 100644
--- a/src/Record/Indi/Famc.php
+++ b/src/Record/Indi/Famc.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record\Noteable;
+use Gedcom\Record\Noteable;
 
 class Famc extends \Gedcom\Record implements Noteable
 {
diff --git a/src/Record/Indi/Fams.php b/src/Record/Indi/Fams.php
index 1d8646bf..a1106a20 100644
--- a/src/Record/Indi/Fams.php
+++ b/src/Record/Indi/Fams.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record\Noteable;
+use Gedcom\Record\Noteable;
 
 class Fams extends \Gedcom\Record implements Noteable
 {
diff --git a/src/Record/Indi/Lds.php b/src/Record/Indi/Lds.php
index 31db0f8e..d2b8fb10 100644
--- a/src/Record/Indi/Lds.php
+++ b/src/Record/Indi/Lds.php
@@ -14,8 +14,8 @@
 
 namespace Gedcom\Record\Indi;
 
-use \Gedcom\Record\Noteable;
-use \Gedcom\Record\Sourceable;
+use Gedcom\Record\Noteable;
+use Gedcom\Record\Sourceable;
 
 abstract class Lds extends \Gedcom\Record implements Sourceable, Noteable
 {
diff --git a/src/Record/Indi/Name/Fone.php b/src/Record/Indi/Name/Fone.php
index ba4c641d..bd8bf9f3 100644
--- a/src/Record/Indi/Name/Fone.php
+++ b/src/Record/Indi/Name/Fone.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\Indi\Name;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Indi/Name/Romn.php b/src/Record/Indi/Name/Romn.php
index b525a74f..f8f8f6af 100644
--- a/src/Record/Indi/Name/Romn.php
+++ b/src/Record/Indi/Name/Romn.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\Indi\Name;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/ObjeRef/File.php b/src/Record/ObjeRef/File.php
index 973b2c48..f2f16da9 100644
--- a/src/Record/ObjeRef/File.php
+++ b/src/Record/ObjeRef/File.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\ObjeRef;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/ObjeRef/File/Form.php b/src/Record/ObjeRef/File/Form.php
index 5d696ea4..3444ffca 100644
--- a/src/Record/ObjeRef/File/Form.php
+++ b/src/Record/ObjeRef/File/Form.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\ObjeRef\File;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Phon.php b/src/Record/Phon.php
index b4daf055..c784d559 100644
--- a/src/Record/Phon.php
+++ b/src/Record/Phon.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Phon.
  */
diff --git a/src/Record/Plac/Fone.php b/src/Record/Plac/Fone.php
index b4428164..e155c32d 100644
--- a/src/Record/Plac/Fone.php
+++ b/src/Record/Plac/Fone.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\Plac;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Plac/Map.php b/src/Record/Plac/Map.php
index a7afea63..1df6caae 100644
--- a/src/Record/Plac/Map.php
+++ b/src/Record/Plac/Map.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\Plac;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Plac/Romn.php b/src/Record/Plac/Romn.php
index c35f2ed7..72a33795 100644
--- a/src/Record/Plac/Romn.php
+++ b/src/Record/Plac/Romn.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record\Plac;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Refn.php b/src/Record/Refn.php
index 8eff0345..a3457c88 100644
--- a/src/Record/Refn.php
+++ b/src/Record/Refn.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Refn.
  */
diff --git a/src/Record/Repo.php b/src/Record/Repo.php
index 7d052013..e0101871 100644
--- a/src/Record/Repo.php
+++ b/src/Record/Repo.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Repo.
  */
diff --git a/src/Record/Sour.php b/src/Record/Sour.php
index e8a8ffbf..50274125 100644
--- a/src/Record/Sour.php
+++ b/src/Record/Sour.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Sour.
  */
diff --git a/src/Record/Sour/Data.php b/src/Record/Sour/Data.php
index 3ae92e92..cc47087f 100644
--- a/src/Record/Sour/Data.php
+++ b/src/Record/Sour/Data.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Sour;
 
-use \Gedcom\Record\Noteable;
+use Gedcom\Record\Noteable;
 
 class Data extends \Gedcom\Record implements Noteable
 {
diff --git a/src/Record/Sour/Repo.php b/src/Record/Sour/Repo.php
index 91a0a4fd..1b986e21 100644
--- a/src/Record/Sour/Repo.php
+++ b/src/Record/Sour/Repo.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record\Sour;
 
-use \Gedcom\Record\Noteable;
+use Gedcom\Record\Noteable;
 
 class Repo extends \Gedcom\Record implements Noteable
 {
diff --git a/src/Record/Subm.php b/src/Record/Subm.php
index 4de88281..30124c7e 100644
--- a/src/Record/Subm.php
+++ b/src/Record/Subm.php
@@ -14,7 +14,7 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
+use Gedcom\Record;
 
 /**
  * Class Subm.
diff --git a/src/Record/Subn.php b/src/Record/Subn.php
index 1a3c058b..132a2a71 100644
--- a/src/Record/Subn.php
+++ b/src/Record/Subn.php
@@ -14,8 +14,6 @@
 
 namespace Gedcom\Record;
 
-use \Gedcom\Record;
-
 /**
  * Class Subn.
  */
diff --git a/src/Writer.php b/src/Writer.php
index 00d65c05..d86737d5 100644
--- a/src/Writer.php
+++ b/src/Writer.php
@@ -14,15 +14,15 @@
 
 namespace Gedcom;
 
-use \Gedcom\Writer\Fam;
-use \Gedcom\Writer\Head;
-use \Gedcom\Writer\Indi;
-use \Gedcom\Writer\Note;
-use \Gedcom\Writer\Obje;
-use \Gedcom\Writer\Repo;
-use \Gedcom\Writer\Sour;
-use \Gedcom\Writer\Subm;
-use \Gedcom\Writer\Subn;
+use Gedcom\Writer\Fam;
+use Gedcom\Writer\Head;
+use Gedcom\Writer\Indi;
+use Gedcom\Writer\Note;
+use Gedcom\Writer\Obje;
+use Gedcom\Writer\Repo;
+use Gedcom\Writer\Sour;
+use Gedcom\Writer\Subm;
+use Gedcom\Writer\Subn;
 
 class Writer
 {
@@ -32,7 +32,7 @@ class Writer
 
     /**
      * @param  $gedcom The GEDCOM object
-     * @param string            $format The format to convert the GEDCOM object to
+     * @param string $format The format to convert the GEDCOM object to
      *
      * @return string The contents of the document in the converted format
      */
diff --git a/src/Writer/Addr.php b/src/Writer/Addr.php
index f14ba562..6085dd61 100644
--- a/src/Writer/Addr.php
+++ b/src/Writer/Addr.php
@@ -17,11 +17,12 @@
 class Addr
 {
     /**
-     * @param string                 $format
-     * @param int                    $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Addr &$addr, $format = self::GEDCOM55, $level = 1)
+    public static function convert(\Gedcom\Record\Addr &$addr, $format = self::GEDCOM55, $level = 1)
     {
         $addrs = explode("\n", $addr->getAddr());
 
@@ -33,7 +34,7 @@ public static function convert (\Gedcom\Record\Addr &$addr, $format = self::GEDC
             $output .= ($level + 1).' CONT '.$cont."\n";
         }
 
-        return $output . (($level + 1).' ADR1 '.$addr->adr1."\n".
+        return $output.(($level + 1).' ADR1 '.$addr->adr1."\n".
             ($level + 1).' ADR2 '.$addr->getAdr2()."\n".
             ($level + 1).' CITY '.$addr->getCity()."\n".
             ($level + 1).' STAE '.$addr->getStae()."\n".
diff --git a/src/Writer/Caln.php b/src/Writer/Caln.php
index 2ac06323..272a3a54 100644
--- a/src/Writer/Caln.php
+++ b/src/Writer/Caln.php
@@ -18,11 +18,11 @@ class Caln
 {
     /**
      * @param \Gedcom\Record\Caln $note
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Caln &$caln, $level)
+    public static function convert(\Gedcom\Record\Caln &$caln, $level)
     {
         $output = '';
         $_caln = $caln->getCaln();
diff --git a/src/Writer/Chan.php b/src/Writer/Chan.php
index cee57f69..5470d704 100644
--- a/src/Writer/Chan.php
+++ b/src/Writer/Chan.php
@@ -18,11 +18,11 @@ class Chan
 {
     /**
      * @param \Gedcom\Record\Chan $note
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Chan &$chan, $level)
+    public static function convert(\Gedcom\Record\Chan &$chan, $level)
     {
         $output = $level." CHAN \n";
         // level up
diff --git a/src/Writer/Fam.php b/src/Writer/Fam.php
index 046cfe39..01aaecbe 100644
--- a/src/Writer/Fam.php
+++ b/src/Writer/Fam.php
@@ -18,11 +18,11 @@ class Fam
 {
     /**
      * @param \Gedcom\Record\Fam $sour
-     * @param int                   $level
+     * @param int                $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Fam &$fam, $level = 0)
+    public static function convert(\Gedcom\Record\Fam &$fam, $level = 0)
     {
         $output = '';
         $id = $fam->getId();
diff --git a/src/Writer/Fam/Even.php b/src/Writer/Fam/Even.php
index 2ac0a664..4165aad2 100644
--- a/src/Writer/Fam/Even.php
+++ b/src/Writer/Fam/Even.php
@@ -17,10 +17,11 @@
 class Even
 {
     /**
-     * @param int                        $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Fam\Even &$even, $level)
+    public static function convert(\Gedcom\Record\Fam\Even &$even, $level)
     {
         $output = '';
 
diff --git a/src/Writer/Fam/Even/Husb.php b/src/Writer/Fam/Even/Husb.php
index 4dec8364..4baf5686 100644
--- a/src/Writer/Fam/Even/Husb.php
+++ b/src/Writer/Fam/Even/Husb.php
@@ -18,11 +18,11 @@ class Husb
 {
     /**
      * @param \Gedcom\Record\Fam\Even\Husb $attr
-     * @param int                             $level
+     * @param int                          $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Fam\Even\Husb &$husb, $level = 0)
+    public static function convert(\Gedcom\Record\Fam\Even\Husb &$husb, $level = 0)
     {
         $output = '';
 
diff --git a/src/Writer/Fam/Even/Wife.php b/src/Writer/Fam/Even/Wife.php
index 9e85ba7b..c1a29b7a 100644
--- a/src/Writer/Fam/Even/Wife.php
+++ b/src/Writer/Fam/Even/Wife.php
@@ -18,11 +18,11 @@ class Wife
 {
     /**
      * @param \Gedcom\Record\Fam\Even\Wife $attr
-     * @param int                             $level
+     * @param int                          $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Fam\Even\Wife &$wife, $level = 0)
+    public static function convert(\Gedcom\Record\Fam\Even\Wife &$wife, $level = 0)
     {
         $output = '';
 
diff --git a/src/Writer/Fam/Slgs.php b/src/Writer/Fam/Slgs.php
index 08ebd387..84563148 100644
--- a/src/Writer/Fam/Slgs.php
+++ b/src/Writer/Fam/Slgs.php
@@ -17,10 +17,11 @@
 class Slgs
 {
     /**
-     * @param int                        $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Fam\Slgs &$slgs, $level)
+    public static function convert(\Gedcom\Record\Fam\Slgs &$slgs, $level)
     {
         $output = '';
         $output .= $level." SLGS \n";
diff --git a/src/Writer/Head.php b/src/Writer/Head.php
index 3dd42c3c..88ada96e 100644
--- a/src/Writer/Head.php
+++ b/src/Writer/Head.php
@@ -17,10 +17,11 @@
 class Head
 {
     /**
-     * @param string                 $format
+     * @param string $format
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head &$head, $format = self::GEDCOM55)
+    public static function convert(\Gedcom\Record\Head &$head, $format = self::GEDCOM55)
     {
         $level = 0;
         $output = $level." HEAD\n";
diff --git a/src/Writer/Head/Char.php b/src/Writer/Head/Char.php
index 6d942961..a00177d5 100644
--- a/src/Writer/Head/Char.php
+++ b/src/Writer/Head/Char.php
@@ -17,11 +17,12 @@
 class Char
 {
     /**
-     * @param string                      $format
-     * @param int                         $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Char &$char, $level)
+    public static function convert(\Gedcom\Record\Head\Char &$char, $level)
     {
         $output = '';
         // char
diff --git a/src/Writer/Head/Date.php b/src/Writer/Head/Date.php
index 1875d3a3..2478b71e 100644
--- a/src/Writer/Head/Date.php
+++ b/src/Writer/Head/Date.php
@@ -17,11 +17,12 @@
 class Date
 {
     /**
-     * @param string                      $format
-     * @param int                         $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Date &$date, $level)
+    public static function convert(\Gedcom\Record\Head\Date &$date, $level)
     {
         $output = '';
         $_date = $date->getDate();
diff --git a/src/Writer/Head/Gedc.php b/src/Writer/Head/Gedc.php
index 6e2a77dc..4b52df07 100644
--- a/src/Writer/Head/Gedc.php
+++ b/src/Writer/Head/Gedc.php
@@ -17,11 +17,12 @@
 class Gedc
 {
     /**
-     * @param string                      $format
-     * @param int                         $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Gedc &$gedc, $level)
+    public static function convert(\Gedcom\Record\Head\Gedc &$gedc, $level)
     {
         $output = $level." GEDC \n";
 
diff --git a/src/Writer/Head/Plac.php b/src/Writer/Head/Plac.php
index 9bc5cef5..3169329e 100644
--- a/src/Writer/Head/Plac.php
+++ b/src/Writer/Head/Plac.php
@@ -17,11 +17,12 @@
 class Plac
 {
     /**
-     * @param string                      $format
-     * @param int                         $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Plac &$plac, $level)
+    public static function convert(\Gedcom\Record\Head\Plac &$plac, $level)
     {
         $output = $level." PLAC \n";
 
diff --git a/src/Writer/Head/Sour.php b/src/Writer/Head/Sour.php
index 661f52e1..3447078c 100644
--- a/src/Writer/Head/Sour.php
+++ b/src/Writer/Head/Sour.php
@@ -17,11 +17,12 @@
 class Sour
 {
     /**
-     * @param string                      $format
-     * @param int                         $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Sour &$sour, $level)
+    public static function convert(\Gedcom\Record\Head\Sour &$sour, $level)
     {
         $output = '';
         $_sour = $sour->getSour();
diff --git a/src/Writer/Head/Sour/Corp.php b/src/Writer/Head/Sour/Corp.php
index 05256a77..afc0f0dd 100644
--- a/src/Writer/Head/Sour/Corp.php
+++ b/src/Writer/Head/Sour/Corp.php
@@ -17,11 +17,12 @@
 class Corp
 {
     /**
-     * @param string                           $format
-     * @param int                              $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Sour\Corp &$corp, $level)
+    public static function convert(\Gedcom\Record\Head\Sour\Corp &$corp, $level)
     {
         $output = '';
         $_corp = $corp->getCorp();
diff --git a/src/Writer/Head/Sour/Data.php b/src/Writer/Head/Sour/Data.php
index 316c9054..f51bed12 100644
--- a/src/Writer/Head/Sour/Data.php
+++ b/src/Writer/Head/Sour/Data.php
@@ -17,11 +17,12 @@
 class Data
 {
     /**
-     * @param string                           $format
-     * @param int                              $level
+     * @param string $format
+     * @param int    $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Head\Sour\Data &$data, $level)
+    public static function convert(\Gedcom\Record\Head\Sour\Data &$data, $level)
     {
         $output = '';
         $_data = $data->getData();
diff --git a/src/Writer/Indi.php b/src/Writer/Indi.php
index f379cf33..b35ac4d6 100644
--- a/src/Writer/Indi.php
+++ b/src/Writer/Indi.php
@@ -17,10 +17,11 @@
 class Indi
 {
     /**
-     * @param string                 $format
+     * @param string $format
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi &$indi)
+    public static function convert(\Gedcom\Record\Indi &$indi)
     {
         $level = 0;
 
diff --git a/src/Writer/Indi/Asso.php b/src/Writer/Indi/Asso.php
index fe8d5e41..373a8a0b 100644
--- a/src/Writer/Indi/Asso.php
+++ b/src/Writer/Indi/Asso.php
@@ -18,11 +18,11 @@ class Asso
 {
     /**
      * @param \Gedcom\Record\Indi\Asso $attr
-     * @param int                         $level
+     * @param int                      $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Asso &$asso, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Asso &$asso, $level = 0)
     {
         $output = '';
         // _indi
diff --git a/src/Writer/Indi/Attr.php b/src/Writer/Indi/Attr.php
index c704b53e..b16cd27a 100644
--- a/src/Writer/Indi/Attr.php
+++ b/src/Writer/Indi/Attr.php
@@ -17,10 +17,11 @@
 class Attr
 {
     /**
-     * @param int                         $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Attr &$attr, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Attr &$attr, $level = 0)
     {
         return '';
     }
diff --git a/src/Writer/Indi/Even.php b/src/Writer/Indi/Even.php
index 4fbe126e..a3bf06a5 100644
--- a/src/Writer/Indi/Even.php
+++ b/src/Writer/Indi/Even.php
@@ -17,10 +17,11 @@
 class Even
 {
     /**
-     * @param int                         $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Even &$even, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Even &$even, $level = 0)
     {
         $output = '';
 
diff --git a/src/Writer/Indi/Even/Plac.php b/src/Writer/Indi/Even/Plac.php
index 9fa713eb..5e88829d 100644
--- a/src/Writer/Indi/Even/Plac.php
+++ b/src/Writer/Indi/Even/Plac.php
@@ -17,10 +17,11 @@
 class Plac
 {
     /**
-     * @param int                              $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Even\Plac &$plac, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Even\Plac &$plac, $level = 0)
     {
         $output = '';
 
diff --git a/src/Writer/Indi/Famc.php b/src/Writer/Indi/Famc.php
index 9cee6f19..3015e98a 100644
--- a/src/Writer/Indi/Famc.php
+++ b/src/Writer/Indi/Famc.php
@@ -18,11 +18,11 @@ class Famc
 {
     /**
      * @param \Gedcom\Record\Indi\Famc $attr
-     * @param int                         $level
+     * @param int                      $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Famc &$famc, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Famc &$famc, $level = 0)
     {
         $output = '';
         // NAME
diff --git a/src/Writer/Indi/Fams.php b/src/Writer/Indi/Fams.php
index ce04059d..06d990d8 100644
--- a/src/Writer/Indi/Fams.php
+++ b/src/Writer/Indi/Fams.php
@@ -18,11 +18,11 @@ class Fams
 {
     /**
      * @param \Gedcom\Record\Indi\Fams $attr
-     * @param int                         $level
+     * @param int                      $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Fams &$fams, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Fams &$fams, $level = 0)
     {
         $output = '';
         // NAME
diff --git a/src/Writer/Indi/Name.php b/src/Writer/Indi/Name.php
index adb6f09e..f8ad0448 100644
--- a/src/Writer/Indi/Name.php
+++ b/src/Writer/Indi/Name.php
@@ -18,11 +18,11 @@ class Name
 {
     /**
      * @param \Gedcom\Record\Indi\Name $attr
-     * @param int                         $level
+     * @param int                      $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Indi\Name &$name, $level = 0)
+    public static function convert(\Gedcom\Record\Indi\Name &$name, $level = 0)
     {
         $output = '';
         // NAME
diff --git a/src/Writer/Note.php b/src/Writer/Note.php
index 29b1fa1a..9f0e6960 100644
--- a/src/Writer/Note.php
+++ b/src/Writer/Note.php
@@ -18,11 +18,11 @@ class Note
 {
     /**
      * @param \Gedcom\Record\Note $sour
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Note &$note)
+    public static function convert(\Gedcom\Record\Note &$note)
     {
         $level = 0;
         $output = '';
diff --git a/src/Writer/NoteRef.php b/src/Writer/NoteRef.php
index 97b15c4a..ced20593 100644
--- a/src/Writer/NoteRef.php
+++ b/src/Writer/NoteRef.php
@@ -17,10 +17,11 @@
 class NoteRef
 {
     /**
-     * @param int                       $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\NoteRef &$note, $level)
+    public static function convert(\Gedcom\Record\NoteRef &$note, $level)
     {
         $output = '';
 
diff --git a/src/Writer/Obje.php b/src/Writer/Obje.php
index 1ea82fe1..52c18c8d 100644
--- a/src/Writer/Obje.php
+++ b/src/Writer/Obje.php
@@ -18,11 +18,11 @@ class Obje
 {
     /**
      * @param \Gedcom\Record\Obje $sour
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Obje &$obje)
+    public static function convert(\Gedcom\Record\Obje &$obje)
     {
         $level = 0;
         $output = '';
diff --git a/src/Writer/ObjeRef.php b/src/Writer/ObjeRef.php
index 4a21a934..425cb783 100644
--- a/src/Writer/ObjeRef.php
+++ b/src/Writer/ObjeRef.php
@@ -18,11 +18,11 @@ class ObjeRef
 {
     /**
      * @param \Gedcom\Record\ObjeRef $note
-     * @param int                       $level
+     * @param int                    $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\ObjeRef &$obje, $level)
+    public static function convert(\Gedcom\Record\ObjeRef &$obje, $level)
     {
         $output = '';
 
diff --git a/src/Writer/Refn.php b/src/Writer/Refn.php
index acb233d0..b1ed17c2 100644
--- a/src/Writer/Refn.php
+++ b/src/Writer/Refn.php
@@ -18,11 +18,11 @@ class Refn
 {
     /**
      * @param \Gedcom\Record\Refn $note
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Refn &$refn, $level)
+    public static function convert(\Gedcom\Record\Refn &$refn, $level)
     {
         $output = '';
         $_refn = $refn->getRefn();
diff --git a/src/Writer/Repo.php b/src/Writer/Repo.php
index 30e4bbfa..478dc96b 100644
--- a/src/Writer/Repo.php
+++ b/src/Writer/Repo.php
@@ -18,11 +18,11 @@ class Repo
 {
     /**
      * @param \Gedcom\Record\Repo $sour
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Repo &$repo)
+    public static function convert(\Gedcom\Record\Repo &$repo)
     {
         $level = 0;
         $output = '';
diff --git a/src/Writer/RepoRef.php b/src/Writer/RepoRef.php
index 54060fe3..b9df6565 100644
--- a/src/Writer/RepoRef.php
+++ b/src/Writer/RepoRef.php
@@ -17,10 +17,11 @@
 class RepoRef
 {
     /**
-     * @param int                       $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\RepoRef &$reporef, $level)
+    public static function convert(\Gedcom\Record\RepoRef &$reporef, $level)
     {
         $output = '';
         $_repo = $reporef->getRepo();
diff --git a/src/Writer/Sour.php b/src/Writer/Sour.php
index 82b17d02..b7ce624f 100644
--- a/src/Writer/Sour.php
+++ b/src/Writer/Sour.php
@@ -17,10 +17,11 @@
 class Sour
 {
     /**
-     * @param int                    $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Sour &$sour, $level)
+    public static function convert(\Gedcom\Record\Sour &$sour, $level)
     {
         $output = '';
         $_sour = $sour->getSour();
diff --git a/src/Writer/Sour/Data.php b/src/Writer/Sour/Data.php
index 0539ee51..6209ed82 100644
--- a/src/Writer/Sour/Data.php
+++ b/src/Writer/Sour/Data.php
@@ -17,10 +17,11 @@
 class Data
 {
     /**
-     * @param int                         $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Sour\Data &$data, $level = 0)
+    public static function convert(\Gedcom\Record\Sour\Data &$data, $level = 0)
     {
         $output = $level." DATA\n";
         $level++;
diff --git a/src/Writer/Sour/Data/Even.php b/src/Writer/Sour/Data/Even.php
index 470e51bd..1efa1de0 100644
--- a/src/Writer/Sour/Data/Even.php
+++ b/src/Writer/Sour/Data/Even.php
@@ -17,10 +17,11 @@
 class Even
 {
     /**
-     * @param int                              $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Sour\Data\Even &$even, $level)
+    public static function convert(\Gedcom\Record\Sour\Data\Even &$even, $level)
     {
         $output = $level." EVEN\n";
         $level++;
diff --git a/src/Writer/SourRef.php b/src/Writer/SourRef.php
index 1dfa7996..055bc82d 100644
--- a/src/Writer/SourRef.php
+++ b/src/Writer/SourRef.php
@@ -17,10 +17,11 @@
 class SourRef
 {
     /**
-     * @param int                       $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\SourRef &$sour, $level)
+    public static function convert(\Gedcom\Record\SourRef &$sour, $level)
     {
         $output = '';
         $_sour = $sour->getSour();
diff --git a/src/Writer/SourRef/Even.php b/src/Writer/SourRef/Even.php
index 5605e244..c409a895 100644
--- a/src/Writer/SourRef/Even.php
+++ b/src/Writer/SourRef/Even.php
@@ -17,10 +17,11 @@
 class Even
 {
     /**
-     * @param int                            $level
+     * @param int $level
+     *
      * @return string
      */
-    public static function convert (\Gedcom\Record\SourRef\Even &$even, $level = 0)
+    public static function convert(\Gedcom\Record\SourRef\Even &$even, $level = 0)
     {
         $output = '';
 
diff --git a/src/Writer/Subm.php b/src/Writer/Subm.php
index e9e5cb29..d580f147 100644
--- a/src/Writer/Subm.php
+++ b/src/Writer/Subm.php
@@ -18,11 +18,11 @@ class Subm
 {
     /**
      * @param \Gedcom\Record\Subm $note
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Subm &$subm)
+    public static function convert(\Gedcom\Record\Subm &$subm)
     {
         $level = 0;
         $output = '';
diff --git a/src/Writer/Subn.php b/src/Writer/Subn.php
index 95727885..1fa42495 100644
--- a/src/Writer/Subn.php
+++ b/src/Writer/Subn.php
@@ -18,11 +18,11 @@ class Subn
 {
     /**
      * @param \Gedcom\Record\Subn $note
-     * @param int                    $level
+     * @param int                 $level
      *
      * @return string
      */
-    public static function convert (\Gedcom\Record\Subn &$subn)
+    public static function convert(\Gedcom\Record\Subn &$subn)
     {
         $level = 0;
         $output = '';