refactor

17 files changed, 142 insertions, 166 deletions

diff --git a/Xerl.pm b/Xerl.pm
index fe9b873..53e4da7 100644
--- a/Xerl.pm
+++ b/Xerl.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -23,40 +23,34 @@ use Xerl::Setup::Configure;
 use Xerl::Setup::Parameter;
 use Xerl::Setup::Request;
 
-sub run($) {
+sub run {
   my Xerl $self = $_[0];
   my $time = [gettimeofday];
 
-  my Xerl::Setup::Request $request =
-    Xerl::Setup::Request->new( request => $ENV{REQUEST_URI} );
-
+  my $request = Xerl::Setup::Request->new( request => $ENV{REQUEST_URI} );
   $request->parse();
-  my Xerl::Setup::Configure $config =
-    Xerl::Setup::Configure->new( config => $self->get_config(), %$request );
 
+  my $config = Xerl::Setup::Configure->new(
+    config => $self->get_config(), %$request
+  );
   $config->parse();
+
   return undef if $config->finish_request_exists();
 
   $config->defaults();
 
-  my Xerl::Setup::Parameter $parameter =
-    Xerl::Setup::Parameter->new( config => $config );
-
+  my $parameter = Xerl::Setup::Parameter->new( config => $config );
   $parameter->parse();
   return undef if $config->finish_request_exists();
 
   if ( $config->document_exists() ) {
-    my Xerl::Page::Document $document =
-      Xerl::Page::Document->new( config => $config );
-
+    my $document = Xerl::Page::Document->new( config => $config );
     $document->parse();
     return undef if $config->finish_request_exists();
 
   }
   else {
-    my Xerl::Page::Templates $templates =
-      Xerl::Page::Templates->new( config => $config );
-
+    my $templates = Xerl::Page::Templates->new( config => $config );
     $templates->parse();
     return undef if $config->finish_request_exists();
     $templates->print($time);
diff --git a/Xerl/Base.pm b/Xerl/Base.pm
index fcf3857..cfddd89 100644
--- a/Xerl/Base.pm
+++ b/Xerl/Base.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -14,13 +14,13 @@ use 5.14.0;
 
 use Data::Dumper;
 
-sub new ($;) {
+sub new {
   my $self = shift;
 
   bless {@_} => $self;
 }
 
-sub setval($$$) {
+sub setval {
   my UNIVERSAL $self = $_[0];
 
   $self->{ $_[1] } = $_[2];
@@ -28,13 +28,13 @@ sub setval($$$) {
   return undef;
 }
 
-sub getval($$) {
+sub getval {
   my UNIVERSAL $self = $_[0];
 
   return defined $self->{ $_[1] } ? $self->{ $_[1] } : '';
 }
 
-sub exists($$) {
+sub exists {
   my UNIVERSAL $self = $_[0];
 
   return exists $self->{ $_[1] } ? 1 : 0;
diff --git a/Xerl/Main/Global.pm b/Xerl/Main/Global.pm
index 291eca7..5a428b7 100644
--- a/Xerl/Main/Global.pm
+++ b/Xerl/Main/Global.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm
index e2dd045..05a206d 100644
--- a/Xerl/Page/Content.pm
+++ b/Xerl/Page/Content.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -22,11 +22,11 @@ use Xerl::XML::Reader;
 
 use LWP::Simple;
 
-sub parse($) {
-  my Xerl::Page::Content $self      = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
-  my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new(
+  my $xmlcontent = Xerl::XML::Reader->new(
     path   => $config->get_templatepath(),
     config => $config
   );
@@ -38,7 +38,7 @@ sub parse($) {
 
   $xmlcontent->parse();
 
-  my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config );
+  my $rules = Xerl::Page::Rules->new( config => $config );
   $rules->parse( $config->get_xmlconfigrootobj() )
     unless $config->exists('noparse');
 
@@ -48,10 +48,10 @@ sub parse($) {
   return undef;
 }
 
-sub insertrules($$$$) {
-  my Xerl::Page::Content $self   = $_[0];
-  my Xerl::Page::Rules $rules    = $_[1];
-  my Xerl::XML::Element $element = $_[2];
+sub insertrules {
+  my $self    = $_[0];
+  my $rules   = $_[1];
+  my $element = $_[2];
 
   # Start inserting rules at <content>
   $element = $element->starttag('content');
@@ -71,12 +71,12 @@ sub insertrules($$$$) {
   return undef;
 }
 
-sub _insertrules($$$) {
-  my Xerl::Page::Content $self      = $_[0];
-  my Xerl::Page::Rules $rules       = $_[1];
-  my Xerl::XML::Element $element    = $_[2];
-  my Xerl::Setup::Configure $config = $self->get_config();
-  my $nonewlines                    = 0;
+sub _insertrules {
+  my $self    = $_[0];
+  my $rules   = $_[1];
+  my $element = $_[2];
+  my $config  = $self->get_config();
+  my $nonewlines = 0;
 
   # Don't interate through the XML childs if we have a leaf node.
   return () unless ref $element->get_array() eq 'ARRAY';
@@ -201,12 +201,12 @@ sub _insertrules($$$) {
   return $nonewlines ? map { s/\n/ /go; $_ } @content : @content;
 }
 
-sub _insert_special_vars($$$$) {
-  my Xerl::Page::Content $self      = $_[0];
-  my Xerl::Page::Rules $rules       = $_[1];
-  my Xerl::XML::Element $element    = $_[2];
-  my Xerl::Setup::Configure $config = $self->get_config();
-  my $rtext                         = $_[3];
+sub _insert_special_vars {
+  my $self    = $_[0];
+  my $rules   = $_[1];
+  my $element = $_[2];
+  my $rtext   = $_[3];
+  my $config  = $self->get_config();
 
   $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo;
   $$rtext =~ s/@\@ln\@\@//go;
diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm
index 89ae788..b7cafa3 100644
--- a/Xerl/Page/Document.pm
+++ b/Xerl/Page/Document.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -17,9 +17,9 @@ use Xerl::Main::Global;
 use Xerl::Setup::Configure;
 use Xerl::Tools::FileIO;
 
-sub parse($) {
-  my Xerl::Page::Document $self     = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
   return undef unless $config->document_exists();
 
@@ -40,7 +40,7 @@ sub parse($) {
       . "/htdocs/$document";
   }
 
-  my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path );
+  my $io = Xerl::Tools::FileIO->new( path => $path );
 
   if ( -1 == $io->fslurp() ) {
     $config->set_finish_request(1);
diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm
index a813461..987c13a 100644
--- a/Xerl/Page/Menu.pm
+++ b/Xerl/Page/Menu.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -17,9 +17,9 @@ use Xerl::Setup::Configure;
 use Xerl::Tools::FileIO;
 use Xerl::XML::Element;
 
-sub generate($;$) {
-  my Xerl::Page::Menu $self         = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub generate {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
   my @site    = split /\//, $config->get_site();
   my @compare = @site;
@@ -27,8 +27,7 @@ sub generate($;$) {
 
   my ( $content, $siteadd ) = ( 'content/', '' );
 
-  my Xerl::XML::Element $menuelem =
-    $self->get_menu( $content, $siteadd, shift @compare );
+  my $menuelem = $self->get_menu( $content, $siteadd, shift @compare );
 
   $self->push_array($menuelem)
     if $menuelem->first_array()->array_length() > 1;
@@ -45,15 +44,15 @@ sub generate($;$) {
   return undef;
 }
 
-sub get_menu($$$$) {
-  my Xerl::Page::Menu $self         = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub get_menu {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
   my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] );
   my $issubsection = $content =~ m{\.sub/$};
   my $pattern = qr/\.(?:xml)|(?:sub)$/;
 
-  my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
+  my $io = Xerl::Tools::FileIO->new(
     path     => $config->get_hostpath() . $content,
     basename => 1,
   );
@@ -78,8 +77,8 @@ sub get_menu($$$$) {
       && $_ !~ /\.inc\.pl$/i
     } @$dir;
 
-  my Xerl::XML::Element $root = Xerl::XML::Element->new();
-  my Xerl::XML::Element $menu = Xerl::XML::Element->new();
+  my $root = Xerl::XML::Element->new();
+  my $menu = Xerl::XML::Element->new();
 
   $menu->set_name('menu');
 
@@ -93,7 +92,7 @@ sub get_menu($$$$) {
     $linkname =~ s/(?:\d+\.)?(.)/\U$1/o;
     $compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#;
 
-    my Xerl::XML::Element $item = Xerl::XML::Element->new(
+    my $item = Xerl::XML::Element->new(
       params => { link => "?site=$siteadd$site" },
       text   => $linkname
     );
diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm
index 6a59285..0d08a67 100644
--- a/Xerl/Page/Rules.pm
+++ b/Xerl/Page/Rules.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -16,10 +16,10 @@ use Xerl::Base;
 use Xerl::Setup::Configure;
 use Xerl::XML::Element;
 
-sub parse($) {
-  my Xerl::Page::Rules $self        = $_[0];
-  my Xerl::XML::Element $element    = $_[1];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+  my $self    = $_[0];
+  my $element = $_[1];
+  my $config  = $self->get_config();
 
   $element = $element->starttag2( 'rules', $config->get_outputformat() );
   return unless defined $element;
diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm
index d18ebcb..a2b2880 100644
--- a/Xerl/Page/Templates.pm
+++ b/Xerl/Page/Templates.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013, 2014 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -23,9 +23,9 @@ use Xerl::Tools::FileIO;
 
 use constant RECURSIVE => 1;
 
-sub parse($) {
-  my Xerl::Page::Templates $self    = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+  my $self    = $_[0];
+  my  $config = $self->get_config();
 
   my $site = $config->get_site();
 
@@ -52,8 +52,7 @@ sub parse($) {
     && ( $config->usecache_exists() or not $config->nocache_exists() ) )
   {
 
-    my Xerl::Tools::FileIO $io =
-      Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
+    my $io = Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
 
     if ( -1 == $io->fslurp() ) {
       $config->set_finish_request(1);
@@ -69,7 +68,7 @@ sub parse($) {
     $xmlconfigpath = $config->get_defaulthostpath() . 'config.xml'
       unless -f $xmlconfigpath;
 
-    my Xerl::XML::Reader $xmlconfigreader =
+    my $xmlconfigreader =
       Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config );
 
     if ( -1 == $xmlconfigreader->open() ) {
@@ -80,8 +79,7 @@ sub parse($) {
     $xmlconfigreader->parse();
     $config->set_xmlconfigrootobj( $xmlconfigreader->get_root() );
 
-    my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config );
-
+    my $menu = Xerl::Page::Menu->new( config => $config );
     $menu->generate();
     $config->set_menuobj($menu);
 
@@ -105,9 +103,7 @@ sub parse($) {
       $config->set_templatepath($glob);
     }
 
-    my Xerl::Page::Content $bodycontent =
-      Xerl::Page::Content->new( config => $config );
-
+    my $bodycontent = Xerl::Page::Content->new( config => $config );
     $bodycontent->parse();
 
     my $templatepath =
@@ -121,16 +117,14 @@ sub parse($) {
 
     $config->set_templatepath($templatepath);
 
-    my Xerl::Page::Content $templatecontent =
-      Xerl::Page::Content->new( config => $config );
-
+    my $templatecontent = Xerl::Page::Content->new( config => $config );
     $templatecontent->parse();
 
     $self->set_array( $templatecontent->get_content() );
     $config->set_content( $bodycontent->get_content() );
     $self->parsetemplate( '%%', RECURSIVE );
 
-    my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
+    my $io = Xerl::Tools::FileIO->new(
       path     => $cachepath,
       filename => $cachefile,
       array    => $self->get_array(),
@@ -143,9 +137,9 @@ sub parse($) {
   return undef;
 }
 
-sub parsetemplate($$;$) {
-  my Xerl::Page::Templates $self    = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parsetemplate {
+  my $self   = $_[0];
+  my $config = $self->get_config();
   my $deepnesslevel = $_[2] || 0;
 
   return $self if $deepnesslevel == 100;
@@ -160,9 +154,9 @@ sub parsetemplate($$;$) {
   return undef;
 }
 
-sub print($;$) {
-  my Xerl::Page::Templates $self    = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub print {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
   my ( $code, $flag ) = ( '', 0 );
   my $time  = $_[1];
@@ -210,7 +204,7 @@ sub print($;$) {
 
 # Static sub
 sub PARSELINE($$$;$) {
-  my Xerl::Setup::Configure $config = $_[0];
+  my $config = $_[0];
   my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ];
 
   $$line =~ s/$sep(!)?(.+?)$sep/
diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm
index 18c49fe..2d248f2 100644
--- a/Xerl/Setup/Configure.pm
+++ b/Xerl/Setup/Configure.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013, 2014 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -16,11 +16,9 @@ use Xerl::Base;
 use Xerl::Tools::FileIO;
 use Xerl::XML::Element;
 
-sub parse($) {
-  my Xerl::Setup::Configure $self = $_[0];
-
-  my Xerl::Tools::FileIO $file =
-    Xerl::Tools::FileIO->new( 'path' => $self->get_config() );
+sub parse {
+  my $self = $_[0];
+  my $file = Xerl::Tools::FileIO->new( 'path' => $self->get_config() );
 
   if ( -1 == $file->fslurp() ) {
     $self->set_finish_request(1);
@@ -39,8 +37,8 @@ sub parse($) {
   return $self;
 }
 
-sub defaults($) {
-  my Xerl::Setup::Configure $self = $_[0];
+sub defaults {
+  my $self = $_[0];
 
   $self->set_proto('https') if exists $ENV{HTTPS};
 
@@ -70,8 +68,7 @@ sub defaults($) {
     my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host();
 
     if ( -f $redirect ) {
-      my Xerl::Tools::FileIO $file =
-        Xerl::Tools::FileIO->new( 'path' => $redirect );
+      my $file = Xerl::Tools::FileIO->new( 'path' => $redirect );
       $file->fslurp();
 
       my $location = $file->shift();
@@ -82,8 +79,7 @@ sub defaults($) {
     my $alias = $self->get_hostroot() . 'alias:' . $self->get_host();
 
     if ( -f $alias ) {
-      my Xerl::Tools::FileIO $file =
-        Xerl::Tools::FileIO->new( 'path' => $alias );
+      my $file = Xerl::Tools::FileIO->new( 'path' => $alias );
 
       $file->fslurp();
       $self->set_host( $file->shift() );
@@ -128,8 +124,8 @@ sub defaults($) {
   return undef;
 }
 
-sub eval($$) {
-  my Xerl::Setup::Configure $self = $_[0];
+sub eval {
+  my $self = $_[0];
   my $val = $_[1];
 
   $val =~ s/^!(.+)/`$1`/eo;
@@ -137,9 +133,9 @@ sub eval($$) {
   return $val;
 }
 
-sub insertxmlvars($$) {
-  my Xerl::Setup::Configure $self = $_[0];
-  my Xerl::XML::Element $element  = $_[1];
+sub insertxmlvars {
+  my $self = $_[0];
+  my $element = $_[1];
 
   $element = $element->starttag('variables');
 
diff --git a/Xerl/Setup/Parameter.pm b/Xerl/Setup/Parameter.pm
index 45c860d..bee8981 100644
--- a/Xerl/Setup/Parameter.pm
+++ b/Xerl/Setup/Parameter.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -17,9 +17,9 @@ use Xerl::Main::Global;
 use Xerl::Setup::Configure;
 use Xerl::Tools::FileIO;
 
-sub parse($) {
-  my Xerl::Setup::Parameter $self   = $_[0];
-  my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+  my $self   = $_[0];
+  my $config = $self->get_config();
 
   print "Content-Type: text/plain\n\n"
     if $config->plain_exists();
diff --git a/Xerl/Setup/Request.pm b/Xerl/Setup/Request.pm
index 31c18a3..c6f2e53 100644
--- a/Xerl/Setup/Request.pm
+++ b/Xerl/Setup/Request.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -14,8 +14,8 @@ use v5.14.0;
 
 use Xerl::Base;
 
-sub parse($) {
-  my Xerl::Setup::Request $self = $_[0];
+sub parse {
+  my $self = $_[0];
   my $request = $self->get_request();
 
   # Secure it!
diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm
index cd3e6bb..31d5c66 100644
--- a/Xerl/Tools/FileIO.pm
+++ b/Xerl/Tools/FileIO.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -15,9 +15,8 @@ use v5.14.0;
 use Xerl::Base;
 use Xerl::Main::Global;
 
-sub dslurp($;$) {
-  my Xerl::Tools::FileIO $self = $_[0];
-
+sub dslurp {
+  my $self = $_[0];
   my $path = $self->get_path();
 
   $path .= '/' unless $path =~ /\/$/;
@@ -36,8 +35,8 @@ sub dslurp($;$) {
   return undef;
 }
 
-sub fslurp($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub fslurp {
+  my $self = $_[0];
   my $path = _SECUREPATH( $self->get_path() );
 
   unless ( -f $path ) {
@@ -58,38 +57,36 @@ sub fslurp($) {
   return 0;
 }
 
-sub exists($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub exists {
+  my $self = $_[0];
   my $path = _SECUREPATH( $self->get_path() );
 
   return -e $path;
 }
 
-sub fwrite($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub fwrite {
+  my $self = $_[0];
   $self->_fwrite(0);
 
   return undef;
 }
 
-sub fwriteappend($) {
-  my Xerl::Tools::FileIO $self = $_[0];
-
+sub fwriteappend {
+  my $self = $_[0];
   $self->_fwrite(1);
 
   return undef;
 }
 
-sub print($) {
-  my Xerl::Tools::FileIO $self = $_[0];
-
+sub print {
+  my $self = $_[0];
   print @{ $self->get_array() };
 
   return undef;
 }
 
-sub reverse_array($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub reverse_array {
+  my $self = $_[0];
 
   my @array = reverse @{ $self->get_array() };
   $self->set_array( \@array );
@@ -97,37 +94,37 @@ sub reverse_array($) {
   return undef;
 }
 
-sub merge($$) {
-  my Xerl::Tools::FileIO( $self, $other ) = @_;
+sub merge {
+  my ($self, $other) = @_;
 
   my @merged = ( @{ $self->get_array() }, @{ $other->get_array() } );
-  my Xerl::Tools::FileIO $fio = Xerl::Tools::FileIO->new();
-
+  my $fio = Xerl::Tools::FileIO->new();
   $fio->set_array( \@merged );
+
   return $fio;
 }
 
-sub shift($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub shift {
+  my $self = $_[0];
   chomp( my $shift = shift @{ $self->get_array() } );
 
   return $shift;
 }
 
-sub pop($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub pop {
+  my $self = $_[0];
   chomp( my $pop = pop @{ $self->get_array() } );
 
   return $pop;
 }
 
-sub str($) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub str {
+  my $self = $_[0];
   return join '', @{ $self->get_array() };
 }
 
-sub _fwrite($;$) {
-  my Xerl::Tools::FileIO $self = $_[0];
+sub _fwrite {
+  my $self = $_[0];
   my $append = $_[1];
 
   my ( $path, $filename ) =
@@ -164,7 +161,6 @@ use overload '+' => \&merge;
 
 sub _SECUREPATH($) {
   my $path = $_[0];
-
   $path =~ s/\.\.+\/?//g;
 
   return $path;
diff --git a/Xerl/XML/Element.pm b/Xerl/XML/Element.pm
index 0867841..f1f79fd 100644
--- a/Xerl/XML/Element.pm
+++ b/Xerl/XML/Element.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -12,8 +12,8 @@ use warnings;
 
 use Xerl::Base;
 
-sub starttag($$) {
-  my Xerl::XML::Element $self = $_[0];
+sub starttag {
+  my $self = $_[0];
   my ( $name, $temp ) = ( $_[1], undef );
 
   return $self if $self->get_name() eq $name;
@@ -27,22 +27,21 @@ sub starttag($$) {
   return undef;
 }
 
-sub starttag2($$$) {
-  my Xerl::XML::Element $self = $_[0];
+sub starttag2 {
+  my $self = $_[0];
   my ( $name, $after ) = @_[ 1 ... 2 ];
 
-  my Xerl::XML::Element $element = $self->starttag($name);
+  my $element = $self->starttag($name);
   return $element->starttag($after) if defined $element;
 
   return undef;
 }
 
-sub params_str($) {
-  my Xerl::XML::Element $self = $_[0];
+sub params_str {
+  my $self = $_[0];
   my $params = $self->get_params();
 
   return undef if $params eq '';
-
   return join '', map { " $_=\"" . $params->{$_} . '"' } keys %$params;
 }
 
diff --git a/Xerl/XML/Reader.pm b/Xerl/XML/Reader.pm
index ae5a07b..88c727a 100644
--- a/Xerl/XML/Reader.pm
+++ b/Xerl/XML/Reader.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -18,8 +18,8 @@ use Xerl::Base;
 use Xerl::XML::Element;
 use Xerl::XML::SAXHandler;
 
-sub open($) {
-  my Xerl::XML::Reader $self = shift;
+sub open {
+  my $self = shift;
 
   if ( -f $self->get_path() ) {
     return 0;
@@ -29,14 +29,12 @@ sub open($) {
   }
 }
 
-sub parse() {
-  my Xerl::XML::Reader $self = shift;
+sub parse {
+  my $self = shift;
   my $sax_handler = Xerl::XML::SAXHandler->new();
 
   my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler );
-
   $parser->parse_uri( $self->get_path() );
-
   $self->set_root( $sax_handler->{xerl}{root} );
 
   return undef;
diff --git a/Xerl/XML/SAXHandler.pm b/Xerl/XML/SAXHandler.pm
index 9ba7729..b168c5f 100644
--- a/Xerl/XML/SAXHandler.pm
+++ b/Xerl/XML/SAXHandler.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
diff --git a/index.fpl b/index.fpl
index 1cfcb5d..7483761 100755
--- a/index.fpl
+++ b/index.fpl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -25,6 +25,6 @@ my $config =
   : ( -e "xerl-$host.conf" ? "xerl-$host.conf" : 'config.conf' );
 
 while ( FCGI::accept >= 0 ) {
-  my Xerl $xerl = Xerl->new( config => $config );
+  my $xerl = Xerl->new( config => $config );
   $xerl->run();
 }
diff --git a/index.pl b/index.pl
index 97aa32c..4f87a2d 100755
--- a/index.pl
+++ b/index.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
 #
 # 	E-Mail: xerl@dev.buetow.org 	WWW: http://xerl.buetow.org
 #
@@ -23,5 +23,5 @@ my $config =
   ? "xerldev.conf"
   : ( -e "xerl-$host.conf" ? "xerl-$host.conf" : 'config.conf' );
 
-my Xerl $xerl = Xerl->new( config => $config );
+my $xerl = Xerl->new( config => $config );
 $xerl->run();