diff --git a/bin/.perltidyrc b/bin/.perltidyrc
index c689e069a..178f514b4 100644
--- a/bin/.perltidyrc
+++ b/bin/.perltidyrc
@@ -51,7 +51,7 @@
 --look-for-selfloader
 --maximum-consecutive-blank-lines=1
 --maximum-fields-per-table=0
---maximum-line-length=80
+--maximum-line-length=132
 --minimum-space-to-comment=4
 --noopening-anonymous-sub-brace-on-new-line
 --noopening-brace-on-new-line
diff --git a/bin/alpha_page b/bin/alpha_page
index d6d271c58..62bd83124 100755
--- a/bin/alpha_page
+++ b/bin/alpha_page
@@ -27,26 +27,21 @@ my ( $Pgm_Path, $Pgm_Name, $Version );
 use vars '$Pgm_Root';    # So we can see it in eval var subs in read_parms
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;                           # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions( \%parms, "h", "help", "message=s", "name:s", "pin:i",
-        "service:s" )
+if (  !&GetOptions( \%parms, "h", "help", "message=s", "name:s", "pin:i", "service:s" )
     or @ARGV
     or $parms{h}
     or $parms{help}
     or !$parms{message}
-    or !$parms{service}
-  )
+    or !$parms{service} )
 {
     print <<eof;
 
@@ -78,23 +73,19 @@ my (%pin_numbers);
 &setup;
 
 $parms{service} = "PageMart" unless $parms{service};
-unless ( ( $parms{service} eq "PageMart" ) | ( $parms{service} eq "Arch1way" ) |
-    ( $parms{service} eq "Arch2way" ) )
-{
+unless ( ( $parms{service} eq "PageMart" ) | ( $parms{service} eq "Arch1way" ) | ( $parms{service} eq "Arch2way" ) ) {
     print "\nParameter error: $parms{service}\n";
     print "The only accepted values for -service are:\n";
     print "    PageMart\n";
     print "    Arch1way\n";
     print "    Arch2way\n";
-    print
-      "(Note: not specifying -service will default to PageMart for backward compatibility.)\n";
+    print "(Note: not specifying -service will default to PageMart for backward compatibility.)\n";
     exit;
 }
 
 $parms{pin} = $pin_numbers{ $parms{name} } unless $parms{pin};
 unless ( $parms{pin} ) {
-    print
-      "\nYou must specifies mh.ini parm alpha_page_NAME_pin and -name option\n";
+    print "\nYou must specifies mh.ini parm alpha_page_NAME_pin and -name option\n";
     print "or specify -pin option.\n";
     exit;
 }
diff --git a/bin/authors b/bin/authors
index 85c2df26e..8b65139eb 100755
--- a/bin/authors
+++ b/bin/authors
@@ -6,8 +6,7 @@ use strict;
 
 # Uses various flakey heuristics to pick out real names.
 
-my @bogus_first =
-  qw(The Tk Bug Web Added Applied Button By Category Change Email Family Fixed Global Henriksen Linux Lan
+my @bogus_first = qw(The Tk Bug Web Added Applied Button By Category Change Email Family Fixed Global Henriksen Linux Lan
   Memory More On Outlook Preset Radio Random Round Serial Unix Voice Windows Cue Dynamic Festival File Some
   ViaVoice SetWindowText Internet My Western Eastern Daylight Restart Call No Peet Rewrote Turtle
   Select Solid Edit Telephony Unit Weather Rio Red About Australian Caller Card
@@ -15,8 +14,7 @@ my @bogus_first =
   How Iridium Misterhouse Motorola Mythtv Password Server Song Charter Ogg European Another Media Moved Video VoIP
   Intuitive Package Perl Scalable Southern
 );
-my @bogus_last =
-  qw(Homelink House Group Report Programs Aqualink WinTV CallerID Voices Video Faq
+my @bogus_last = qw(Homelink House Group Report Programs Aqualink WinTV CallerID Voices Video Faq
   Events Address Station Audio Hat MrHouse Clipsal
   Remotes Credit Type Inputs Tivo Robotics Codes Commands Celeron Linux Theatre To Flares
   GUIs Management Network Info Media Windows Serial Wireless Acid Bay Manager Users
diff --git a/bin/backup_data b/bin/backup_data
index 9282c9bc3..7182251b2 100755
--- a/bin/backup_data
+++ b/bin/backup_data
@@ -21,21 +21,15 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
 }
 my %parms;
 use Getopt::Long;
-if (
-    !&GetOptions(
-        \%parms, 'h',      'help',    'file=s', 'size=i', 'skip=s',
-        'age=s', 'no_zip', 'no_date', 'int'
-    )
+if (   !&GetOptions( \%parms, 'h', 'help', 'file=s', 'size=i', 'skip=s', 'age=s', 'no_zip', 'no_date', 'int' )
     or !@ARGV
     or $parms{h}
-    or $parms{help}
-  )
+    or $parms{help} )
 {
     print <<eof;
 
@@ -109,19 +103,12 @@ sub get_files {
         push @files, &read_dir($dir);
     }
     $msg = "\nRead $counts{dir} directories:\n";
-    $msg .= sprintf " -  Storing %5.1f MB of data from %4d files\n",
-      $counts{size} / 10**6, $counts{file};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with size > $parms{size} KBytes\n",
+    $msg .= sprintf " -  Storing %5.1f MB of data from %4d files\n", $counts{size} / 10**6, $counts{file};
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with size > $parms{size} KBytes\n",
       $counts{size_size} / 10**6, $counts{count_size};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with name = $parms{skip}\n",
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with name = $parms{skip}\n",
       $counts{size_skip} / 10**6, $counts{count_skip};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with age  > $parms{age}\n",
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with age  > $parms{age}\n",
       $counts{size_age} / 10**6, $counts{count_age};
     print $msg;
     $log .= $msg;
@@ -156,8 +143,7 @@ sub tar_files {
         }
     }
     my ( $size, $date ) = ( stat $parms{file} )[ 7, 9 ];
-    printf "\nFile stats: %s  %s  %s\n\n", $parms{file}, $size,
-      scalar localtime $date;
+    printf "\nFile stats: %s  %s  %s\n\n", $parms{file}, $size, scalar localtime $date;
 }
 
 sub read_dir {
diff --git a/bin/dailystrips b/bin/dailystrips
index 8b30a3d5f..050f37040 100755
--- a/bin/dailystrips
+++ b/bin/dailystrips
@@ -25,13 +25,11 @@ use File::Copy;
 
 # Variables
 my (
-    %options,             $version,             $time_today,
-    @localtime_today,     @localtime_yesterday, @localtime_tomorrow,
-    $long_date,           $short_date,          $short_date_yesterday,
-    $short_date_tomorrow, @get,                 @strips,
-    %defs,                $known_strips,        %groups,
-    $known_groups,        %classes,             $val,
-    $link_tomorrow,       $no_dateparse,        @base_dirparts
+    %options,            $version,   $time_today, @localtime_today,      @localtime_yesterday,
+    @localtime_tomorrow, $long_date, $short_date, $short_date_yesterday, $short_date_tomorrow,
+    @get,                @strips,    %defs,       $known_strips,         %groups,
+    $known_groups,       %classes,   $val,        $link_tomorrow,        $no_dateparse,
+    @base_dirparts
 );
 
 $version = "1.0.28";
@@ -40,15 +38,11 @@ $time_today = time;
 
 # Get options
 GetOptions(
-    \%options,    'quiet|q',    'verbose',     'output=s',
-    'lite',       'local|l',    'noindex',     'archive|a',
-    'dailydir|d', 'stripdir',   'save|s',      'nostale',
-    'date=s',     'new|n',      'defs=s',      'nopersonal',
-    'basedir=s',  'list',       'proxy=s',     'proxyauth=s',
-    'noenvproxy', 'nospaces',   'useragent=s', 'version|v',
-    'help|h',     'avantgo',    'random',      'nosystem',
-    'stripnav',   'nosymlinks', 'titles=s',    'retries=s',
-    'clean=s',    'updates=s',  'noupdates'
+    \%options,    'quiet|q',   'verbose', 'output=s',    'lite',       'local|l',    'noindex',     'archive|a',
+    'dailydir|d', 'stripdir',  'save|s',  'nostale',     'date=s',     'new|n',      'defs=s',      'nopersonal',
+    'basedir=s',  'list',      'proxy=s', 'proxyauth=s', 'noenvproxy', 'nospaces',   'useragent=s', 'version|v',
+    'help|h',     'avantgo',   'random',  'nosystem',    'stripnav',   'nosymlinks', 'titles=s',    'retries=s',
+    'clean=s',    'updates=s', 'noupdates'
 ) or exit 1;
 
 # Process options:
@@ -266,8 +260,7 @@ if ( $options{'dailydir'} and $options{'stripdir'} ) {
 if ( $options{'proxy'} ) {
     $options{'proxy'} =~ /^(http:\/\/)?(.*?):(.+?)\/?$/i;
     unless ( $2 and $3 ) {
-        die
-          "Error: incorrectly formatted proxy server ('http://server:port' expected)\n";
+        die "Error: incorrectly formatted proxy server ('http://server:port' expected)\n";
     }
 
     $options{'proxy'} = "http://$2:$3";
@@ -276,8 +269,7 @@ if ( $options{'proxy'} ) {
 if ( !$options{'noenvproxy'} and !$options{'proxy'} and $ENV{'http_proxy'} ) {
     $ENV{'http_proxy'} =~ /(http:\/\/)?(.*?):(.+?)\/?$/i;
     unless ( $2 and $3 ) {
-        die
-          "Error: incorrectly formatted proxy server environment variable\n('http://server:port' expected)\n";
+        die "Error: incorrectly formatted proxy server environment variable\n('http://server:port' expected)\n";
     }
 
     $options{'proxy'} = "http://$2:$3";
@@ -285,8 +277,7 @@ if ( !$options{'noenvproxy'} and !$options{'proxy'} and $ENV{'http_proxy'} ) {
 
 if ( $options{'proxyauth'} ) {
     unless ( $options{'proxyauth'} =~ /^.+?:.+?$/ ) {
-        die
-          "Error: incorrectly formatted proxy credentials ('user:pass' expected)\n";
+        die "Error: incorrectly formatted proxy credentials ('user:pass' expected)\n";
     }
 }
 
@@ -357,15 +348,13 @@ if ( $options{'local'} ) {
 
             # any issues with masks and Win32?
             unless ( mkdir( $short_date, 0755 ) ) {
-                die
-                  "Error: could not create today's directory ($short_date/)\n";
+                die "Error: could not create today's directory ($short_date/)\n";
             }
         }
     }
 
     unless ( open( STDOUT, ">dailystrips-$short_date.html" ) ) {
-        die
-          "Error: could not open HTML file (dailystrips-$short_date.html) for writing\n";
+        die "Error: could not open HTML file (dailystrips-$short_date.html) for writing\n";
     }
 
     unless ( $options{'date'} ) {
@@ -417,10 +406,7 @@ if ( $options{'local'} ) {
 
         unless ( grep( /<a href="dailystrips-$short_date.html">/, @archive ) ) {
             for (@archive) {
-                if (
-                    s/(<!--insert below-->)/$1\n<a href="dailystrips-$short_date.html">$long_date<\/a><br>/
-                  )
-                {
+                if ( s/(<!--insert below-->)/$1\n<a href="dailystrips-$short_date.html">$long_date<\/a><br>/ ) {
                     unless ( open( ARCHIVE, ">archive.html" ) ) {
                         die "Error: could not open archive.html for writing\n";
                     }
@@ -443,10 +429,7 @@ if ( $options{'local'} ) {
             my $match_count;
 
             for (@previous_page) {
-                if (
-                    s/<!--nextday-->/ | <a href="dailystrips-$short_date.html">Next day<\/a>/
-                  )
-                {
+                if ( s/<!--nextday-->/ | <a href="dailystrips-$short_date.html">Next day<\/a>/ ) {
                     $match_count++;
                     last if ( $match_count == 2 );
                 }
@@ -457,18 +440,15 @@ if ( $options{'local'} ) {
                 close(PREVIOUS);
             }
             else {
-                warn
-                  "Warning: could not open dailystrips-$short_date_yesterday.html for writing\n";
+                warn "Warning: could not open dailystrips-$short_date_yesterday.html for writing\n";
             }
         }
         else {
-            warn
-              "Warning: did not find any tag in previous day's file to make today's link\n";
+            warn "Warning: did not find any tag in previous day's file to make today's link\n";
         }
     }
     else {
-        warn
-          "Warning: could not open dailystrips-$short_date_yesterday.html for reading\n";
+        warn "Warning: could not open dailystrips-$short_date_yesterday.html for reading\n";
     }
 
 }
@@ -478,8 +458,7 @@ elsif ( $options{'output'} ) {
     }
 
     unless ( open( STDOUT, ">$options{'output'}" ) ) {
-        die
-          "Error: Could not open output file ($options{'output'}) for writing\n";
+        die "Error: Could not open output file ($options{'output'}) for writing\n";
     }
 }
 
@@ -506,8 +485,7 @@ unless ( $options{'quiet'} ) {
 }
 
 if ( -e "dailystrips-$short_date_tomorrow.html" ) {
-    $link_tomorrow =
-      " | <a href=\"dailystrips-$short_date_tomorrow.html\">Next day</a>";
+    $link_tomorrow = " | <a href=\"dailystrips-$short_date_tomorrow.html\">Next day</a>";
 }
 else {
     $link_tomorrow = "<!--nextday-->";
@@ -515,8 +493,7 @@ else {
 
 # Generate HTML page
 if ( $options{'lite'} ) {
-    print
-      "<font face=\"helvetica\" size=\"+2\"><b><u>$options{'titles'}dailystrips for $long_date</u></b></font><br><br>\n";
+    print "<font face=\"helvetica\" size=\"+2\"><b><u>$options{'titles'}dailystrips for $long_date</u></b></font><br><br>\n";
 }
 else {
     my $topanchor;
@@ -572,17 +549,13 @@ for (@strips) {
     my ( $strip, $name, $homepage, $img_addr, $referer, $prefetch, $artist ) =
       split( /;/, $_ );
     my (
-        $img_line,                 $local_name,
-        $local_name_dir,           $local_name_file,
-        $local_name_ext,           $image,
-        $ext,                      $local_name_yesterday,
-        $local_name_yesterday_dir, $local_name_yesterday_file,
-        $local_name_yesterday_ext
+        $img_line,                 $local_name,                $local_name_dir, $local_name_file,
+        $local_name_ext,           $image,                     $ext,            $local_name_yesterday,
+        $local_name_yesterday_dir, $local_name_yesterday_file, $local_name_yesterday_ext
     );
 
     if ( $options{'verbose'} and $options{'local'} ) {
-        warn "Downloading strip file for "
-          . lc( ( split( /;/, $_ ) )[0] ) . "\n";
+        warn "Downloading strip file for " . lc( ( split( /;/, $_ ) )[0] ) . "\n";
     }
 
     if ( $img_addr =~ "^unavail" ) {
@@ -612,8 +585,7 @@ for (@strips) {
                 $local_name_ext  = "$ext";
             }
             elsif ( $options{'dailydir'} ) {
-                $local_name_yesterday =
-                  "$short_date_yesterday/$name-$short_date_yesterday$ext";
+                $local_name_yesterday      = "$short_date_yesterday/$name-$short_date_yesterday$ext";
                 $local_name_yesterday_dir  = "$short_date_yesterday/";
                 $local_name_yesterday_file = "$name-$short_date_yesterday";
                 $local_name_yesterday_ext  = "$ext";
@@ -668,8 +640,7 @@ for (@strips) {
                     $img_addr = $local_name;
                     $img_addr =~ s/ /\%20/go;
                     if ( $options{'stripnav'} ) {
-                        $img_line =
-                          "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                        $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
                     }
                     else {
                         $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
@@ -729,8 +700,7 @@ for (@strips) {
                         $img_addr = $local_name;
                         $img_addr =~ s/ /\%20/go;
                         if ( $options{'stripnav'} ) {
-                            $img_line =
-                              "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                            $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
                         }
                         else {
                             $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
@@ -743,57 +713,41 @@ for (@strips) {
                         print IMAGE $image;
                         close(IMAGE);
 
-                        if (
-                            -e $local_name
-                            and system(
-                                "diff \"$local_name\" \"$local_name.tmp\" >/dev/null 2>&1"
-                            ) == 0
-                          )
+                        if ( -e $local_name
+                            and system( "diff \"$local_name\" \"$local_name.tmp\" >/dev/null 2>&1" ) == 0 )
                         {
                             # already downloaded the same strip earlier today
                             unlink("$local_name.tmp");
 
                             if ( $options{'avantgo'} ) {
-                                $img_line =
-                                  &make_avantgo_table( $local_name, $ext );
+                                $img_line = &make_avantgo_table( $local_name, $ext );
                             }
                             else {
                                 $img_addr = $local_name;
                                 $img_addr =~ s/ /\%20/go;
                                 if ( $options{'stripnav'} ) {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
                                 }
                                 else {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\">";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
                                 }
                             }
                         }
-                        elsif (
-                            system(
-                                "diff \"$local_name_yesterday\" \"$local_name.tmp\" >/dev/null 2>&1"
-                            ) == 0
-                          )
-                        {
+                        elsif ( system( "diff \"$local_name_yesterday\" \"$local_name.tmp\" >/dev/null 2>&1" ) == 0 ) {
+
                             # same strip as yesterday
                             if ( $options{'nosymlinks'} ) {
-                                system( "mv", "$local_name.tmp",
-                                    "$local_name" );
+                                system( "mv", "$local_name.tmp", "$local_name" );
                             }
                             else {
                                 unlink("$local_name.tmp");
                                 if (   $options{'stripdir'}
                                     or $options{'dailydir'} )
                                 {
-                                    system(
-                                        "ln -s \"../$local_name_yesterday\" \"$local_name\" >/dev/null 2>&1"
-                                    );
+                                    system( "ln -s \"../$local_name_yesterday\" \"$local_name\" >/dev/null 2>&1" );
                                 }
                                 else {
-                                    system(
-                                        "ln -s \"$local_name_yesterday\" \"$local_name\" >/dev/null 2>&1"
-                                    );
+                                    system( "ln -s \"$local_name_yesterday\" \"$local_name\" >/dev/null 2>&1" );
                                 }
 
                             }
@@ -805,12 +759,10 @@ for (@strips) {
                                 $img_addr = $local_name;
                                 $img_addr =~ s/ /\%20/go;
                                 if ( $options{'stripnav'} ) {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
                                 }
                                 else {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\">";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
                                 }
                             }
                         }
@@ -823,21 +775,17 @@ for (@strips) {
                             system( "mv", "$local_name.tmp", "$local_name" );
 
                             if ( $options{'avantgo'} ) {
-                                &make_avantgo_files( $local_name,
-                                    $local_name_ext );
-                                $img_line =
-                                  &make_avantgo_table( $local_name, $ext );
+                                &make_avantgo_files( $local_name, $local_name_ext );
+                                $img_line = &make_avantgo_table( $local_name, $ext );
                             }
                             else {
                                 $img_addr = $local_name;
                                 $img_addr =~ s/ /\%20/go;
                                 if ( $options{'stripnav'} ) {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
                                 }
                                 else {
-                                    $img_line =
-                                      "<img src=\"$img_addr\" alt=\"$name\">";
+                                    $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
                                 }
                             }
                         }
@@ -849,8 +797,7 @@ for (@strips) {
         else {
             # regular mode - just give addresses to strips on their webserver
             if ( $options{'stripnav'} ) {
-                $img_line =
-                  "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
+                $img_line = "<img src=\"$img_addr\" alt=\"$name\"><br><a href=\"#top\">Return to top</a>";
             }
             else {
                 $img_line = "<img src=\"$img_addr\" alt=\"$name\">";
@@ -863,8 +810,7 @@ for (@strips) {
     }
 
     if ( $options{'lite'} ) {
-        print
-          "<font face=\"helvetica\" size=\"+1\"><b><a href=\"$homepage\">$name</a>$artist</b></font><br>
+        print "<font face=\"helvetica\" size=\"+1\"><b><a href=\"$homepage\">$name</a>$artist</b></font><br>
 $img_line<br>
 <br>
 ";
@@ -972,8 +918,7 @@ sub http_get {
 
         if ( $response->is_error() ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Warning: could not download $url: $status (attempt $_ of $options{'retries'})\n";
+                warn "Warning: could not download $url: $status (attempt $_ of $options{'retries'})\n";
             }
         }
         else {
@@ -1003,8 +948,7 @@ sub get_strip {
 
         if ( $page =~ /^ERROR/ ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
+                warn "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
             }
 
             $addr = "unavail-server";
@@ -1035,10 +979,7 @@ sub get_strip {
                     $addr =~ s/\$match/$match/ge;
                 }
                 else {
-                    $addr =
-                        $defs{$strip}{'baseurl'}
-                      . $match
-                      . $defs{$strip}{'urlsuffix'};
+                    $addr = $defs{$strip}{'baseurl'} . $match . $defs{$strip}{'urlsuffix'};
                 }
             }
         }
@@ -1052,8 +993,7 @@ sub get_strip {
 
         if ( $page =~ /^ERROR/ ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
+                warn "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
             }
 
             $addr = "unavail-server";
@@ -1109,8 +1049,7 @@ sub get_strip {
 
         if ( $page =~ /^ERROR/ ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
+                warn "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
             }
 
             $addr = "unavail-server";
@@ -1174,8 +1113,7 @@ sub get_strip {
         $page = &http_get( $defs{$strip}{'searchpage'} );
         if ( $page =~ /^ERROR/ ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
+                warn "Error: $strip: could not download searchpage $defs{$strip}{'searchpage'}\n";
             }
             $addr = "unavail-server";
         }
@@ -1203,8 +1141,7 @@ sub get_strip {
                 }
                 else {
                     # find the information in the second page
-                    my ($searchkey) =
-                      $page =~ /$defs{$strip}{'searchpattern2'}/;
+                    my ($searchkey) = $page =~ /$defs{$strip}{'searchpattern2'}/;
                     if ( $searchkey eq '' ) {
                         warn "Error: $strip: unable to locate searchkey2\n";
                     }
@@ -1297,8 +1234,7 @@ sub get_defs {
                         qw(homepage searchpage searchpattern baseurl imageurl urlsuffix referer prefetch artist drmurl searchpattern2)
                       )
                     {
-                        if ( $classes{$using_class}{$_} and !$defs{$strip}{$_} )
-                        {
+                        if ( $classes{$using_class}{$_} and !$defs{$strip}{$_} ) {
                             my $classvar = $classes{$using_class}{$_};
                             $classvar =~ s/(\$[0-9])/$defs{$strip}{$1}/g;
                             $classvar =~ s/\$strip/$strip/g;
@@ -1307,8 +1243,7 @@ sub get_defs {
                     }
 
                     for (qw(type matchpart provides)) {
-                        if ( $classes{$using_class}{$_} and !$defs{$strip}{$_} )
-                        {
+                        if ( $classes{$using_class}{$_} and !$defs{$strip}{$_} ) {
                             $defs{$strip}{$_} = $classes{$using_class}{$_};
                         }
                     }
@@ -1328,10 +1263,7 @@ sub get_defs {
                 }
 
                 #other vars in definition
-                for (
-                    qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer prefetch)
-                  )
-                {
+                for ( qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer prefetch) ) {
                     if ( $defs{$strip}{$_} ) {
                         $defs{$strip}{$_} =~
                           s/\$(name|homepage|searchpage|searchpattern|imageurl|baseurl|referer|prefetch)/$defs{$strip}{$1}/g;
@@ -1339,24 +1271,16 @@ sub get_defs {
                 }
 
                 #dates
-                for (
-                    qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer prefetch)
-                  )
-                {
+                for ( qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer prefetch) ) {
                     if ( $defs{$strip}{$_} ) {
-                        $defs{$strip}{$_} =~
-                          s/(\%(-?)[a-zA-Z])/strftime("$1", @localtime_today)/ge;
+                        $defs{$strip}{$_} =~ s/(\%(-?)[a-zA-Z])/strftime("$1", @localtime_today)/ge;
                     }
                 }
 
                 # <code:> stuff
-                for (
-                    qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer)
-                  )
-                {
+                for ( qw(homepage searchpage searchpattern imageurl baseurl urlsuffix referer) ) {
                     if ( $defs{$strip}{$_} ) {
-                        $defs{$strip}{$_} =~
-                          s/<code:(.*?)(?<!\\)>/&my_eval($1)/ge;
+                        $defs{$strip}{$_} =~ s/<code:(.*?)(?<!\\)>/&my_eval($1)/ge;
                     }
                 }
 
@@ -1377,13 +1301,11 @@ sub get_defs {
 
                 if ( $defs{$strip}{'type'} eq "search" ) {
                     unless ( $defs{$strip}{'searchpattern'} ) {
-                        die
-                          "Error: strip $strip has no 'searchpattern' value in $defs_file\n";
+                        die "Error: strip $strip has no 'searchpattern' value in $defs_file\n";
                     }
 
                     unless ( $defs{$strip}{'searchpattern'} =~ /\(.+\)/ ) {
-                        die
-                          "Error: strip $strip has no parentheses in searchpattern\n";
+                        die "Error: strip $strip has no parentheses in searchpattern\n";
                     }
 
                     unless ( $defs{$strip}{'matchpart'} ) {
@@ -1398,20 +1320,17 @@ sub get_defs {
                             or $defs{$strip}{'urlsuffix'} )
                       )
                     {
-                        die
-                          "Error: strip $strip: cannot use both 'imageurl' at the same time as 'baseurl'\nor 'urlsuffix'\n";
+                        die "Error: strip $strip: cannot use both 'imageurl' at the same time as 'baseurl'\nor 'urlsuffix'\n";
                     }
                 }
                 elsif ( $defs{$strip}{'type'} eq "generate" ) {
                     unless ( $defs{$strip}{'imageurl'} ) {
-                        die
-                          "Error: strip $strip has no 'imageurl' value in $defs_file\n";
+                        die "Error: strip $strip has no 'imageurl' value in $defs_file\n";
                     }
                 }
 
                 unless ( $defs{$strip}{'provides'} ) {
-                    die
-                      "Error: strip $strip has no 'provides' value in $defs_file\n";
+                    die "Error: strip $strip has no 'provides' value in $defs_file\n";
                 }
 
                 #debugger
@@ -1498,8 +1417,7 @@ sub get_defs {
             }
             elsif (/^useclass\s+(.+)$/i) {
                 unless ( defined $classes{$1} ) {
-                    die
-                      "Error: strip $strip references invalid class $1 at $defs_file line $line\n";
+                    die "Error: strip $strip references invalid class $1 at $defs_file line $line\n";
                 }
 
                 $defs{$strip}{'useclass'} = $1;
@@ -1508,9 +1426,7 @@ sub get_defs {
                 $defs{$strip}{'homepage'} = $1;
             }
             elsif (/^type\s+(.+)$/i) {
-                unless ( $1 =~
-                    /^(search|generate|flashdrm|search2pages|doublesearch)$/i )
-                {
+                unless ( $1 =~ /^(search|generate|flashdrm|search2pages|doublesearch)$/i ) {
                     die "Error: invalid 'type' at $defs_file line $line\n";
                 }
 
@@ -1561,8 +1477,7 @@ sub get_defs {
                 $defs{$strip}{'artist'} = $1;
             }
             elsif (/^(.+)\s+?/) {
-                die
-                  "Error: Unknown keyword '$1' at $defs_file line $line, in strip $strip\n";
+                die "Error: Unknown keyword '$1' at $defs_file line $line, in strip $strip\n";
             }
         }
         elsif ( $sectype eq "group" ) {
@@ -1578,8 +1493,7 @@ sub get_defs {
                   join( ';', split( /\s+/, $1 ) ) . ";";
             }
             elsif (/^(.+)\s+?/) {
-                die
-                  "Error: Unknown keyword '$1' at $defs_file line $line, in group $group\n";
+                die "Error: Unknown keyword '$1' at $defs_file line $line, in group $group\n";
             }
         }
     }
@@ -1655,10 +1569,7 @@ sub make_avantgo_table {
     foreach my $row ( 0 .. ( $rows - 1 ) ) {
         $table .= "<tr>";
         foreach my $col ( 0 .. ( $cols - 1 ) ) {
-            $table .=
-                "<td><img src=$file_base-"
-              . ( ( $row * $cols ) + $col )
-              . "$file_ext></td>";
+            $table .= "<td><img src=$file_base-" . ( ( $row * $cols ) + $col ) . "$file_ext></td>";
 
         }
         $table .= "</tr>";
diff --git a/bin/dailystrips-clean b/bin/dailystrips-clean
index 94999b319..d0c79077a 100755
--- a/bin/dailystrips-clean
+++ b/bin/dailystrips-clean
@@ -27,10 +27,7 @@ $version = "1.0.1";
 $time_today = time;
 
 # Get options
-GetOptions(
-    \%options, 'quiet|q',   'verbose|v', 'test|t',
-    'dir=s',   'archive|a', 'version|v', 'help|h'
-) or exit 1;
+GetOptions( \%options, 'quiet|q', 'verbose|v', 'test|t', 'dir=s', 'archive|a', 'version|v', 'help|h' ) or exit 1;
 
 # Help and version override anything else
 if ( $options{'help'} ) {
@@ -133,8 +130,7 @@ for (@files) {
 
 if ( $options{'archive'} ) {
     if ( open( ARCHIVE, "<$options{'dir'}archive.html" ) ) {
-        my $oldest = strftime( "\%Y.\%m.\%d",
-            localtime( $time_today - ( 86400 * ( $options{'days'} - 1 ) ) ) );
+        my $oldest = strftime( "\%Y.\%m.\%d", localtime( $time_today - ( 86400 * ( $options{'days'} - 1 ) ) ) );
         my $out;
 
         while (<ARCHIVE>) {
@@ -151,8 +147,7 @@ if ( $options{'archive'} ) {
             print ARCHIVE $out;
         }
         else {
-            warn
-              "Error: cannot update archive.html - could not write file: $!\n";
+            warn "Error: cannot update archive.html - could not write file: $!\n";
         }
     }
     else {
diff --git a/bin/display b/bin/display
index 6ba7408db..0d2b294e9 100755
--- a/bin/display
+++ b/bin/display
@@ -7,7 +7,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib'";   # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
@@ -36,8 +36,7 @@ End_of_Help
 # Find the path to the mh/bin directory.
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /^(.*?)[\\\/]?([^\\\/]+).bat/;
-    use Cwd
-      ; # perl2exe leaves $0=mh.bat, so assume/require current directory is mh/bin dir
+    use Cwd;    # perl2exe leaves $0=mh.bat, so assume/require current directory is mh/bin dir
     $Pgm_Path = cwd() unless ($Pgm_Path);
 }
 
diff --git a/bin/display_callers b/bin/display_callers
index 9154790fd..5b81a751e 100755
--- a/bin/display_callers
+++ b/bin/display_callers
@@ -17,20 +17,18 @@
 #
 #---------------------------------------------------------------------------
 
-package display_callers
-  ;    # So we can do the faster 'do' from mh, and not mess it up.
+package display_callers;    # So we can do the faster 'do' from mh, and not mess it up.
 
 my ( $Pgm_Path, $Pgm_Name );
-use vars '$Pgm_Root';    # So we can see it in eval var subs in read_parms
+use vars '$Pgm_Root';       # So we can see it in eval var subs in read_parms
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib'";   # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib'";        # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
@@ -69,10 +67,10 @@ else {
     &display;
 }
 
-my ( $file_qual, $dir, $MW );
-my ( @members1, @members2, @members_picked1, @members_picked2, %info );
+my ( $file_qual,               $dir,                $MW );
+my ( @members1,                @members2,           @members_picked1, @members_picked2, %info );
 my ( %callerid_name_by_number, %dbm_name_by_number, %calls );
-my ( @pl1, @pl2, @pl3 );
+my ( @pl1,                     @pl2,                @pl3 );
 my ($loop);
 
 my %config_parms;
@@ -90,8 +88,7 @@ sub setup {
     #   use DB_File;  # neede for ocmpiled version??
 
     if ( $parms{cgi} ) {
-        eval "use CGI ':all';"
-          ;    # Use eval so we don't fail if CGI not available (e.g. mh.exe)
+        eval "use CGI ':all';";      # Use eval so we don't fail if CGI not available (e.g. mh.exe)
         print &header( -target => 'New Window' );
         print &start_html("Phone Logs");
         print "<center><H2>Phone Logs</H1></center>\n";
@@ -137,9 +134,8 @@ sub read_member_list {
     opendir( DIR, "$dir/logs" )
       or die "Could not open directory $dir/logs: $!\n";
     my @members = readdir(DIR);
-    @members1 = reverse sort grep( /callerid.*$file_qual.*log$/, @members )
-      ;    # ... should sort by -M instead of name ??
-    @members2 = reverse sort grep( /phone.*$file_qual.*log$/, @members );
+    @members1 = reverse sort grep( /callerid.*$file_qual.*log$/, @members );    # ... should sort by -M instead of name ??
+    @members2 = reverse sort grep( /phone.*$file_qual.*log$/,    @members );
 
     # Default to just the latest member
     unless (@members_picked1) {
@@ -156,8 +152,7 @@ sub read_member_list {
 sub read_callerid_list {
     print "Reading override phone list\n";
     open( CALLERID, $config_parms{caller_id_file} )
-      or print
-      "Error, could not open mh.ini caller_id_file=$config_parms{caller_id_file}: $!\n";
+      or print "Error, could not open mh.ini caller_id_file=$config_parms{caller_id_file}: $!\n";
 
     my $callerid_cnt = 0;
     while (<CALLERID>) {
@@ -201,15 +196,12 @@ sub read_dbm_file {
         #       print "1 number=$number data=$data\n" if $data =~ /SPENSER/i or $number =~ /8619/ or $number =~ /5307/;
         #       next if $data =~ /[^\x9\xa\xd\x20-\x7e]/; # Ignore messed up records  ... should filter these out of source file.
         next
-          if $data =~ /[^\x20-\x7e]/
-          ; # Ignore messed up records  ... should filter these out of source file.
+          if $data =~ /[^\x20-\x7e]/;    # Ignore messed up records  ... should filter these out of source file.
         next
-          if $number =~ /[^\x20-\x7e]/
-          ; # Ignore messed up records  ... should filter these out of source file.
+          if $number =~ /[^\x20-\x7e]/;    # Ignore messed up records  ... should filter these out of source file.
 
         #2  3:53 PM Sat, Dec 27 1997 name=WINTER BRUCE LA
-        my ( $calls, $time, $date, $name ) =
-          $data =~ /^(\d+) +(.+), (.+) name=(.+)/;
+        my ( $calls, $time, $date, $name ) = $data =~ /^(\d+) +(.+), (.+) name=(.+)/;
         next unless $name;
         $dbm_name_by_number{$number} = $name;
 
@@ -218,8 +210,8 @@ sub read_dbm_file {
         $calls{dbm}{$count}{date} =
           sprintf( "last=%010d calls=%4d", parsedate($date), $calls );
 
-        $calls{dbm}{$count}{'# calls'} = sprintf( "%04d", $calls )
-          ; # Since we do not have a sortable date here, sort on number of calls.
+        $calls{dbm}{$count}{'# calls'} =
+          sprintf( "%04d", $calls );    # Since we do not have a sortable date here, sort on number of calls.
         $calls{dbm}{$count}{time_date} =
           sprintf( "last=%s calls=%4d", $date, $calls );
         $calls{dbm}{$count}{number} = $number;
@@ -251,16 +243,15 @@ sub read_in_call_log {
         while (<DATA>) {
 
             #            next if /[^\x9\xa\xd\x20-\x7e]/; # Ignore messed up records
-            tr/\x20-\x7e//cd; # Translate bad characters or else TK will mess up
+            tr/\x20-\x7e//cd;    # Translate bad characters or else TK will mess up
 
             #Tue, Nov  2  6:46 PM 507-252-8619 SPENCER DARYL
             #Mon 04/14/97 14:28:00
 
             #Sat 12/15/01 17:37:51 507-281-3888 name=TACINELLI JOHN  data=###DATE12151737...NMBR5072813888...NAMETACINELLI JOHN +++ line=W
 
-            my ( $time_date, $number, $name ) =
-              $_ =~ /(.+?)(\d\d\d\-?\d\d\d\-?\d\d\d\d) (.+)$/;
-            my ($line) = $_ =~ /line=(.+?)/;  # Optional ... which incoming line
+            my ( $time_date, $number, $name ) = $_ =~ /(.+?)(\d\d\d\-?\d\d\d\-?\d\d\d\d) (.+)$/;
+            my ($line) = $_ =~ /line=(.+?)/;    # Optional ... which incoming line
             $name =~ s/^name=//;
 
             # Deal with "private, 'out of area', and bad data" calls
@@ -323,7 +314,7 @@ sub read_out_call_log {
         while (<DATA>) {
 
             #           next if /[^\x9\xa\xd\x20-\x7e]/; # Ignore messed up records
-            tr/\x20-\x7e//cd; # Translate bad characters or else TK will mess up
+            tr/\x20-\x7e//cd;    # Translate bad characters or else TK will mess up
 
             #Tue, Nov  2  9:28 AM O2537009
             #Fri 11/26/99 10:14:06 O2537009
@@ -392,25 +383,18 @@ sub display {
 
     $fbr->Label( -text => 'List of log files' )->pack;
     my $fbr2 = $fbr->Frame->pack(qw/-expand no -fill x/);
-    $fbr2->Label( -text => 'Incoming files' )
-      ->pack(qw/-expand yes -fill x -side left/);
-    $fbr2->Label( -text => 'Outgoing files' )
-      ->pack(qw/-expand yes -fill x -side left/);
+    $fbr2->Label( -text => 'Incoming files' )->pack(qw/-expand yes -fill x -side left/);
+    $fbr2->Label( -text => 'Outgoing files' )->pack(qw/-expand yes -fill x -side left/);
 
     my ( $files1, $files2 );
-    $files1 = $fbr->Scrolled(
-        qw/Listbox -selectmode extended -width -1 -height 10 -setgrid 1 -scrollbars e -bg cyan/
-    );
+    $files1 = $fbr->Scrolled( qw/Listbox -selectmode extended -width -1 -height 10 -setgrid 1 -scrollbars e -bg cyan/ );
     $files1->pack(@pl2)->insert( 0, @members1 );
-    $files2 = $fbr->Scrolled(
-        qw/Listbox -selectmode extended -width -1 -height 10 -setgrid 1 -scrollbars e -bg cyan/
-    );
+    $files2 = $fbr->Scrolled( qw/Listbox -selectmode extended -width -1 -height 10 -setgrid 1 -scrollbars e -bg cyan/ );
     $files2->pack(@pl2)->insert( 0, @members2 );
 
     #   $files1->activate(0);
     #   $files2->activate(0);
-    $files1->selection( 'set', 0 )
-      ;    # Only one listbox widget can have a row slected at a time :(
+    $files1->selection( 'set', 0 );    # Only one listbox widget can have a row slected at a time :(
 
     #   $files2->selection('set', 0);
 
@@ -478,19 +462,14 @@ sub phone_list {
     if ( $class eq 'dbm' ) {
         my $search_frame = $ptr->Frame->pack;
 
-        my $search_label =
-          $search_frame->Label( -text => "Search:" )->pack( -side => 'left' );
+        my $search_label = $search_frame->Label( -text => "Search:" )->pack( -side => 'left' );
 
-        my $search_entry =
-          $search_frame->Entry( -textvariable => \$search_var, -width => 10 )
-          ->pack;
+        my $search_entry = $search_frame->Entry( -textvariable => \$search_var, -width => 10 )->pack;
         $search_entry->bind( '<Return>', sub { &search_data($search_var) } );
     }
 
     my $frame = $ptr->Frame->pack;
-    my $log   = $ptr->Scrolled(
-        qw/Text -state normal -width 60 -height 15 -scrollbars e -bg cyan/)
-      ->pack(@pl2);
+    my $log   = $ptr->Scrolled(qw/Text -state normal -width 60 -height 15 -scrollbars e -bg cyan/)->pack(@pl2);
     $info{$class}{window} = $log;
 
     for my $button (qw/name number date calls/) {
@@ -509,16 +488,13 @@ sub phone_list {
 
     $log->bind(
         '<Double-1>' => sub {
-            my $text =
-              $log->get( 'current linestart +20 chars', 'current lineend' );
+            my $text = $log->get( 'current linestart +20 chars', 'current lineend' );
             $text =~ s/^.*? (\d\d\d-)/$1/;    # Delete up to the number
             my $popup = $MW->Toplevel;
             my $label =
-              $popup->Label( -text =>
-                  "Edit name to be more prounancable,\nthen hit enter (or Escape to exit)"
-              )->pack( -side => 'top' );
-            my $entry = $popup->Entry( -width => 40, -textvariable => \$text )
-              ->pack( -side => 'bottom' );
+              $popup->Label( -text => "Edit name to be more prounancable,\nthen hit enter (or Escape to exit)" )
+              ->pack( -side => 'top' );
+            my $entry = $popup->Entry( -width => 40, -textvariable => \$text )->pack( -side => 'bottom' );
 
             $entry->tkwait( 'visibility', $entry );
             $entry->focus;
@@ -551,20 +527,16 @@ sub search_data {
     print "Searching for $search_var\n";
 
     # Search data logged from incoming caller id data.
-    my ( $count1, $count2, %results ) =
-      &main::search_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $search_var );
+    my ( $count1, $count2, %results ) = &main::search_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $search_var );
 
     # Also search in array created from mh.ini caller_id_file data
     while ( my ( $key, $value ) = each %callerid_name_by_number ) {
         if ( $key =~ /$search_var/i or $value =~ /$search_var/i ) {
-            $value =
-              &main::read_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-                $key );    # Use dbm data for consistency
+            $value = &main::read_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $key );    # Use dbm data for consistency
             $results{$key} = $value;
         }
     }
-    $count2 = keys %results;   # Reset count, in case Caller_ID search found any
+    $count2 = keys %results;    # Reset count, in case Caller_ID search found any
 
     my $list = $info{dbm}{window};
 
@@ -573,25 +545,21 @@ sub search_data {
     my $results;
     if ($count2) {
         for ( sort keys %results ) {
-            my ( $cid_number, $cid_date, $cid_name ) =
-              $results{$_} =~ /(\S+) (.+) name=(.+)/;
+            my ( $cid_number, $cid_date, $cid_name ) = $results{$_} =~ /(\S+) (.+) name=(.+)/;
             $cid_name = $callerid_name_by_number{$_}
               if $callerid_name_by_number{$_};
             $cid_date =
               ( split( ',', $cid_date ) )[1];    #  Drop leading time field
 
             #           $results .= sprintf("%15s: %-15s calls=%3s last=%s\n                 %s\n", $_, $cid_name, $cid_number, $cid_date, $caller);
-            $results .= sprintf( "last=%12s calls=%4d %s %s\n",
-                $cid_date, $cid_number, $_, $cid_name );
+            $results .= sprintf( "last=%12s calls=%4d %s %s\n", $cid_date, $cid_number, $_, $cid_name );
         }
 
         #       map {$results .= "   $_: $results{$_}\n\n"} sort keys %results;
-        $results =
-          "Results:  $count2 out of $count1 records matched\n\n" . $results;
+        $results = "Results:  $count2 out of $count1 records matched\n\n" . $results;
     }
     else {
-        $results =
-          "\nResults:  No match found out of $count1 records searched\n";
+        $results = "\nResults:  No match found out of $count1 records searched\n";
     }
 
     $list->delete( '0.0', 'end' );
@@ -689,8 +657,7 @@ sub post_cgi_form {
 sub phone_list2 {
     my ($list) = @_;
 
-    print "\n<td BGCOLOR='#B6C7F3' colspan=2><center>",
-      "$info{$list}{label} Calls ($info{$list}{count} entries)<br>\n";
+    print "\n<td BGCOLOR='#B6C7F3' colspan=2><center>", "$info{$list}{label} Calls ($info{$list}{count} entries)<br>\n";
     print &radio_group(
         -name    => "sort_$list",
         -values  => [ 'name', 'number', 'date' ],
diff --git a/bin/find_files b/bin/find_files
index 4b6d8daa0..bf14425be 100755
--- a/bin/find_files
+++ b/bin/find_files
@@ -19,8 +19,7 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
@@ -65,19 +64,18 @@ $search = shift;
 @skip   = split ',', $parms{skip} if $parms{skip};
 @boxes  = split ',', $parms{boxes} if $parms{boxes};
 @shares = split ',', $parms{dirs};
-@skip   = qw(^/program ^/win) unless @skip;      # Skip program and windows dirs
+@skip   = qw(^/program ^/win) unless @skip;            # Skip program and windows dirs
 @boxes  = &find_boxes unless @boxes;
 @shares = &find_shares(@boxes) unless @shares;
 
-$| = 1;    # Turn on command buffering (e.g. flush on every print)
+$| = 1;                                                # Turn on command buffering (e.g. flush on every print)
 print "\nSearching for $search in @shares\n\n";
 for my $share (@shares) {
     print "Traversing share $share\n";
     &read_dir($share);
 }
 
-print
-  "\nRead $counts{dir} directories and $counts{file} files.\n  - Found  $counts{found} files that match $search\n";
+print "\nRead $counts{dir} directories and $counts{file} files.\n  - Found  $counts{found} files that match $search\n";
 print "\nFound files:\n  ", join "\n  ", @found if @found;
 print "\nRun took ", scalar(time) - $time_start, " seconds\n";
 
@@ -115,13 +113,8 @@ sub find_shares_wmi {
     print "Finding shares on @boxes\n";
     use Win32::OLE;
     for my $box (@boxes) {
-        if (
-            my $WMI = Win32::OLE->GetObject(
-                "WinMgmts:{impersonationLevel=impersonate}!//$box")
-          )
-        {
-            for my $share ( Win32::OLE::in( $WMI->InstancesOf('Win32_Share') ) )
-            {
+        if ( my $WMI = Win32::OLE->GetObject("WinMgmts:{impersonationLevel=impersonate}!//$box") ) {
+            for my $share ( Win32::OLE::in( $WMI->InstancesOf('Win32_Share') ) ) {
                 next unless $share->{Type} == 0;    # Look at shares only
                 next if $share->{Name} =~ /\$$/;    # Ignore hidden shares
                 push @shares, "//$box/$share->{Name}";
diff --git a/bin/find_programs b/bin/find_programs
index 41cc5b013..9cfff1445 100755
--- a/bin/find_programs
+++ b/bin/find_programs
@@ -46,8 +46,7 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
@@ -109,20 +108,13 @@ sub wmi_processes {
       defwatch rtvscan stisvc vptray OSA msgsys mgabg pdesk);
 
     my $count = 0;
-    if (
-        my $WMI = Win32::OLE->GetObject(
-            "WinMgmts:{impersonationLevel=impersonate}!//$box")
-      )
-    {
-        for my $process ( Win32::OLE::in( $WMI->InstancesOf('Win32_Process') ) )
-        {
+    if ( my $WMI = Win32::OLE->GetObject("WinMgmts:{impersonationLevel=impersonate}!//$box") ) {
+        for my $process ( Win32::OLE::in( $WMI->InstancesOf('Win32_Process') ) ) {
             my $name = $process->{Name};
             $count++;
             next if !$parms{all} and grep $name =~ /$_/i, @ignore_list;
             next if $find and $name !~ /$find/i;
-            $list .=
-              sprintf
-              " PID:%5d,%5d Pgm:%-15s Threads:%3s Mem:%6.2f,%6.2f Date: %s\n",
+            $list .= sprintf " PID:%5d,%5d Pgm:%-15s Threads:%3s Mem:%6.2f,%6.2f Date: %s\n",
               $process->{ProcessID}, $process->{ParentProcessID},
               $process->{Name},      $process->{ThreadCount},
               $process->{WorkingSetSize} / 10**6,
@@ -130,8 +122,7 @@ sub wmi_processes {
         }
     }
     else {
-        print "WMI unable to connect to \\$box:"
-          . Win32::OLE->LastError() . "\n";
+        print "WMI unable to connect to \\$box:" . Win32::OLE->LastError() . "\n";
     }
     return ( $count, $list );
 }
diff --git a/bin/get_earthquakes b/bin/get_earthquakes
index 501a92008..85b37499a 100755
--- a/bin/get_earthquakes
+++ b/bin/get_earthquakes
@@ -29,8 +29,7 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision: 398 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision: 398 $ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 use Getopt::Long;
 our %parms;
@@ -97,7 +96,7 @@ unless ( tie %DBM, 'DB_File', $parms{dbm}, O_RDWR | O_CREAT, 0666 ) {
 }
 
 if ( $parms{d} ) {
-    print map( {"$_ => $DBM{$_}\n"} keys(%DBM) );
+    print map( { "$_ => $DBM{$_}\n" } keys(%DBM) );
     untie %DBM;
     die "Dumpped the DBM file.  Exiting!\n";
 }
@@ -105,8 +104,7 @@ if ( $parms{d} ) {
 unlink $f_cnss_merged_txt;
 my $getURLcmd = 'net_ftp -passive 1 -command get -server hazards.cr.usgs.gov ';
 $getURLcmd .= ' -user anonymous -password anonymous';
-system( $getURLcmd
-      . " -file $f_cnss_merged_txt -file_remote cnss/cnss_14.fing " );
+system( $getURLcmd . " -file $f_cnss_merged_txt -file_remote cnss/cnss_14.fing " );
 
 unless ( open CNSS, $f_cnss_merged_txt ) {
     die "$Pgm_Name: Failed to retrieve file from USGS\n";
@@ -134,9 +132,7 @@ foreach $line (@txtFile) {
         if ( !exists( $DBM{$key} ) ) {
 
             #Entry is new so go ahead and calculate the distance; expensive
-            $event->[7] = sprintf "%d",
-              calc_distance( $latitude, $longitude,
-                $event->[1], $event->[2], $Earthquake_Units ) + .5;
+            $event->[7] = sprintf "%d", calc_distance( $latitude, $longitude, $event->[1], $event->[2], $Earthquake_Units ) + .5;
             $event->[9] = 0;
         }
         else {
@@ -154,11 +150,7 @@ foreach $line (@txtFile) {
             if (    $event->[7] <= $distance
                 and $event->[4] >= $Magnitude_thresholds{$distance} )
             {
-                print(  "$Pgm_Name: found magnitude "
-                      . $event->[4]
-                      . " quake "
-                      . $event->[7]
-                      . " $Earthquake_Units away\n" )
+                print( "$Pgm_Name: found magnitude " . $event->[4] . " quake " . $event->[7] . " $Earthquake_Units away\n" )
                   if $parms{v};
                 print($line) if $parms{v};
                 $event->[8] = 1;
@@ -206,13 +198,9 @@ if ( $keyNewest ne "" ) {
       ? ( abs( 5 * round( $dbmEvent[1] / 5 ) ) > 65 ? 20 : 10 )
       : 5;
     my $image =
-      'http://earthquake.usgs.gov/recenteqsww/Maps/10/'
-      . $long_reso *
-      round(
-        ( $dbmEvent[2] < 0 ? 360 + $dbmEvent[2] : $dbmEvent[2] ) / $long_reso )
-      . '_'
-      . 5 *
-      round( $dbmEvent[1] / 5 ) . '.gif';
+        'http://earthquake.usgs.gov/recenteqsww/Maps/10/'
+      . $long_reso * round( ( $dbmEvent[2] < 0 ? 360 + $dbmEvent[2] : $dbmEvent[2] ) / $long_reso ) . '_'
+      . 5 * round( $dbmEvent[1] / 5 ) . '.gif';
     unlink $f_earthquakes_gif;
     $getURLcmd = "get_url " . ( $parms{v} ? "" : "-quiet" );
     system( $getURLcmd . " $image $f_earthquakes_gif" );
@@ -244,12 +232,10 @@ else {
     my $units = $Earthquake_Units eq 'miles' ? "miles" : "km   ";
     print( TXT "List is filtered using the follwing:\n" );
     print( TXT "  Distance <=   Magnitude >=\n" );
-    foreach my $distThresh ( sort( { $b <=> $a } keys(%Magnitude_thresholds) ) )
-    {
+    foreach my $distThresh ( sort( { $b <=> $a } keys(%Magnitude_thresholds) ) ) {
         my $magThresh = $Magnitude_thresholds{$distThresh};
-        $distThresh =
-          $distThresh > 20038 ? "  Any" : sprintf( "%5.0d", $distThresh );
-        $magThresh = $magThresh == 0 ? " Any" : sprintf( "%4.1f", $magThresh );
+        $distThresh = $distThresh > 20038 ? "  Any" : sprintf( "%5.0d", $distThresh );
+        $magThresh  = $magThresh == 0     ? " Any"  : sprintf( "%4.1f", $magThresh );
         print( TXT "  $distThresh $units        $magThresh\n" );
     }
     print( TXT "\n" );
@@ -273,10 +259,7 @@ foreach my $key ( reverse( sort(@keysSpeak) ) ) {
 
     ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday ) =
       gmtime( $dbmEvent[0] );
-    printf( TXT "%04d/%02d/%02d %02d:%02d:%02d ",
-        $year + 1900,
-        $mon + 1, $mday, $hour, $min, $sec
-    );
+    printf( TXT "%04d/%02d/%02d %02d:%02d:%02d ", $year + 1900, $mon + 1, $mday, $hour, $min, $sec );
 
     $qnoso = $dbmEvent[1] < 0 ? "S" : "N";
     $qeawe = $dbmEvent[2] < 0 ? "W" : "E";
@@ -303,23 +286,15 @@ sub parse_quake {
     #  0   1   2    3      4        5      6         7       8     9
     #[gmt,lat,lon,depth,magnitude,source,location,distance,speak,spoken]
 
-    if (
-        my (
-            $qdate, $qtime, $qlatd, $qnoso, $qlong,
-            $qeawe, $qdept, $qmagn, $qsrc,  $qloca
-        )
-        = $line =~
-        m!^(.{10})\s(.{8})\s(.{6})([NS])\s(.{6})([EW])\s(.{5})\s(.{3})\s(.{7}):\s(.+)!
-      )
+    if ( my ( $qdate, $qtime, $qlatd, $qnoso, $qlong, $qeawe, $qdept, $qmagn, $qsrc, $qloca ) =
+        $line =~ m!^(.{10})\s(.{8})\s(.{6})([NS])\s(.{6})([EW])\s(.{5})\s(.{3})\s(.{7}):\s(.+)! )
     {
 
         #convert timestamp to gmt
         my ( $qyear, $qmnth, $qday )  = $qdate =~ m!(\S+)/(\S+)/(\S+)!;
         my ( $qhour, $qminu, $qseco ) = $qtime =~ m!(\S+):(\S+):(\S+)!;
         my $qgmt;
-        eval {
-            $qgmt = timegm( $qseco, $qminu, $qhour, $qday, $qmnth - 1, $qyear );
-        };
+        eval { $qgmt = timegm( $qseco, $qminu, $qhour, $qday, $qmnth - 1, $qyear ); };
         if ($@) {
             print("$Pgm_Name: timegm() failed to parse date and time\n")
               if $parms{v};
@@ -362,11 +337,7 @@ sub calc_distance {
     $lon2 /= $c;
 
     $d = 2 * Math::Trig::asin(
-        sqrt(
-            ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 +
-              cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2
-        )
-    );
+        sqrt( ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 + cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2 ) );
 
     if ( $units ne 'miles' ) {
         return $d * 6378;    # convert to kilometers and return
diff --git a/bin/get_email b/bin/get_email
index 703ccdf68..8a869ac44 100755
--- a/bin/get_email
+++ b/bin/get_email
@@ -27,24 +27,19 @@ my ( $Pgm_Path, $Pgm_Name, $Version );
 use vars '$Pgm_Root';    # So we can see it in eval var subs in read_parms
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;                           # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
 use vars qw(%config_parms %config_parms_startup);
-if (
-    !&GetOptions( \%config_parms_startup, 'quiet', 'debug', 'h', 'help',
-        'net_mail_scan_age=s' )
+if (  !&GetOptions( \%config_parms_startup, 'quiet', 'debug', 'h', 'help', 'net_mail_scan_age=s' )
     or @ARGV
     or $config_parms_startup{h}
-    or $config_parms_startup{help}
-  )
+    or $config_parms_startup{help} )
 {
     print <<eof;
 
@@ -64,10 +59,7 @@ eof
 &setup;
 &check_accounts;
 
-my (
-    @email_accounts, %email_prev,     %email_type, $email_rule,
-    $results_new,    $results_unread, $results_unread2
-);
+my ( @email_accounts, %email_prev, %email_type, $email_rule, $results_new, $results_unread, $results_unread2 );
 
 sub setup {
 
@@ -128,8 +120,7 @@ sub check_accounts {
     my ( $email_file_data, $summary );
 
     my $time = localtime;
-    $summary =
-      qq[$time &nbsp;&nbsp; <A HREF='/email/latest.html'>Latest emails</A><br>];
+    $summary = qq[$time &nbsp;&nbsp; <A HREF='/email/latest.html'>Latest emails</A><br>];
 
     my $wday = (localtime)[6];
     my $day = ( 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun' )[$wday];
@@ -219,7 +210,7 @@ sub check_accounts {
         my $message_s = "s";
         $message_s = "" if ( $msgcnt == 1 );
         $summary .=
-          qq[&nbsp;&nbsp;&nbsp;$msgcnt message$message_s ($msg_unread unread) $msgsize in ]
+            qq[&nbsp;&nbsp;&nbsp;$msgcnt message$message_s ($msg_unread unread) $msgsize in ]
           . qq[$account: $config_parms{"net_mail_${account}_address"}, $config_parms{"net_mail_${account}_user"}<BR>\n];
 
         if ( $$msgptr{from_name} ) {
@@ -248,8 +239,7 @@ sub check_accounts {
 
                 #                   print "dbx get_email body=$body.\n";
 
-                $body =~
-                  s/Content-Disposition: attachment.+?filename=(.+?)^.+/Attachment deleted: $1/gsm;
+                $body =~ s/Content-Disposition: attachment.+?filename=(.+?)^.+/Attachment deleted: $1/gsm;
 
                 #                   while ($body =~ m/Content-Disposition: attachment.+?filename=(.+?\").+?NextPart.+?\n/s) {
                 #                       $body =~ s/Content-Disposition: attachment.+?filename=(.+?\").+?NextPart.+?\n/Attachment removed: $1\n\n/sm;
@@ -269,13 +259,11 @@ sub check_accounts {
                 #  - .scan is deleted in code_dir/internet_mail.pl after scanning for commands
                 #  - .html will be deleted (in get_email) only after email has been read
                 logit( "$config_parms{data_dir}/get_email.scan",
-                    "Msg: $number From:$$msgptr{from}[$cnt]  To:$to  Subject:$subject  Body:$body"
-                );
+                    "Msg: $number From:$$msgptr{from}[$cnt]  To:$to  Subject:$subject  Body:$body" );
 
                 #                   print "dbx get_email s=$subject body=$body\n";
 
-                use HTML::Entities
-                  ;    # So we can encode stuff like <bruce@misterhouse.net>
+                use HTML::Entities;    # So we can encode stuff like <bruce@misterhouse.net>
                 $to      = encode_entities $to;
                 $replyto = encode_entities $replyto;
                 $from    = encode_entities $from;
@@ -290,11 +278,11 @@ sub check_accounts {
                     $body = "<pre>$body</pre>";
                 }
 
-                my $href = time . $cnt;                     # An arbitrary index
+                my $href      = time . $cnt;                       # An arbitrary index
                 my $href_prev = $href - 1 unless $cnt == 0;
                 my $href_next = $href + 1 unless $cnt == $#list;
                 $href_prev = 'top'
-                  unless $href_prev;    # No easy way to track prev href
+                  unless $href_prev;                               # No easy way to track prev href
 
                 my $time_date = &time_date_stamp( 14, time );
                 my $html;
@@ -303,8 +291,7 @@ sub check_accounts {
                 #                   $html = 'Date: ' . &time_date_stamp(14, time) . "<br>\n"; # Log format same as .scan logit
                 $html = "<a href='#$href_prev'>Previous</a> , ";
                 $html .= "<a href='#$href_next'>Next</a>\n" if $href_next;
-                $html .= "<br><b>Date:</b> $time_date<br>\n"
-                  ;    # Log format same as .scan logit
+                $html .= "<br><b>Date:</b> $time_date<br>\n";    # Log format same as .scan logit
                 $html .=
                   "<b>To:</b>$to<br>\n<b>From:</b> <a href='mailto:$from'>$name</a><br>\n<b>Reply to:</b> <a href='mailto:$replyto'>$replyto</a><br>\n<b>Subject:</b>$subject<br>\n";
                 $html .= "<blockquote>$body</blockquote><br><hr>\n";
@@ -314,24 +301,17 @@ sub check_accounts {
                 $msg_latest .= $html;
 
                 # Log by account and day of week
-                my $log =
-                  "$config_parms{data_dir}/email/${account}_${day}.shtml";
-                my $logi =
-                  "$config_parms{data_dir}/email/${account}_${day}_index.html";
+                my $log  = "$config_parms{data_dir}/email/${account}_${day}.shtml";
+                my $logi = "$config_parms{data_dir}/email/${account}_${day}_index.html";
                 unlink $log
-                  if time - ( stat $log )[9] >
-                  3600 * 24;    # Reset if from last week
+                  if time - ( stat $log )[9] > 3600 * 24;    # Reset if from last week
                 unless ( -e $log ) {
                     unlink $logi;
-                    my $html2 =
-                      "<table cellspacing=5>\n<tr><th><b>Msg</b></th><th><b>Received</b></th>";
-                    $html2 .=
-                      "<th><b>From</b></th><th><b>Subject</b></th></tr></b>\n";
+                    my $html2 = "<table cellspacing=5>\n<tr><th><b>Msg</b></th><th><b>Received</b></th>";
+                    $html2 .= "<th><b>From</b></th><th><b>Subject</b></th></tr></b>\n";
                     logit( $logi, $html2, 0 );
-                    $html2 =
-                      qq[<LINK REL='STYLESHEET' HREF='/default.css' TYPE='text/css'>\n];
-                    $html2 .=
-                      qq[<!--\#include file="/email/${account}_${day}_index.html"-->\n</table>\n<hr>\n];
+                    $html2 = qq[<LINK REL='STYLESHEET' HREF='/default.css' TYPE='text/css'>\n];
+                    $html2 .= qq[<!--\#include file="/email/${account}_${day}_index.html"-->\n</table>\n<hr>\n];
                     logit( $log, $html2, 0 );
                 }
 
@@ -345,14 +325,11 @@ sub check_accounts {
                   unless ( defined $msgcnt_prev );
                 $msgcnt_prev = 0 unless ( defined $msgcnt_prev );
                 my $msgcnt2 = sprintf( "%02d", $msgcnt_prev + $cnt + 1 );
-                $html =
-                  "($msgcnt2) <a name='$href' href='#top'>Back to Index</a> , "
-                  . $html;
+                $html = "($msgcnt2) <a name='$href' href='#top'>Back to Index</a> , " . $html;
 
                 logit( $log, $html, 0 );
 
-                my $index =
-                  "<tr><td>$msgcnt2</td><td><a href='#$href'>$time_date</a></td><td><a href='mailto:$from'>$name</a>";
+                my $index = "<tr><td>$msgcnt2</td><td><a href='#$href'>$time_date</a></td><td><a href='mailto:$from'>$name</a>";
                 $index .= "</td><td><a href='#$href'>$subject</a></td></tr>\n";
                 logit( $logi, $index, 0 );
             }
@@ -373,27 +350,23 @@ sub check_accounts {
             # If new mail is age based, need to reset latest.html every time
             unlink("$config_parms{data_dir}/email/latest.html")
               if $config_parms{net_mail_scan_age};
-            logit( "$config_parms{data_dir}/email/latest.html", $msg_latest,
-                0 );
+            logit( "$config_parms{data_dir}/email/latest.html", $msg_latest, 0 );
         }
 
         #        $msgcnt_flag .= sprintf("%3d", ($config_parms{net_mail_scan_age})?$msg_inbox_total:$msgcnt);
         # gmail can have thousands of messages, instead, just add a space...
-        $message_counts .= " "
-          . ( $config_parms{net_mail_scan_age} ? $msg_inbox_total : $msgcnt );
+        $message_counts .= " " . ( $config_parms{net_mail_scan_age} ? $msg_inbox_total : $msgcnt );
 
         my $temp = &make_name_list( $account, @{ $email_prev{$account} } );
         $results_unread .= $temp;
 
         # Create html version with a link
-        $temp =~
-          s|^(.+) has |&nbsp;&nbsp;&nbsp;<A HREF='/email/${account}_${day}.shtml'>$1</A> has |;
+        $temp =~ s|^(.+) has |&nbsp;&nbsp;&nbsp;<A HREF='/email/${account}_${day}.shtml'>$1</A> has |;
 
         $results_unread2 .= $temp . "<br>" if $temp;
 
         # Save parsed data, so we don't have to re-read next time
-        $email_file_data .=
-          ( join( $;, $account, @{ $email_prev{$account} } ) ) . "\n"
+        $email_file_data .= ( join( $;, $account, @{ $email_prev{$account} } ) ) . "\n"
           if $email_prev{$account} and @{ $email_prev{$account} };
 
     }
@@ -420,8 +393,7 @@ sub make_name_list {
     my $account2 = $account;
     $account2 =~ tr/_/ /;    # Make speakable
 
-    @list = grep !/^filtered/i,
-      @list;   # Delete blank names (filtered out from the above get_email_rule)
+    @list = grep !/^filtered/i, @list;    # Delete blank names (filtered out from the above get_email_rule)
     my $cnt = @list;
 
     return unless $cnt;
@@ -434,11 +406,7 @@ sub make_name_list {
     #       $_ =~ s/\@/ At /g ;     # ...change \@  to the word "At"
     #   }
 
-    return ("$account2 has "
-          . plural( $cnt, 'new message' )
-          . " from "
-          . &speakify_list(@list)
-          . ".\n" );
+    return ( "$account2 has " . plural( $cnt, 'new message' ) . " from " . &speakify_list(@list) . ".\n" );
 
     #   return ("Email account $account2 has " . plural($cnt, 'new email message') .
 
diff --git a/bin/get_email_rule_example.pl b/bin/get_email_rule_example.pl
index f5e2045a4..f25f81cc3 100755
--- a/bin/get_email_rule_example.pl
+++ b/bin/get_email_rule_example.pl
@@ -8,8 +8,7 @@ sub get_email_rule {
     $from = 'The perl guys'         if $to =~ /Perl-Win32-Users/;
     $from = 'The phone guys'        if $to =~ /ktx/ or $subject =~ /kx-t/i;
     $from = 'junk mail'
-      if $from =~ /\S+[0-9]{3,}/
-      ;    # If we get a joe#### type address, assume it is junk mail.
+      if $from =~ /\S+[0-9]{3,}/;    # If we get a joe#### type address, assume it is junk mail.
     return if $from =~ /X10 Newsletter/;
 
     # These are not needed if using the MS TTS engine (it pronounces fred@placed.com ok)
diff --git a/bin/get_mp3_data b/bin/get_mp3_data
index 8891f9f24..306505556 100755
--- a/bin/get_mp3_data
+++ b/bin/get_mp3_data
@@ -7,8 +7,7 @@ use IO::File;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
@@ -49,8 +48,7 @@ for my $dir (@ARGV) {
     print "\nTraversing dir $dir\n";
     &read_mp3_dir($dir);
 }
-print
-  "\nRead $counts{dir} directories and $counts{file} files.\n  - Found  $counts{tag} files with TAG data\n";
+print "\nRead $counts{dir} directories and $counts{file} files.\n  - Found  $counts{tag} files with TAG data\n";
 my @tags = qw(title artist album year comment genre file);
 for ( 0 .. 6 ) {
     printf "  - Found %4d files with a $tags[$_] tag\n", $counts{$_}
@@ -130,8 +128,7 @@ sub GetOggInfo ($) {
 
     #Find out if the Ogg Stream uses Vorbis version 0 encoding.
     return
-      if unpack( 'H22', OggRead( $fh, \$temp, 11 ) ) ne
-      '01766f7262697300000000';
+      if unpack( 'H22', OggRead( $fh, \$temp, 11 ) ) ne '01766f7262697300000000';
 
     #Skip the next 18 bytes of the identification header.
     $buf = OggRead( $fh, \$temp, 18 );
@@ -183,80 +180,43 @@ sub read_mp3_dir {
     close MP3DIR;
 
     my @mp3_genres = (
-        'Blues',                  'Classic Rock',
-        'Country',                'Dance',
-        'Disco',                  'Funk',
-        'Grunge',                 'Hip-Hop',
-        'Jazz',                   'Metal',
-        'New Age',                'Oldies',
-        'Other',                  'Pop',
-        'R&B',                    'Rap',
-        'Reggae',                 'Rock',
-        'Techno',                 'Industrial',
-        'Alternative',            'Ska',
-        'Death Metal',            'Pranks',
-        'Soundtrack',             'Euro-Techno',
-        'Ambient',                'Trip-Hop',
-        'Vocal',                  'Jazz+Funk',
-        'Fusion',                 'Trance',
-        'Classical',              'Instrumental',
-        'Acid',                   'House',
-        'Game',                   'Sound Clip',
-        'Gospel',                 'Noise',
-        'Alt. Rock',              'Bass',
-        'Soul',                   'Punk',
-        'Space',                  'Meditative',
-        'Instrumental Pop',       'Instrumental Rock',
-        'Ethnic',                 'Gothic',
-        'Darkwave',               'Techno-Industrial',
-        'Electronic',             'Pop-Folk',
-        'Eurodance',              'Dream',
-        'Southern Rock',          'Comedy',
-        'Cult',                   'Gangsta Rap',
-        'Top 40',                 'Christian Rap',
-        'Pop/Funk',               'Jungle',
-        'Native American',        'Cabaret',
-        'New Wave',               'Psychedelic',
-        'Rave',                   'Showtunes',
-        'Trailer',                'Lo-Fi',
-        'Tribal',                 'Acid Punk',
-        'Acid Jazz',              'Polka',
-        'Retro',                  'Musical',
-        'Rock & Roll',            'Hard Rock',
-        'Folk',                   'Folk/Rock',
-        'National Folk',          'Swing',
-        'Fast-Fusion',            'Bebob',
-        'Latin',                  'Revival',
-        'Celtic',                 'Bluegrass',
-        'Avantgarde',             'Gothic Rock',
-        'Progressive Rock',       'Psychedelic Rock',
-        'Symphonic Rock',         'Slow Rock',
-        'Big Band',               'Chorus',
-        'Easy Listening',         'Acoustic',
-        'Humour',                 'Speech',
-        'Chanson',                'Opera',
-        'Chamber Music',          'Sonata',
-        'Symphony',               'Booty Bass',
-        'Primus',                 'Porn Groove',
-        'Satire',                 'Slow Jam',
-        'Club',                   'Tango',
-        'Samba',                  'Folklore',
-        'Ballad',                 'Power Ballad',
-        'Rhythmic Soul',          'Freestyle',
-        'Duet',                   'Punk Rock',
-        'Drum Solo',              'A Cappella',
-        'Euro-House',             'Dance Hall',
-        'Goa',                    'Drum & Bass',
-        'Club-House',             'Hardcore',
-        'Terror',                 'Indie',
-        'BritPop',                'Negerpunk',
-        'Polsk Punk',             'Beat',
-        'Christian Gangsta Rap',  'Heavy Metal',
-        'Black Metal',            'Crossover',
-        'Contemporary Christian', 'Christian Rock',
-        'Merengue',               'Salsa',
-        'Thrash Metal',           'Anime',
-        'JPop',                   'Synthpop'
+        'Blues',                  'Classic Rock',     'Country',          'Dance',
+        'Disco',                  'Funk',             'Grunge',           'Hip-Hop',
+        'Jazz',                   'Metal',            'New Age',          'Oldies',
+        'Other',                  'Pop',              'R&B',              'Rap',
+        'Reggae',                 'Rock',             'Techno',           'Industrial',
+        'Alternative',            'Ska',              'Death Metal',      'Pranks',
+        'Soundtrack',             'Euro-Techno',      'Ambient',          'Trip-Hop',
+        'Vocal',                  'Jazz+Funk',        'Fusion',           'Trance',
+        'Classical',              'Instrumental',     'Acid',             'House',
+        'Game',                   'Sound Clip',       'Gospel',           'Noise',
+        'Alt. Rock',              'Bass',             'Soul',             'Punk',
+        'Space',                  'Meditative',       'Instrumental Pop', 'Instrumental Rock',
+        'Ethnic',                 'Gothic',           'Darkwave',         'Techno-Industrial',
+        'Electronic',             'Pop-Folk',         'Eurodance',        'Dream',
+        'Southern Rock',          'Comedy',           'Cult',             'Gangsta Rap',
+        'Top 40',                 'Christian Rap',    'Pop/Funk',         'Jungle',
+        'Native American',        'Cabaret',          'New Wave',         'Psychedelic',
+        'Rave',                   'Showtunes',        'Trailer',          'Lo-Fi',
+        'Tribal',                 'Acid Punk',        'Acid Jazz',        'Polka',
+        'Retro',                  'Musical',          'Rock & Roll',      'Hard Rock',
+        'Folk',                   'Folk/Rock',        'National Folk',    'Swing',
+        'Fast-Fusion',            'Bebob',            'Latin',            'Revival',
+        'Celtic',                 'Bluegrass',        'Avantgarde',       'Gothic Rock',
+        'Progressive Rock',       'Psychedelic Rock', 'Symphonic Rock',   'Slow Rock',
+        'Big Band',               'Chorus',           'Easy Listening',   'Acoustic',
+        'Humour',                 'Speech',           'Chanson',          'Opera',
+        'Chamber Music',          'Sonata',           'Symphony',         'Booty Bass',
+        'Primus',                 'Porn Groove',      'Satire',           'Slow Jam',
+        'Club',                   'Tango',            'Samba',            'Folklore',
+        'Ballad',                 'Power Ballad',     'Rhythmic Soul',    'Freestyle',
+        'Duet',                   'Punk Rock',        'Drum Solo',        'A Cappella',
+        'Euro-House',             'Dance Hall',       'Goa',              'Drum & Bass',
+        'Club-House',             'Hardcore',         'Terror',           'Indie',
+        'BritPop',                'Negerpunk',        'Polsk Punk',       'Beat',
+        'Christian Gangsta Rap',  'Heavy Metal',      'Black Metal',      'Crossover',
+        'Contemporary Christian', 'Christian Rock',   'Merengue',         'Salsa',
+        'Thrash Metal',           'Anime',            'JPop',             'Synthpop'
     );
 
     for my $file ( sort @files ) {
@@ -328,7 +288,7 @@ sub read_mp3_dir {
                       if defined $tag_data[$i];
                 }
 
-                $tag_data[$i] =~ tr/\x20-\x7e//cd;   # Drop non-ascii characters
+                $tag_data[$i] =~ tr/\x20-\x7e//cd;    # Drop non-ascii characters
                 $tag_data[$i] =~ s/^\s+//;
                 $tag_data[$i] =~ s/\s+$//;
                 if ( $i == 1 ) {
diff --git a/bin/get_tv_grid b/bin/get_tv_grid
index 1d1922359..6403d4615 100755
--- a/bin/get_tv_grid
+++ b/bin/get_tv_grid
@@ -42,36 +42,32 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 require "RedirAgent.pm";
 
 #require "SMSAgent.pm";
-require 'handy_utilities.pl';                                # For read_mh_opts
-require 'handy_net_utilities.pl'
-  ;    # For net_mail_send <-- causes probs in perl 5.6.1 with -w flag!
+require 'handy_utilities.pl';                                      # For read_mh_opts
+require 'handy_net_utilities.pl';                                  # For net_mail_send <-- causes probs in perl 5.6.1 with -w flag!
 
 use Getopt::Long;
 use LWP::Simple;
 use LWP::UserAgent;
 use HTTP::Cookies;
 use HTTP::Request::Common;
-use vars '%config_parms';    # Not a my, as called from handy_net_utils
+use vars '%config_parms';                                          # Not a my, as called from handy_net_utils
 
 #======================================================================
 # Variable declarations and other init
 #======================================================================
 # Globals
 #
-my ( %parms, $didLogIn, $infile, $outfile, %channels_skip, %channels_keep,
-    $channel_data );
-my ( $url, $ua, $cookie_jar, $req_get1, $req_get2, $req_post, $logged_in );
+my ( %parms, $didLogIn, $infile,     $outfile,  %channels_skip, %channels_keep, $channel_data );
+my ( $url,   $ua,       $cookie_jar, $req_get1, $req_get2,      $req_post,      $logged_in );
 my ( @hours, %providers, @uas );
 my ( $dbm_file, $dbm_file2 );
 my ( %DBM,      %DBM2 );
@@ -96,23 +92,12 @@ my $dbgSubmitRequest = 1;    # Set to 0 to turn off URL requests
 #======================================================================
 if (
     !&GetOptions(
-        \%parms,          "h",
-        "help",           "infile=s",
-        "outfile=s",      "outdir=s",
-        "reget",          "redo",
-        "db=s",           "name=s",
-        "preserveRaw",    "keep=s",
-        "skip=s",         "channel_max=s",
-        "channel_min=s",  "zip:s",
-        "debug",          "label=s",
-        "keep_old",       "mail_to=s",
-        "provider:s",     "provider_name:s",
-        "get_providers",  "mail_server=s",
-        "mail_baseref=s", "purge=s",
-        "mail_baseref=s", "include_footer",
-        "days=s",         "day=s",
-        "hour=s",         "tableChannels=s",
-        "timebars=s"
+        \%parms,          "h",               "help",           "infile=s",        "outfile=s",     "outdir=s",
+        "reget",          "redo",            "db=s",           "name=s",          "preserveRaw",   "keep=s",
+        "skip=s",         "channel_max=s",   "channel_min=s",  "zip:s",           "debug",         "label=s",
+        "keep_old",       "mail_to=s",       "provider:s",     "provider_name:s", "get_providers", "mail_server=s",
+        "mail_baseref=s", "purge=s",         "mail_baseref=s", "include_footer",  "days=s",        "day=s",
+        "hour=s",         "tableChannels=s", "timebars=s"
     )
     or @ARGV
     or ( $parms{h} or $parms{help} )
@@ -213,8 +198,7 @@ sub days_from_now {
     my ( $day_time, $days ) = @_;
     my $day_time2 = $day_time + $days * 60 * 60 * 24;
     my ( $day, $month, $year, $down ) = ( localtime($day_time2) )[ 3, 4, 5, 6 ];
-    my $dow =
-      (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
+    my $dow = (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
 
     $month++;
     $year += 1900;
@@ -250,7 +234,7 @@ sub setup {
     $parms{tableChannels} = 40   unless $parms{tableChannels};
     $parms{days}          = 1    unless $parms{days};
     $parms{db}            = 'tv' unless $parms{db};
-    $parms{outdir} = "$config_parms{html_dir}/$parms{db}"
+    $parms{outdir}        = "$config_parms{html_dir}/$parms{db}"
       unless $parms{outdir};
     $parms{zip}   = $config_parms{zip_code} unless $parms{zip};
     $parms{proxy} = $ENV{http_proxy}        unless $parms{proxy};
@@ -261,9 +245,9 @@ sub setup {
       unless $parms{provider};
     $parms{provider_name} = $config_parms{ $parms{db} . '_provider_name' }
       unless $parms{provider_name};
-    $parms{get_providers} = 0 unless ( $parms{get_providers} );
-    $parms{hour} = $config_parms{ $parms{db} . '_hours' } unless $parms{hour};
-    $parms{skip} = $config_parms{ $parms{db} . '_channels_skip' }
+    $parms{get_providers} = 0                                      unless ( $parms{get_providers} );
+    $parms{hour}          = $config_parms{ $parms{db} . '_hours' } unless $parms{hour};
+    $parms{skip}          = $config_parms{ $parms{db} . '_channels_skip' }
       if ( $config_parms{ $parms{db} . '_channels_skip' } and !$parms{skip} );
     $parms{keep} = $config_parms{ $parms{db} . '_channels_keep' }
       if ( $config_parms{ $parms{db} . '_channels_keep' } and !$parms{keep} );
@@ -307,8 +291,8 @@ sub setup {
       || die "Missing provider!";
     $parms{channel_min} = '1'     unless $parms{channel_min};
     $parms{channel_max} = '99999' unless $parms{channel_max};
-    $parms{label} = "VCR" unless $parms{label}; # This can also be an image link
-    $parms{days}  = 1     unless $parms{days};
+    $parms{label}       = "VCR"   unless $parms{label};         # This can also be an image link
+    $parms{days}        = 1       unless $parms{days};
     $parms{redo}  = 1 if $parms{reget};
     $parms{reget} = 1 if $parms{get_providers};
     $parms{duration} = 6 unless $parms{duration};
@@ -409,9 +393,8 @@ sub submitRequest {
     my $res;    # Reponse
     $request->content_type('application/x-www-form-urlencoded');
     $request->header(
-        'User-Agent' => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)',
-        'Referer' =>
-          ( $referer ? $referer : 'http://tvlistings.zap2it.com/grid.asp' ),
+        'User-Agent'      => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)',
+        'Referer'         => ( $referer ? $referer : 'http://tvlistings.zap2it.com/grid.asp' ),
         'Accept'          => '*/*',
         'Accept-Language' => 'en',
     );
@@ -423,9 +406,7 @@ sub submitRequest {
     }
 
     # Submit request
-    print "Request: ["
-      . ( $request->as_string )
-      . ( $cookie_jar->as_string ) . "]\n"
+    print "Request: [" . ( $request->as_string ) . ( $cookie_jar->as_string ) . "]\n"
       if ( $parms{debug} );
     if ($outFile) {
         print "Submitting request with output file: $outFile \n"
@@ -452,9 +433,7 @@ sub submitRequest {
           or die "missing location: ", $res->as_string;
         print "is redirect to $ur\n" if ( $parms{debug} );
         $request = HTTP::Request->new( GET => $url . $ur );
-        print "Request: ["
-          . ( $request->as_string )
-          . ( $cookie_jar->as_string ) . "]\n"
+        print "Request: [" . ( $request->as_string ) . ( $cookie_jar->as_string ) . "]\n"
           if ( $parms{debug} );
         $res = $ua->request( $request, $outFile );
         return 1;
@@ -506,17 +485,11 @@ sub login {
     # Second submission, to submit our zip code
     #------------------------------------------------------------
 
-    my $req_zip =
-      HTTP::Request->new(
-        POST => $url . "zipcode.asp?partner_id=national&zipcode=$parms{zip}" );
-    $req_zip->content( "zipcode=$parms{zip}&"
-          . "partner_id=national&"
-          . "FormName=zipcode.asp&"
-          . "submit1=Continue" );
+    my $req_zip = HTTP::Request->new( POST => $url . "zipcode.asp?partner_id=national&zipcode=$parms{zip}" );
+    $req_zip->content( "zipcode=$parms{zip}&" . "partner_id=national&" . "FormName=zipcode.asp&" . "submit1=Continue" );
     $req_zip->content_type('application/x-www-form-urlencoded');
     print "2 of 4\n" if $parms{debug};
-    $submitResult =
-      submitRequest( $req_zip, "$config_parms{data_dir}/tv_providers.html" );
+    $submitResult = submitRequest( $req_zip, "$config_parms{data_dir}/tv_providers.html" );
     if ( 1 != $submitResult ) {
         return -1;
     }
@@ -547,12 +520,9 @@ sub login {
     }
 
     if ( !defined $this_provider ) {
-        ($this_provider) = split( /,\s*/, $parms{provider} )
-          ;    # first time through, take the first one
+        ($this_provider) = split( /,\s*/, $parms{provider} );    # first time through, take the first one
     }
-    my $req_prov =
-      HTTP::Request->new(
-        POST => $url . "system.asp?partner_id=national&zipcode=$parms{zip}" );
+    my $req_prov = HTTP::Request->new( POST => $url . "system.asp?partner_id=national&zipcode=$parms{zip}" );
     $req_prov->content( "provider=$this_provider&"
           . "saveProvider=See%20Listings&"
           . "zipCode=$parms{zip}&"
@@ -573,8 +543,7 @@ sub login {
     # so we have to do that with this step before asking for specific
     # dates/times
     #------------------------------------------------------------
-    my $req_allChans =
-      HTTP::Request->new( GET => $url . 'listings_redirect.asp?spp=0' );
+    my $req_allChans = HTTP::Request->new( GET => $url . 'listings_redirect.asp?spp=0' );
     print "4 of 4\n" if $parms{debug};
     $submitResult = submitRequest($req_allChans);
     if ( 1 != $submitResult ) {
@@ -646,8 +615,7 @@ sub fetchDataToFile {
                 }
                 if ( !@uas ) {
                     @providers = split( /,\s*/, $parms{provider} );
-                    $this_provider =
-                      shift @providers;    # what we just logged-into
+                    $this_provider = shift @providers;    # what we just logged-into
                 }
                 push(
                     @uas,
@@ -657,8 +625,7 @@ sub fetchDataToFile {
                         'provider'   => $this_provider
                     }
                 );
-                if ( $this_provider = shift @providers )
-                {                          # prepare for next request
+                if ( $this_provider = shift @providers ) {    # prepare for next request
                     $ua         = new RedirAgent();
                     $cookie_jar = HTTP::Cookies->new;
                     $ua->cookie_jar($cookie_jar);
@@ -669,8 +636,7 @@ sub fetchDataToFile {
         #------------------------------------------------------------
         # Retrieve the file we need
         #------------------------------------------------------------
-        print
-          "Requesting data for ${startDay} at $startHour for $parms{duration} hours\n";
+        print "Requesting data for ${startDay} at $startHour for $parms{duration} hours\n";
 
         #     $startHour -= 2;
         my $provnum;
@@ -678,8 +644,7 @@ sub fetchDataToFile {
             $ua         = $_->{ua};
             $cookie_jar = $_->{cookie_jar};
             my $ofile = providerFilename( $outfile, $provnum );
-            my $loopReq =
-              HTTP::Request->new( POST => $url . 'listings_redirect.asp' );
+            my $loopReq = HTTP::Request->new( POST => $url . 'listings_redirect.asp' );
             $loopReq->content( "displayType=Grid&"
                   . "duration=$parms{duration}&"
                   . "startDay=${startDay}&"
@@ -690,8 +655,7 @@ sub fetchDataToFile {
 
             $loopReq->content_type('application/x-www-form-urlencoded');
             my $submitResult = submitRequest( $loopReq, $ofile );
-            my $loopReq =
-              HTTP::Request->new( GET => $url . 'listings_redirect.asp?spp=0' );
+            my $loopReq = HTTP::Request->new( GET => $url . 'listings_redirect.asp?spp=0' );
             my $submitResult = submitRequest( $loopReq, $ofile );
             if ( 1 != $submitResult ) {
                 return -1;
@@ -734,9 +698,7 @@ sub prov_count {
 # SUB: processRawFile
 #======================================================================
 sub processRawFile {
-    my ( $day_time, $hour, $down, $rawFile, $outfile, $dow, $month, $day,
-        $year, $tomorrow_month, $tomorrow_day )
-      = @_;
+    my ( $day_time, $hour, $down, $rawFile, $outfile, $dow, $month, $day, $year, $tomorrow_month, $tomorrow_day ) = @_;
     print "Processing $rawFile to $outfile\n" if ( $parms{debug} );
 
     #------------------------------------------------------------
@@ -766,21 +728,17 @@ eof
         #------------------------------------------------------------
         # Create & initialize local variables for processing
         #------------------------------------------------------------
-        my (
-            $record, $record_prev, $script, $loop_phase,
-            $count1, $count2,      $count3
-        );
+        my ( $record, $record_prev, $script, $loop_phase, $count1, $count2, $count3 );
         my ( $pgm_desc, $min_start, $min_end, $min_pgm ) = 0;
 
         $count1 = $count2 = $count3 = 0;
-        my $channel_number   = '';
-        my $channel_name     = '';
-        my $pgm_name         = '';
-        my $channelRowsSaved = 0;
-        my $current_time_bar = '';
-        my $rowOfLastTimeBar = 0;
-        my $tableStartText =
-          qq|<table border="1" BGCOLOR="#FFFFFF" CELLPADDING="2" CELLSPACING="1" WIDTH="">|;
+        my $channel_number        = '';
+        my $channel_name          = '';
+        my $pgm_name              = '';
+        my $channelRowsSaved      = 0;
+        my $current_time_bar      = '';
+        my $rowOfLastTimeBar      = 0;
+        my $tableStartText        = qq|<table border="1" BGCOLOR="#FFFFFF" CELLPADDING="2" CELLSPACING="1" WIDTH="">|;
         my $rowsInCurrentOutTable = 0;
         my $script_flag           = 0;
 
@@ -920,10 +878,7 @@ eof
                 #------------------------------------------------------------
                 # remove Shockwave ads
                 #------------------------------------------------------------
-                if ( $record =~
-                    m!<tr>\s*<td\s+colspan=12><b><nobr><center><OBJECT.*?</tr>!
-                  )
-                {
+                if ( $record =~ m!<tr>\s*<td\s+colspan=12><b><nobr><center><OBJECT.*?</tr>! ) {
                     next;
                 }
 
@@ -994,11 +949,9 @@ eof
                         # (Don't do this if this is the last line of the table.)
                         #------------------------------------------------------------
                         if (    $rowsInCurrentOutTable % $parms{timebars} == 0
-                            and $rowsInCurrentOutTable !=
-                            $parms{tableChannels} )
+                            and $rowsInCurrentOutTable != $parms{tableChannels} )
                         {
-                            my $tempResult =
-                              $rowsInCurrentOutTable % $parms{timebars};
+                            my $tempResult = $rowsInCurrentOutTable % $parms{timebars};
                             print OUT $current_time_bar;
                         }
 
@@ -1058,17 +1011,12 @@ eof
                 # can show them on the local output webpage. Also, alter url ref
                 # so that it points to our logos directory.
                 #-----------------------------------------------------------------
-                if ( $record =~
-                    s!/tms_network_logos/([^/]*\.(jpg|gif))!/$parms{db}/logos/$1!
-                  )
-                {
+                if ( $record =~ s!/tms_network_logos/([^/]*\.(jpg|gif))!/$parms{db}/logos/$1! ) {
                     unless ( -f "$parms{outdir}/logos/$1" ) {
 
                         #print "Retrieving logo: $1\n" if ( $parms{debug} );
                         print "Retrieving logo: $1\n";
-                        my $logoRequest =
-                          HTTP::Request->new(
-                            GET => $url . "tms_network_logos/$1" );
+                        my $logoRequest = HTTP::Request->new( GET => $url . "tms_network_logos/$1" );
 
                         $ua->request( $logoRequest, "$parms{outdir}/logos/$1" );
 
@@ -1080,15 +1028,12 @@ eof
                 # can show them on the local output webpage. Also, alter url ref
                 # so that it points to our logos directory.
                 #-----------------------------------------------------------------
-                if ( $record =~
-                    s!images/([^/]*\.(jpg|gif))!/$parms{db}/logos/$1! )
-                {
+                if ( $record =~ s!images/([^/]*\.(jpg|gif))!/$parms{db}/logos/$1! ) {
                     unless ( -f "$parms{outdir}/logos/$1" ) {
 
                         #print "Retrieving logo: $1\n" if ( $parms{debug} );
                         print "Retrieving logo: $1\n";
-                        my $logoRequest =
-                          HTTP::Request->new( GET => $url . "images/$1" );
+                        my $logoRequest = HTTP::Request->new( GET => $url . "images/$1" );
 
                         $ua->request( $logoRequest, "$parms{outdir}/logos/$1" );
                     }
@@ -1102,8 +1047,7 @@ eof
                 #  <a href="listings_redirect.asp?station_num=10715">
                 #  <form method="post" action="listings_redirect.asp"><TD height=3 width = "100%" align=center>
                 #------------------------------------------------------------
-                $record =~
-                  s|\"([_a-z]+\.asp\??)|\"http://tvlistings2.zap2it.com/$1|g;
+                $record =~ s|\"([_a-z]+\.asp\??)|\"http://tvlistings2.zap2it.com/$1|g;
 
                 # last if $record =~ / END GRID TABLE /;
 
@@ -1158,8 +1102,7 @@ eof
                         $pgm_name_html =~ s/&/and/g;
                         $pgm_name_html =~ s/\'/&#39;/g;
                         $pgm_name_html =~ s/\?/&#63;/g;
-                        $pgm_name =~
-                          s/\<.+?\>//g; # Drop extra HTML directives (e.g. font)
+                        $pgm_name =~ s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
 
                         # Set program times/dates
                         my $time_start = &min_to_hour($min_start);
@@ -1172,16 +1115,14 @@ eof
                             $time_start = &min_to_hour( $min_start - 24 * 60 );
                             $time_end   = &min_to_hour( $min_end - 24 * 60 );
                         }
-                        print
-                          "found program start $time_start pgm_date $pgm_date\n";
+                        print "found program start $time_start pgm_date $pgm_date\n";
 
-                        print
-                          "db $pgm_name, $min_pgm, $min_start, $min_end, $time_start, $time_end, $pgm_date\n"
+                        print "db $pgm_name, $min_pgm, $min_start, $min_end, $time_start, $time_end, $pgm_date\n"
                           if $parms{debug};
 
                         # Insert the mh VCR link
                         my $vcr_ref =
-                          "<a href='/SET:last_spoken?\$tv_grid?channel_${channel_number}_from_${time_start}"
+                            "<a href='/SET:last_spoken?\$tv_grid?channel_${channel_number}_from_${time_start}"
                           . "_to_${time_end}_on_${pgm_date}_for_${pgm_name_html}'>$parms{label}</a>";
                         $pgm_data = "$vcr_ref for $pgm_data"
                           unless lc $parms{label} eq 'none';
@@ -1194,21 +1135,17 @@ eof
                         $pgm_data .= $record;
                         ($pgm_desc) = $record =~ /> *(.+)/;
 
-                        $record =
-                          $pgm_data;    # This will get saved to $channel_data;
+                        $record = $pgm_data;    # This will get saved to $channel_data;
 
                         # Clean up the program description
-                        $pgm_desc =~
-                          s/\<.+?\>//g; # Drop extra HTML directives (e.g. font)
-                        $pgm_desc =~ s/  / /g;    # Drop extra spaces
+                        $pgm_desc =~ s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
+                        $pgm_desc =~ s/  / /g;        # Drop extra spaces
 
                         #------------------------------------------------------------
                         # Store the data in the DBM
                         #------------------------------------------------------------
-                        my $db_key =
-                          join( $;, $channel_number, $pgm_date, $time_start );
-                        my $db_data =
-                          join( $;, $time_end, $pgm_name, $pgm_desc );
+                        my $db_key  = join( $;, $channel_number, $pgm_date, $time_start );
+                        my $db_data = join( $;, $time_end,       $pgm_name, $pgm_desc );
                         $DBM{$db_key}          = $db_data;
                         $DBM2{$channel_number} = $channel_name;
                         print "db key=$db_key\n  data=$db_data.\n"
@@ -1236,8 +1173,7 @@ eof
             }
         }    # Main while-loop
 
-        print "$count1 records with $count2 grid records were read. "
-          . "$count3 programs stored for $channelRowsSaved channels.\n";
+        print "$count1 records with $count2 grid records were read. " . "$count3 programs stored for $channelRowsSaved channels.\n";
         close IN;
         $provnum++;
     }
@@ -1252,11 +1188,9 @@ eof
 #======================================================================
 sub make_index {
     my ( $hour, $down, $day, $day_time ) = @_;
-    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n"
-      ;    ### DW: remove bgcolors
+    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n";    ### DW: remove bgcolors
 
-    print OUT
-      "<font face=arial size=+1 color=white> TV Listings for $parms{name} </td><td align=right>";
+    print OUT "<font face=arial size=+1 color=white> TV Listings for $parms{name} </td><td align=right>";
     print OUT "<FORM>";
 
     #----------------------------------------------------------------------
@@ -1270,8 +1204,7 @@ sub make_index {
     #  be the friendliest way to do this (in my own humble opinion.)
     #  Feel free to change this if you like.
     #----------------------------------------------------------------------
-    print OUT
-      "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'main')>\n";
+    print OUT "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'main')>\n";
 
     #my $dow_start = -$down - 7;
     my $dow_start = -$parms{purge};
@@ -1279,8 +1212,7 @@ sub make_index {
 
     #  my $dow_stop  = $parms{days} -1;
     for my $count ( $dow_start .. $dow_stop ) {
-        my ( $dow2, $dow2n, $day2, $month2, $year2 ) =
-          &days_from_now( $day_time, $count );
+        my ( $dow2, $dow2n, $day2, $month2, $year2 ) = &days_from_now( $day_time, $count );
         print OUT "<option value='/" . $parms{db} . "/${day2}_$hour.html'";
 
         if ( $day2 == $day ) {
@@ -1289,8 +1221,7 @@ sub make_index {
         print OUT ">$dow2, $month2/$day2\n";
     }
     print OUT "</select>\n";
-    print OUT
-      "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'main')>\n";
+    print OUT "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'main')>\n";
 
     for my $hour2 (@hours) {
         my $hour2_ampm;
@@ -1422,8 +1353,7 @@ sub fetchLoop {
             #------------------------------------------------------------
             # Calculate the name of the output file
             #------------------------------------------------------------
-            my $rawFile = "$parms{outdir}/download/"
-              . "${month}_${day}_${startHour}_$parms{duration}.html";
+            my $rawFile = "$parms{outdir}/download/" . "${month}_${day}_${startHour}_$parms{duration}.html";
             my $outfile = "$parms{outdir}/${day}_${startHour}.html";
             $outfile = $parms{outfile} if ( $parms{outfile} );
 
diff --git a/bin/get_tv_grid_ge b/bin/get_tv_grid_ge
index 5c5bd68dc..2c6fd9d41 100755
--- a/bin/get_tv_grid_ge
+++ b/bin/get_tv_grid_ge
@@ -21,60 +21,35 @@ use LWP::UserAgent;
 
 my @lchannels;
 @lchannels = (
-    'nuller',            'SF 1',
-    'SF 2',              'SF INFO',
-    'RTL',               'RTL II',
-    'PRO SIEBEN',        'VOX',
-    'KABEL 1',           'ORF 1',
-    'ORF 2',             'SAT.1',
-    'ARD',               'ZDF',
-    '3SAT',              'VIVA',
-    'WDR',               'ONYX',
-    'CNN',               'NBC',
-    'MTV',               'CNN',
-    'MTV',               'ORB',
-    'ARTE',              'N 24',
-    'EUROSPORT',         'DSF',
-    'SFB 1',             'NDR',
-    'MDR',               'MTV 2',
-    'VPLUS',             'ONYX',
-    'Goldstar TV',       '13th Street',
-    'Phoenix',           'TV Berlin',
-    'EinsExtra',         'EinsMuXx',
-    'HESSEN',            'HH 1',
-    'EinsFestival',      'Heimatkanal',
-    'BAYERN',            'ArteDigital',
-    'NEUN LIVE',         'Theaterkanal',
-    'Euronews',          'PREMIERE ONE',
-    'PREMIERE MOVIE 2',  'PREMIERE MOVIE 3',
-    'PREMIERE WORLD',    'Premiere Action',
-    'Premiere Star',     'Premiere Comedy',
-    'Discovery Channel', 'Beate Uhse TV',
-    'Sport 1',           'Sport 2',
-    'Sport 3',           'Studio Universal',
-    'BBC WORLD'
+    'nuller',        'SF 1',             'SF 2',              'SF INFO',          'RTL',            'RTL II',
+    'PRO SIEBEN',    'VOX',              'KABEL 1',           'ORF 1',            'ORF 2',          'SAT.1',
+    'ARD',           'ZDF',              '3SAT',              'VIVA',             'WDR',            'ONYX',
+    'CNN',           'NBC',              'MTV',               'CNN',              'MTV',            'ORB',
+    'ARTE',          'N 24',             'EUROSPORT',         'DSF',              'SFB 1',          'NDR',
+    'MDR',           'MTV 2',            'VPLUS',             'ONYX',             'Goldstar TV',    '13th Street',
+    'Phoenix',       'TV Berlin',        'EinsExtra',         'EinsMuXx',         'HESSEN',         'HH 1',
+    'EinsFestival',  'Heimatkanal',      'BAYERN',            'ArteDigital',      'NEUN LIVE',      'Theaterkanal',
+    'Euronews',      'PREMIERE ONE',     'PREMIERE MOVIE 2',  'PREMIERE MOVIE 3', 'PREMIERE WORLD', 'Premiere Action',
+    'Premiere Star', 'Premiere Comedy',  'Discovery Channel', 'Beate Uhse TV',    'Sport 1',        'Sport 2',
+    'Sport 3',       'Studio Universal', 'BBC WORLD'
 );
 
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,          "h",        "help",       "infile=s",
-        "outfile=s",      "outdir=s", "reget",      "redo",
-        "db=s",           "name=s",   "keep=s",     "skip=s",
-        "channel_max=s",  "zip:s",    "provider:s", "debug",
-        "label=s",        "keep_old", "mail_to=s",  "mail_server=s",
-        "mail_baseref=s", "days=s",   "day=s",      "hour=s"
+        \%parms,         "h",             "help",           "infile=s", "outfile=s", "outdir=s",
+        "reget",         "redo",          "db=s",           "name=s",   "keep=s",    "skip=s",
+        "channel_max=s", "zip:s",         "provider:s",     "debug",    "label=s",   "keep_old",
+        "mail_to=s",     "mail_server=s", "mail_baseref=s", "days=s",   "day=s",     "hour=s"
     )
     or @ARGV
     or ( $parms{h} or $parms{help} )
@@ -138,18 +113,12 @@ eof
 }
 
 # Globals
-my (
-    @days,          @hours, $infile, $outfile,
-    %DBM,           %DBM2,  %DBM3,   %channels_skip,
-    %channels_keep, $channel_data
-);
-my ( $url, $ua, $cookies, $req_get, $req_get1, $req_get2, $req_post,
-    $logged_in );
+my ( @days, @hours, $infile, $outfile, %DBM, %DBM2, %DBM3, %channels_skip, %channels_keep, $channel_data );
+my ( $url, $ua, $cookies, $req_get, $req_get1, $req_get2, $req_post, $logged_in );
 
 $logged_in = 1;    # German STOLL
 
-use vars
-  '%config_parms';    # Not a my, as it is called from handy_net_utils for sent
+use vars '%config_parms';    # Not a my, as it is called from handy_net_utils for sent
 &setup;
 for my $day_data (@days) {
     my ( $down, $dow, $day, $month, $year, $day_time, $countDay ) =
@@ -169,8 +138,7 @@ for my $day_data (@days) {
             use File::Copy;
             copy( $outfile, "$parms{outdir}/index.html" );
             if ( $parms{mail_to} ) {
-                &mail_file( $parms{mail_to}, $parms{mail_server}, $outfile,
-                    "$parms{name} Schedule for $dow, $month/$day/$year" );
+                &mail_file( $parms{mail_to}, $parms{mail_server}, $outfile, "$parms{name} Schedule for $dow, $month/$day/$year" );
             }
         }
     }
@@ -196,8 +164,7 @@ sub get_html {
     }
     else {
         &login unless $logged_in;
-        print
-          "Requesting data for hour=$hour day=$day month=$month year=$year .";
+        print "Requesting data for hour=$hour day=$day month=$month year=$year .";
         my $hours = ( $parms{hour} eq 'all_by_3' ) ? 3 : 4;
 
         print " .";
@@ -227,11 +194,7 @@ sub get_html {
           . $day
           . "_3456_1-2-3-4-5-6-7-9-10-172-174-151-152-153-162-111-33-114-112-113-_0_adsl_1_360_360_1,00.html";
 
-        $localUrlCall =
-            $url
-          . "programm/tvplaner/0,8484,"
-          . $countDay
-          . "_alle_alle_alle_1_2000_2000_1,00.html";
+        $localUrlCall = $url . "programm/tvplaner/0,8484," . $countDay . "_alle_alle_alle_1_2000_2000_1,00.html";
 
         #	$localUrlCall = $url . "programm/tvplaner/0,8484,".$countDay."_alle_alle_alle_1_40_2000_1,00.html";
 
@@ -271,13 +234,10 @@ sub filter_html {
 </HEAD>
 <body bgcolor=gray>
 eof
-    my ( $record, $record_prev, $script, $script_flag, $data_flag, $count1,
-        $count2, $count3 );
+    my ( $record, $record_prev, $script, $script_flag, $data_flag, $count1, $count2, $count3 );
     my (
-        $channel_number, $channel_name, $pgm_name,  $pgm_link,
-        $pgm_genre,      $pgm_desc,     $min_start, $min_end,
-        $min_pgm,        $von,          $bis,       $vonM,
-        $bisM,           $datum
+        $channel_number, $channel_name, $pgm_name, $pgm_link, $pgm_genre, $pgm_desc, $min_start,
+        $min_end,        $min_pgm,      $von,      $bis,      $vonM,      $bisM,     $datum
     );
 
     $count1 = $count2 = $count3 = 0;
@@ -297,10 +257,8 @@ eof
         if ( $record =~ /\>\|/gi ) {
 
             #			$record =~ /\>\|(.*):(.*)-(.*):(.*)\|([A-Z|a-z|0-9| ]*)\</ &&  ($von = $1.":".$2 ,$bis = $3.":".$4 ,$channel_name=$5 );
-            $record =~
-              /\>([.|0-9| ]*)<\/font\>\|(.*):(.*)-(.*):(.*)\|([A-Z|a-z|0-9| ]*)\</
-              && ( $datum = $1, $von = $2 . ":" . $3, $bis = $4 . ":" . $5,
-                $channel_name = $6 );
+            $record =~ /\>([.|0-9| ]*)<\/font\>\|(.*):(.*)-(.*):(.*)\|([A-Z|a-z|0-9| ]*)\</
+              && ( $datum = $1, $von = $2 . ":" . $3, $bis = $4 . ":" . $5, $channel_name = $6 );
         }
         if ( $record =~ /class=text\>\<b\>/gi ) {
             $record =~ /\<a href=\/(.*)\.html\>/
@@ -347,11 +305,9 @@ eof
                 $count3++;
 
                 # Clean up the program description
-                $pgm_name =~
-                  s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
-                $pgm_link =~
-                  s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
-                $pgm_link =~ s/  / /g;    # Drop extra spaces
+                $pgm_name =~ s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
+                $pgm_link =~ s/\<.+?\>//g;    # Drop extra HTML directives (e.g. font)
+                $pgm_link =~ s/  / /g;        # Drop extra spaces
 
                 my $ChannelCounter = 0;
                 my ( $channel_nameint, $channel_nameint2 );
@@ -400,20 +356,18 @@ eof
                 #                    print "db $pgm_name, $min_pgm, $min_start, $min_end, $time_start, $time_end, $pgm_date\n" if $parms{debug};
                 # Insert the mh link
                 my $vcr_ref =
-                  "<a href='/SET:last_spoken?\$tv_grid?channel_${channel_number}_from_${time_start}"
+                    "<a href='/SET:last_spoken?\$tv_grid?channel_${channel_number}_from_${time_start}"
                   . "_to_${time_end}_on_${pgm_date}_for_${pgm_name_html}'>$parms{label}</a>";
 
                 $record =~ s|<a href=|$vcr_ref for <a href=|
                   unless lc $parms{label} eq 'none';
 
                 # Store the data in the DBM
-                my $db_key =
-                  join( $;, $channel_number, $pgm_date, $time_start );
+                my $db_key = join( $;, $channel_number, $pgm_date, $time_start );
 
                 #                    my $db_data= join($;, $time_end, $pgm_name,$pgm_genre, $pgm_link);
                 #                    my $db_data= join($;, $time_end, $pgm_name, $pgm_desc);
-                my $db_data = join( $;,
-                    $time_end, $pgm_name, $pgm_desc, $pgm_genre, $pgm_link );
+                my $db_data = join( $;, $time_end, $pgm_name, $pgm_desc, $pgm_genre, $pgm_link );
 
                 $DBM{$db_key}          = $db_data;
                 $DBM2{$channel_number} = $lchannels[$channel_number];
@@ -422,13 +376,11 @@ eof
                 $DBM3{$genre_key} = $pgm_genre;
                 print "db key=$db_key\n  data=$db_data.\n" if $parms{debug};
             }
-            $von = $bis = $channel_name = $pgm_name = $pgm_genre = $pgm_link =
-              $pgm_desc = "";
+            $von = $bis = $channel_name = $pgm_name = $pgm_genre = $pgm_link = $pgm_desc = "";
         }
 
     }
-    print
-      "$count1 records with $count2 grid rows were read.  $count3 programs stored.\n";
+    print "$count1 records with $count2 grid rows were read.  $count3 programs stored.\n";
     close IN;
     close OUT;
 }
@@ -436,18 +388,14 @@ eof
 # Create the index table, for the next 2 weeks, and for other hours in this day
 sub make_index {
     my ( $hour, $down, $day, $day_time ) = @_;
-    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n"
-      ;    ### DW: remove bgcolors
-    print OUT
-      "<font face=arial size=+1 color=white> $parms{name} Listings</td><td align=right>";
+    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n";    ### DW: remove bgcolors
+    print OUT "<font face=arial size=+1 color=white> $parms{name} Listings</td><td align=right>";
     print OUT "<FORM>";
-    print OUT
-      "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'_top')>";
+    print OUT "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'_top')>";
     my $dow_start = -$down - 7;
     my $dow_stop  = $dow_start + 20;
     for my $count ( $dow_start .. $dow_stop ) {
-        my ( $dow2n, $dow2, $day2, $month2, $year2 ) =
-          &days_from_now( $day_time, $count );
+        my ( $dow2n, $dow2, $day2, $month2, $year2 ) = &days_from_now( $day_time, $count );
         print OUT "<option value='/" . $parms{db} . "/${day2}_$hour.html'";
         if ( $day2 == $day ) {
             print OUT " Selected ";
@@ -455,8 +403,7 @@ sub make_index {
         print OUT ">$dow2, $month2/$day2\n";
     }
     print OUT "</select>\n";
-    print OUT
-      "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'_top')>";
+    print OUT "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'_top')>";
 
     #   for my $hour2 (2, 6, 10, 14, 18, 22) {
     for my $hour2 (@hours) {
@@ -499,8 +446,7 @@ sub delete_old_data {
     for my $channel_number (@channels) {
         for my $hour ( 00 .. 23 ) {
             for my $min ( '00', '30' ) {
-                my $db_key =
-                  join( $;, $channel_number, $pgm_date, "$hour:$min" );
+                my $db_key = join( $;, $channel_number, $pgm_date, "$hour:$min" );
 
                 #               print "deleting $db_key\n" if $parms{debug};
                 delete $DBM{$db_key};
@@ -523,8 +469,7 @@ sub days_from_now {
     #   $day_time = time if $parms{day}; # Need to do a string to time thing here.
     my $day_time2 = $day_time + $days * 60 * 60 * 24;
     my ( $day, $month, $year, $down ) = ( localtime($day_time2) )[ 3, 4, 5, 6 ];
-    my $dow =
-      (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
+    my $dow = (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
 
     #   $month= (January,February,March,April,May,June,July,August,Septermber,October,November,December)[$month];
     $month++;
@@ -577,7 +522,7 @@ sub setup {
       unless $parms{provider};
     $parms{hour}  = $config_parms{ $parms{db} . '_hours' } unless $parms{hour};
     $parms{label} = $config_parms{ $parms{db} . '_label' } unless $parms{label};
-    $parms{skip} = $config_parms{ $parms{db} . '_channels_skip' }
+    $parms{skip}  = $config_parms{ $parms{db} . '_channels_skip' }
       unless $parms{skip};
     $parms{keep} = $config_parms{ $parms{db} . '_channels_keep' }
       unless $parms{keep};
@@ -586,7 +531,7 @@ sub setup {
     $parms{zip}         = '55901'  unless $parms{zip};
     $parms{provider}    = '255248' unless $parms{provider};
     $parms{channel_max} = '999'    unless $parms{channel_max};
-    $parms{label} = "VCR" unless $parms{label}; # This can also be an image link
+    $parms{label}       = "VCR"    unless $parms{label};         # This can also be an image link
 
     #   $parms{label} = qq[<img src="/tv/vcr.jpg">] unless $parms{label};
     $parms{days} = 1 unless $parms{days};
@@ -597,7 +542,7 @@ sub setup {
 
     for my $count ( 0 .. $parms{days} - 1 ) {
         my @day_data = &days_from_now( time, $count ), $count;
-        push( @days, "@day_data" );             # $dow $month $day $year");
+        push( @days, "@day_data" );                              # $dow $month $day $year");
     }
 
     $parms{hour} = '6pm' unless $parms{hour};
@@ -609,7 +554,7 @@ sub setup {
     }
     elsif ( 1 < ( @hours = split( ',', $parms{hour} ) ) ) {
         for (@hours) {
-            $_ = sprintf( "%02d", $_ );         # force hour to be  zero padded
+            $_ = sprintf( "%02d", $_ );                          # force hour to be  zero padded
 
             #           print "$_/n";
         }
@@ -664,8 +609,7 @@ sub setup {
 
     $req_get1 = HTTP::Request->new( GET  => $url . 'gridall.asp' );
     $req_post = HTTP::Request->new( POST => $url . 'programm/freetv' );
-    $req_get2 =
-      HTTP::Request->new( GET => $url . 'listings_redirect.asp?spp=0' );
+    $req_get2 = HTTP::Request->new( GET  => $url . 'listings_redirect.asp?spp=0' );
 
     $req_post->content_type('application/x-www-form-urlencoded');
 
diff --git a/bin/get_tv_grid_xmltv b/bin/get_tv_grid_xmltv
index ba69b6a6a..17f8693b1 100755
--- a/bin/get_tv_grid_xmltv
+++ b/bin/get_tv_grid_xmltv
@@ -54,12 +54,10 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 use XMLTV::Version '$Id$ ';
@@ -69,7 +67,7 @@ Date_Init('TZ=UTC');
 use POSIX 'tmpnam';
 use Getopt::Long;
 use XMLTV qw(best_name);
-use vars '%config_parms';    # Not a my, as called from handy_net_utils
+use vars '%config_parms';                                          # Not a my, as called from handy_net_utils
 use Time::Local;
 
 #======================================================================
@@ -80,8 +78,7 @@ use Time::Local;
 my ( %parms, $infile, $channel_data );
 my ( @hours, @uas );
 my ( $dbm_file, $dbm_file2 );
-my ( %DBM, %DBM2, %DBM_channel, %DBM_html, %DBM_index )
-  ;    # DBM_html is extended data for HTML
+my ( %DBM, %DBM2, %DBM_channel, %DBM_html, %DBM_index );    # DBM_html is extended data for HTML
 my (%showtimes);
 my @weekday = qw (Sun Mon Tue Wed Thu Fri Sat);
 
@@ -90,11 +87,9 @@ my @weekday = qw (Sun Mon Tue Wed Thu Fri Sat);
 #======================================================================
 if (
     !&GetOptions(
-        \%parms,     "h",             "help",          "infile=s",
-        "outfile=s", "outdir=s",      "db=s",          "keep=s",
-        "skip=s",    "channel_max=s", "channel_min=s", "debug",
-        "label=s",   "keep_old",      "purge=s",       "days=s",
-        "day=s",     "hour=s"
+        \%parms,   "h",        "help",    "infile=s",      "outfile=s",     "outdir=s",
+        "db=s",    "keep=s",   "skip=s",  "channel_max=s", "channel_min=s", "debug",
+        "label=s", "keep_old", "purge=s", "days=s",        "day=s",         "hour=s"
     )
     or @ARGV
     or ( $parms{h} or $parms{help} )
@@ -147,8 +142,7 @@ sub days_from_now {
     my ( $day_time, $days ) = @_;
     my $day_time2 = $day_time + $days * 60 * 60 * 24;
     my ( $day, $month, $year, $down ) = ( localtime($day_time2) )[ 3, 4, 5, 6 ];
-    my $dow =
-      (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
+    my $dow = (qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday))[$down];
 
     $month++;
     $year += 1900;
@@ -182,7 +176,7 @@ sub setup {
     $parms{timebars} = 5    unless $parms{timebars};
     $parms{days}     = 1    unless $parms{days};
     $parms{db}       = 'tv' unless $parms{db};
-    $parms{outdir} = "$config_parms{html_dir}/$parms{db}"
+    $parms{outdir}   = "$config_parms{html_dir}/$parms{db}"
       unless $parms{outdir};
     $parms{name} = 'TV' unless $parms{name};
     $parms{hour} = $config_parms{ $parms{db} . '_hours' } unless $parms{hour};
@@ -190,38 +184,20 @@ sub setup {
     $parms{hour} = '6pm' unless $parms{hour};
     @hours       = qw(02 06 10 14 18 22);
     %showtimes   = (
-        $hours[0] => [
-            '02:00 AM', '02:30 AM', '03:00 AM', '03:30 AM',
-            '04:00 AM', '04:30 AM', '05:00 AM', '05:30 AM'
-        ],
-        $hours[1] => [
-            '06:00 AM', '06:30 AM', '07:00 AM', '07:30 AM',
-            '08:00 AM', '08:30 AM', '09:00 AM', '09:30 AM'
-        ],
-        $hours[2] => [
-            '10:00 AM', '10:30 AM', '11:00 AM', '11:30 AM',
-            '12:00 PM', '12:30 PM', '1:00 PM',  '1:30 PM'
-        ],
-        $hours[3] => [
-            '2:00 PM', '2:30 PM', '3:00 PM', '3:30 PM',
-            '4:00 PM', '4:30 PM', '5:00 PM', '5:30 PM'
-        ],
-        $hours[4] => [
-            '6:00 PM', '6:30 PM', '7:00 PM', '7:30 PM',
-            '8:00 PM', '8:30 PM', '9:00 PM', '9:30 PM'
-        ],
-        $hours[5] => [
-            '10:00 PM', '10:30 PM', '11:00 PM', '11:30 PM',
-            '00:00 AM', '00:30 AM', '01:00 AM', '01:30 AM'
-        ],
+        $hours[0] => [ '02:00 AM', '02:30 AM', '03:00 AM', '03:30 AM', '04:00 AM', '04:30 AM', '05:00 AM', '05:30 AM' ],
+        $hours[1] => [ '06:00 AM', '06:30 AM', '07:00 AM', '07:30 AM', '08:00 AM', '08:30 AM', '09:00 AM', '09:30 AM' ],
+        $hours[2] => [ '10:00 AM', '10:30 AM', '11:00 AM', '11:30 AM', '12:00 PM', '12:30 PM', '1:00 PM',  '1:30 PM' ],
+        $hours[3] => [ '2:00 PM',  '2:30 PM',  '3:00 PM',  '3:30 PM',  '4:00 PM',  '4:30 PM',  '5:00 PM',  '5:30 PM' ],
+        $hours[4] => [ '6:00 PM',  '6:30 PM',  '7:00 PM',  '7:30 PM',  '8:00 PM',  '8:30 PM',  '9:00 PM',  '9:30 PM' ],
+        $hours[5] => [ '10:00 PM', '10:30 PM', '11:00 PM', '11:30 PM', '00:00 AM', '00:30 AM', '01:00 AM', '01:30 AM' ],
     );
 
     $parms{duration} = 4 unless ( $parms{duration} );
 
-    $parms{label} = "VCR" unless $parms{label}; # This can also be an image link
-    $parms{days}  = 1     unless $parms{days};
-    $parms{redo}  = 1;
-    $parms{duration} = 6 unless $parms{duration};
+    $parms{label}    = "VCR" unless $parms{label};      # This can also be an image link
+    $parms{days}     = 1     unless $parms{days};
+    $parms{redo}     = 1;
+    $parms{duration} = 6     unless $parms{duration};
 
     # Set up DBM files
     $dbm_file  = "$config_parms{data_dir}/$parms{db}_programs.dbm";
@@ -350,8 +326,7 @@ eof
 
                 # This should also really go into make_index
                 ##############################################
-                print OUT
-                  qq|<table border="1" BGCOLOR="#FFFFFF" CELLPADDING="2" CELLSPACING="1" WIDTH="">\n|;
+                print OUT qq|<table border="1" BGCOLOR="#FFFFFF" CELLPADDING="2" CELLSPACING="1" WIDTH="">\n|;
                 $current_time_bar =
                   qq|<tr><td colspan=2 align="center" bgcolor="#663366" width="60"><a href="/tv/$day\_$hour.html"><input border="0" width=60 height=30 type="image" name="earlier" src="/tv/logos/leftArrow.gif" value="earlier"></a></td>\n|;
                 foreach my $showtime ( @{ $showtimes{$hour} } ) {
@@ -373,20 +348,17 @@ eof
 
                     # Check for every channel
                     # if past midnight adjust the date to "tomorrow"
-                    my (
-                        $channel_number,    $channel_name,
-                        $channel_affiliate, $channel_image,
-                        $channel_ID
-                    ) = split( $;, $DBM_channel{$key} );
+                    my ( $channel_number, $channel_name, $channel_affiliate, $channel_image, $channel_ID ) =
+                      split( $;, $DBM_channel{$key} );
                     my $channel_number_display = $channel_number;
-                    my $show_found = 0;    # when the beginning of the channel
-                         # has nothing in it, to fill in the blanks
-                    my $colspan      = 0;    # keep track of how wide a show is
-                    my $colspancount = 0;    # track width of ttl grid
-                    my $show_found   = 0;    # has a show been found yet
-                    my $max_col_span = 8;    # Maximum # of columns in table
-                         # so we can figure out when the day flips
-                    my $its_late = 0;
+                    my $show_found             = 0;                 # when the beginning of the channel
+                                                                    # has nothing in it, to fill in the blanks
+                    my $colspan                = 0;                 # keep track of how wide a show is
+                    my $colspancount           = 0;                 # track width of ttl grid
+                    my $show_found             = 0;                 # has a show been found yet
+                    my $max_col_span           = 8;                 # Maximum # of columns in table
+                                                                    # so we can figure out when the day flips
+                    my $its_late               = 0;
 
                     my $row_started = 0;
 
@@ -414,49 +386,35 @@ eof
                         }
                         $showtime_epoch = $showtime_epoch + $day_epoch;
 
-                        my ( $pgm_date, $pgm_time ) =
-                          &convert_epoch_to_time($showtime_epoch);
-                        my $db_key =
-                          join( $;, $channel_number, $pgm_date, $pgm_time );
+                        my ( $pgm_date, $pgm_time ) = &convert_epoch_to_time($showtime_epoch);
+                        my $db_key = join( $;, $channel_number, $pgm_date, $pgm_time );
 
                         # If there is a value for the half hour interval
                         # figure out how long the show is and print the HTML
                         if ( $DBM_html{$db_key} ) {
                             $show_found = 1;
                             my (
-                                $time_end,     $pgm_name,
-                                $pgm_title,    $pgm_air,
-                                $time_start,   $time_start_adj,
-                                $time_end_adj, $pgm_rating,
-                                $pgm_desc,     $pgm_date_end,
-                                $epoch_start,  $epoch_end,
-                                @pgm_category
+                                $time_end,       $pgm_name,     $pgm_title,  $pgm_air,  $time_start,
+                                $time_start_adj, $time_end_adj, $pgm_rating, $pgm_desc, $pgm_date_end,
+                                $epoch_start,    $epoch_end,    @pgm_category
                             ) = split( $;, $DBM_html{$db_key} );
 
                             # calculate how many columns the show will take up.
                             # using the difference in two times for determining grid width.
-                            $colspan = int(
-                                ( $epoch_end / 60 - $epoch_start / 60 ) / 30 );
+                            $colspan = int( ( $epoch_end / 60 - $epoch_start / 60 ) / 30 );
 
                             # If the show is longer than is left on the table,
                             #     decrease width to available space
-                            if ( ( $colspancount + $colspan ) > $max_col_span )
-                            {
-                                do { $colspan = $colspan - 1; } until (
-                                    (
-                                        ( $colspancount + $colspan ) <=
-                                          $max_col_span
-                                    ) | $colspan < 2
-                                );
+                            if ( ( $colspancount + $colspan ) > $max_col_span ) {
+                                do { $colspan = $colspan - 1; }
+                                  until ( ( ( $colspancount + $colspan ) <= $max_col_span ) | $colspan < 2 );
                             }
                             $colspancount = $colspancount + $colspan;
 
                             # Define the program listing for display to the grid
                             print OUT &display_program(
-                                $pgm_name,   $pgm_title,      $pgm_desc,
-                                $pgm_air,    $pgm_rating,     $channel_number,
-                                $time_start, $time_start_adj, $time_end,
-                                $pgm_date,   $colspan,        @pgm_category
+                                $pgm_name,   $pgm_title,      $pgm_desc, $pgm_air,  $pgm_rating, $channel_number,
+                                $time_start, $time_start_adj, $time_end, $pgm_date, $colspan,    @pgm_category
                             );
 
                         }
@@ -469,52 +427,35 @@ eof
 
                                 # Figure out when the last time was
                                 # back up time 30 minutes
-                                $grid_time_search = $grid_time_search -
-                                  ( 30 * 60 );    # Backup 30 minutes
-                                my ( $pgm_date_loop, $pgm_time_loop ) =
-                                  &convert_epoch_to_time($grid_time_search);
+                                $grid_time_search = $grid_time_search - ( 30 * 60 );    # Backup 30 minutes
+                                my ( $pgm_date_loop, $pgm_time_loop ) = &convert_epoch_to_time($grid_time_search);
 
                                 #Build a key
-                                my $search_key = join( $;,
-                                    $channel_number, $pgm_date_loop,
-                                    $pgm_time_loop );
+                                my $search_key = join( $;, $channel_number, $pgm_date_loop, $pgm_time_loop );
                                 if ( $DBM_html{$search_key} ) {
 
                                     # then hey we found it
                                     my (
-                                        $time_end,     $pgm_name,
-                                        $pgm_title,    $pgm_air,
-                                        $time_start,   $time_start_adj,
-                                        $time_end_adj, $pgm_rating,
-                                        $pgm_desc,     $pgm_date_end,
-                                        $epoch_start,  $epoch_end,
-                                        @pgm_category
+                                        $time_end,       $pgm_name,     $pgm_title,  $pgm_air,  $time_start,
+                                        $time_start_adj, $time_end_adj, $pgm_rating, $pgm_desc, $pgm_date_end,
+                                        $epoch_start,    $epoch_end,    @pgm_category
                                     ) = split( $;, $DBM_html{$search_key} );
 
                                     # Show has to end before the beginning of grid or we don't really care and it's a lost cause
                                     if ( $epoch_end > $grid_start_epoch ) {
 
                                         # Figure out the column width
-                                        $colspan = int(
-                                            (
-                                                $epoch_end / 60 -
-                                                  $grid_start_epoch / 60
-                                            ) / 30
-                                        );
+                                        $colspan = int( ( $epoch_end / 60 - $grid_start_epoch / 60 ) / 30 );
 
                                         # and of course display the info
                                         print OUT &display_program(
-                                            $pgm_name,   $pgm_title,
-                                            $pgm_desc,   $pgm_air,
-                                            $pgm_rating, $channel_number,
-                                            $time_start, $time_start_adj,
-                                            $time_end,   $pgm_date,
-                                            $colspan,    @pgm_category
+                                            $pgm_name,   $pgm_title,      $pgm_desc,   $pgm_air,
+                                            $pgm_rating, $channel_number, $time_start, $time_start_adj,
+                                            $time_end,   $pgm_date,       $colspan,    @pgm_category
                                         );
-                                        $show_found  = 1;
-                                        $row_started = 1;
-                                        $i           = 10
-                                          ; # Kick ourselves out of the loop because we found it
+                                        $show_found   = 1;
+                                        $row_started  = 1;
+                                        $i            = 10;         # Kick ourselves out of the loop because we found it
                                         $colspancount = $colspan;
                                     }
                                 }
@@ -524,27 +465,22 @@ eof
 
                             # Otherwise just leave it blank and do the best you can
                             if ( !($show_found) ) {
-                                print OUT
-                                  qq|<td bgcolor="#ffffff" colspan="1" width="10%" valign="top"></td>\n|;
+                                print OUT qq|<td bgcolor="#ffffff" colspan="1" width="10%" valign="top"></td>\n|;
                                 $colspancount++;
                                 $row_started = 1;
                             }
                         }
                         elsif ( !($show_found) ) {
-                            print OUT
-                              qq|<td bgcolor="#ffffff" colspan="1" width="10%" valign="top"></td>\n|;
+                            print OUT qq|<td bgcolor="#ffffff" colspan="1" width="10%" valign="top"></td>\n|;
                             $colspancount++;
                             $row_started = 1;
                         }
 
                         $row_started = 0;
                     }
-                    if ( $colspancount < $max_col_span )
-                    {    # fix for blanks at the end of the channel
+                    if ( $colspancount < $max_col_span ) {    # fix for blanks at the end of the channel
                         my $colspan = $max_col_span - $colspancount;
-                        print OUT
-                          qq|<td bgcolor="#ffffff" colspan="$colspan" width="$colspan|
-                          . qq|0%" valign="top"></td>\n|;
+                        print OUT qq|<td bgcolor="#ffffff" colspan="$colspan" width="$colspan| . qq|0%" valign="top"></td>\n|;
                     }
 
                     # print the channel information on the right
@@ -575,12 +511,8 @@ eof
                     print "Copied $outfile  to $parms{outdir}/index.html\n"
                       if $parms{debug};
                     if ( $parms{mail_to} ) {
-                        &mail_file(
-                            $parms{mail_to},
-                            $parms{mail_server},
-                            $outfile,
-                            "$parms{name} Schedule for $dow, $month/$day/$year"
-                        );
+                        &mail_file( $parms{mail_to}, $parms{mail_server}, $outfile,
+                            "$parms{name} Schedule for $dow, $month/$day/$year" );
                     }
                 }
             }
@@ -595,11 +527,9 @@ eof
 #======================================================================
 sub make_index {
     my ( $hour, $down, $day, $day_time ) = @_;
-    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n"
-      ;    ### DW: remove bgcolors
+    print OUT "<center>\n<table border=1 width=100%>\n<tr>\n<td align=left>\n";    ### DW: remove bgcolors
 
-    print OUT
-      "<font face=arial size=+1 color=white> Listings for $parms{name} </td><td align=right>";
+    print OUT "<font face=arial size=+1 color=white> Listings for $parms{name} </td><td align=right>";
     print OUT "<FORM>";
 
     #----------------------------------------------------------------------
@@ -613,8 +543,7 @@ sub make_index {
     #  be the friendliest way to do this (in my own humble opinion.)
     #  Feel free to change this if you like.
     #----------------------------------------------------------------------
-    print OUT
-      "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'output')>\n";
+    print OUT "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'output')>\n";
 
     #print OUT "<SELECT NAME=url onchange=window.open(this.options[this.selectedIndex].value,'menu')>\n";
     #my $dow_start = -$down - 7;
@@ -623,8 +552,7 @@ sub make_index {
 
     #  my $dow_stop  = $parms{days} -1;
     for my $count ( $dow_start .. $dow_stop ) {
-        my ( $dow2, $dow2n, $day2, $month2, $year2 ) =
-          &days_from_now( $day_time, $count );
+        my ( $dow2, $dow2n, $day2, $month2, $year2 ) = &days_from_now( $day_time, $count );
         print OUT "<option value='/" . $parms{db} . "/${day2}_$hour.html'";
 
         if ( $day2 == $day ) {
@@ -633,8 +561,7 @@ sub make_index {
         print OUT ">$dow2, $month2/$day2\n";
     }
     print OUT "</select>\n";
-    print OUT
-      "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'output')>\n";
+    print OUT "<SELECT NAME=tvtime onchange=window.open(this.options[this.selectedIndex].value,'output')>\n";
 
     for my $hour2 (@hours) {
         my $hour2_ampm;
@@ -785,18 +712,14 @@ sub fetchLoop {
 
             # for some reason some of the channel icons are gifs, others jpgs.
             # Check for both
-            $channel_image_path =
-              $parms{outdir} . '/logos/' . lc($channel_affiliate) . '.gif';
+            $channel_image_path = $parms{outdir} . '/logos/' . lc($channel_affiliate) . '.gif';
             if ( ( -e $channel_image_path ) ) {
-                $channel_image =
-                  qq|<img src="/tv/logos/$channel_affiliate.gif"><br>|;
+                $channel_image = qq|<img src="/tv/logos/$channel_affiliate.gif"><br>|;
             }
             else {
-                $channel_image_path =
-                  $parms{outdir} . '/logos/' . lc($channel_affiliate) . '.jpg';
+                $channel_image_path = $parms{outdir} . '/logos/' . lc($channel_affiliate) . '.jpg';
                 if ( ( -e $channel_image_path ) ) {
-                    $channel_image =
-                      qq|<img src="/tv/logos/$channel_affiliate.jpg"><br>|;
+                    $channel_image = qq|<img src="/tv/logos/$channel_affiliate.jpg"><br>|;
                 }
                 if ( !($channel_image) ) {
                     $channel_image = "$channel_affiliate<br>";
@@ -806,19 +729,15 @@ sub fetchLoop {
 
         # and if it's not an affiliate it could still have an icon.
         else {
-            $channel_image_path =
-              $parms{outdir} . '/logos/' . lc($channel_name) . '.jpg';
+            $channel_image_path = $parms{outdir} . '/logos/' . lc($channel_name) . '.jpg';
             if ( ( -e $channel_image_path ) ) {
-                $channel_image =
-                  qq|<img src="/tv/logos/$channel_name.jpg"><br>|;
+                $channel_image = qq|<img src="/tv/logos/$channel_name.jpg"><br>|;
             }
         }
 
         $DBM2{$channel_number} = $channel_name;
 
-        my $db_data = join( $;,
-            $channel_number, $channel_name, $channel_affiliate,
-            $channel_image,  $channel_ID );
+        my $db_data = join( $;, $channel_number, $channel_name, $channel_affiliate, $channel_image, $channel_ID );
         $DBM_channel{$channel_number} = $db_data;
 
         # DBM_index cross references between channels and programs
@@ -890,10 +809,8 @@ sub fetchLoop {
         # not screw with the actual database. Also would be much bigger.
         my $html_key = join( $;, $channel_number, $pgm_date, $time_start_adj );
         my $html_data = join( $;,
-            $time_end,   $pgm_name,       $pgm_title,    $pgm_air,
-            $time_start, $time_start_adj, $time_end_adj, $pgm_rating,
-            $pgm_desc,   $pgm_date_end,   $epoch_start,  $epoch_end,
-            @pgm_category );
+            $time_end,   $pgm_name, $pgm_title,    $pgm_air,     $time_start, $time_start_adj, $time_end_adj,
+            $pgm_rating, $pgm_desc, $pgm_date_end, $epoch_start, $epoch_end,  @pgm_category );
         $DBM_html{$html_key} = $html_data;
         my $db_key  = join( $;, $channel_number, $pgm_date,      $time_start );
         my $db_data = join( $;, $time_end,       $pgm_name_full, 0 );
@@ -959,16 +876,10 @@ sub convert_XML_to_epoch {
 # ========================================================
 sub convert_epoch_to_time {
     my ($epoch) = @_;
-    my (
-        $Second,    $Minute,  $Hour,      $DayofMonth, $WrongMonth,
-        $WrongYear, $WeekDay, $DayofYear, $IsDST
-    ) = localtime($epoch);
+    my ( $Second, $Minute, $Hour, $DayofMonth, $WrongMonth, $WrongYear, $WeekDay, $DayofYear, $IsDST ) = localtime($epoch);
     my $Month = $WrongMonth + 1;
     my $Year  = $WrongYear + 1900;
-    return (
-        sprintf( '%02d/%02d', $Month, $DayofMonth ),
-        sprintf( '%02d:%02d', $Hour,  $Minute )
-    );
+    return ( sprintf( '%02d/%02d', $Month, $DayofMonth ), sprintf( '%02d:%02d', $Hour, $Minute ) );
 }
 
 # ========================================================
@@ -1053,9 +964,8 @@ sub display_program {
 
     # Make the Display output for the tv_grid html page
     my (
-        $pgm_name,   $pgm_title,      $pgm_desc,   $pgm_air,
-        $pgm_rating, $channel_number, $time_start, $time_start_adj,
-        $time_end,   $pgm_date,       $colspan,    @pgm_category
+        $pgm_name,   $pgm_title,      $pgm_desc, $pgm_air,  $pgm_rating, $channel_number,
+        $time_start, $time_start_adj, $time_end, $pgm_date, $colspan,    @pgm_category
     ) = @_;
     my ( $program, $pgm_category, $pgm_color, $time_wrong );
 
@@ -1077,9 +987,9 @@ sub display_program {
     $program .= ": <i>$pgm_title</i>" if ($pgm_title);
     $program .= ".";
     $program .= " (" if ( defined $pgm_category || defined $pgm_air );
-    $program .= "$pgm_air, " if ($pgm_air);
+    $program .= "$pgm_air, "    if ($pgm_air);
     $program .= "$pgm_category" if defined $pgm_category;
-    $program .= "). " if ( defined $pgm_category || defined $pgm_air );
+    $program .= "). "           if ( defined $pgm_category || defined $pgm_air );
 
     $program .= " $pgm_desc"   if defined $pgm_desc;
     $program .= " $pgm_rating" if defined $pgm_rating;
@@ -1101,8 +1011,7 @@ sub display_program {
     if ( $time_start ne $time_start_adj ) {
         $time_wrong = qq|(<i>$time_start</i>) |;
     }
-    $program = qq|<td bgcolor="$pgm_color" colspan="$colspan" width="$colspan|
-      . qq|0%" valign="top">$time_wrong$program</td>|;
+    $program = qq|<td bgcolor="$pgm_color" colspan="$colspan" width="$colspan| . qq|0%" valign="top">$time_wrong$program</td>|;
 
     return $program;
 }
diff --git a/bin/get_tv_info b/bin/get_tv_info
index 6e5616c7d..1c64e5f71 100755
--- a/bin/get_tv_info
+++ b/bin/get_tv_info
@@ -22,24 +22,20 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,      "h",           "help",       "db=s",
-        "name=s",     "channels=s",  "keep=s",     "dates=s",
-        "times=s",    "lengths=s",   "keys=s",     "keyfile=s",
-        'title_only', 'increment=s', "outfile1=s", "outfile2=s",
-        "early_am=s", "started=s",   "debug",      "quiet"
+        \%parms,      "h",         "help",   "db=s",      "name=s",     "channels=s",  "keep=s",     "dates=s",
+        "times=s",    "lengths=s", "keys=s", "keyfile=s", 'title_only', 'increment=s', "outfile1=s", "outfile2=s",
+        "early_am=s", "started=s", "debug",  "quiet"
     )
     or @ARGV
     or !(
@@ -120,17 +116,14 @@ eof
 
 # Globals
 my (
-    @channels,  @dates,       @times,       @early_am,
-    @lengths,   @keys,        %DBM,         %DBM2,
-    $match_cnt, $match_list1, $match_list2, $date_today,
-    $time_now,  $min_begin,   $min_now,     $symbol
+    @channels,  @dates,       @times,       @early_am,   @lengths,  @keys,      %DBM,     %DBM2,
+    $match_cnt, $match_list1, $match_list2, $date_today, $time_now, $min_begin, $min_now, $symbol
 );
 my %config_parms;
 
 &setup;
 &find_match;
-print "\nFound $match_cnt $parms{name} programmes from ", @channels + 0,
-  " channels. Detailed results are in $parms{outfile2}\n"
+print "\nFound $match_cnt $parms{name} programmes from ", @channels + 0, " channels. Detailed results are in $parms{outfile2}\n"
   unless $parms{quiet};
 print $match_list1 if $match_cnt < 10;
 
@@ -145,8 +138,7 @@ sub find_match {
     for my $pgm_date (@dates) {
         for my $time_start (@times) {
             for my $channel_number (@channels) {
-                my $db_key =
-                  join( $;, $channel_number, $pgm_date, $time_start );
+                my $db_key = join( $;, $channel_number, $pgm_date, $time_start );
                 print "key=$db_key.\n" if $parms{debug};
 
                 #               print "key=$db_key.  data=$DBM{$db_key}.\n" if $channel_number == 8 and $time_start eq '18:30';
@@ -154,8 +146,7 @@ sub find_match {
                     print "db_data=$db_data\n" if $parms{debug};
 
                     # Drop HTML tags
-                    $db_data = HTML::FormatText->new( lm => 0, rm => 500 )
-                      ->format( HTML::TreeBuilder->new()->parse($db_data) );
+                    $db_data = HTML::FormatText->new( lm => 0, rm => 500 )->format( HTML::TreeBuilder->new()->parse($db_data) );
 
                     my ( $time_end, $pgm_name, $pgm_desc ) =
                       split( $;, $db_data );
@@ -192,8 +183,7 @@ sub find_match {
                         # I can also now edit the key_lists with Notepad from inside mh.
                         # I have added case-sensitive upper-case in $pgm_desc.
                         if ( $pgm_name =~ /\b$key/i
-                            or
-                            ( $pgm_desc =~ /\b$key/i and !$parms{title_only} ) )
+                            or ( $pgm_desc =~ /\b$key/i and !$parms{title_only} ) )
                         {
                             $match_key = 1;
                             print "$key " if $parms{debug};
@@ -216,8 +206,7 @@ sub find_match {
 
                     my $show_ended;
 
-                    if ( $min_start > 24 * 60 )
-                    { #show starts after midnight, adjust current min so we compare apples and apples
+                    if ( $min_start > 24 * 60 ) {    #show starts after midnight, adjust current min so we compare apples and apples
                         $min_now = $min_now + 24 * 60;
                     }
                     $show_ended = 1
@@ -240,8 +229,7 @@ sub find_match {
                         if ( $parms{debug} ) {
                             print "\nFound a match:\n";
                             print "  Channel: $channel_number $channel_name\n";
-                            print
-                              "     Time: $pgm_date $time_start2 -> $time_end2\n";
+                            print "     Time: $pgm_date $time_start2 -> $time_end2\n";
                             print "   Length: $pgm_length hour\n";
                             print "    Title: $pgm_name\n";
                             print "     Desc: $pgm_desc\n";
@@ -266,18 +254,15 @@ sub find_match {
 
                         # Add 5 minutes to end of vcr recording time in case program starts late
                         #  - skip for now ... back-to-back recordings would get messed up
-                        my $vcr_time_end =
-                          &min_to_hour( &hour_to_min($time_end) + 5 );
+                        my $vcr_time_end = &min_to_hour( &hour_to_min($time_end) + 5 );
 
                         my $vcr_link =
                           " <a href=../bin/vcr.pl?$channel_number&$vcr_date&$time_start&$time_end target='control'><img src=/graphics/vcr.gif width=20 height=16 border=0></a>";
 
                         #                       my $vcr_link = " <a href=../bin/vcr.pl?$channel_number&$vcr_date&$time_start&$vcr_time_end target='control'><img src=/graphics/vcr.gif width=20 height=16 border=0></a>";
                         $vcr_link =~ s/://g;
-                        $pgm_name =~
-                          s/\*+//g;    # Change **show name** => show name
-                        $pgm_name =~ s/[\\\$\^]//g
-                          ;   # Remove regular expression chars introduced above
+                        $pgm_name =~ s/\*+//g;         # Change **show name** => show name
+                        $pgm_name =~ s/[\\\$\^]//g;    # Remove regular expression chars introduced above
 
                         #	print "\n\n**$min_now**********$min_start***#################*********************\n\n";
 
@@ -306,16 +291,14 @@ sub find_match {
                         $match_list1 =~ s/CH/Channel /g
                           if ( $config_parms{country} eq "UK" );
                         chomp $temp;
-                        $match_list2 .=
-                          $temp . $vcr_link . $watch_link . "\n$pgm_desc";
+                        $match_list2 .= $temp . $vcr_link . $watch_link . "\n$pgm_desc";
                     }
                 }
 
             }
         }
 
-        my $divider =
-          "           ______________________________________________________________              \n";
+        my $divider = "           ______________________________________________________________              \n";
         $match_list2 .= $divider;
     }
 
@@ -339,8 +322,7 @@ sub find_match {
     print OUT1 "Found $match_cnt $parms{name} shows.\n$match_list1";
 
     #    It's a bit tidier like this (I can't actually see the bottom two lines without the CRs)
-    print OUT2
-      "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
+    print OUT2 "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
     print OUT2 "\n \n \n \n \n \n \n";
 
     close OUT1;
@@ -362,8 +344,7 @@ sub find_match {
     my $header = "<HTML><HEAD>\n";
     $header .= "<meta http-equiv='Pragma' content='no-cache'>\n";
     $header .= "<TITLE>TV selections</TITLE>\n";
-    $header .=
-      "<link rel=STYLESHEET href=/default.css type=text/css>\n</HEAD>\n<BODY BGCOLOR=Wheat>";
+    $header .= "<link rel=STYLESHEET href=/default.css type=text/css>\n</HEAD>\n<BODY BGCOLOR=Wheat>";
     $header .= "<FONT FACE=Arial SIZE=2>\n";
 
     $html = $header . $html . "</FONT>\n</BODY></HTML>";
@@ -417,15 +398,13 @@ sub setup {
     }
     if ( my ( $time_start, $hours ) = $parms{times} =~ /(\S*)\+(\S+)/ ) {
         $time_start = '6pm' unless defined $time_start;
-        my $time_stop =
-          $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
+        my $time_stop = $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
         $time_stop = &min_to_hour($time_stop);
         $parms{times} = "$time_start-$time_stop";
     }
     if ( my ( $early_start, $hours ) = $parms{early_am} =~ /(\S*)\+(\S+)/ ) {
         $early_start = '0:00am' unless defined $early_start;
-        my $early_stop =
-          $hours * 60 + &hour_to_min( &ampm_to_hour24($early_start) );
+        my $early_stop = $hours * 60 + &hour_to_min( &ampm_to_hour24($early_start) );
         $early_stop = &min_to_hour($early_stop);
         $parms{early_am} = "$early_start-$early_stop";
 
@@ -482,8 +461,7 @@ sub setup {
     $parms{outfile2} = "$config_parms{data_dir}/$parms{db}_info2.txt"
       unless $parms{outfile2};
 
-    print "\nSearching for:\n  channels: @channels\n  times: @times\n  "
-      . "lengths: @lengths\n  dates: @dates\n  keys: @keys\n\n"
+    print "\nSearching for:\n  channels: @channels\n  times: @times\n  " . "lengths: @lengths\n  dates: @dates\n  keys: @keys\n\n"
       unless $parms{quiet};
 
 }
@@ -562,8 +540,8 @@ sub increment_date {
     my @dateholder = localtime();    # Get the current year
     $dateholder[5] += 1900;          # Adjust it to the correct value
     my $timeinsec = str2time("$dateholder[5]-$month-$day");
-    $timeinsec += $days * 24 * 60 * 60;   # Add the offest (adjusted to seconds)
-    @dateholder = localtime($timeinsec);  # Get the new day/month back
+    $timeinsec += $days * 24 * 60 * 60;    # Add the offest (adjusted to seconds)
+    @dateholder = localtime($timeinsec);   # Get the new day/month back
     return sprintf( "%s/%02d", $dateholder[4] + 1, $dateholder[3] );
 }
 
@@ -571,8 +549,8 @@ sub format_date {
 
     #my ($month, $day) = @_[0] =~ /0?(\d+)\/(\d+)/; # Drop leading 0 from month
     my ( $month, $day ) = @_[0] =~ /(\d+)\/(\d+)/;    # Drop year
-          #return sprintf("%s/%02d", $month, $day); # Add leading 0 to day
-    return sprintf( "%02d/%02d", $month, $day );    #
+                                                      #return sprintf("%s/%02d", $month, $day); # Add leading 0 to day
+    return sprintf( "%02d/%02d", $month, $day );      #
 }
 
 sub min_to_hour {
diff --git a/bin/get_tv_info_ge b/bin/get_tv_info_ge
index c6fcce549..c6a52711b 100755
--- a/bin/get_tv_info_ge
+++ b/bin/get_tv_info_ge
@@ -19,25 +19,20 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,      "h",           "help",       "db=s",
-        "name=s",     "channels=s",  "keep=s",     "dates=s",
-        "times=s",    "lengths=s",   "keys=s",     "keyfile=s",
-        'title_only', 'increment=s', "outfile1=s", "outfile2=s",
-        "early_am=s", "started=s",   "debug",      "quiet",
-        "table",      "genre=s"
+        \%parms,      "h",         "help",   "db=s",      "name=s",     "channels=s",  "keep=s",     "dates=s",
+        "times=s",    "lengths=s", "keys=s", "keyfile=s", 'title_only', 'increment=s', "outfile1=s", "outfile2=s",
+        "early_am=s", "started=s", "debug",  "quiet",     "table",      "genre=s"
     )
     or @ARGV
     or !(
@@ -122,17 +117,14 @@ eof
 
 # Globals
 my (
-    @channels,    @dates,       @times,       @early_am,   @lengths,
-    @keys,        %DBM,         %DBM2,        %DBM3,       $match_cnt,
-    $match_list1, $match_list2, $match_list3, $date_today, $time_now,
-    $min_begin,   $min_now,     $symbol
+    @channels,  @dates,       @times,       @early_am,    @lengths,    @keys,     %DBM,       %DBM2,    %DBM3,
+    $match_cnt, $match_list1, $match_list2, $match_list3, $date_today, $time_now, $min_begin, $min_now, $symbol
 );
 my %config_parms;
 
 &setup;
 &find_match;
-print "\nFound $match_cnt $parms{name} programmes from ", @channels + 0,
-  " channels. Detailed results are in $parms{outfile2}\n"
+print "\nFound $match_cnt $parms{name} programmes from ", @channels + 0, " channels. Detailed results are in $parms{outfile2}\n"
   unless $parms{quiet};
 print $match_list1 if $match_cnt < 10;
 
@@ -160,9 +152,8 @@ sub find_match {
         $myStart = "0" . $myStart if ( $myStart < 10 );
         $myEnd   = "0" . $myEnd if ( $myEnd < 10 );
         $myEnd   = "24" if ( $myEnd > 24 );
-        $SELECT = " SELECTED" if ( $parms{times} =~ /$myStart:/gi && !$SELECT );
-        $match_list3 .=
-          "<option value=\"$myStart:00-$myEnd:00\"$SELECT>$myStart:00-$myEnd:00";
+        $SELECT  = " SELECTED" if ( $parms{times} =~ /$myStart:/gi && !$SELECT );
+        $match_list3 .= "<option value=\"$myStart:00-$myEnd:00\"$SELECT>$myStart:00-$myEnd:00";
         $SELECT = " " if ( $SELECT eq " SELECTED" );
         $myStart1++;
     }
@@ -183,16 +174,14 @@ sub find_match {
     $match_list3 .= "<td>";
     $match_list3 .= "<SELECT name=\"channels\" >";
     $match_list3 .= "<option value=\"\" ><-- channel -->";
-    $match_list3 .=
-      "<option value=\"$config_parms{tv_my_favorites_channels}\" SELECTED>favoriten";
+    $match_list3 .= "<option value=\"$config_parms{tv_my_favorites_channels}\" SELECTED>favoriten";
     my @Mychannels = sort { $a <=> $b } keys %DBM2;
     $SELECT = "";
 
     for my $channel_number (@Mychannels) {
 
         #		$SELECT =" SELECTED" if (".".$parms{channels}."." =~ /\.$channel_number\./gi && !$SELECT);
-        $match_list3 .=
-          "<option value=\"$channel_number\"$SELECT>$DBM2{$channel_number}";
+        $match_list3 .= "<option value=\"$channel_number\"$SELECT>$DBM2{$channel_number}";
         $SELECT = " " if ( $SELECT eq " SELECTED" );
     }
     $match_list3 .= "</SELECT>";
@@ -212,8 +201,7 @@ sub find_match {
     $match_list3 .= "</tr>";
 
     $match_list3 .= "<tr>";
-    $match_list3 .=
-      "<td colspan=3><font size=1 color=\"black\">Keyword:</font><input align='left' size='25' name='search'></td>";
+    $match_list3 .= "<td colspan=3><font size=1 color=\"black\">Keyword:</font><input align='left' size='25' name='search'></td>";
     $match_list3 .= "</tr>";
 
     $match_list3 .= "</tr>";
@@ -227,18 +215,15 @@ sub find_match {
     for my $pgm_date (@dates) {
         for my $time_start (@times) {
             for my $channel_number (@channels) {
-                my $db_key =
-                  join( $;, $channel_number, $pgm_date, $time_start );
+                my $db_key = join( $;, $channel_number, $pgm_date, $time_start );
                 print "key=$db_key.\n" if $parms{debug};
                 if ( my $db_data = $DBM{$db_key} ) {
                     print "db_data=$db_data\n" if $parms{debug};
 
                     # Drop HTML tags
-                    $db_data = HTML::FormatText->new( lm => 0, rm => 500 )
-                      ->format( HTML::TreeBuilder->new()->parse($db_data) );
+                    $db_data = HTML::FormatText->new( lm => 0, rm => 500 )->format( HTML::TreeBuilder->new()->parse($db_data) );
 
-                    my ( $time_end, $pgm_name, $pgm_desc, $pgm_genre,
-                        $pgm_link ) = split( $;, $db_data );
+                    my ( $time_end, $pgm_name, $pgm_desc, $pgm_genre, $pgm_link ) = split( $;, $db_data );
 
                     my $min_start   = &hour_to_min($time_start);
                     my $min_end     = &hour_to_min($time_end);
@@ -273,9 +258,8 @@ sub find_match {
                         # I can also now edit the key_lists with Notepad from inside mh.
                         # I have added case-sensitive upper-case in $pgm_desc.
                         if (
-                            $pgm_name =~ /\b$key/i
-                            or
-                            ( $pgm_desc =~ /\b$key/i and !$parms{title_only} )
+                               $pgm_name =~ /\b$key/i
+                            or ( $pgm_desc =~ /\b$key/i and !$parms{title_only} )
                             or (    $parms{genre} =~ /\'$pgm_genre\'/i
                                 and $parms{genre} )
                           )
@@ -308,8 +292,7 @@ sub find_match {
                         if ( $parms{debug} ) {
                             print "\nFound a match:\n";
                             print "  Channel: $channel_number $channel_name\n";
-                            print
-                              "     Time: $pgm_date $time_start2 -> $time_end2\n";
+                            print "     Time: $pgm_date $time_start2 -> $time_end2\n";
                             print "   Length: $pgm_length hour\n";
                             print "    Title: $pgm_name\n";
                             print "     Desc: $pgm_desc\n";
@@ -322,9 +305,7 @@ sub find_match {
 
                         #                        my $watch_link = " <a href='SET?\$TV?$channel_name'><img src=/tv-stations/".$channelGif.".gif width=16 height=16 border=0></a>";
                         my $watch_link =
-                          " <a href='SET?\$TV?$channel_name'><img src=/tv-stations/"
-                          . $channelGif
-                          . ".gif border=0></a>";
+                          " <a href='SET?\$TV?$channel_name'><img src=/tv-stations/" . $channelGif . ".gif border=0></a>";
                         $watch_link =~ s/CH/Channel+/;
 
                         # Set VCR data
@@ -339,21 +320,16 @@ sub find_match {
 
                         # Add 5 minutes to end of vcr recording time in case program starts late
                         #  - skip for now ... back-to-back recordings would get messed up
-                        my $vcr_time_end =
-                          &min_to_hour( &hour_to_min($time_end) + 5 );
+                        my $vcr_time_end = &min_to_hour( &hour_to_min($time_end) + 5 );
 
                         my $vcr_link =
                           " <a href=../bin/vcr.pl?$channel_number&$vcr_date&$time_start&$time_end target='control'><img src=/graphics/vcr.gif width=20 height=16 border=0></a>";
                         $vcr_link =~ s/://g;
-                        $pgm_name =~
-                          s/\*+//g;    # Change **show name** => show name
-                        $pgm_name =~ s/[\\\$\^]//g
-                          ;   # Remove regular expression chars introduced above
-                        my $temp =
-                          "\n$match_cnt.  $pgm_name.  $channel_name Channel $channel_number.  ";
-
-                        my $temp2 =
-                          "\n$match_cnt.  $pgm_name.  $channel_name Channel $channel_number.  ";
+                        $pgm_name =~ s/\*+//g;         # Change **show name** => show name
+                        $pgm_name =~ s/[\\\$\^]//g;    # Remove regular expression chars introduced above
+                        my $temp = "\n$match_cnt.  $pgm_name.  $channel_name Channel $channel_number.  ";
+
+                        my $temp2 = "\n$match_cnt.  $pgm_name.  $channel_name Channel $channel_number.  ";
                         if ( length($pgm_link) > 5 ) {
                             $pgm_link =~ s/\n//gi;
                             $pgm_link =~ s/\r//gi;
@@ -383,20 +359,15 @@ sub find_match {
 
                         if ( $parms{table} ) {
                             $match_list3 .= "<TR>";
-                            $match_list3 .=
-                              "<td align=left><font size=3 color=\"black\"><b>";
+                            $match_list3 .= "<td align=left><font size=3 color=\"black\"><b>";
                             $match_list3 .=
                               "<a href=/bin/tv_search.pl?time=$time_start-"
-                              . &min_to_hour(
-                                ( &hour_to_min($time_start) + 60 ) )
-                              . ">";
+                              . &min_to_hour( ( &hour_to_min($time_start) + 60 ) ) . ">";
                             $match_list3 .= "$time_start";
                             $match_list3 .= "</a>";
                             $match_list3 .= "</b></font></td>";
-                            $match_list3 .=
-                              "<td align=right><font size=2 color=\"black\">";
-                            $match_list3 .=
-                              "<a href=/bin/tv_search.pl?channel=$channel_number>";
+                            $match_list3 .= "<td align=right><font size=2 color=\"black\">";
+                            $match_list3 .= "<a href=/bin/tv_search.pl?channel=$channel_number>";
                             $match_list3 .= "$channel_number";
                             $match_list3 .= "</a>";
                             $match_list3 .= "</font></td>";
@@ -408,23 +379,17 @@ sub find_match {
                                   "<td align=left><font size=2 color=\"black\"><b>$pgm_name &nbsp;<a href=\"$pgm_link\"><img src=/tv-stations/1_info.gif border=0></a></b></font></td>";
                             }
                             else {
-                                $match_list3 .=
-                                  "<td align=left><font size=2 color=\"black\"><b>$pgm_name</b></font></td>";
+                                $match_list3 .= "<td align=left><font size=2 color=\"black\"><b>$pgm_name</b></font></td>";
                             }
 
                             $match_list3 .=
                               "<td align=right><font size=2 color=\"black\"><b>$pgm_genre&nbsp;$vcr_link</b></font></td>";
-                            $match_list3 .=
-                              "<td align=right><font size=2 color=\"black\"><b>$watch_link</b></font></td>";
+                            $match_list3 .= "<td align=right><font size=2 color=\"black\"><b>$watch_link</b></font></td>";
                             $match_list3 .= "</TR>";
                             $match_list3 .= "<TR>";
+                            $match_list3 .= "<td align=right><font size=2 color=\"black\">";
                             $match_list3 .=
-                              "<td align=right><font size=2 color=\"black\">";
-                            $match_list3 .=
-                              "<a href=/bin/tv_search.pl?time=$time_end-"
-                              . &min_to_hour(
-                                ( &hour_to_min($time_end) + 120 ) )
-                              . ">";
+                              "<a href=/bin/tv_search.pl?time=$time_end-" . &min_to_hour( ( &hour_to_min($time_end) + 120 ) ) . ">";
                             $match_list3 .= "$time_end";
                             $match_list3 .= "</a>";
                             $match_list3 .= "</b></font></td>";
@@ -434,8 +399,7 @@ sub find_match {
                             $match_list3 .= "</TR>";
                         }
                         else {
-                            $match_list2 .=
-                              $temp2 . $vcr_link . $watch_link . "\n$pgm_desc";
+                            $match_list2 .= $temp2 . $vcr_link . $watch_link . "\n$pgm_desc";
                         }
                     }
                 }
@@ -443,8 +407,7 @@ sub find_match {
             }
         }
 
-        my $divider =
-          "           ______________________________________________________________              \n";
+        my $divider = "           ______________________________________________________________              \n";
         $match_list2 .= $divider;
         $match_list3 .= "</table>";
     }
@@ -469,8 +432,7 @@ sub find_match {
     print OUT1 "Found $match_cnt $parms{name} shows.\n$match_list1";
 
     #    It's a bit tidier like this (I can't actually see the bottom two lines without the CRs)
-    print OUT2
-      "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
+    print OUT2 "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
     print OUT2 "\n \n \n \n \n \n \n";
 
     close OUT1;
@@ -492,8 +454,7 @@ sub find_match {
     my $header = "<HTML><HEAD>\n";
     $header .= "<meta http-equiv='Pragma' content='no-cache'>\n";
     $header .= "<TITLE>TV selections</TITLE>\n";
-    $header .=
-      "<link rel=STYLESHEET href=/default.css type=text/css>\n</HEAD>\n<BODY BGCOLOR=white>";
+    $header .= "<link rel=STYLESHEET href=/default.css type=text/css>\n</HEAD>\n<BODY BGCOLOR=white>";
     $header .= "<FONT FACE=Arial SIZE=2>\n";
 
     $html = $header . $html . "</FONT>\n</BODY></HTML>";
@@ -552,15 +513,13 @@ sub setup {
     }
     if ( my ( $time_start, $hours ) = $parms{times} =~ /(\S*)\+(\S+)/ ) {
         $time_start = '6pm' unless defined $time_start;
-        my $time_stop =
-          $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
+        my $time_stop = $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
         $time_stop = &min_to_hour($time_stop);
         $parms{times} = "$time_start-$time_stop";
     }
     if ( my ( $early_start, $hours ) = $parms{early_am} =~ /(\S*)\+(\S+)/ ) {
         $early_start = '0:00am' unless defined $early_start;
-        my $early_stop =
-          $hours * 60 + &hour_to_min( &ampm_to_hour24($early_start) );
+        my $early_stop = $hours * 60 + &hour_to_min( &ampm_to_hour24($early_start) );
         $early_stop = &min_to_hour($early_stop);
         $parms{early_am} = "$early_start-$early_stop";
     }
@@ -612,8 +571,7 @@ sub setup {
     $parms{outfile2} = "$config_parms{data_dir}/$parms{db}_info2.txt"
       unless $parms{outfile2};
 
-    print "\nSearching for:\n  channels: @channels\n  times: @times\n  "
-      . "lengths: @lengths\n  dates: @dates\n  keys: @keys\n\n"
+    print "\nSearching for:\n  channels: @channels\n  times: @times\n  " . "lengths: @lengths\n  dates: @dates\n  keys: @keys\n\n"
       unless $parms{quiet};
 
 }
@@ -692,14 +650,14 @@ sub increment_date {
     my @dateholder = localtime();    # Get the current year
     $dateholder[5] += 1900;          # Adjust it to the correct value
     my $timeinsec = str2time("$dateholder[5]-$month-$day");
-    $timeinsec += $days * 24 * 60 * 60;   # Add the offest (adjusted to seconds)
-    @dateholder = localtime($timeinsec);  # Get the new day/month back
+    $timeinsec += $days * 24 * 60 * 60;    # Add the offest (adjusted to seconds)
+    @dateholder = localtime($timeinsec);   # Get the new day/month back
     return sprintf( "%s/%02d", $dateholder[4] + 1, $dateholder[3] );
 }
 
 sub format_date {
-    my ( $month, $day ) = @_[0] =~ /0?(\d+)\/(\d+)/; # Drop leading 0 from month
-    return sprintf( "%s/%02d", $month, $day );       # Add leading 0 to day
+    my ( $month, $day ) = @_[0] =~ /0?(\d+)\/(\d+)/;    # Drop leading 0 from month
+    return sprintf( "%s/%02d", $month, $day );          # Add leading 0 to day
 }
 
 sub min_to_hour {
diff --git a/bin/get_url b/bin/get_url
index 549d83f63..06d4a7082 100755
--- a/bin/get_url
+++ b/bin/get_url
@@ -9,8 +9,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 my ( %config_parms, %parms );
@@ -19,8 +18,7 @@ use Getopt::Long;
 
 #print "get_url: @ARGV\n";
 if (
-    !&GetOptions( \%parms, 'h', 'help',
-        'quiet', 'cookies=s', 'cookie_file_in=s', 'cookie_file_out=s',
+    !&GetOptions( \%parms, 'h', 'help', 'quiet', 'cookies=s', 'cookie_file_in=s', 'cookie_file_out=s',
         'post=s', 'header=s', 'userid=s', 'password=s' )
     or !@ARGV
     or $parms{h}
@@ -139,8 +137,7 @@ sub use_ua {
         print " url retrieved.\n" unless $parms{quiet};
         if ( $parms{header} ) {
             open( OUT, ">$parms{header}" )
-              or die
-              "Error, could not open file '$parms{header}' for output: $!\n";
+              or die "Error, could not open file '$parms{header}' for output: $!\n";
             binmode OUT;
             print OUT $response->headers_as_string();
             close OUT;
@@ -148,9 +145,7 @@ sub use_ua {
         if ( $parms{cookie_file_out} ) {
             my $cookies;
             for my $header ( split /\n/, $response->headers_as_string() ) {
-                if ( my ( $name, $value ) =
-                    $header =~ /^Set-Cookie: ([^=]+)=([^;]+)/ )
-                {
+                if ( my ( $name, $value ) = $header =~ /^Set-Cookie: ([^=]+)=([^;]+)/ ) {
                     $cookies .= "$name=$value; ";
                 }
             }
diff --git a/bin/get_weather b/bin/get_weather
index 1a753d514..a24457382 100755
--- a/bin/get_weather
+++ b/bin/get_weather
@@ -28,22 +28,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,   "h",      "help", "v", "city:s", "zone:s",
-        "state:s", "data=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "h", "help", "v", "city:s", "zone:s", "state:s", "data=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -119,8 +113,7 @@ if ( $data{forecast} ) {
 }
 
 unless ( $parms{no_log} ) {
-    file_write( "$config_parms{data_dir}/web/weather_conditions.txt",
-        $conditions )
+    file_write( "$config_parms{data_dir}/web/weather_conditions.txt", $conditions )
       if $data{conditions};
     file_write( "$config_parms{data_dir}/web/weather_forecast.txt", $forecast )
       if $data{forecast};
diff --git a/bin/get_weather_ca b/bin/get_weather_ca
index 6e75b619a..df4e53777 100755
--- a/bin/get_weather_ca
+++ b/bin/get_weather_ca
@@ -28,22 +28,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,  "reget",  "h", "help", "v", "debug",
-        "city:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "city:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -99,10 +93,7 @@ $parms{city} = $config_parms{weather_city} unless $parms{city};
 $parms{city} = 'on-117' unless $parms{city};
 
 my $WeatherURL;
-$WeatherURL =
-  sprintf
-  'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true',
-  $parms{city};
+$WeatherURL = sprintf 'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true', $parms{city};
 
 my $f_weather_html = "$config_parms{data_dir}/web/weather_ca.html";
 my $f_weather_data = "$config_parms{data_dir}/weather_data";
diff --git a/bin/githook-perltidy b/bin/githook-perltidy
index 8957df96d..5c1851e74 100755
--- a/bin/githook-perltidy
+++ b/bin/githook-perltidy
@@ -159,10 +159,7 @@ elsif ( $command eq 'pre-commit' ) {
 
     print "$self pre-commit:\n    # saving non-indexed changes and tidying\n";
 
-    run(
-        qw/git stash save --quiet --keep-index /,
-        $self . ' ' . localtime->datetime
-    );
+    run( qw/git stash save --quiet --keep-index /, $self . ' ' . localtime->datetime );
     $stashed = 1;
 
     run(qw/git checkout-index -a /);
@@ -192,9 +189,7 @@ elsif ( $command eq 'pre-commit' ) {
             unlink $file . '.ERR';
 
             print "perltidy $file\n";
-            Perl::Tidy::perltidy(
-                argv => [ '--profile=' . $rc, qw/-nst -b -bext=.bak/, $file ],
-            );
+            Perl::Tidy::perltidy( argv => [ '--profile=' . $rc, qw/-nst -b -bext=.bak/, $file ], );
 
             unlink $file . '.bak';
             if ( -e $file . '.ERR' ) {
@@ -244,8 +239,7 @@ elsif ( $command eq 'post-commit' ) {
         my $rc = get_perltidyrc();
         @perlfiles = map { chomp; $_ } read_file(POST_HOOK_FILE);
 
-        print "$self post-commit:\n",
-          "    # tidying and re-applying your non-indexed changes.\n";
+        print "$self post-commit:\n", "    # tidying and re-applying your non-indexed changes.\n";
 
         my $branch = qx/git branch --contains HEAD/;
         chomp $branch;
@@ -285,9 +279,7 @@ elsif ( $command eq 'post-commit' ) {
                     unlink $file . '.ERR';
 
                     print "perltidy $file\n";
-                    Perl::Tidy::perltidy( argv =>
-                          [ '--profile=' . $rc, qw/-nst -b -bext=.bak/, $file ],
-                    );
+                    Perl::Tidy::perltidy( argv => [ '--profile=' . $rc, qw/-nst -b -bext=.bak/, $file ], );
 
                     unlink $file . '.bak';
                     if ( -e $file . '.ERR' ) {
@@ -320,9 +312,7 @@ END {
     if ( defined $command && $command eq 'pre-commit' ) {
         if ($success) {
             if ($partial) {
-                print "    # writing '"
-                  . POST_HOOK_FILE
-                  . "' for post-commit hook\n";
+                print "    # writing '" . POST_HOOK_FILE . "' for post-commit hook\n";
                 write_file( POST_HOOK_FILE, join( "\n", values %partial ) );
             }
             else {
diff --git a/bin/h2ph b/bin/h2ph
index 61c017e1a..bf9c03a56 100755
--- a/bin/h2ph
+++ b/bin/h2ph
@@ -99,7 +99,7 @@ while ( defined( my $file = next_file() ) ) {
                 $name = $1;
                 $new  = '';
                 s/\s+$//;
-                s/\(\w+\s*\(\*\)\s*\(\w*\)\)\s*(-?\d+)/$1/;  # (int (*)(foo_t))0
+                s/\(\w+\s*\(\*\)\s*\(\w*\)\)\s*(-?\d+)/$1/;    # (int (*)(foo_t))0
                 if (s/^\(([\w,\s]*)\)//) {
                     $args = $1;
                     my $proto = '() ';
@@ -126,13 +126,11 @@ while ( defined( my $file = next_file() ) ) {
                             $eval_index++;
                         }
                         else {
-                            print OUT $t,
-                              "eval 'sub $name $proto\{\n$t    ${args}eval q($new);\n$t}' unless defined(\&$name);\n";
+                            print OUT $t, "eval 'sub $name $proto\{\n$t    ${args}eval q($new);\n$t}' unless defined(\&$name);\n";
                         }
                     }
                     else {
-                        print OUT
-                          "unless(defined(\&$name)) {\n    sub $name $proto\{\n\t${args}eval q($new);\n    }\n}\n";
+                        print OUT "unless(defined(\&$name)) {\n    sub $name $proto\{\n\t${args}eval q($new);\n    }\n}\n";
                     }
                     %curargs = ();
                 }
@@ -152,17 +150,14 @@ while ( defined( my $file = next_file() ) ) {
                             $eval_index++;
                         }
                         else {
-                            print OUT $t, "eval 'sub $name () {", $new,
-                              ";}' unless defined(\&$name);\n";
+                            print OUT $t, "eval 'sub $name () {", $new, ";}' unless defined(\&$name);\n";
                         }
                     }
                     else {
                         # Shunt around such directives as `#define FOO FOO':
                         next if " \&$name" eq $new;
 
-                        print OUT $t,
-                          "unless(defined(\&$name)) {\n    sub $name () {\t",
-                          $new, ";}\n}\n";
+                        print OUT $t, "unless(defined(\&$name)) {\n    sub $name () {\t", $new, ";}\n}\n";
                     }
                 }
             }
@@ -179,12 +174,7 @@ while ( defined( my $file = next_file() ) ) {
                     $t = "\t" x ( $tab / 8 ) . ' ' x ( $tab % 8 );
                     print OUT ( $t, "my(\@REM);\n" );
                     if ( $incl_type eq 'include_next' ) {
-                        print OUT (
-                            $t,
-                            "my(\%INCD) = map { \$INC{\$_} => 1 } ",
-                            "(grep { \$_ eq \"$incl\" } ",
-                            "keys(\%INC));\n"
-                        );
+                        print OUT ( $t, "my(\%INCD) = map { \$INC{\$_} => 1 } ", "(grep { \$_ eq \"$incl\" } ", "keys(\%INC));\n" );
                         print OUT (
                             $t,
                             "\@REM = map { \"\$_/$incl\" } ",
@@ -193,11 +183,7 @@ while ( defined( my $file = next_file() ) ) {
                         );
                     }
                     else {
-                        print OUT (
-                            $t,
-                            "\@REM = map { \"\$_/$incl\" } ",
-                            "(grep {-r \"\$_/$incl\" } \@INC);\n"
-                        );
+                        print OUT ( $t, "\@REM = map { \"\$_/$incl\" } ", "(grep {-r \"\$_/$incl\" } \@INC);\n" );
                     }
                     print OUT ( $t, "require \"\$REM[0]\" if \@REM;\n" );
                     $tab -= 4;
@@ -293,19 +279,16 @@ while ( defined( my $file = next_file() ) ) {
             s@/\*.*?\*/@@g;
             s/\s+/ /g;
             next
-              unless
-              /^\s?(typedef\s?)?enum\s?([a-zA-Z_]\w*)?\s?\{(.*)\}\s?([a-zA-Z_]\w*)?\s?;/;
+              unless /^\s?(typedef\s?)?enum\s?([a-zA-Z_]\w*)?\s?\{(.*)\}\s?([a-zA-Z_]\w*)?\s?;/;
             ( my $enum_subs = $3 ) =~ s/\s//g;
             my @enum_subs = split( /,/, $enum_subs );
             my $enum_val = -1;
 
             foreach my $enum (@enum_subs) {
-                my ( $enum_name, $enum_value ) =
-                  $enum =~ /^([a-zA-Z_]\w*)(=.+)?$/;
+                my ( $enum_name, $enum_value ) = $enum =~ /^([a-zA-Z_]\w*)(=.+)?$/;
                 $enum_name or next;
                 $enum_value =~ s/^=//;
-                $enum_val =
-                  ( length($enum_value) ? $enum_value : $enum_val + 1 );
+                $enum_val = ( length($enum_value) ? $enum_value : $enum_val + 1 );
                 if ($opt_h) {
                     print OUT (
                         $t,
@@ -316,22 +299,17 @@ while ( defined( my $file = next_file() ) ) {
                     ++$eval_index;
                 }
                 else {
-                    print OUT (
-                        $t,
-                        "eval(\"sub $enum_name () \{ $enum_val; \}\") ",
-                        "unless defined(\&$enum_name);\n"
-                    );
+                    print OUT ( $t, "eval(\"sub $enum_name () \{ $enum_val; \}\") ", "unless defined(\&$enum_name);\n" );
                 }
             }
         }
-        elsif (
-            /^(?:__extension__\s+)?(?:extern|static)\s+(?:__)?inline(?:__)?\s+/
+        elsif ( /^(?:__extension__\s+)?(?:extern|static)\s+(?:__)?inline(?:__)?\s+/
             and !/;\s*$/
             and !/{\s*}\s*$/ )
         {    # { for vi
-             # This is a hack to parse the inline functions in the glibc headers.
-             # Warning: massive kludge ahead. We suppose inline functions
-             # are mainly constructed like macros.
+                # This is a hack to parse the inline functions in the glibc headers.
+                # Warning: massive kludge ahead. We suppose inline functions
+                # are mainly constructed like macros.
             while (1) {
                 last unless defined( $next = next_line($file) );
                 chomp $next;
@@ -347,8 +325,7 @@ while ( defined( my $file = next_file() ) ) {
 
             # violently drop #ifdefs
             s/#\s*if.*?#\s*endif//g
-              and print OUT
-              "# some #ifdef were dropped here -- fill in the blanks\n";
+              and print OUT "# some #ifdef were dropped here -- fill in the blanks\n";
             if (s/^(?:\w|\s|\*)*\s(\w+)\s*//) {
                 $name = $1;
             }
@@ -376,8 +353,7 @@ while ( defined( my $file = next_file() ) ) {
             expr();
 
             # try to find and perlify local C variables
-            our @local_variables =
-              ();               # needs to be a our(): (?{...}) bug workaround
+            our @local_variables = ();    # needs to be a our(): (?{...}) bug workaround
             {
                 use re "eval";
                 my $typelist = join '|', keys %isatype;
@@ -401,8 +377,8 @@ while ( defined( my $file = next_file() ) ) {
 		 [my \$$1;]gx;
             }
             $new =~ s/&$_\b/\$$_/g for @local_variables;
-            $new =~ s/(["\\])/\\$1/g; #"]);
-                                      # now that's almost like a macro (we hope)
+            $new =~ s/(["\\])/\\$1/g;    #"]);
+                                         # now that's almost like a macro (we hope)
             goto EMIT;
         }
     }
@@ -431,8 +407,8 @@ sub expr {
         $joined_args = join( '|', keys(%curargs) );
     }
     while ( $_ ne '' ) {
-        s/^\&\&// && do { $new .= " &&"; next; };    # handle && operator
-        s/^\&([\(a-z\)]+)/$1/i;    # hack for things that take the address of
+        s/^\&\&// && do { $new .= " &&"; next; };              # handle && operator
+        s/^\&([\(a-z\)]+)/$1/i;                                # hack for things that take the address of
         s/^(\s+)// && do { $new .= ' '; next; };
         s/^0X([0-9A-F]+)[UL]*//i
           && do {
@@ -441,8 +417,7 @@ sub expr {
             if ( length $hex > 8 && !$Config{use64bitint} ) {
 
                 # Croak if nv_preserves_uv_bits < 64 ?
-                $new .= hex( substr( $hex, -8 ) ) +
-                  2**32 * hex( substr( $hex, 0, -8 ) );
+                $new .= hex( substr( $hex, -8 ) ) + 2**32 * hex( substr( $hex, 0, -8 ) );
 
                 # The above will produce "errorneus" code
                 # if the hex constant was e.g. inside UINT64_C
@@ -498,7 +473,7 @@ sub expr {
         # Eliminate typedefs
         /\(([\w\s]+)[\*\s]*\)\s*[\w\(]/ && do {
             my $doit = 1;
-            foreach ( split /\s+/, $1 ) {   # Make sure all the words are types,
+            foreach ( split /\s+/, $1 ) {    # Make sure all the words are types,
                 unless ( $isatype{$_} or $_ eq 'struct' or $_ eq 'union' ) {
                     $doit = 0;
                     last;
@@ -616,7 +591,7 @@ sub next_line {
                 next READ;
             }
             if (
-                $in =~ /^extern inline / &&    # Inlined assembler.
+                $in =~ /^extern inline / &&                          # Inlined assembler.
                 $^O eq 'linux' && $file =~ m!(?:^|/)asm/[^/]+\.h$!
               )
             {
@@ -626,17 +601,17 @@ sub next_line {
                 $in = "";
                 next READ;
             }
-            if ( $in =~ s/\\$// ) {            # \-newline
+            if ( $in =~ s/\\$// ) {                                  # \-newline
                 $out .= ' ';
                 next READ;
             }
-            elsif ( $in =~ s/^([^"'\\\/]+)// ) {    # Passthrough
+            elsif ( $in =~ s/^([^"'\\\/]+)// ) {                     # Passthrough
                 $out .= $1;
             }
-            elsif ( $in =~ s/^(\\.)// ) {           # \...
+            elsif ( $in =~ s/^(\\.)// ) {                            # \...
                 $out .= $1;
             }
-            elsif ( $in =~ /^'/ ) {                 # '...
+            elsif ( $in =~ /^'/ ) {                                  # '...
                 if ( $in =~ s/^('(\\.|[^'\\])*')// ) {
                     $out .= $1;
                 }
@@ -644,7 +619,7 @@ sub next_line {
                     next READ;
                 }
             }
-            elsif ( $in =~ /^"/ ) {                 # "...
+            elsif ( $in =~ /^"/ ) {                                  # "...
                 if ( $in =~ s/^("(\\.|[^"\\])*")// ) {
                     $out .= $1;
                 }
@@ -652,19 +627,19 @@ sub next_line {
                     next READ;
                 }
             }
-            elsif ( $in =~ s/^\/\/.*// ) {          # //...
-                                                    # fall through
+            elsif ( $in =~ s/^\/\/.*// ) {                           # //...
+                                                                     # fall through
             }
-            elsif ( $in =~ m/^\/\*/ ) {             # /*...
-                    # C comment removal adapted from perlfaq6:
+            elsif ( $in =~ m/^\/\*/ ) {                              # /*...
+                                                                     # C comment removal adapted from perlfaq6:
                 if ( $in =~ s/^\/\*[^*]*\*+([^\/*][^*]*\*+)*\/// ) {
                     $out .= ' ';
                 }
-                else {    # Incomplete /* */
+                else {                                               # Incomplete /* */
                     next READ;
                 }
             }
-            elsif ( $in =~ s/^(\/)// ) {    # /...
+            elsif ( $in =~ s/^(\/)// ) {                             # /...
                 $out .= $1;
             }
             elsif ( $in =~ s/^([^\'\"\\\/]+)// ) {
@@ -775,8 +750,7 @@ sub link_if_possible {
             }
         }
         else {
-            print STDERR
-              "Could not symlink $target -> $Dest_dir/$dirlink:  $!\n";
+            print STDERR "Could not symlink $target -> $Dest_dir/$dirlink:  $!\n";
         }
     }
 }
@@ -813,16 +787,9 @@ sub queue_includes_from {
 # non-GCC?) C compilers, but gcc uses an additional include directory.
 sub inc_dirs {
     my $from_gcc = `LC_ALL=C $Config{cc} -v 2>&1`;
-    if ( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) )
-    {    # gcc-4+ :
+    if ( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) ) {    # gcc-4+ :
         $from_gcc = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`;
-        if (
-            !(
-                $from_gcc =~
-                s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s
-            )
-          )
-        {
+        if ( !( $from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s ) ) {
             $from_gcc = '';
         }
     }
@@ -875,8 +842,7 @@ sub build_preamble_if_necessary {
             print PREAMBLE "unless (defined &$_) { sub $_() { $1 } }\n\n";
         }
         elsif ( $define{$_} =~ /^\w+$/ ) {
-            print PREAMBLE
-              "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
+            print PREAMBLE "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
         }
         else {
             print PREAMBLE
@@ -892,8 +858,7 @@ sub build_preamble_if_necessary {
 # function with perl as the .h files do with cc.
 sub _extract_cc_defines {
     my %define;
-    my $allsymbols = join " ",
-      @Config{ 'ccsymbols', 'cppsymbols', 'cppccsymbols' };
+    my $allsymbols = join " ", @Config{ 'ccsymbols', 'cppsymbols', 'cppccsymbols' };
 
     # Split compiler pre-definitions into `key=value' pairs:
     while ( $allsymbols =~ /([^\s]+)=((\\\s|[^\s])+)/g ) {
diff --git a/bin/holical b/bin/holical
index 7b6145d6c..9065ace32 100755
--- a/bin/holical
+++ b/bin/holical
@@ -88,8 +88,7 @@ foreach my $year (@hyears) {
             my $offset;
             my ( $tmpdow, $tmpday, $tmpmonth, $tmpyear ) =
               split( /\,/, UnixDate( $tmpdate, "%w,%e,%B,%Y" ) );
-            print
-              "db: $tmpdow, $tmpday, $tmpmonth, $tmpyear -> $nday $dow{\"$nday\"}"
+            print "db: $tmpdow, $tmpday, $tmpmonth, $tmpyear -> $nday $dow{\"$nday\"}"
               if ( $DB > 1 );
             if ( lc $op eq "after" ) {
                 $offset = ( $dow{$nday} + $tmpdow ) % 7;
@@ -142,8 +141,7 @@ foreach my $year (@hyears) {
             }
 
             if ( $olddate and ( !$noweekend ) ) {
-                my ( $hyear1, $hmon1, $hday1 ) =
-                  $olddate =~ /(\d\d\d\d)(\d\d)(\d\d)/;
+                my ( $hyear1, $hmon1, $hday1 ) = $olddate =~ /(\d\d\d\d)(\d\d)(\d\d)/;
 
                 #strip leading zeros
                 $hmon1 =~ s/^0*//g;
@@ -171,8 +169,7 @@ $calendar->add_properties( method => "PUBLISH", );
 foreach my $line (@icaldata) {
     my ( $year, $month, $day, $summary ) = split /\t/, $line;
     my $event = Data::ICal::Entry::Event->new();
-    my $start =
-      Date::ICal->new( year => $year, month => $month, day => $day )->ical;
+    my $start = Date::ICal->new( year => $year, month => $month, day => $day )->ical;
 
     #	my $end = $start->clone;
     my $end = $start;
@@ -186,8 +183,8 @@ foreach my $line (@icaldata) {
 
         #description => "FreeFormText.\\nMore FreeFormText.\\n\\n",
         #dtstart     => Date::ICal->new( epoch => time )->ical,
-        dtstart => $start,    #->ical (localtime => 1),
-        dtend   => $end,      #->ical (localtime => 1),
+        dtstart => $start,                                   #->ical (localtime => 1),
+        dtend   => $end,                                     #->ical (localtime => 1),
         dtstamp => Date::ICal->new( epoch => time )->ical,
 
         #class       => "PUBLIC",
@@ -216,11 +213,9 @@ sub print_help {
 
     print "Help:	$progname $version\n";
     print "usage:	$progname [-h]\n";
-    print
-      "	$progname [-y year(s)] [-y +year(s)] [-f output_file] [-n] region_file_definition\n";
+    print "	$progname [-y year(s)] [-y +year(s)] [-f output_file] [-n] region_file_definition\n";
     print "	-h: Help\n";
-    print
-      "	-y: Year(s) to generate, comma separated list (ie, 2006,2007,2008)\n";
+    print "	-y: Year(s) to generate, comma separated list (ie, 2006,2007,2008)\n";
     print "	    current year is used if no year(s) specified\n";
     print "	or\n";
     print "	-y: + additional years to generate from current year\n";
diff --git a/bin/ical2vsdb b/bin/ical2vsdb
index d42eb827c..112891383 100755
--- a/bin/ical2vsdb
+++ b/bin/ical2vsdb
@@ -43,9 +43,8 @@ my $progname = "ical2vsdb";
 my $progver  = "v4 01-2014";
 my $DB       = 0;
 
-my $days_before =
-  -180;    # defaults to avoid large vsdb databases, can be overriden
-my $days_after = 180;    #
+my $days_before = -180;    # defaults to avoid large vsdb databases, can be overriden
+my $days_after  = 180;     #
 
 my $config_file    = "";
 my $config_version = 2;
@@ -140,16 +139,11 @@ while (1) {
             print "Fetching via LWP:$method...";
             my $req = new HTTP::Request GET => $method . "://" . $calendar_loc;
             if ( $ical_data[$loop]->{username} ) {
-                $req->authorization_basic(
-                    $ical_data[$loop]->{username},
-                    $ical_data[$loop]->{password}
-                );
+                $req->authorization_basic( $ical_data[$loop]->{username}, $ical_data[$loop]->{password} );
             }
             my $results = $ua->request($req);
             if ( !( $results->is_success ) ) {
-                print
-                  "Error.\nThe calendar specified by $calendar_loc could not be retrieved: "
-                  . $results->status_line . "\n";
+                print "Error.\nThe calendar specified by $calendar_loc could not be retrieved: " . $results->status_line . "\n";
             }
             else {
                 $data = $results->content;
@@ -243,10 +237,8 @@ while (1) {
         print "Updating databases for @changed_icals ...\n";
 
         #print Dumper @master_cal;
-        update_db( "$output_dir/$vsdb_cal_file", \@changed_icals,
-            \@master_cal );
-        update_db( "$output_dir/$vsdb_todo_file", \@changed_icals,
-            \@master_todo );
+        update_db( "$output_dir/$vsdb_cal_file",  \@changed_icals, \@master_cal );
+        update_db( "$output_dir/$vsdb_todo_file", \@changed_icals, \@master_todo );
         print "done\n";
     }
 
@@ -298,9 +290,7 @@ sub update_db {
                       if ( $objDB->FieldValue('SOURCE') =~ m/ical=$ical/i );
                 }
                 if ($delete) {
-                    print "Deleting "
-                      . $objDB->FieldValue("ID")
-                      . " source=$delete\n"
+                    print "Deleting " . $objDB->FieldValue("ID") . " source=$delete\n"
                       if $DB;
                     $objDB->Delete();
                 }
@@ -358,8 +348,7 @@ sub parse_cal {
 
     my $caldesc = $cal->{cals}->[0]->{'X-WR-CALDESC'};
     $caldesc = "none" if !$caldesc;
-    my ( $lsec, $lmin, $lhour, $lday, $lmon, $lyear, $t4, $t5, $t6 ) =
-      localtime();
+    my ( $lsec, $lmin, $lhour, $lday, $lmon, $lyear, $t4, $t5, $t6 ) = localtime();
     $lyear += 1900;
     $lmon++;
     $lsec = "00" if ( $lsec == 0 );
@@ -367,20 +356,10 @@ sub parse_cal {
     my $source = "ical=$calname";
 
     if ( $date_format =~ /ddmm/i ) {
-        $source .=
-            " sync=$lday" . "/"
-          . $lmon . "/"
-          . "$lyear $lhour" . ":"
-          . $lmin . ":"
-          . $lsec;
+        $source .= " sync=$lday" . "/" . $lmon . "/" . "$lyear $lhour" . ":" . $lmin . ":" . $lsec;
     }
     else {
-        $source .=
-            " sync=$lmon" . "/"
-          . $lday . "/"
-          . "$lyear $lhour" . ":"
-          . $lmin . ":"
-          . $lsec;
+        $source .= " sync=$lmon" . "/" . $lday . "/" . "$lyear $lhour" . ":" . $lmin . ":" . $lsec;
     }
     push @out_info, $calname;
     push @out_info, $caldesc;
@@ -391,19 +370,14 @@ sub parse_cal {
         while ( my $month = each %{ $cal->{events}->{$year} } ) {
             while ( my $day = each %{ $cal->{events}->{$year}->{$month} } ) {
                 print ".";    #give some progress
-                while ( my $uid =
-                    each %{ $cal->{events}->{$year}->{$month}->{$day} } )
-                {
+                while ( my $uid = each %{ $cal->{events}->{$year}->{$month}->{$day} } ) {
                     my $delta;
 
                     #is this event in range?
                     if ( $days_before or $days_after ) {
-                        $delta =
-                          Delta_Days( $lyear, $lmon, $lday, $year, $month,
-                            $day );
+                        $delta = Delta_Days( $lyear, $lmon, $lday, $year, $month, $day );
                     }
-                    print
-                      "EventID:$uid, before=$days_before after=$days_after delta=$delta\n"
+                    print "EventID:$uid, before=$days_before after=$days_after delta=$delta\n"
                       if ( $DB > 2 );
 
                     #if not then skip the item
@@ -414,9 +388,8 @@ sub parse_cal {
                     print "Processing EventID:$uid\n" if ( $DB > 2 );
                     my $event_ref =
                       $cal->{events}->{$year}->{$month}->{$day}->{$uid};
-                    my $starttime = "12:00 am"
-                      ; # starttime and endtime are initialized the same if all day
-                    my $endtime = "12:00 am";
+                    my $starttime = "12:00 am";    # starttime and endtime are initialized the same if all day
+                    my $endtime   = "12:00 am";
 
                     #What is the time of the event, or is it all day?
                     if ( not defined( $event_ref->{allday} ) ) {
@@ -425,17 +398,15 @@ sub parse_cal {
                         my $am_pm = ( $starthour >= 12 ) ? "pm" : "am";
                         $starthour = ( $starthour + 11 ) % 12 + 1;
                         $starttime =
-                          sprintf( "%2s", $starthour ) . ":"
-                          . sprintf( "%02s",
-                            $event_ref->{DTSTART}->{local_c}->{minute} )
+                            sprintf( "%2s", $starthour ) . ":"
+                          . sprintf( "%02s", $event_ref->{DTSTART}->{local_c}->{minute} )
                           . " $am_pm";
                         my $endhour = $event_ref->{DTEND}->{local_c}->{hour};
                         $am_pm = ( $endhour >= 12 ) ? "pm" : "am";
                         $endhour = ( $endhour + 11 ) % 12 + 1;
                         $endtime =
-                          sprintf( "%2s", $endhour ) . ":"
-                          . sprintf( "%02s",
-                            $event_ref->{DTEND}->{local_c}->{minute} )
+                            sprintf( "%2s", $endhour ) . ":"
+                          . sprintf( "%02s", $event_ref->{DTEND}->{local_c}->{minute} )
                           . " $am_pm";
                     }
 
@@ -443,8 +414,7 @@ sub parse_cal {
                     if ( $event_ref->{VALARM} ) {
                         foreach my $alarm ( @{ $event_ref->{VALARM} } ) {
                             if ( $alarm->{when} && $event_ref->{DTSTART} ) {
-                                my $duration =
-                                  $event_ref->{DTSTART} - $alarm->{when};
+                                my $duration = $event_ref->{DTSTART} - $alarm->{when};
                                 $reminder .= ($reminder) ? ',' : '';
                                 if ( $duration->delta_days ) {
                                     $reminder .= $duration->delta_days . 'd';
@@ -476,8 +446,7 @@ sub parse_cal {
 
                     #package all the ical data up in a hash
 
-                    $out_cals[$count]->{DATE} =
-                      $year . "." . $month . "." . $day;
+                    $out_cals[$count]->{DATE}     = $year . "." . $month . "." . $day;
                     $out_cals[$count]->{TIME}     = $starttime;
                     $out_cals[$count]->{EVENT}    = $event_ref->{SUMMARY};
                     $out_cals[$count]->{CATEGORY} = $event_ref->{CATEGORIES};
@@ -505,8 +474,7 @@ sub parse_cal {
             $completed = "Yes" if ( $todo->{STATUS} eq "COMPLETED" );
         }
         $completed = "Yes"
-          if ( defined $todo->{COMPLETED} )
-          ;    #some older ical servers don't have status
+          if ( defined $todo->{COMPLETED} );    #some older ical servers don't have status
         print "db: task=" . $todo->{SUMMARY} . " status=" if ($DB);
         print $todo->{STATUS} if ( ( defined $todo->{STATUS} ) and ($DB) );
         print " complete=" if ($DB);
@@ -525,15 +493,11 @@ sub parse_cal {
 
             if ( $date_format =~ /ddmm/i ) {
                 $duedate =
-                    $todo->{DUE}->{local_c}->{day} . "/"
-                  . $todo->{DUE}->{local_c}->{month} . "/"
-                  . $todo->{DUE}->{local_c}->{year};
+                  $todo->{DUE}->{local_c}->{day} . "/" . $todo->{DUE}->{local_c}->{month} . "/" . $todo->{DUE}->{local_c}->{year};
             }
             else {
                 $duedate =
-                    $todo->{DUE}->{local_c}->{month} . "/"
-                  . $todo->{DUE}->{local_c}->{day} . "/"
-                  . $todo->{DUE}->{local_c}->{year};
+                  $todo->{DUE}->{local_c}->{month} . "/" . $todo->{DUE}->{local_c}->{day} . "/" . $todo->{DUE}->{local_c}->{year};
             }
             if (    $todo->{DTSTART}->{local_c}->{day}
                 and $todo->{DTSTART}->{local_c}->{month}
@@ -555,18 +519,12 @@ sub parse_cal {
             my $endhour = $todo->{DUE}->{local_c}->{hour};
             my $am_pm = ( $endhour >= 12 ) ? "pm" : "am";
             $endhour = ( $endhour + 11 ) % 12 + 1;
-            $duetime =
-                sprintf( "%2s", $endhour ) . ":"
-              . sprintf( "%02s", $todo->{DUE}->{local_c}->{minute} )
-              . " $am_pm";
+            $duetime = sprintf( "%2s", $endhour ) . ":" . sprintf( "%02s", $todo->{DUE}->{local_c}->{minute} ) . " $am_pm";
             $duetime = '' if $duetime =~ /0:00/;
             my $starthour = $todo->{DTSTART}->{local_c}->{hour};
-            $am_pm = ( $starthour >= 12 ) ? "pm" : "am";
+            $am_pm     = ( $starthour >= 12 ) ? "pm" : "am";
             $starthour = ( $starthour + 11 ) % 12 + 1;
-            $starttime =
-                sprintf( "%2s", $starthour ) . ":"
-              . sprintf( "%02s", $todo->{DTSTART}->{local_c}->{minute} )
-              . " $am_pm";
+            $starttime = sprintf( "%2s", $starthour ) . ":" . sprintf( "%02s", $todo->{DTSTART}->{local_c}->{minute} ) . " $am_pm";
             $starttime = '' if $duetime =~ /0:00/;
         }
         my $reminder = '';
@@ -667,17 +625,14 @@ sub init {
                 $ical_data[$count]->{options}->{$key} = $value;
             }
             $ical_data[$count]->{hash} = "none";
-            print
-              "Applying second level ical parsing (set nodscfix if this breaks anything) ...\n"
+            print "Applying second level ical parsing (set nodscfix if this breaks anything) ...\n"
               unless ( exists $ical_data[$count]->{options}->{nodcsfix} );
 
             my ( $method, $loc ) = split( /:\/\//, $url );
             if ($loc) {
-                my ( $username, $password, $uri ) =
-                  $loc =~ /^(\S+):(\S+)@(\S+)/i;
+                my ( $username, $password, $uri ) = $loc =~ /^(\S+):(\S+)@(\S+)/i;
                 if ( $username and $password ) {
-                    print
-                      "parsed username: $username and password: $password and uri: $uri\n"
+                    print "parsed username: $username and password: $password and uri: $uri\n"
                       if ($DB);
                     $loc                           = $uri;
                     $ical_data[$count]->{username} = $username;
@@ -710,14 +665,12 @@ sub init {
     print "Error: No iCals to Process!\n" if ( $count == 0 );
 
     if ( !-e "$output_dir/$vsdb_cal_file" ) {
-        print
-          "Error: Target Calendar file not found at $output_dir/$vsdb_cal_file!\n";
+        print "Error: Target Calendar file not found at $output_dir/$vsdb_cal_file!\n";
         $count = 0;
     }
 
     if ( !-e "$output_dir/$vsdb_todo_file" ) {
-        print
-          "Error: Target Todo file not found at $output_dir/$vsdb_todo_file!\n";
+        print "Error: Target Todo file not found at $output_dir/$vsdb_todo_file!\n";
         $count = 0;
     }
 
@@ -733,10 +686,8 @@ sub help {
     print " -- CONFIG FILE SYNTAX -- \n";
     print "TYPE<tab>VALUE<tab>option\n\n";
     print "TYPE = cfg_version|ical|days_before|days_after|sleep\n";
-    print
-      "VALUE = parameter value or ical location (http://, file://, dir://)\n";
-    print
-      "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,\n";
+    print "VALUE = parameter value or ical location (http://, file://, dir://)\n";
+    print "OPTION = comma delimited values (holiday,name=Joe User,speak_todos,vacation,\n";
     print "			control, nodcsfix, nosync_dtstamp)\n";
     print "\n";
 
@@ -791,8 +742,7 @@ sub cache_local {
         return;
     }
     open( CACHE, ">$local_cache/$filename.ics" )
-      || warn
-      "Error: Cannot write local cache file $local_cache/$filename.ics!";
+      || warn "Error: Cannot write local cache file $local_cache/$filename.ics!";
     print CACHE $data;
 
     close(CACHE);
@@ -801,8 +751,7 @@ sub cache_local {
 sub purge_icals {
 
     my $output_dir = $ARGV[1];
-    my @vsdb_files =
-      ( "$output_dir/$vsdb_cal_file", "$output_dir/$vsdb_todo_file" );
+    my @vsdb_files = ( "$output_dir/$vsdb_cal_file", "$output_dir/$vsdb_todo_file" );
 
     foreach my $filename (@vsdb_files) {
         print "Purging iCal information from $filename...";
diff --git a/bin/ical_load b/bin/ical_load
index db590e7da..4d9ee1c6d 100755
--- a/bin/ical_load
+++ b/bin/ical_load
@@ -24,26 +24,18 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 use Getopt::Long;
 my (%parms);
-if (
-    !&GetOptions(
-        \%parms,     "calendar_file=s", "quiet",  "debug",
-        "pl_file=s", "date=s",          "days=s", "h",
-        "help"
-    )
+if (  !&GetOptions( \%parms, "calendar_file=s", "quiet", "debug", "pl_file=s", "date=s", "days=s", "h", "help" )
     or @ARGV > 0
     or $parms{h}
-    or $parms{help}
-  )
+    or $parms{help} )
 {
     print <<eof;
    
@@ -93,22 +85,19 @@ my ($ical_cmd);    # Globals
 
 sub setup {
 
-    require 'handy_utilities.pl'
-      ;            # For misc. functions (e.g. time/date stamp routines)
+    require 'handy_utilities.pl';    # For misc. functions (e.g. time/date stamp routines)
 
     # Setup the defaults
-    $parms{date} = &time_date_stamp(11) unless $parms{date};  # Returns mm/dd/yy
+    $parms{date} = &time_date_stamp(11) unless $parms{date};    # Returns mm/dd/yy
     $parms{days} = 0 unless $parms{days};
     $parms{date_end} = &time_date_stamp( 11, time + 3600 * 24 * $parms{days} );
 
     $ical_cmd = "ical -list ";
     $ical_cmd .= " -calendar $parms{calendar}" if $parms{calendar};
     $ical_cmd .= " -date $parms{date}"         if $parms{date};
-    $ical_cmd .=
-      " -show +$parms{days}";  #always want days otherwise it will default to 1.
+    $ical_cmd .= " -show +$parms{days}";                        #always want days otherwise it will default to 1.
 
-    print
-      "$Pgm_Name: Searching calendar: Start: $parms{date}  Stop: $parms{date_end}\n\n"
+    print "$Pgm_Name: Searching calendar: Start: $parms{date}  Stop: $parms{date_end}\n\n"
       unless $parms{quiet};
 
     open( PL, ">$parms{pl_file}" )
@@ -152,13 +141,11 @@ sub find_items {
         my $start_datetime = $event_date . " " . $start;
         my $end_datetime   = $event_date . " " . $end;
         $subject =~ s/\s+/ /g;
-        printf( "start=%15s end=%15s   subject=%s\n\n",
-            $start_datetime, $end_datetime, $subject )
+        printf( "start=%15s end=%15s   subject=%s\n\n", $start_datetime, $end_datetime, $subject )
           unless $parms{quiet};
 
         if ( my ( $channel, $show ) = $subject =~ /^ *vcr +(\d+) +(.+)/i ) {
-            &create_vcr_event( $start_datetime, $end_datetime, $channel,
-                $show );
+            &create_vcr_event( $start_datetime, $end_datetime, $channel, $show );
         }
         &create_other_event( $start_datetime, $subject )
           unless !$start and !$subject;
@@ -171,22 +158,19 @@ sub find_items {
             &parse_event;
             next LINE;
         }
-        if (/^[A-Z]/)
-        {    # dates always start first column, nothing else does, i hope.
+        if (/^[A-Z]/) {    # dates always start first column, nothing else does, i hope.
             s/,//g;
             my ( $event_wday, $event_month, $event_day, $event_year ) =
               split '\s+';
-            my $longedate =
-              str2time( $event_month . " " . $event_day . " " . $event_year );
+            my $longedate = str2time( $event_month . " " . $event_day . " " . $event_year );
             $event_date = &time_date_stamp( 11, $longedate );
             next LINE;
         }
-        if (/^ \*/)
-        {    # times always start second column preceeded by an asterick.
-                # all day events with no time are also here.
+        if (/^ \*/) {      # times always start second column preceeded by an asterick.
+                           # all day events with no time are also here.
             &parse_event if $subject;
 
-            s/^ \*//g;    # get rid of that stupid asterick.
+            s/^ \*//g;     # get rid of that stupid asterick.
 
             if (/:\d\d[ap]m/i) {    # got a timed event
                 s/to //g;
@@ -216,8 +200,7 @@ sub create_vcr_event {
         $channel_commified = "0,$channel";
     }
     else {
-        $channel_commified =
-          substr( $channel, 0, 1 ) . "," . substr( $channel, 1, 1 );
+        $channel_commified = substr( $channel, 0, 1 ) . "," . substr( $channel, 1, 1 );
     }
 
     print "VCR on channel $channel from $start to $end\n" unless $parms{quiet};
diff --git a/bin/image_index b/bin/image_index
index 9d5bf1e12..6a3b044dd 100755
--- a/bin/image_index
+++ b/bin/image_index
@@ -67,8 +67,7 @@ sub get_img() {
         return unless $ext and $ext =~ /(jpg|gif)/i;
         return if $root =~ /^${prefix}_/;
         my $file_icon = "${prefix}_$root.$ext";
-        $html .=
-          qq[<td>$file<br><a href="$file"><img src="$file_icon"></a></td>\n];
+        $html .= qq[<td>$file<br><a href="$file"><img src="$file_icon"></a></td>\n];
         $html .= qq[</tr><tr>\n] unless ++$count % 4;
     }
 }
diff --git a/bin/image_resize b/bin/image_resize
index ccb183eda..0a864da15 100755
--- a/bin/image_resize
+++ b/bin/image_resize
@@ -89,14 +89,8 @@ use File::Find;
 use Getopt::Long;
 
 # Declare parms and defaults
-my (
-    $size,   $dir,  $exts, $border,  $replace, $annotate,
-    $prefix, $skip, $help, $verbose, $colorfill
-  )
-  = (
-    '640x480', '', 'bmp,gif,jpg,jpeg,mng,pcd,pcx,png,tga,tiff,xpm',
-    1, 0, 0, 'sm1', '', 0, 0, 'black'
-  );
+my ( $size, $dir, $exts, $border, $replace, $annotate, $prefix, $skip, $help, $verbose, $colorfill ) =
+  ( '640x480', '', 'bmp,gif,jpg,jpeg,mng,pcd,pcx,png,tga,tiff,xpm', 1, 0, 0, 'sm1', '', 0, 0, 'black' );
 my ( %exts, $rc, %counts, $file_in, $file_out, $outdir );
 $counts{resized} = $counts{existed} = 0;
 
@@ -140,8 +134,7 @@ if ( $file_in and $file_out ) {
 else {
     find( { wanted => \&get_img, no_chdir => 1 }, $dir );
 }
-print
-  " - Resized $counts{resized} images ($counts{existed} images not replaced)\n";
+print " - Resized $counts{resized} images ($counts{existed} images not replaced)\n";
 
 sub get_img() {
     my $full_file = $_;
diff --git a/bin/mh b/bin/mh
index a1315e43d..04971e694 100755
--- a/bin/mh
+++ b/bin/mh
@@ -33,8 +33,7 @@ $SIG{__DIE__} = sub { Carp::confess(@_) };
 my ( $Pgm_Name, $Revision, $usage );
 
 # So we can get at it from other packages
-use vars
-  qw(%config_parms %config_parms_startup $Pgm_Path $Version $Version_date %Info);
+use vars qw(%config_parms %config_parms_startup $Pgm_Path $Version $Version_date %Info);
 
 BEGIN {
     $Info{Perl_compiled} = 'perl2exe'
@@ -112,8 +111,7 @@ eof
 }
 
 # Use var instead of my so we can get these in the http_server.pl scripts
-use vars
-  qw($Time_Start_time $Time_Stop_time $Time_Increment $Time_Startup $Time_Startup_time $Time_Boot_time $Time_Uptime_Seconds);
+use vars qw($Time_Start_time $Time_Stop_time $Time_Increment $Time_Startup $Time_Startup_time $Time_Boot_time $Time_Uptime_Seconds);
 use vars
   qw($Time_Sunrise $Time_Sunrise_Twilight $Time_Sunset $Time_Sunset_Twilight %Moon $Time_Now $Time_Date $Date_Now $Date_Now_Speakable $Year_Month_Now);
 use vars qw($Time $Second $Minute $Hour $Mday $Wday $Day $Month $Year);
@@ -127,46 +125,32 @@ use vars qw(%User_Code @Code_Dirs @Generic_Serial_Ports %Misc);
 use vars qw(%Run_Members);
 
 my ($Pgm_PathU);
-my (
-    $Loop_Speed,     @Loop_Speeds, $Loop_Sleep_Time,
-    $Loop_Tk_Passes, $Web_Play_Index
-);
-my (
-    @Requested_Files, @Print_Log,      @Print_Log_Time, @Display_Log,
-    @Speak_Log,       @Speak_Log_Time, @Error_Log,      @Error_Log_Time
-);
-
-my ( $exit_flag, $xcmd_file, %file_code_times, %file_code_times2,
-    %file_change_times );
-my ( @Loop_Code, @Sub_Code, %Sub_Code, %Run_Members, %Run_Members_Error_Count,
-    %Benchmark_Members, @Item_Code, @Item_Code_Objects );
-my %custom_child_windows
-  ;    #subs by window_name, display sub checks and calls sub to create window
-my ( $user_code, $user_code_last_good );
+my ( $Loop_Speed, @Loop_Speeds, $Loop_Sleep_Time, $Loop_Tk_Passes, $Web_Play_Index );
+my ( @Requested_Files, @Print_Log, @Print_Log_Time, @Display_Log, @Speak_Log, @Speak_Log_Time, @Error_Log, @Error_Log_Time );
+
+my ( $exit_flag, $xcmd_file, %file_code_times, %file_code_times2, %file_change_times );
+my ( @Loop_Code, @Sub_Code, %Sub_Code, %Run_Members, %Run_Members_Error_Count, %Benchmark_Members, @Item_Code, @Item_Code_Objects );
+my %custom_child_windows;    #subs by window_name, display sub checks and calls sub to create window
+my ( $user_code,              $user_code_last_good );
 my ( %objects_by_object_name, %file_by_object_name, %files_by_webname );
-my (
-    %object_names_by_file,    %object_names_by_type,
-    %object_names_by_webname, $pause_mode
-);
-my ( @Server_Ports, @Generic_Devices, %Local_Addresses, @Local_Addresses,
-    %Passwords, @Password_Allow_Clients );
-my ( %proxy_servers, %app_parms );
-my ( $CON_IN,        $CON_OUT );
-
-my ( $state, $temp );    # Some generic useful vars
-
-use vars '%Tk_objects', '%Tk_results', '@Tk_widgets',
-  '@Object_Types';        # So we can use in http_server
-use vars '$MW';           # So that programs that we 'do' can use the top window
-use vars '%Serial_Ports'; # So we can get at it from the Serial_Item package.
+my ( %object_names_by_file,   %object_names_by_type, %object_names_by_webname, $pause_mode );
+my ( @Server_Ports,           @Generic_Devices, %Local_Addresses, @Local_Addresses, %Passwords, @Password_Allow_Clients );
+my ( %proxy_servers,          %app_parms );
+my ( $CON_IN,                 $CON_OUT );
+
+my ( $state, $temp );        # Some generic useful vars
+
+use vars '%Tk_objects', '%Tk_results', '@Tk_widgets', '@Object_Types';    # So we can use in http_server
+use vars '$MW';                                                           # So that programs that we 'do' can use the top window
+use vars '%Serial_Ports';                                                 # So we can get at it from the Serial_Item package.
 use vars '%Generic_Devices';
 use vars '%Socket_Ports';
 use vars '%Save', '%Flags';
-use vars '%Persistent';        # Uses Dumper for dynamic objects e.g. timers.pl
+use vars '%Persistent';                                                   # Uses Dumper for dynamic objects e.g. timers.pl
 use vars '$OS_win';
-use vars '%Password_Allow';    # So we can see check it from http_server.pl
-use vars '%Disabled_Commands'; # So we can access fro Voice_Cmd.pm
-use vars '$Pgm_Root';          # So we can see it in eval var subs in read_parms
+use vars '%Password_Allow';                                               # So we can see check it from http_server.pl
+use vars '%Disabled_Commands';                                            # So we can access fro Voice_Cmd.pm
+use vars '$Pgm_Root';                                                     # So we can see it in eval var subs in read_parms
 use vars '$DNS_resolver';
 use vars '%cm11_objects';
 use vars '%ti103_objects';
@@ -221,8 +205,7 @@ BEGIN {
     sub setup_INC {
 
         # For some weird reason, we get a startup abend this is evaled after we change INC with perl2exe :(
-        eval
-          "use Win32::Setupsup qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText)"
+        eval "use Win32::Setupsup qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText)"
           if $Info{Perl_compiled};
 
         # Pick local mh modules first, over any site install ones
@@ -246,8 +229,7 @@ BEGIN {
                 push @INC, "${Pgm_Path}/../lib/site_win512";
             }
         }
-        require 'handy_utilities.pl'
-          ;    # For misc. functions (e.g. time/date stamp routines)
+        require 'handy_utilities.pl';    # For misc. functions (e.g. time/date stamp routines)
     }
 
     sub check_for_run_cmd {
@@ -275,13 +257,13 @@ BEGIN {
 
     sub print_version {
 
-        $Version_date = localtime( ( stat $0 )[9] );    #this script as default
+        $Version_date = localtime( ( stat $0 )[9] );                      #this script as default
         $Version_date = localtime( ( stat "$Pgm_Path/bin/$0.exe" )[9] )
           if $PerlApp::BUILD;
         $Version_date = localtime( ( stat $ENV{sourceExe} )[9] )
-          if $ENV{sourceExe};                           # Older 3.x perl2exe
+          if $ENV{sourceExe};                                             # Older 3.x perl2exe
         $Version_date = localtime( ( stat '../VERSION' )[9] )
-          if ( -e '../VERSION' );    #if VERSION file exists use that
+          if ( -e '../VERSION' );                                         #if VERSION file exists use that
 
         #Get version date for unstable branch
         my $autover;
@@ -297,9 +279,8 @@ BEGIN {
               if ( $build_date =~ /^\d\d\d\d-\d\d-\d\d/ );
         }
 
-        $Pgm_PathU = '.'
-          ; # Since we now chdir, this is obsolete, but still used in some user code :(
-        $Pgm_Root = './..';
+        $Pgm_PathU = '.';      # Since we now chdir, this is obsolete, but still used in some user code :(
+        $Pgm_Root  = './..';
 
         $OS_win = ( $^O eq "MSWin32" ) ? 1 : 0;
 
@@ -337,10 +318,8 @@ BEGIN {
         # Use eval to avoid problems with earlier version (e.g. build 502)
         $Info{Perl_version} .= " Build " . buildNumber() if $OS_win;
         print "Perl version: $Info{Perl_version}\n";
-        print
-          "OS   version: $^O $Info{OS_name} $Info{OS_version} $Info{OS_filesystem}\n";
-        print
-          "Other       : user=$Info{User} pid=$$ box=$Info{Machine} cpu=$ENV{PROCESSOR_ARCHITECTURE}-$ENV{PROCESSOR_LEVEL}\n";
+        print "OS   version: $^O $Info{OS_name} $Info{OS_version} $Info{OS_filesystem}\n";
+        print "Other       : user=$Info{User} pid=$$ box=$Info{Machine} cpu=$ENV{PROCESSOR_ARCHITECTURE}-$ENV{PROCESSOR_LEVEL}\n";
         print "\n";
 
     }
@@ -375,14 +354,8 @@ EOF
             push( @parms2, "$1=s" ) if /^([^\s\#\=]+)\s*=/;
         }
         use Getopt::Long;
-        if (
-            !&GetOptions(
-                \%config_parms_startup, "h",
-                "help",                 "run=s",
-                "run_parms=s",          @parms2
-            )
-            or ( $config_parms_startup{h} or $config_parms_startup{help} )
-          )
+        if ( !&GetOptions( \%config_parms_startup, "h", "help", "run=s", "run_parms=s", @parms2 )
+            or ( $config_parms_startup{h} or $config_parms_startup{help} ) )
         {
             print $usage;
             exit;
@@ -393,8 +366,7 @@ EOF
 
             # Avoid an odd problem with Win32::Process ... it restarts the main process!
             if ( $^O eq "MSWin32" and $PAR::VERSION ) {
-                print
-                  "\nWarning:  -log_file causes problems with Windows mhe.exe.\n";
+                print "\nWarning:  -log_file causes problems with Windows mhe.exe.\n";
                 print "Instead, use redirection like: mh > debug.log\n\n";
             }
             else {
@@ -426,35 +398,25 @@ EOF
         print "Read parameter files: @files\n";
         if ( $config_parms{code_dir} eq "$Pgm_Root/code/test" ) {
             print "\n" . '*' x 80 . "\n";
-            print
-              "Warning, you should create your own code directory outside of the main\n";
-            print
-              "distribution directory and point code_dir to it.  Otherwise, you may lose\n";
+            print "Warning, you should create your own code directory outside of the main\n";
+            print "distribution directory and point code_dir to it.  Otherwise, you may lose\n";
             print "your customizations on upgrades.\n";
             print '*' x 80 . "\n\n";
         }
         if ( $config_parms{data_dir} eq "$Pgm_Root/data" ) {
             print "\n" . '*' x 80 . "\n";
-            print
-              "Warning, you should create your own data directory outside of the main\n";
-            print
-              "distribution directory and point data_dir to it.  Otherwise, you may lose\n";
-            print
-              "your customizations on upgrades.  The best way to accomplish this is to copy\n";
-            print
-              "the entire contents of the standard data directory into a new directory.\n";
+            print "Warning, you should create your own data directory outside of the main\n";
+            print "distribution directory and point data_dir to it.  Otherwise, you may lose\n";
+            print "your customizations on upgrades.  The best way to accomplish this is to copy\n";
+            print "the entire contents of the standard data directory into a new directory.\n";
             print '*' x 80 . "\n\n";
         }
 
         # Read in speak parms per application
-        &main::read_parm_hash( \%{ $app_parms{speak} },
-            $main::config_parms{speak_apps_default} );
-        &main::read_parm_hash( \%{ $app_parms{speak} },
-            $main::config_parms{speak_apps} );
-        &main::read_parm_hash( \%{ $app_parms{display} },
-            $main::config_parms{display_apps_default} );
-        &main::read_parm_hash( \%{ $app_parms{display} },
-            $main::config_parms{display_apps} );
+        &main::read_parm_hash( \%{ $app_parms{speak} },   $main::config_parms{speak_apps_default} );
+        &main::read_parm_hash( \%{ $app_parms{speak} },   $main::config_parms{speak_apps} );
+        &main::read_parm_hash( \%{ $app_parms{display} }, $main::config_parms{display_apps_default} );
+        &main::read_parm_hash( \%{ $app_parms{display} }, $main::config_parms{display_apps} );
 
         # We need to honor starup parms, but a total reset messes up the tk debug button interface
         #       %config_parms = (%config_parms, %config_parms_startup); # Last one (startup parms) wins
@@ -479,7 +441,7 @@ EOF
                 # Allow for multiple debugs like serial;x10
                 for my $debug ( split /[,|;]/, lc $config_parms{debug} ) {
                     $debug =~ s/^\s+|\s+$//g;    #Trim whitespace
-                        # Allow for debug level like: x10:4
+                                                 # Allow for debug level like: x10:4
                     next unless $debug;
                     if ( $debug =~ /\s*(\S+)\s*:\s*(\d+)\s*/ ) {
                         $Debug{$1} = $2;
@@ -509,36 +471,29 @@ EOF
         $config_parms{pulse_port} = "4713" unless $config_parms{pulse_port};
 
         # Set the Pulseaudio Environment variable
-        $ENV{PULSE_SERVER} =
-            $config_parms{pulse_protocol} . ":"
-          . $config_parms{pulse_server} . ":"
-          . $config_parms{pulse_port};
+        $ENV{PULSE_SERVER} = $config_parms{pulse_protocol} . ":" . $config_parms{pulse_server} . ":" . $config_parms{pulse_port};
         @Code_Dirs = split ',', $config_parms{code_dir};
         push @Code_Dirs, $config_parms{code_dir_common};
-        for (@Code_Dirs) { s/^\s*//; s/\s*$//; }; # Drop leading and trailing blanks
+        for (@Code_Dirs) { s/^\s*//; s/\s*$//; };    # Drop leading and trailing blanks
         print "Code Directories:\n - ", join( "\n - ", @Code_Dirs ), "\n";
 
         # If first time, add default selected modules
         use File::Copy;
 
         # Grandfather old style file
-        move "$config_parms{data_dir}/select_code.txt",
-          "$config_parms{data_dir}/code_select.txt"
+        move "$config_parms{data_dir}/select_code.txt", "$config_parms{data_dir}/code_select.txt"
           unless -e "$config_parms{data_dir}/code_select.txt";
-        move "$config_parms{data_dir}/select_code2.txt",
-          "$config_parms{data_dir}/code_unselect.txt"
+        move "$config_parms{data_dir}/select_code2.txt", "$config_parms{data_dir}/code_unselect.txt"
           unless -e "$config_parms{data_dir}/code_unselect.txt";
 
         # Get default files from the distro if needed
-        copy "$Pgm_Root/data/$config_parms{code_select}",
-          $config_parms{data_dir}
+        copy "$Pgm_Root/data/$config_parms{code_select}", $config_parms{data_dir}
           unless -e "$config_parms{data_dir}/$config_parms{code_select}";
-        copy "$Pgm_Root/data/$config_parms{code_unselect}",
-          $config_parms{data_dir}
+        copy "$Pgm_Root/data/$config_parms{code_unselect}", $config_parms{data_dir}
           unless -e "$config_parms{data_dir}/$config_parms{code_unselect}";
 
-        unshift @INC, @Code_Dirs;   # So we can add/override .pm modules locally
-                                    # So we can add/override .pl modules locally
+        unshift @INC, @Code_Dirs;    # So we can add/override .pm modules locally
+                                     # So we can add/override .pl modules locally
         if ( $config_parms{lib_dir} ) {
             print "User   Lib  Directory: $config_parms{lib_dir}\n";
             unshift @INC, split( ',', $config_parms{lib_dir} );
@@ -594,8 +549,7 @@ EOF
             # Note: Must use eval, not my_use, or exported pgms are not seen :(
             #  - Loaded from: http://jenda.krynicky.cz/perl/
             #  - For some reason, perl2exe binary abends here, so we evaled it earlier
-            eval
-              "use Win32::Setupsup qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText)"
+            eval "use Win32::Setupsup qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText)"
               unless $Info{Perl_compiled};
             print "\nError in loading module=Win32::Setupsup:\n  $@\n" if $@;
 
@@ -604,45 +558,37 @@ EOF
 
             &my_use("Win32::SerialPort");
 
-            &my_use("File::DosGlob 'glob'")
-              ;    # Allow for globbing without perlglob.exe
+            &my_use("File::DosGlob 'glob'");    # Allow for globbing without perlglob.exe
 
             # Older Win32 perls do not have this
             eval "Win32::Sound::Volume";
             if ($@) {
-                print
-                  "\nWin32::Sound::Volume not installed ... volume control is disabled\n\n";
+                print "\nWin32::Sound::Volume not installed ... volume control is disabled\n\n";
             }
             else {
                 $Info{Volume_Control} = 'Win32::Sound';
             }
 
         }
-        else {    # load the mutually-exclusive non-Windows modules
-            &my_use("Device::SerialPort")
-              ;   # Unix Posix verion of Win32 SerialPort
-                  # Used for $Keyboard.  Messes up background mh, so is optional
-                  #  - no way to detect if we are in the foreground??
+        else {                                  # load the mutually-exclusive non-Windows modules
+            &my_use("Device::SerialPort");      # Unix Posix verion of Win32 SerialPort
+                                                # Used for $Keyboard.  Messes up background mh, so is optional
+                                                #  - no way to detect if we are in the foreground??
             eval "use Term::ReadKey" if $config_parms{term} eq 'readkey';
-            print
-              "\nTerm::ReadKey not installed ... keyboard monitoring disabled\n\n"
+            print "\nTerm::ReadKey not installed ... keyboard monitoring disabled\n\n"
               if $@;
-            eval "use Time::HiRes('gettimeofday')"
-              ;    # Used for gettimeofday for sub-second timing
+            eval "use Time::HiRes('gettimeofday')";    # Used for gettimeofday for sub-second timing
             if ($@) {
-                print
-                  "\nTime::HiRes not installed ... benchmark timing is disabled\n\n";
+                print "\nTime::HiRes not installed ... benchmark timing is disabled\n\n";
                 $Info{HiRes} = 0;
             }
             else {
                 $Info{HiRes} = 1;
             }
             if ( $main::Info{OS_name} eq "linux" ) {
-                eval "use Audio::Mixer"
-                  ;    # Used in mh/code/common/mh_sound.pl volume control
+                eval "use Audio::Mixer";               # Used in mh/code/common/mh_sound.pl volume control
                 if ($@) {
-                    print
-                      "\nAudio::Mixer not installed ... volume control is disabled\n\n";
+                    print "\nAudio::Mixer not installed ... volume control is disabled\n\n";
                 }
                 else {
                     $Info{Volume_Control} = 'Audio::Mixer';
@@ -656,8 +602,7 @@ EOF
         if ( $config_parms{gd} ) {
             eval "use GD";
             if ($@) {
-                print
-                  "Error in use GD: $@\n\nTo disable this error, set mh.ini parm gd=0\n\n";
+                print "Error in use GD: $@\n\nTo disable this error, set mh.ini parm gd=0\n\n";
             }
             elsif ( $GD::VERSION and $GD::VERSION < 1.19 ) {
                 print "GD version needs to be > 1.18. Version=$GD::VERSION\n";
@@ -676,8 +621,7 @@ EOF
             print "Version $Tk::VERSION\n";
 
             if ($@) {
-                print
-                  "\nError, perl Tk module is not installed.\nTk windows will be disabled with the -tk 0 option. Error:$@\n\n";
+                print "\nError, perl Tk module is not installed.\nTk windows will be disabled with the -tk 0 option. Error:$@\n\n";
                 $config_parms{tk} = 0;
             }
             else {
@@ -695,8 +639,7 @@ EOF
         if ( $config_parms{rrd_dir} ) {
             eval "use RRDs";
             if ($@) {
-                print
-                  "\nError, perl RRDs.pm is not installed.\n  - Either install or unset the rrd_dir mh.ini parm\n\n";
+                print "\nError, perl RRDs.pm is not installed.\n  - Either install or unset the rrd_dir mh.ini parm\n\n";
                 $config_parms{rrd_dir} = '';
             }
         }
@@ -728,8 +671,7 @@ sub setup {
 
     #   use HTTP::Date qw(time2str str2time);
     use HTTP::Date qw(time2str);
-    use Date::Parse qw(str2time)
-      ;           # This str2time is more robust than the HTTP::Date one
+    use Date::Parse qw(str2time);    # This str2time is more robust than the HTTP::Date one
 
     #   use Data::Dumper qw(Dumper DumperX);
     use Data::Dumper;
@@ -740,14 +682,13 @@ sub setup {
     use IO::Socket;
 
     #   use IO::Socket::INET;       # Gives us the INADDR constants, used in xAP.pm ... not in 5.0 :(
-    use LWP::Simple;  # For pgms like set_clock that need to grab data from urls
+    use LWP::Simple;    # For pgms like set_clock that need to grab data from urls
 
     #   use MIME::Base64;           # Needed for uudecode/uuencode in http_server and mhsend_server
-    use Net::FTP;     # For uploading stuff
+    use Net::FTP;       # For uploading stuff
     use Text::Wrap;
 
-    eval
-      "use Lingua::Num2Word";  # converts numbers to text for multiple languages
+    eval "use Lingua::Num2Word";    # converts numbers to text for multiple languages
     print "Eval error on Error in use: $@\n" if $@;
 
     # These Text modules are used in &phrase_match
@@ -757,15 +698,13 @@ sub setup {
     # but the non-XS version is too slow.  Use the XS version if installed,
     # otherwise we use a simple but fast exact word match distance function.
     {
-        local $SIG{__WARN__} =
-          sub { };    # Disable 5.8 "Can't locate auto/..." message
+        local $SIG{__WARN__} = sub { };    # Disable 5.8 "Can't locate auto/..." message
         eval 'use Text::LevenshteinXS qw(distance)';
-        eval
-          'print " - using simple Text distance function\n"; sub distance { return $_[0] ne $_[1] }'
+        eval 'print " - using simple Text distance function\n"; sub distance { return $_[0] ne $_[1] }'
           if $@;
     }
-    use Time::Local;          # For timelocal
-    use Time::DaysInMonth;    # For days_in (and is_leap?)
+    use Time::Local;                       # For timelocal
+    use Time::DaysInMonth;                 # For days_in (and is_leap?)
 
     # Date::Manip needs it in ISO 8601 form: +-HHMM
     # Hmmm, this messes up str2time from Date::Parse
@@ -783,8 +722,7 @@ sub setup {
 
     #    exit;
 
-    use Timer
-      ;    # This needs to be first, as it is used in Voice_Cmd (and elsewhere?)
+    use Timer;                            # This needs to be first, as it is used in Voice_Cmd (and elsewhere?)
     use File_Item;
     use Generic_Item;
     use Device_Item;
@@ -822,7 +760,7 @@ sub setup {
     use Voice_Cmd;
     use Voice_Text;
 
-    use Caller_ID;  # Old module ... keep for a while for backward compatability
+    use Caller_ID;    # Old module ... keep for a while for backward compatability
 
     #    use Telephony_Item;
     #    use CID_Lookup;
@@ -855,8 +793,7 @@ sub setup {
 
     eval "use JSON";    # Used in mh/lib/json_server.pl JSON Web Attributes
     if ($@) {
-        print
-          "\nJSON not installed or didnt correctly initialize... JSON is disabled\n\n";
+        print "\nJSON not installed or didnt correctly initialize... JSON is disabled\n\n";
     }
     else {
         require 'json_server.pl';
@@ -878,9 +815,8 @@ sub setup {
     $SIG{KILL}  = \&sig_handler;            # Exit cleanly with a kill signal
     $SIG{TERM}  = \&sig_handler;            # Exit cleanly with a kill signal
     $SIG{HUP}   = \&read_code
-      if !$OS_win;    # Reload code (alias mhreload per info in mh.ini file)
-    $SIG{PIPE} = \&sig_handler_pipe
-      ;    # Web browsers can shut down sockets while we are sending data
+      if !$OS_win;                          # Reload code (alias mhreload per info in mh.ini file)
+    $SIG{PIPE} = \&sig_handler_pipe;        # Web browsers can shut down sockets while we are sending data
 
     #   $SIG{CHLD}  = 'IGNORE';                   # So we don't create zombies when forking
 
@@ -914,8 +850,7 @@ sub setup {
     mkdir( "$config_parms{html_dir}/tv/clicktv", 0777 )
       unless -d "$config_parms{html_dir}/tv/clicktv";
 
-    $Time_Date = &time_date_stamp( $config_parms{time_format_log}, $Time )
-      ;    # Needed by print_log
+    $Time_Date = &time_date_stamp( $config_parms{time_format_log}, $Time );    # Needed by print_log
 
     &open_logs;
 
@@ -962,8 +897,7 @@ sub setup {
         my $pretty_port_name = $port_name;
         $pretty_port_name =~ s/_/\x20/g;    # a slight improvement
 
-        printf " - creating %-15s on %3s %s %5s %s\n", $pretty_port_name,
-          $proto, $address, $port, $datatype;
+        printf " - creating %-15s on %3s %s %5s %s\n", $pretty_port_name, $proto, $address, $port, $datatype;
 
         $Socket_Ports{$port_name}{port}     = $port;
         $Socket_Ports{$port_name}{protocol} = lc $proto;
@@ -1032,8 +966,7 @@ sub setup {
                   if $Debug{startup};
                 require "$module.pm";
                 eval "&${module}::${type}_startup('$instance')";
-                print
-                  "Startup error on &${module}::${type}_startup('$instance'): $@\n"
+                print "Startup error on &${module}::${type}_startup('$instance'): $@\n"
                   if $@;
             }
             else {
@@ -1052,8 +985,7 @@ sub setup {
             {
                 #               -e "$config_parms{code_dir}/$module") {
                 my $startup = "&$config_parms{$parm}" . '::startup';
-                print
-                  "Found managed $module module\nMH will now require $module and call $startup\n"
+                print "Found managed $module module\nMH will now require $module and call $startup\n"
                   if $Debug{startup};
                 require $module;
                 eval $startup;
@@ -1078,9 +1010,7 @@ sub setup {
             my $address = $1;
             printf " - creating %-15s proxy on %s\n", $interface, $address;
             next if $proxy_servers{$address};    # Only need/want one
-            $proxy_servers{$address} =
-              new Socket_Item( undef, undef, $address, undef, undef, undef,
-                "\035" );
+            $proxy_servers{$address} = new Socket_Item( undef, undef, $address, undef, undef, undef, "\035" );
             $proxy_servers{$address}->start;
         }
     }
@@ -1088,11 +1018,7 @@ sub setup {
     if ( $config_parms{weeder_port} ) {
         $config_parms{weeder_baudrate} = 1200
           unless $config_parms{weeder_baudrate};
-        &serial_port_create(
-            'weeder',
-            $config_parms{weeder_port},
-            $config_parms{weeder_baudrate}, 'dtr'
-        );
+        &serial_port_create( 'weeder', $config_parms{weeder_port}, $config_parms{weeder_baudrate}, 'dtr' );
         $Serial_Ports{weeder}{process_data} = 1;
     }
 
@@ -1101,19 +1027,13 @@ sub setup {
     if ( $config_parms{cm11_bak_port} && !$config_parms{cm11_port} ) {
         $config_parms{cm11_port} = $config_parms{cm11_bak_port};
         undef $config_parms{cm11_bak_port};
-        print
-          "Warning: a backup CM11 was configured without a main CM11. The backup will be used as the main unit\n";
+        print "Warning: a backup CM11 was configured without a main CM11. The backup will be used as the main unit\n";
     }
 
     if ( $config_parms{cm11_port} ) {
         require 'ControlX10/CM11.pm';
-        if (
-            &serial_port_create(
-                'cm11', $config_parms{cm11_port},
-                4800, 'none'
-            )
-          )
-        {
+        if ( &serial_port_create( 'cm11', $config_parms{cm11_port}, 4800, 'none' ) ) {
+
             # Reset the CM11 so we don't get old X10 incoming data
             # This will also set the cm11 $POWER_RESET flag that
             # that mh_control $Power_Supply will look for to detect power fails
@@ -1127,13 +1047,7 @@ sub setup {
 
     # Initialise the backup CM11 if we have one
     if ( $config_parms{cm11_bak_port} ) {
-        if (
-            &serial_port_create(
-                'cm11_bak', $config_parms{cm11_bak_port},
-                4800, 'none'
-            )
-          )
-        {
+        if ( &serial_port_create( 'cm11_bak', $config_parms{cm11_bak_port}, 4800, 'none' ) ) {
             &ControlX10::CM11::read( $Serial_Ports{cm11_bak}{object}, 1 );
             &ControlX10::CM11::setClock( $Serial_Ports{cm11_bak}{object} );
             $cm11_objects{bak_timer}  = new Timer;
@@ -1143,13 +1057,7 @@ sub setup {
 
     if ( $config_parms{ti103_port} ) {
         require 'TI103.pm';
-        if (
-            &serial_port_create(
-                'ti103', $config_parms{ti103_port},
-                19200, 'none'
-            )
-          )
-        {
+        if ( &serial_port_create( 'ti103', $config_parms{ti103_port}, 19200, 'none' ) ) {
             &ControlX10::TI103::read( $Serial_Ports{ti103}{object}, 1 );
             $ti103_objects{timer}  = new Timer;
             $ti103_objects{active} = new Generic_Item;
@@ -1159,48 +1067,27 @@ sub setup {
     if ( $config_parms{Homevision_port} ) {
         require 'Homevision.pm';
         my ($speed) = $config_parms{Homevision_baudrate} || 9600;
-        if (
-            &serial_port_create(
-                'Homevision', $config_parms{Homevision_port},
-                $speed,       'none'
-            )
-          )
-        {
-            &Homevision::init( $Serial_Ports{Homevision}{object} )
-              ;    # Turn on Echo mode
+        if ( &serial_port_create( 'Homevision', $config_parms{Homevision_port}, $speed, 'none' ) ) {
+            &Homevision::init( $Serial_Ports{Homevision}{object} );    # Turn on Echo mode
         }
     }
     if ( $config_parms{Marrick_port} ) {
         require 'Marrick.pm';
         my ($speed) = $config_parms{Marrick_baudrate} || 9600;
-        if (
-            &serial_port_create(
-                'Marrick', $config_parms{Marrick_port},
-                $speed, 'none'
-            )
-          )
-        {
+        if ( &serial_port_create( 'Marrick', $config_parms{Marrick_port}, $speed, 'none' ) ) {
             &Marrick::init( $Serial_Ports{Marrick}{object} );
         }
     }
     if ( $config_parms{HomeBase_port} ) {
         require 'HomeBase.pm';
         my ($speed) = $config_parms{HomeBase_baudrate} || 9600;
-        if (
-            &serial_port_create(
-                'HomeBase', $config_parms{HomeBase_port},
-                $speed, 'none'
-            )
-          )
-        {
-            &HomeBase::init( $Serial_Ports{HomeBase}{object} )
-              ;    # Turn on Echo mode
+        if ( &serial_port_create( 'HomeBase', $config_parms{HomeBase_port}, $speed, 'none' ) ) {
+            &HomeBase::init( $Serial_Ports{HomeBase}{object} );    # Turn on Echo mode
         }
     }
     if ( $config_parms{ncpuxa_port} ) {
         require 'ncpuxa_mh.pm';
-        &ncpuxa_mh::init( $config_parms{ncpuxa_port} )
-          ;        # Create socket connection
+        &ncpuxa_mh::init( $config_parms{ncpuxa_port} );            # Create socket connection
     }
     if ( $config_parms{use_wish} && $^O eq 'linux' && -d '/dev/x10/' ) {
 
@@ -1222,8 +1109,7 @@ sub setup {
 
     # Store boot time in seconds since epoc
     if ($OS_win) {
-        $Time_Boot_time =
-          time - &get_tickcount / 1000;   # Gettickcount starts at computer boot
+        $Time_Boot_time = time - &get_tickcount / 1000;    # Gettickcount starts at computer boot
     }
     elsif ( $^O eq 'linux' or $^O eq 'cygwin' ) {
 
@@ -1277,13 +1163,12 @@ sub setup {
 
     $Time = time;
 
-    ( $Second, $Minute, $Hour, $Mday, $Month, $Year ) =
-      localtime $Time;    # Needed in my_str2time;
+    ( $Second, $Minute, $Hour, $Mday, $Month, $Year ) = localtime $Time;    # Needed in my_str2time;
 
     $Month++;
 
-    &persistent_restore();    # Populate %Save
-    &setup_DBI();             # Create optional $DBI database interface
+    &persistent_restore();                                                  # Populate %Save
+    &setup_DBI();                                                           # Create optional $DBI database interface
 
     use vars '$Catchup_Mode';
     $Catchup_Mode = new Generic_Item;
@@ -1300,9 +1185,7 @@ sub setup {
         #       $Loop_Tk_Passes  = 1;
         $Time_Start_time = &my_str2time($time_start);
         set $Catchup_Mode 'startup';
-        $Time =
-          $Time_Start_time -
-          $Time_Increment;    # Cause we start the loop with an increment
+        $Time = $Time_Start_time - $Time_Increment;    # Cause we start the loop with an increment
         print "time_start=$time_start -> $Time_Start_time \n";
     }
     if ( $config_parms{time_stop} =~ /\S/ ) {
@@ -1334,17 +1217,15 @@ sub setup {
       if $config_parms{xcmd_file};
 
     $config_parms{html_dir} = $config_parms{html_root}
-      if $config_parms{html_root};   # Grandfather in the old name for this parm
+      if $config_parms{html_root};    # Grandfather in the old name for this parm
 
-    print
-      " - HTML file     : $config_parms{html_dir}$config_parms{html_file}\n";
-    print
-      "\nError, HTML file not found: $config_parms{html_dir}/$config_parms{html_file}\n\n"
+    print " - HTML file     : $config_parms{html_dir}$config_parms{html_file}\n";
+    print "\nError, HTML file not found: $config_parms{html_dir}/$config_parms{html_file}\n\n"
       unless -e "$config_parms{html_dir}/$config_parms{html_file}";
 
     @Requested_Files = @ARGV;
 
-    &password_read(1);               ## force initial read
+    &password_read(1);                ## force initial read
 
     # Perl 5.004+ will self-randomize
     #   srand(time() ^ ($$ + ($$ << 15)) ); # Set the random number seed, used in time_random;
@@ -1433,16 +1314,14 @@ sub set_by_to_target {
     my @objectList = ();
     while ( ref $set_by and $set_by->can('get_set_by') ) {
         if ( grep( $set_by->{object_name} eq $_, @objectList ) ) {
-            &print_log( "BUG! set_by loop detected with these objects: "
-                  . join( ', ', @objectList ) );
+            &print_log( "BUG! set_by loop detected with these objects: " . join( ', ', @objectList ) );
             last;
         }
         push( @objectList, $set_by->{object_name} );
         my $predecessor = $set_by->get_set_by();
         last
           if $predecessor
-          and $predecessor eq
-          $set_by;    # comment this line out to detect self-setting objects
+          and $predecessor eq $set_by;    # comment this line out to detect self-setting objects
         $set_by = $predecessor;
     }
 
@@ -1461,7 +1340,7 @@ sub register_custom_window {
 
     return if !$config_parms{tk};
 
-    $menu = 1 unless defined $menu;   # default is to provide an activation menu
+    $menu = 1 unless defined $menu;    # default is to provide an activation menu
 
     my $label = ucfirst($app) . ' ' . ucfirst($window);
     $label = $title if $title;
@@ -1469,13 +1348,11 @@ sub register_custom_window {
     my $sub = eval( "sub { &open_$app" . "_" . $window . "_window() }" );
     if ($dialog) {
         $Tk_objects{ "menu_tools_" . $app . "_" . $window } =
-          $Tk_objects{menu_tools}
-          ->command( -label => "$label...", -command => $sub )
+          $Tk_objects{menu_tools}->command( -label => "$label...", -command => $sub )
           unless $Tk_objects{ "menu_tools_" . $app . "_" . $window };
     }
     else {
-        $Tk_objects{ "menu_view_" . $app . "_" . $window } =
-          $Tk_objects{menu_view}->command( -label => $label, -command => $sub )
+        $Tk_objects{ "menu_view_" . $app . "_" . $window } = $Tk_objects{menu_view}->command( -label => $label, -command => $sub )
           unless $Tk_objects{ "menu_view_" . $app . "_" . $window };
     }
 
@@ -1505,14 +1382,14 @@ sub load_child_window {
     my $help    = $parms{help};          # just text for the moment
 
     $wait = 1
-      unless defined $wait;  # Do not activate (window remains hidden on return)
+      unless defined $wait;              # Do not activate (window remains hidden on return)
 
     $title = ucfirst($app) unless $title;
 
     my %parms2 = qw//;
     $parms2{time}        = 0;
     $parms2{wait}        = $wait;
-    $parms2{app}         = $app;      # was missing before!
+    $parms2{app}         = $app;         # was missing before!
     $parms2{window_name} = $window;
     $parms2{title}       = $title;
     $parms2{text}        = $text;
@@ -1520,14 +1397,12 @@ sub load_child_window {
 
     my $win = new Display(%parms2);
 
-    if ( $win and defined $buttons and !$win->{activated} )
-    {    # 1 = Close, 2 = OK/Cancel, 3=OK/Cancel/Apply
+    if ( $win and defined $buttons and !$win->{activated} ) {    # 1 = Close, 2 = OK/Cancel, 3=OK/Cancel/Apply
         $win->{MW}{bottom_frame}->configure( -borderwidth => 4 );
         if ($help) {
             my $tk;
-            my $fb = $win->{MW}{bottom_frame};
-            my $sub =
-              eval "sub { &display('app=help window_name=topic time=0 $help')}";
+            my $fb  = $win->{MW}{bottom_frame};
+            my $sub = eval "sub { &display('app=help window_name=topic time=0 $help')}";
             $tk = $fb->Button( -text => 'Help', -command => $sub );
             $tk->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
@@ -1536,50 +1411,31 @@ sub load_child_window {
         if ( $buttons == 1 ) {
             my $tk;
             my $sub = eval "sub { \$win->destroy() }";
-            $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'Close', -command => $sub )
-              ->pack( -side => 'right' );
+            $tk = $win->{MW}{bottom_frame}->Button( -text => 'Close', -command => $sub )->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
         }
         elsif ( $buttons == 2 ) {
             my $tk;
             my $sub = eval "sub { \$win->{canceled} = 1; \$win->destroy() }";
-            $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'Cancel', -command => $sub )
-              ->pack( -side => 'right' );
+            $tk = $win->{MW}{bottom_frame}->Button( -text => 'Cancel', -command => $sub )->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
-            $sub =
-              "sub { \$win->destroy() unless &$parms{app}_$parms{window_name}_window_saving(\$win) }";
+            $sub = "sub { \$win->destroy() unless &$parms{app}_$parms{window_name}_window_saving(\$win) }";
             $sub = eval($sub);
-            $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'OK', -command => $sub )
-              ->pack( -side => 'right' );
+            $tk  = $win->{MW}{bottom_frame}->Button( -text => 'OK', -command => $sub )->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
         }
         else {
             my $tk;
-            my $sub = eval
-              "sub { $win->destroy() unless &$parms{app}_$parms{window_name}_window_saving(\$win) }";
-            $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'OK', -command => $sub )
-              ->pack( -side => 'right' );
+            my $sub = eval "sub { $win->destroy() unless &$parms{app}_$parms{window_name}_window_saving(\$win) }";
+            $tk = $win->{MW}{bottom_frame}->Button( -text => 'OK', -command => $sub )->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
             $sub = eval "sub { $win->{canceled} = 1; $win->destroy() }";
-            $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'Cancel', -command => $sub )
-              ->pack( -side => 'right' );
+            $tk = $win->{MW}{bottom_frame}->Button( -text => 'Cancel', -command => $sub )->pack( -side => 'right' );
             &configure_element( 'button', \$tk );
-            $sub =
-              eval "sub { &$parms{app}_$parms{window_name}_window_saving() }";
+            $sub = eval "sub { &$parms{app}_$parms{window_name}_window_saving() }";
             $tk =
-              $win->{MW}{bottom_frame}
-              ->Button( -text => 'Apply', -command => $sub )
-              ->pack( -side => 'right' ) & configure_element( 'button', \$tk );
+              $win->{MW}{bottom_frame}->Button( -text => 'Apply', -command => $sub )->pack( -side => 'right' ) &
+              configure_element( 'button', \$tk );
 
         }
     }
@@ -1633,8 +1489,7 @@ sub ${location}_hooks     { return run_hooks_( '$location', \@_ ) }
         }
 
         unless ( ref $hook eq 'CODE' ) {
-            print
-              "add_hook: Hook must be a code reference, loc=$location hook=$hook\n";
+            print "add_hook: Hook must be a code reference, loc=$location hook=$hook\n";
             return 0;
         }
 
@@ -1655,8 +1510,7 @@ sub ${location}_hooks     { return run_hooks_( '$location', \@_ ) }
         my ( $location, $hook ) = @_;
 
         unless ( defined( $hook_locations{$location} ) ) {
-            print
-              "drop_hook: Invalid hook location, loc=$location hook=$hook\n";
+            print "drop_hook: Invalid hook location, loc=$location hook=$hook\n";
             return 0;
         }
 
@@ -1681,8 +1535,7 @@ sub ${location}_hooks     { return run_hooks_( '$location', \@_ ) }
 
     sub get_hooks_ {
         my ($location) = @_;
-        return
-          defined $hook_pointers{$location}
+        return defined $hook_pointers{$location}
           ? @{ $hook_pointers{$location} }
           : ();
     }
@@ -1768,18 +1621,14 @@ sub browser {
     run qq[$config_parms{browser} "$file"];
 }
 
-my (
-    $loop_tickcount1, $loop_tickcount2, $loop_tickcount3,
-    $loop_tickcount4, $loop_tickcount_total
-);
+my ( $loop_tickcount1, $loop_tickcount2, $loop_tickcount3, $loop_tickcount4, $loop_tickcount_total );
 my ( $loop_sleep_total, $Disable );
 
 sub check_for_action {
     &exit_pgm if $exit_flag;
 
     # Avoid -w uninitialzed value warnings
-    $loop_tickcount1 = $loop_tickcount2 = $loop_tickcount3 = $loop_tickcount4 =
-      $loop_tickcount_total = 0
+    $loop_tickcount1 = $loop_tickcount2 = $loop_tickcount3 = $loop_tickcount4 = $loop_tickcount_total = 0
       if $Startup;
     $loop_tickcount1 = &get_tickcount;
 
@@ -1791,8 +1640,7 @@ sub check_for_action {
           if $Loop_Tk_Passes <= 0;     # Make sure we make at least one pass
         for ( 1 .. $Loop_Tk_Passes ) {
             my $tk_activity;
-            $tk_activity = DoOneEvent(0xFF)
-              ;    # Avoid Constants ... we get compile errors if -tk 0
+            $tk_activity = DoOneEvent(0xFF);    # Avoid Constants ... we get compile errors if -tk 0
 
             #           $tk_activity = DoOneEvent(DONT_WAIT | ALL_EVENTS);
             #           $tk_activity = DoOneEvent(0x1E);
@@ -1800,8 +1648,7 @@ sub check_for_action {
         }
     }
     $Disable = 0
-      unless
-      $Disable;    # Debug run times problems by turning off sections of code
+      unless $Disable;    # Debug run times problems by turning off sections of code
 
     &check_for_keyboard_input   unless $Disable == 1;
     &check_for_nextpass_actions unless $Disable == 2;
@@ -1810,11 +1657,9 @@ sub check_for_action {
     &set_global_vars unless $Disable == 3;
     &Process_Item::harvest unless $Disable == 4;    # Check for done processes
     &Generic_Item::reset_states
-      unless $Disable ==
-      5;    # Reset states for all objects that are 'ISA Item' objects
+      unless $Disable == 5;    # Reset states for all objects that are 'ISA Item' objects
     &Voice_Cmd::check_for_voice_cmd
-      unless $Disable == 6
-      ; # Do this even if VR is not installed, so we can do web and manual run_voice_cmd
+      unless $Disable == 6;    # Do this even if VR is not installed, so we can do web and manual run_voice_cmd
     &check_for_proxy_data            unless $Disable == 7;
     &check_for_serial_data           unless $Disable == 8;
     &check_for_socket_data_http      unless $Disable == 9;
@@ -1865,8 +1710,7 @@ sub check_for_action {
                 -underline   => 0
               )->pack( -side => 'left', -padx => 0 )
               unless $Tk_objects{menu_modules};
-            $Tk_objects{menu_modules}->menu->delete( 0, 'end' )
-              ;    # Delete old menus
+            $Tk_objects{menu_modules}->menu->delete( 0, 'end' );    # Delete old menus
             &configure_element( 'window', \$Tk_objects{menu_modules} );
 
             $Tk_objects{menu_modules}->command(
@@ -1878,15 +1722,11 @@ sub check_for_action {
             my $i;
 
             for ( sort keys %Run_Members ) {
-                $Tk_objects{menu_modules}
-                  ->checkbutton( -label => $_, -variable => \$Run_Members{$_} );
+                $Tk_objects{menu_modules}->checkbutton( -label => $_, -variable => \$Run_Members{$_} );
                 last
-                  if $i++ > (
-                    (
-                        defined $config_parms{tk_module_menu_max}
-                          and $config_parms{tk_module_menu_max}
-                    ) ? $config_parms{tk_module_menu_max} : 50
-                  );
+                  if $i++ > ( ( defined $config_parms{tk_module_menu_max} and $config_parms{tk_module_menu_max} )
+                    ? $config_parms{tk_module_menu_max}
+                    : 50 );
             }
 
             my $tb_align =
@@ -1901,8 +1741,7 @@ sub check_for_action {
             $Tk_objects{toolbar}->destroy() if $Tk_objects{toolbar};
 
             $Tk_objects{toolbar} =
-              $MW->ToolBar( '-movable', 1, '-side', "$tb_align",
-                '-indicatorcolor', 'blue', '-sticky', 'nsew' );
+              $MW->ToolBar( '-movable', 1, '-side', "$tb_align", '-indicatorcolor', 'blue', '-sticky', 'nsew' );
 
             my $tb = $Tk_objects{toolbar};
 
@@ -1952,8 +1791,7 @@ sub check_for_action {
 
             tk_toolbar_add_button( $tb, \%button );
 
-            if ( $Run_Members{'internet_mail'} )
-            {    # ugly (20-line email scan belongs in lib or in here)
+            if ( $Run_Members{'internet_mail'} ) {    # ugly (20-line email scan belongs in lib or in here)
 
                 my $sep = $tb->separator();
 
@@ -1962,10 +1800,9 @@ sub check_for_action {
                 # Calling voice command for this is absurd of course (see above)
 
                 my %button = (
-                    'text'  => 'Check email',
-                    'image' => 'mailget22',
-                    'command' =>
-                      sub { run_voice_cmd( 'check for e mail', 0, 'tk' ) }
+                    'text'    => 'Check email',
+                    'image'   => 'mailget22',
+                    'command' => sub { run_voice_cmd( 'check for e mail', 0, 'tk' ) }
                 );    # *** Goofy vc name too
 
                 tk_toolbar_add_button( $tb, \%button );
@@ -2073,11 +1910,9 @@ sub check_for_action {
 
             $tb->separator();
 
-            %button =
-              ( 'text' => 'Help', 'image' => 'acthelp22', 'command' => \&help );
+            %button = ( 'text' => 'Help', 'image' => 'acthelp22', 'command' => \&help );
 
-            $Tk_objects{toolbar_help_button} =
-              tk_toolbar_add_button( $tb, \%button );
+            $Tk_objects{toolbar_help_button} = tk_toolbar_add_button( $tb, \%button );
 
             unless ( $Tk_objects{menu_help} ) {
 
@@ -2168,9 +2003,7 @@ sub check_for_ti103_data {
 
     #       if ($data_d == 0x5a) {
     if ( $data_d == 0x5a or $data_d == 0xa5 ) {
-        if ( $data =
-            &ControlX10::TI103::receive_buffer( $Serial_Ports{ti103}{object} ) )
-        {
+        if ( $data = &ControlX10::TI103::receive_buffer( $Serial_Ports{ti103}{object} ) ) {
             &process_serial_data( "X" . $data );
         }
     }
@@ -2189,12 +2022,7 @@ sub check_for_cm11_data {
 
         #       if ($data_d == 0x5a) {
         if ( $data_d == 0x5a or $data_d == 0xa5 ) {
-            if (
-                $data = &ControlX10::CM11::receive_buffer(
-                    $Serial_Ports{cm11}{object}
-                )
-              )
-            {
+            if ( $data = &ControlX10::CM11::receive_buffer( $Serial_Ports{cm11}{object} ) ) {
                 &process_serial_data( "X" . $data );
             }
         }
@@ -2202,15 +2030,13 @@ sub check_for_cm11_data {
 
     # Dual cm11 code
     else {
-        my $data = &ControlX10::CM11::read( $Serial_Ports{cm11}{object}, 1 );
-        my $data_bak =
-          &ControlX10::CM11::read( $Serial_Ports{cm11_bak}{object}, 1 )
+        my $data     = &ControlX10::CM11::read( $Serial_Ports{cm11}{object},     1 );
+        my $data_bak = &ControlX10::CM11::read( $Serial_Ports{cm11_bak}{object}, 1 )
           if $config_parms{cm11_bak_port};
 
         my $heartbeat = $config_parms{cm11_heartbeat};
         $heartbeat = -1
-          unless
-          $heartbeat;    # setting heartbeat to -1 disables the functionality
+          unless $heartbeat;    # setting heartbeat to -1 disables the functionality
 
         # restart the timers if we've got data from them
         if ($data) {
@@ -2250,17 +2076,14 @@ sub check_for_cm11_data {
         $data = &ControlX10::CM11::receive_buffer( $Serial_Ports{cm11}{object} )
           if ( $data && ( $data_d == 0x5a or $data_d == 0xa5 ) );
 
-        $data_bak =
-          &ControlX10::CM11::receive_buffer( $Serial_Ports{cm11_bak}{object} )
+        $data_bak = &ControlX10::CM11::receive_buffer( $Serial_Ports{cm11_bak}{object} )
           if ( $data_bak && ( $data_d_bak == 0x5a or $data_d_bak == 0xa5 ) );
 
         if ( $heartbeat != -1 ) {
             if ( $cm11_objects{timer}->inactive() ) {
                 print "db CM11 cm11_timer has expired... testing... "
                   if $Debug{cm11};
-                if ( &ControlX10::CM11::ping_cm11( $Serial_Ports{cm11}{object} )
-                  )
-                {
+                if ( &ControlX10::CM11::ping_cm11( $Serial_Ports{cm11}{object} ) ) {
                     $cm11_objects{active}->set(ON);
                     print "alive\n" if $Debug{cm11};
                 }
@@ -2276,12 +2099,7 @@ sub check_for_cm11_data {
             {
                 print "db CM11 cm11_bak_timer has expired... testing... "
                   if $Debug{cm11};
-                if (
-                    &ControlX10::CM11::ping_cm11(
-                        $Serial_Ports{cm11_bak}{object}
-                    )
-                  )
-                {
+                if ( &ControlX10::CM11::ping_cm11( $Serial_Ports{cm11_bak}{object} ) ) {
                     $cm11_objects{bak_active}->set(ON);
                     print "alive\n" if $Debug{cm11};
                 }
@@ -2341,8 +2159,7 @@ sub check_for_generic_serial_data {
 
     $Serial_Ports{$port_name}{data} .= $data if defined $data;
 
-    print
-      "  serial name=$port_name type=$Serial_Ports{$port_name}{datatype} data2=\n$Serial_Ports{$port_name}{data}\n---\n"
+    print "  serial name=$port_name type=$Serial_Ports{$port_name}{datatype} data2=\n$Serial_Ports{$port_name}{data}\n---\n"
       if defined $data and ( $Debug{serial} or $Debug{$port_name} );
 
     # Check to see if we have a carrage return yet
@@ -2350,15 +2167,12 @@ sub check_for_generic_serial_data {
         if ( defined( $Serial_Ports{$port_name}{datatype} )
             and $Serial_Ports{$port_name}{datatype} eq 'raw' )
         {
-            &Serial_data_hooks( $Serial_Ports{$port_name}{data}, $port_name )
-              ;    # Created by &add_hooks
+            &Serial_data_hooks( $Serial_Ports{$port_name}{data}, $port_name );    # Created by &add_hooks
         }
         else {
             my $break = $config_parms{"${port_name}_break"};
             $break = "[\r\n]+" unless $break;
-            while ( my ( $record, $remainder ) =
-                $Serial_Ports{$port_name}{data} =~ /(.+?)$break(.*)/s )
-            {
+            while ( my ( $record, $remainder ) = $Serial_Ports{$port_name}{data} =~ /(.+?)$break(.*)/s ) {
                 print "Data from $port_name: $record.  remainder=$remainder.\n"
                   if $Debug{serial} or $Debug{$port_name};
                 $Serial_Ports{$port_name}{data_record} = $record;
@@ -2367,9 +2181,8 @@ sub check_for_generic_serial_data {
                     &process_serial_data($record);
                 }
                 else {
-                    &Serial_data_hooks( $record, $port_name )
-                      ;      # Created by &add_hooks
-                    last;    # Only process one data_record per user_code loop
+                    &Serial_data_hooks( $record, $port_name );    # Created by &add_hooks
+                    last;                                         # Only process one data_record per user_code loop
                 }
             }
         }
@@ -2416,8 +2229,7 @@ sub check_for_keyboard_input {
             my @event = $CON_IN->Input();
             $Keyboard = $event[3] if $event[1];
         }
-        if ( $Keyboard and ( $Keyboard == 13 or $Keyboard == 32 ) )
-        {    # Enter Key  -> display simple menu
+        if ( $Keyboard and ( $Keyboard == 13 or $Keyboard == 32 ) ) {    # Enter Key  -> display simple menu
             print "F1->Reload  F2->Pause  F3->Exit  F4->Debug  F5->Logging\n";
         }
 
@@ -2444,8 +2256,7 @@ sub check_for_keyboard_input {
             $keystring .= sprintf( '%2x', ord $key );
             $Keyboard = $key;
         }
-        ReadMode 'normal'
-          ; # Or else we loose echo when mh exits.  Benchmark shows no slowdown.
+        ReadMode 'normal';    # Or else we loose echo when mh exits.  Benchmark shows no slowdown.
         $Keyboard = $keystring if defined $keystring and length $keystring > 2;
     }
 
@@ -2520,7 +2331,7 @@ sub toggle_log {
         open( OLDERR, ">&STDERR" );    # Copy old handle
         open STDOUT, ">>$logfile"
           or print "\nError, could not open logfile $logfile: $!\n";
-        $| = 1;    # Turn on command buffering (e.g. flush on every print)
+        $| = 1;                        # Turn on command buffering (e.g. flush on every print)
         open( STDERR, ">&STDOUT" );
     }
     else {
@@ -2597,8 +2408,7 @@ sub check_for_proxy_data {
         my $proxy = $proxy_servers{$address};
         if ( my $data = $proxy->said ) {
             my ( $type, @data ) = split $;, $data;
-            print
-              "server proxy data received address: $address, type: $type, data: @data.\n"
+            print "server proxy data received address: $address, type: $type, data: @data.\n"
               if $Debug{proxy};
             return unless $type;
             if ( $type eq 'serial' ) {
@@ -2619,8 +2429,7 @@ sub check_for_proxy_data {
                         &process_serial_data( $data[0] );
                     }
                     else {
-                        &Serial_data_hooks( $data[0], $data[1], 'proxy' )
-                          ;    # Created by &add_hooks
+                        &Serial_data_hooks( $data[0], $data[1], 'proxy' );    # Created by &add_hooks
                     }
                 }
                 else {
@@ -2659,9 +2468,9 @@ sub check_for_serial_data {
       and $Serial_Ports{ti103}{object} ne 'proxy';
     &check_for_cm11_data
       if $Serial_Ports{cm11}{object} and $Serial_Ports{cm11}{object} ne 'proxy';
-    &check_for_Homevision_data if $Serial_Ports{Homevision}{object};
-    &check_for_HomeBase_data   if $Serial_Ports{HomeBase}{object};
-    &check_for_ncpuxa_data     if $config_parms{ncpuxa_port};
+    &check_for_Homevision_data               if $Serial_Ports{Homevision}{object};
+    &check_for_HomeBase_data                 if $Serial_Ports{HomeBase}{object};
+    &check_for_ncpuxa_data                   if $config_parms{ncpuxa_port};
     &check_for_generic_serial_data('weeder') if $Serial_Ports{weeder}{object};
     for my $port_name (@Generic_Serial_Ports) {
         &check_for_generic_serial_data($port_name)
@@ -2669,8 +2478,7 @@ sub check_for_serial_data {
     }
 }
 
-my ( $leave_socket_open_passes, $leave_socket_open_action,
-    $leave_socket_open_check );
+my ( $leave_socket_open_passes, $leave_socket_open_action, $leave_socket_open_check );
 use vars '%socket_fork_data';
 
 sub check_for_socket_data_http {
@@ -2682,8 +2490,7 @@ sub check_for_socket_data_http {
         and $socket_fork_data{process}
         and $socket_fork_data{process}->Wait(0) )
     {
-        print
-          "http: closing http port after forked process s=$socket_fork_data{socket}\n"
+        print "http: closing http port after forked process s=$socket_fork_data{socket}\n"
           if $Debug{http};
         $socket_fork_data{socket}->close if $socket_fork_data{socket};
         if ( $config_parms{http_fork} eq 'memmap' ) {
@@ -2713,8 +2520,7 @@ sub check_for_socket_data_http {
         or ( $leave_socket_open_check and eval($leave_socket_open_check) ) )
     {
         my $sock = $Socket_Ports{http}{socka};
-        print
-          "http: closing http port with action: s=$sock a=$leave_socket_open_action\n"
+        print "http: closing http port with action: s=$sock a=$leave_socket_open_action\n"
           if $Debug{http};
         my @data = eval($leave_socket_open_action);
         print "Error in http lso action: $@\n" if $@;
@@ -2727,7 +2533,7 @@ sub check_for_socket_data_http {
     }
 
     #   return if $leave_socket_open_passes; # Wait for previous request to finish
-    return if $leave_socket_open_action;   # Wait for previous request to finish
+    return if $leave_socket_open_action;    # Wait for previous request to finish
 
     my $loop_count = 0;
     my $time_check = time;
@@ -2735,23 +2541,20 @@ sub check_for_socket_data_http {
 
         # See if there is a http request
         my $nfound = &socket_has_data( $Socket_Ports{http}{sock} );
-        last unless $nfound > 0;           # nfound = -1 means an error occurred
+        last unless $nfound > 0;            # nfound = -1 means an error occurred
         my $sock = $Socket_Ports{http}{sock}->accept();
-        last unless $sock;                 # Can be undef it socket was killed
-        $sock->autoflush(1);               # Not sure if this does anything?
+        last unless $sock;                  # Can be undef it socket was killed
+        $sock->autoflush(1);                # Not sure if this does anything?
         $Socket_Ports{http}{socka} = $sock;
 
-        ( $leave_socket_open_passes, $leave_socket_open_action ) =
-          &http_process_request($sock);
+        ( $leave_socket_open_passes, $leave_socket_open_action ) = &http_process_request($sock);
 
         my $time_diff = time - $time_check;
-        print
-          "http: c=$loop_count td=$time_diff sop=$leave_socket_open_passes soa=$leave_socket_open_action.\n"
+        print "http: c=$loop_count td=$time_diff sop=$leave_socket_open_passes soa=$leave_socket_open_action.\n"
           if $Debug{http};
 
         if ($leave_socket_open_action) {
-            last
-              ; # Wait for socket action to finish before we process the next request
+            last;                           # Wait for socket action to finish before we process the next request
         }
         else {
             # forked socket needs no closing, and can not have a open_action
@@ -2781,7 +2584,7 @@ sub check_for_socket_data {
     #  - could probably use a smarter select check here, rather than loop for each port
     for my $port_name ( keys %Socket_Ports ) {
         next if $port_name eq 'http';    # Deal with this elsewhere
-          # Need to use _flag var so active/inactive_this_pass is valid for 1 full pass.
+                                         # Need to use _flag var so active/inactive_this_pass is valid for 1 full pass.
         $Socket_Ports{$port_name}{active_this_pass} = 0;
         $Socket_Ports{$port_name}{active_this_pass} = 1
           if $Socket_Ports{$port_name}{active_this_pass_flag};
@@ -2797,20 +2600,17 @@ sub check_for_socket_data {
         if ( $Socket_Ports{$port_name}{clients} ) {
             my $client_number = 0;
             for my $ptr ( @{ $Socket_Ports{$port_name}{clients} } ) {
-                my ( $socka, $client_ip_address, $client_port, $data ) =
-                  @{$ptr};
+                my ( $socka, $client_ip_address, $client_port, $data ) = @{$ptr};
                 next unless $socka;
                 my $nfound = &socket_has_data($socka);
-                if ( $nfound > 0 ) {   # nfound = -1 means an error has occurred
-                                       # Set default to active socket
-                    $Socket_Ports{$port_name}{socka}         = $socka;
-                    $Socket_Ports{$port_name}{client_number} = $client_number;
-                    $Socket_Ports{$port_name}{data}          = $data;
-                    $Socket_Ports{$port_name}{client_ip_address} =
-                      $client_ip_address;
-                    $Socket_Ports{$port_name}{client_port} = $client_port;
-                    print
-                      "socket: $port_name nfound=$nfound client=$client_number"
+                if ( $nfound > 0 ) {    # nfound = -1 means an error has occurred
+                                        # Set default to active socket
+                    $Socket_Ports{$port_name}{socka}             = $socka;
+                    $Socket_Ports{$port_name}{client_number}     = $client_number;
+                    $Socket_Ports{$port_name}{data}              = $data;
+                    $Socket_Ports{$port_name}{client_ip_address} = $client_ip_address;
+                    $Socket_Ports{$port_name}{client_port}       = $client_port;
+                    print "socket: $port_name nfound=$nfound client=$client_number"
                       if $Debug{$port_name};
                     $server_active = 1;
                     last;
@@ -2830,32 +2630,27 @@ sub check_for_socket_data {
             # Else look for new clients
             else {
                 my $nfound = &socket_has_data($sock);
-                if ( $nfound > 0 and my $new_sock = $sock->accept() )
-                {    # nfound == -1 means an error
-                    $new_sock->autoflush(1);   # Not sure if this does anything?
-                                               # Log the address of the client
+                if ( $nfound > 0 and my $new_sock = $sock->accept() ) {    # nfound == -1 means an error
+                    $new_sock->autoflush(1);                               # Not sure if this does anything?
+                                                                           # Log the address of the client
                     my $peer = $new_sock->peername;
                     my ( $client_port, $iaddr ) = unpack_sockaddr_in($peer)
                       if $peer;
                     my $client_ip_address = inet_ntoa($iaddr) if $iaddr;
-                    $Socket_Ports{$port_name}{client_ip_address} =
-                      $client_ip_address;
-                    $Socket_Ports{$port_name}{client_port} = $client_port;
-                    $Socket_Ports{$port_name}{socka}       = $new_sock;
+                    $Socket_Ports{$port_name}{client_ip_address}     = $client_ip_address;
+                    $Socket_Ports{$port_name}{client_port}           = $client_port;
+                    $Socket_Ports{$port_name}{socka}                 = $new_sock;
                     $Socket_Ports{$port_name}{active_this_pass_flag} = 1;
 
-                    push @{ $Socket_Ports{$port_name}{clients} },
-                      [ $new_sock, $client_ip_address, $client_port, undef ];
-                    delete $Socket_Ports{$port_name}{data}
-                      ;    # Delete data from previous session
+                    push @{ $Socket_Ports{$port_name}{clients} }, [ $new_sock, $client_ip_address, $client_port, undef ];
+                    delete $Socket_Ports{$port_name}{data};                # Delete data from previous session
                     $Socket_Ports{$port_name}{client_number} =
                       @{ $Socket_Ports{$port_name}{clients} } - 1;
 
                     logit
                       "$config_parms{data_dir}/logs/server.$Year_Month_Now.log",
                       "$port_name $client_ip_address";
-                    print
-                      "\nsocket: $port_name active sock=$new_sock client=$client_ip_address.\n"
+                    print "\nsocket: $port_name active sock=$new_sock client=$client_ip_address.\n"
                       if $Debug{$port_name};
 
                     $server_active = 1;
@@ -2884,8 +2679,7 @@ sub check_for_socket_data {
                       if $Debug{'socket'};
                 }
                 else {
-                    print
-                      "socket: closing socket port $port_name due to error on select\n"
+                    print "socket: closing socket port $port_name due to error on select\n"
                       if $Debug{'socket'};
                     &socket_close($port_name);
                 }
@@ -2977,9 +2771,7 @@ sub check_for_socket_data {
 
         #        $break = "[\r\n]+";
 
-        if ( my ( $record, $remainder ) =
-            $Socket_Ports{$port_name}{data} =~ /(.+?)$break(.*)/s )
-        {
+        if ( my ( $record, $remainder ) = $Socket_Ports{$port_name}{data} =~ /(.+?)$break(.*)/s ) {
             $Socket_Ports{$port_name}{data_record} = $record;
             $Socket_Ports{$port_name}{data}        = $remainder;
             if ( $Debug{$port_name} ) {
@@ -2992,8 +2784,7 @@ sub check_for_socket_data {
 
         # Store away Client data
         my $client_number = $Socket_Ports{$port_name}{client_number};
-        $Socket_Ports{$port_name}{clients}[$client_number][3] =
-          $Socket_Ports{$port_name}{data}
+        $Socket_Ports{$port_name}{clients}[$client_number][3] = $Socket_Ports{$port_name}{data}
           if defined $client_number;
 
         # 10/99 Comment out \r\n print ... what needed this?? Messed up viavoice server
@@ -3010,17 +2801,14 @@ sub check_for_tied_events {
     my @objects = @_;
     for my $object1 (@objects) {
         next
-          unless $object1->isa('Generic_Item')
-          ;    # Safeguard ... should not need this
+          unless $object1->isa('Generic_Item');    # Safeguard ... should not need this
         my $state1 = $object1->state;
         $state1 = $object1->{state}
-          unless
-          defined $state1;  # In case default_getstate fails for whatever reason
+          unless defined $state1;                  # In case default_getstate fails for whatever reason
 
-        &State_change_hooks( $object1, $state1 );    # Created by &add_hooks
+        &State_change_hooks( $object1, $state1 );  # Created by &add_hooks
 
-        print
-          "Object link: starting enumeration for object=$object1->{object_name} state=$state1\n"
+        print "Object link: starting enumeration for object=$object1->{object_name} state=$state1\n"
           if $Debug{events};
 
         for my $key ( keys %{ $$object1{tied_objects} } ) {
@@ -3032,9 +2820,7 @@ sub check_for_tied_events {
               unless $$object1{tied_objects}{$key}{$state_key};
 
             if ( $$object1{tied_objects}{$key}{$state_key} ) {
-                for my $state2 (
-                    sort keys %{ $$object1{tied_objects}{$key}{$state_key} } )
-                {
+                for my $state2 ( sort keys %{ $$object1{tied_objects}{$key}{$state_key} } ) {
                     my ( $object2, $log_msg ) =
                       @{ $$object1{tied_objects}{$key}{$state_key}{$state2} };
                     &print_log($log_msg) unless $log_msg eq '1';
@@ -3047,19 +2833,16 @@ sub check_for_tied_events {
                         unless (
                             $object1->{set_by}
                             and (  $object1->{set_by} eq $object2
-                                or $object1->{set_by} eq
-                                $$object2{object_name} )
+                                or $object1->{set_by} eq $$object2{object_name} )
                           )
                         {
                             #                           $object2->{set_by} = $object1->{object_name};
                             #                           $object2->{set_by} = $object1;
                             my $Set_By = $object1->{set_by};
-                            $Respond_Target =
-                              $object1->get_target();    # Pass target along
+                            $Respond_Target = $object1->get_target();    # Pass target along
                             $Respond_Target = $Set_By
                               unless $Respond_Target
-                              or
-                              ref $Set_By; # Just for legacy code (speak chimes)
+                              or ref $Set_By;                            # Just for legacy code (speak chimes)
                             $object2->set( $state2, $object1 );
                         }
                     }
@@ -3079,18 +2862,15 @@ sub check_for_tied_events {
                 &print_log($log_msg) unless $log_msg eq '1';
                 my $state  = $state1;    # So eval can substitute $state
                 my $object = $object1;
-                $Set_By = $object1->{set_by}
-                  ; # Checked in Generic_Item set method (not usually at this time)
-                print
-                  "Event link: state=$state set_by=$Set_By object=$object->{object_name} eval event=$event\n"
+                $Set_By = $object1->{set_by};    # Checked in Generic_Item set method (not usually at this time)
+                print "Event link: state=$state set_by=$Set_By object=$object->{object_name} eval event=$event\n"
                   if $Debug{events};
 
                 $Respond_Target = $object1->get_target()
-                  if defined $object1->get_target()
-                  ; # Pass target along (IF it exists, else we overwrite good value!)
+                  if defined $object1->get_target();    # Pass target along (IF it exists, else we overwrite good value!)
                 $Respond_Target = $Set_By
                   unless $Respond_Target
-                  or ref $Set_By;    # Just for legacy code (speak chimes)
+                  or ref $Set_By;                       # Just for legacy code (speak chimes)
                 eval $event;
                 $Set_By = '';
                 print "tie_events eval error: $@" if $@;
@@ -3112,12 +2892,10 @@ sub check_for_tied_filters {
             if (   $log_msg = $$self{tied_filters}{$filter}{$searchstate}
                 or $log_msg = $$self{tied_filters}{$filter}{all_states} )
             {
-                print
-                  "Item tie_fiter test for $self->{object_name} filter: $filter  state:$searchstate\n"
+                print "Item tie_fiter test for $self->{object_name} filter: $filter  state:$searchstate\n"
                   if $Debug{filters};
                 if ( eval $filter ) {
-                    print
-                      "Item tie_filter triggered for $self->{object_name} $filter\n"
+                    print "Item tie_filter triggered for $self->{object_name} $filter\n"
                       if $Debug{filters};
                     &print_log($log_msg) unless $log_msg eq '1';
                     return 1;
@@ -3152,15 +2930,13 @@ sub check_for_tied_filters {
                 split( /;/, $state, 2 )
               )
             {
-                print
-                  "Multiple states split into state=$currentstate remainder=$remainingstate\n"
+                print "Multiple states split into state=$currentstate remainder=$remainingstate\n"
                   if $Debug{state};
                 $state = $remainingstate;
 
                 # Check for states with a embedded set_with_timer directive
                 return 1
-                  if check_for_embedded_commands( $self, $currentstate,
-                    $remainingstate );
+                  if check_for_embedded_commands( $self, $currentstate, $remainingstate );
 
                 # Set the object to the currentstate, we will then loop and repeat
                 #print ">>>>>set state=$currentstate\n";
@@ -3182,13 +2958,11 @@ sub check_for_embedded_commands {
     # Allow for embeded objects (e.g.: $Pool;on)
     if ( $state =~ /^\$.*/ ) {
         my $ref = eval "ref $state";
-        print
-          "check_for_embedded_commands found $state->set('$remainingstates') ref=$ref\n"
+        print "check_for_embedded_commands found $state->set('$remainingstates') ref=$ref\n"
           if $Debug{state};
         if ($ref) {
             eval "$state->set('$remainingstates');";
-            print
-              "generic_item set invalid multistate $state->set('$remainingstates'); (:$@)\n"
+            print "generic_item set invalid multistate $state->set('$remainingstates'); (:$@)\n"
               if $@;
             return 1;
         }
@@ -3198,12 +2972,10 @@ sub check_for_embedded_commands {
     if ( my ( $s1, $time, $s2 ) = $state =~ /(.*?)~(.+?)~(.*)/
         and $self->can('set_with_timer') )
     {
-        print
-          "Multiple states set with timer state=$s1 time=$time afterstate=$s2\n"
+        print "Multiple states set with timer state=$s1 time=$time afterstate=$s2\n"
           if $Debug{state};
         $self->set_with_timer( $s1, $time, $s2, $remainingstates );
-        print
-          "Embeded set_with_timer state found for $self->{object_name}: s1=$s1, time=$time, s2=$s2\n"
+        print "Embeded set_with_timer state found for $self->{object_name}: s1=$s1, time=$time, s2=$s2\n"
           if $Debug{filters};
         return 1;
     }
@@ -3218,8 +2990,7 @@ sub check_for_tied_times {
         for my $time ( keys %{ $$ref{tied_times} } ) {
             for my $state ( keys %{ $$ref{tied_times}{$time} } ) {
                 my $triggered = 0;
-                print
-                  "Item tie_time test for $ref->{object_name} time: $time  state:$state\n"
+                print "Item tie_time test for $ref->{object_name} time: $time  state:$state\n"
                   if $Debug{tied_times};
 
                 # Look for time_idle specs like:
@@ -3248,8 +3019,7 @@ sub check_for_tied_times {
                     }
                 }
                 if ($triggered) {
-                    print
-                      "Item tie_time triggered for $ref->{object_name} $time\n"
+                    print "Item tie_time triggered for $ref->{object_name} $time\n"
                       if $Debug{tied_times};
                     my $log_msg = $$ref{tied_times}{$time}{$state};
                     &print_log($log_msg) unless $log_msg eq '1';
@@ -3259,8 +3029,7 @@ sub check_for_tied_times {
                         $ref->set( $state, 'tied_time' );
                     }
                     else {
-                        print
-                          "tie_items object can not set: $ref->{object_name}\n";
+                        print "tie_items object can not set: $ref->{object_name}\n";
                     }
                 }
             }
@@ -3324,11 +3093,11 @@ sub convert_mile2nm {    # convert miles (per hour) to nautical miles (knots)
     sprintf( "%5.2f", $_[0] / 1.150779448 );
 }
 
-sub convert_nm2km {    # convert nautical miles (knots) to kilometers (per hour)
+sub convert_nm2km {      # convert nautical miles (knots) to kilometers (per hour)
     sprintf( "%5.2f", $_[0] * 1.85198849217 );
 }
 
-sub convert_km2nm {    # convert kilometers (per hour) to nautical miles (knots)
+sub convert_km2nm {      # convert kilometers (per hour) to nautical miles (knots)
     sprintf( "%5.2f", $_[0] / 1.85198849217 );
 }
 
@@ -3366,34 +3135,30 @@ sub display {
     my %parms = &parse_func_parms(@_);
 
     unless ( defined $parms{text} and $parms{text} ne '' ) {
-        (
-            $parms{text}, $parms{time},        $parms{title},
-            $parms{font}, $parms{window_name}, $parms{append}
-        ) = @_;
+        ( $parms{text}, $parms{time}, $parms{title}, $parms{font}, $parms{window_name}, $parms{append} ) = @_;
     }
     else {
-        &set_app_parms( \%parms, 'display' )
-          ;    # Set parms according to an optional app parm
+        &set_app_parms( \%parms, 'display' );    # Set parms according to an optional app parm
     }
 
     print "db display t=$parms{text} d=$parms{device} p=@_\n"
       if $Debug{display};
 
     my $text = $parms{text};
-    return unless $text;    # No data
+    return unless $text;                         # No data
 
     # If it is a TXT file, read it
     if ( $text =~ /^\S+\.txt$/ and -e $text ) {
         open IN, $text
           or print "Error in sub display, could not open file $text:$!\n";
-        local $/ = undef;    # Slurp the whole file at once
+        local $/ = undef;                        # Slurp the whole file at once
         $text = <IN>;
         close IN;
     }
 
     unshift( @Display_Log, $text );
     pop @Display_Log if @Display_Log > $config_parms{max_log_entries};
-    &Log_hooks( 'display', $text, %parms );    # Created by &add_hooks
+    &Log_hooks( 'display', $text, %parms );      # Created by &add_hooks
 
     # Allow for display_device functions (e.g. lib/Display_Alpha.pm display_alpha)
     if ( $parms{device} ) {
@@ -3448,8 +3213,7 @@ sub display {
             and $custom_child_windows{"$parms{app} $parms{window_name}"} )
         {
             # Try to create custom window
-            eval
-              "\$return_object = &open_$parms{app}_$parms{window_name}_window()";
+            eval "\$return_object = &open_$parms{app}_$parms{window_name}_window()";
         }
         $return_object = new Display(%parms) unless $return_object;
         return ( ( ref $return_object ) ? $return_object : 0 );
@@ -3506,8 +3270,7 @@ sub eval_user_code_load {
             eval $item_code;
 
             if ($@) {
-                my $error = "\nError in item/global_var code:\n  "
-                  . &eval_user_code_error( $@, $item_code );
+                my $error = "\nError in item/global_var code:\n  " . &eval_user_code_error( $@, $item_code );
                 print $error;
                 &display( $error, 60 ) unless $Startup or !$config_parms{tk};
                 undef $old_error;
@@ -3523,8 +3286,7 @@ sub eval_user_code_load {
                     &eval_user_code_reset;
                     eval $temp_code;
                     if ($@) {
-                        my $error = "\nError in file $member:\n  "
-                          . &eval_user_code_error( $@, $temp_code );
+                        my $error = "\nError in file $member:\n  " . &eval_user_code_error( $@, $temp_code );
                         print $error;
                         &display( $error, 60 )
                           unless $Startup or !$config_parms{tk};
@@ -3550,8 +3312,7 @@ sub eval_user_code_load {
         &eval_user_code_reset;
         eval $user_code;
         &object_states_restore;    # Put vars back to their last know state
-        &Reload_post_hooks()
-          ;    # Created by &add_hooks (after object states have been restored)
+        &Reload_post_hooks();      # Created by &add_hooks (after object states have been restored)
 
         print "Activate voice menu\n";
         &Voice_Cmd::activate;
@@ -3563,7 +3324,7 @@ sub eval_user_code_load {
         play( 'file' => $config_parms{sound_reload} );
 
         #       &file_write('mh.started', $$); # Used in mh.bat and mhl to loop on accidental exit
-        unlink 'mh.startup'; # Used in mh.bat and mhl to loop on accidental exit
+        unlink 'mh.startup';       # Used in mh.bat and mhl to loop on accidental exit
     }
 }
 
@@ -3626,8 +3387,7 @@ sub eval_user_code_error {
     #  Undefined subroutine &main::abc called at (eval 39) line 59.
     #  Global symbol "$a1" requires explicit package name at (eval 39) line 60.
     my ( $line1, $line2 ) = $error =~ /at\s+\(eval\s+(\d+)\)\s+line\s+(\d+)/;
-    $error =~
-      s/\seval .+//s;   # Drop listing of eval-ed code (shown if -diagnostics 1)
+    $error =~ s/\seval .+//s;    # Drop listing of eval-ed code (shown if -diagnostics 1)
     my @code = split( "\n", $code );
     if ( defined $line2 ) {
         $line2 -= 6;
@@ -3681,9 +3441,8 @@ sub exit_pgm {
     #  Dispose_Speech_Channel();
     #}
     &Voice_Cmd::remove_voice_cmds if $config_parms{voice_cmd};
-    &Exit_hooks();    # Allow user code exits
-    &run_kill_processes
-      ;    # From handy_utilities ... kills anybody that isn't done yet
+    &Exit_hooks();          # Allow user code exits
+    &run_kill_processes;    # From handy_utilities ... kills anybody that isn't done yet
     &Process_Item::stop();
 
     # Used in mh/code/common/mh_control to
@@ -3738,8 +3497,7 @@ sub file_changed {
     }
 
     #    print "Warning, file_change file does not exist: $file\n" unless -e $file;
-    print
-      "db file_change file=$file time=$file_time time_old=$file_change_times{$file}\n"
+    print "db file_change file=$file time=$file_time time_old=$file_change_times{$file}\n"
       if $Debug{file};
 
     # 1st time we look at a file, return 'unknown' (-1)
@@ -3748,9 +3506,8 @@ sub file_changed {
         return undef;
     }
     return 0
-      if $file_time ==
-      $file_change_times{$file};    # File has not changed since last call
-    $file_change_times{$file} = $file_time;    # Reset time
+      if $file_time == $file_change_times{$file};    # File has not changed since last call
+    $file_change_times{$file} = $file_time;          # Reset time
     print "File changed: time=$file_time file=$file\n" if $Debug{file};
     return 1;
 }
@@ -3820,8 +3577,7 @@ sub get_ip_address {
     print "IP addresses for $hostname are @ip_addresses\n" if $Debug{misc};
     return wantarray
       ? @ip_addresses
-      : $ip_addresses[-1]
-      ;    # Assume last one is most interesting ... usually IP address
+      : $ip_addresses[-1];    # Assume last one is most interesting ... usually IP address
 }
 
 sub get_object_by_name {
@@ -3864,9 +3620,8 @@ sub last_response {
     my $last_response;
     if ( $Last_Response eq 'speak' ) {
         ($last_response) = &speak_log_last(1);
-        $last_response =~ s/\n/  /g;    # Remove line breaks
-        $last_response =~
-          s/^.+?: //s;    # Remove time/date/status portion of log entry
+        $last_response =~ s/\n/  /g;      # Remove line breaks
+        $last_response =~ s/^.+?: //s;    # Remove time/date/status portion of log entry
     }
     elsif ( $Last_Response eq 'display' ) {
         ($last_response) = &display_log_last(1);
@@ -4038,35 +3793,30 @@ sub monitor_commands {
 }
 
 # use our own str2time here so we can do arithmitic offsets
-my %table_month =
-  qw(jan 1 feb 2 mar 3 apr 4 may 5 jun 6 jul 7 aug 8 sep 9 oct 10 nov 11 dec 12
+my %table_month = qw(jan 1 feb 2 mar 3 apr 4 may 5 jun 6 jul 7 aug 8 sep 9 oct 10 nov 11 dec 12
   january 1 february 2 march 3 april 4 may 5 june 6
   july 7 august 8 september 9 october 10 november 11 december 12);
 
 sub my_str2time {
     my ($time_date_arg) = @_;
     return 0 if !defined $time_date_arg or $time_date_arg eq 'none';
-    my ( $monthf, $mdayf, $yearf, $time_date_time, $hourf, $minf, $secf,
-        $am_pm );
+    my ( $monthf, $mdayf, $yearf, $time_date_time, $hourf, $minf, $secf, $am_pm );
     my ( $op, $offset, $sec_offset, $hour_offset, $min_offset );
-    my $time_date = eval(qq["$time_date_arg"])
-      ;    # Use eval for on-the-fly variable substitution
+    my $time_date = eval(qq["$time_date_arg"]);    # Use eval for on-the-fly variable substitution
     print "Error in my_str2time: time=$time_date_arg  error=$@\n" if $@;
 
     # Date specification is optional.  Allow for:
     #  12/25/00 7:00 pm
     #  12/25    7:00 pm
     #  Dec/25   7:00 pm (Dec 25 7:00 pm would be tricky)
-    ( $monthf, $mdayf, $yearf, $time_date_time ) =
-      $time_date =~ /(\S+)\/(\S+)\/(\S+)\s+(.+)/;
+    ( $monthf, $mdayf, $yearf, $time_date_time ) = $time_date =~ /(\S+)\/(\S+)\/(\S+)\s+(.+)/;
     ( $monthf, $mdayf, $time_date_time ) = $time_date =~ /(\S+)\/(\S+)\s+(.+)/
       unless $time_date_time;    # Year is optional
 
     # Allow for Date only specs
     unless ($time_date_time) {
         $time_date_time = '12 pm'
-          if ( $monthf, $mdayf, $yearf ) =
-          $time_date =~ /^ *(\S+?)\/(\S+?)\/?(\S*) *$/;
+          if ( $monthf, $mdayf, $yearf ) = $time_date =~ /^ *(\S+?)\/(\S+?)\/?(\S*) *$/;
     }
 
     # Allow for dd/mm format
@@ -4080,15 +3830,12 @@ sub my_str2time {
     $monthf--;    # Jan = 0;
 
     $time_date = $time_date_time if $time_date_time;
-    ( $hourf, $minf, $secf, $am_pm ) =
-      $time_date =~ /(\d+):?(\d*):?(\d*)\s*([AaPp]?[Mm]?)/;
+    ( $hourf, $minf, $secf, $am_pm ) = $time_date =~ /(\d+):?(\d*):?(\d*)\s*([AaPp]?[Mm]?)/;
     $minf = 0 unless $minf;
     $secf = 0 unless $secf;
     unless ( defined $hourf ) {
         my @caller = caller;    # This is not useful in user_code eval :(
-        print_log(
-            "Warning, bad time record: time=$time_date_arg time_date=$time_date caller=@caller."
-        );
+        print_log( "Warning, bad time record: time=$time_date_arg time_date=$time_date caller=@caller." );
         return 0;
     }
 
@@ -4151,8 +3898,7 @@ sub my_str2time {
           . "hour=$Hour hourf=$hourf ap=$am_pm m=$Month mf=$monthf y=$Year yf=$yearf\n";
         return;
     }
-    return ( $sec_offset +
-          timelocal( $secf, $minf, $hourf, $mdayf, $monthf, $yearf ) );
+    return ( $sec_offset + timelocal( $secf, $minf, $hourf, $mdayf, $monthf, $yearf ) );
 }
 
 sub new_second {
@@ -4194,8 +3940,7 @@ sub object_states_restore {
     print "Restoring object states\n";
 
     # Set unused stats first, so they can get overwritten by a more recent state
-    no strict 'vars'
-      ; # Do this so eval doesn't choke ... we do defined checks in the $state code
+    no strict 'vars';    # Do this so eval doesn't choke ... we do defined checks in the $state code
     while ( my $state = pop @states ) {
         print "restoring state: $state" if $Debug{save};
         my $rc = eval $state;
@@ -4239,10 +3984,8 @@ sub object_states_save {
             print "Saving state for $object_type $var\n" if $Debug{save};
             my $ref = $objects_by_object_name{$var};
             if ( $ref and $ref->can('restore_string') ) {
-                $restore_string =
-                  &object_states_save_check( $ref->restore_string );
-                $restore_state .=
-                  "if (defined $var) {$restore_string} else {'var not used'}\n"
+                $restore_string = &object_states_save_check( $ref->restore_string );
+                $restore_state .= "if (defined $var) {$restore_string} else {'var not used'}\n"
                   if $restore_string;
             }
         }
@@ -4266,8 +4009,7 @@ sub object_states_save {
     # Not sure why this does not work ... only the first gets saved??
     #   file_write "$restore_state_file.persistent", Data::Dumper->Dump([\%Persistent, \%Save], [qw(*Persistent *Save)]);
     file_write "$restore_state_file.persistent",
-      Data::Dumper->Dump( [ \%Persistent ], [qw(*Persistent)] )
-      . Data::Dumper->Dump( [ \%Save ], [qw(*Save)] );
+      Data::Dumper->Dump( [ \%Persistent ], [qw(*Persistent)] ) . Data::Dumper->Dump( [ \%Save ], [qw(*Save)] );
 
     print " done\n" unless $config_parms{no_log} =~ /save_state/;
 
@@ -4344,16 +4086,14 @@ sub password_read {
                         $Passwords{$1} = $2;
                     }
                     else {
-                        $Passwords{family} =
-                          $_;    # Grandfathter old single-user file
+                        $Passwords{family} = $_;    # Grandfathter old single-user file
                     }
                 }
             }
             close PASSWD;
         }
         else {
-            print
-              "\nWarning:  password_file $pw_file not found.  Run mh/bin/set_password\n\n";
+            print "\nWarning:  password_file $pw_file not found.  Run mh/bin/set_password\n\n";
         }
     }
 
@@ -4396,7 +4136,7 @@ sub authority_check {
     return 1 if !$user_required;
     return 1 if $Authorized eq 'admin';          # Allow any command for admin
     return 1 if $Authorized eq $user_required;
-    return 1 if $user_required eq 'guest';  # Allow any login for guest commands
+    return 1 if $user_required eq 'guest';       # Allow any login for guest commands
     return 0;
 }
 
@@ -4406,7 +4146,7 @@ sub password_check {
 
     #   return 0;  # disable remote access
 
-    &password_read(0);                      ## reload if anything changed
+    &password_read(0);                           ## reload if anything changed
 
     if (%Passwords) {
         if ($password) {
@@ -4480,8 +4220,7 @@ sub phrase_match {
     #   for my $phrase2 (('when will the sun set', 'new moon')) {
     # Do a fast less accurate search on all phrases
     for my $phrase2 ( &Voice_Cmd::voice_items( 'mh', 'no_category' ) ) {
-        my $d = pdistance( $phrase, $phrase2, $set1, \&distance,
-            { -cost => [ 1, 0, 3 ], -mode => 'set' } );
+        my $d = pdistance( $phrase, $phrase2, $set1, \&distance, { -cost => [ 1, 0, 3 ], -mode => 'set' } );
         print " - d1=$d phrase=$phrase2.\n" if $Debug{phrase};
         push @{ $list1{$d} }, $phrase2 if $d <= $d_min1;
         $d_min1 = $d if $d < $d_min1;
@@ -4494,8 +4233,7 @@ sub phrase_match {
     my $d_min2 = 999;
     my $set2   = 'abcdefghijklmnopqrstuvwxyz0123456789+-%';
     for my $phrase2 ( @{ $list1{$d_min1} } ) {
-        my $d = pdistance( $phrase, $phrase2, $set2, \&distance,
-            { -cost => [ 1, 0, 3 ], -mode => 'set' } );
+        my $d = pdistance( $phrase, $phrase2, $set2, \&distance, { -cost => [ 1, 0, 3 ], -mode => 'set' } );
         print " - d2=$d phrase=$phrase2.\n" if $Debug{phrase};
         push @{ $list2{$d} }, $phrase2 if $d <= $d_min2;
         $d_min2 = $d if $d < $d_min2;
@@ -4517,8 +4255,7 @@ sub play {
         %parms = @_;
     }
 
-    &set_app_parms( \%parms, 'speak' )
-      ;                 # Set parms according to an optional app parm
+    &set_app_parms( \%parms, 'speak' );    # Set parms according to an optional app parm
 
     $parms{mode}  = '' unless $parms{mode};
     $parms{retry} = 5  unless $parms{retry};
@@ -4571,15 +4308,15 @@ sub play {
     elsif ( lc($play_parm) eq 'wait' ) {
 
         # If we want to wait (e.g. so we can turn speakers off), maybe we should fork
-        $play_parm = 0;    # Or can we test to see if we are still playing??
+        $play_parm = 0;                              # Or can we test to see if we are still playing??
     }
     else {
-        $play_parm = SND_ASYNC;    # Do not wait.
+        $play_parm = SND_ASYNC;                      # Do not wait.
     }
 
     #   &set_volume($parms{volume});
-    &Play_parms_hooks( \%parms );    # Created by &add_hooks
-    &Play_pre_hooks(%parms);         # Created by &add_hooks
+    &Play_parms_hooks( \%parms );                    # Created by &add_hooks
+    &Play_pre_hooks(%parms);                         # Created by &add_hooks
 
     # Do not speak locally if this parm is specified and does not
     # match the rooms parm or it is a non-standard card
@@ -4594,8 +4331,7 @@ sub play {
     for my $file (@files) {
 
         # Check for SystemXYZ or //server or \file or c:\file
-        unless ( $file =~ /^System/ or $file =~ /^[\\\/]/ or $file =~ /^\S\:/ )
-        {
+        unless ( $file =~ /^System/ or $file =~ /^[\\\/]/ or $file =~ /^\S\:/ ) {
 
             if ( -e $file ) {
             }
@@ -4637,13 +4373,11 @@ sub play {
         # Let the speak code push the wav file
         # For speak (TTS), this gets done in Voice_Text.pm
         if ( $parms{address} ) {
-            copy $file,
-              "$config_parms{html_alias_cache}/speak_address.$Second.wav";
+            copy $file, "$config_parms{html_alias_cache}/speak_address.$Second.wav";
             for my $address ( split ',', $parms{address} ) {
                 my $address_code = $config_parms{voice_text_address_code};
                 $address_code =~ s|\$address|$address|;
-                $address_code =~
-                  s|\$url|http://$Info{IPAddress_local}:$config_parms{http_port}/cache/speak_address.$Second.wav|;
+                $address_code =~ s|\$url|http://$Info{IPAddress_local}:$config_parms{http_port}/cache/speak_address.$Second.wav|;
                 print "play running address code: $address_code\n"
                   if $Debug{play};
                 eval $address_code;
@@ -4670,8 +4404,7 @@ sub play {
 
         if ( !$OS_win ) {
             next if $file =~ /^System/;
-            if ( $config_parms{sound_program} =~ /vv_tts/i )
-            {    # use vv_tts for play also
+            if ( $config_parms{sound_program} =~ /vv_tts/i ) {    # use vv_tts for play also
                 speak( play => "$file", nolog => 1, %parms );
                 last;
             }
@@ -4754,8 +4487,7 @@ sub play {
                 set $play_timer 1, "&play($replay_parms)";
 
                 #               print "Waiting to play sound file, pass $parms{retry}, &play{$replay_parms}\n";
-                print
-                  "Waiting to play sound file, pass=$parms{retry} file=$file\n";
+                print "Waiting to play sound file, pass=$parms{retry} file=$file\n";
             }
             else {
                 print "Gave up trying to play sound file: $file\n";
@@ -4763,7 +4495,7 @@ sub play {
             }
         }
 
-        $parms{fileplayed} = $file if $played_ok;   # For play_post_hooks to use
+        $parms{fileplayed} = $file if $played_ok;    # For play_post_hooks to use
 
         #        print "Waiting to play sound file, pass $i, file=$file\n";
         #        sleep 1;
@@ -4929,8 +4661,8 @@ sub print_speaklog {
     else {
         print "$data\n"
           unless $config_parms{no_log} =~ /speak/
-          or $Startup
-          ; # On startup no print needed as it is just the "System Restarted" message (or an error with its own debug info)
+          or
+          $Startup;  # On startup no print needed as it is just the "System Restarted" message (or an error with its own debug info)
     }
     print SPEAKLOG "$Time_Date $data\n";
 
@@ -4965,7 +4697,7 @@ sub print_speaklog_since {
 
         #print "db/mh/since: i=$i time=$time, plt=$Print_Log_Time[$i] slt=$Speak_Log_Time[$i]\n";
         if ( $time >= $Speak_Log_Time[$i] ) {    #TODO: Problem
-             # We have already seen this message, so the prior index is what we need
+                                                 # We have already seen this message, so the prior index is what we need
             $index--;
             last;
         }
@@ -4989,9 +4721,8 @@ sub print_speaklog_current_time {
 
     #print "db/mh/curr: time=" . &get_tickcount . " plt=$Print_Log_Time[0] slt=$Speak_Log_Time[0]\n";
     return $Print_Log_Time[0]
-      unless ( scalar @Speak_Log_Time <= 0 )
-      ;    #TODO HP should return $Speak_Log_Time
-     #return $Speak_Log_Time[0] unless (scalar @Speak_Log_Time <= 0); #TODO HP should return $Speak_Log_Time
+      unless ( scalar @Speak_Log_Time <= 0 );    #TODO HP should return $Speak_Log_Time
+         #return $Speak_Log_Time[0] unless (scalar @Speak_Log_Time <= 0); #TODO HP should return $Speak_Log_Time
     return 0;
 }
 
@@ -5008,8 +4739,7 @@ sub process_external_command {
 
         print_log "Ran $set_by command: $cmd"
           unless $config_parms{no_log} =~ /xcmd/
-          or $set_by eq 'tk'
-          ;    # tk is not appropriate here (command listbox doesn't call this.)
+          or $set_by eq 'tk';    # tk is not appropriate here (command listbox doesn't call this.)
     }
 
     # Limit syntax to protect from dangerous hacks
@@ -5019,8 +4749,7 @@ sub process_external_command {
         print_log "Running set command: $cmd"
           unless $config_parms{no_log} =~ /xcmd/;
         eval $cmd;
-        print_log
-          "\nError in running external set command: cmd=$cmd\n error: $@\n"
+        print_log "\nError in running external set command: cmd=$cmd\n error: $@\n"
           if $@;
     }
     elsif ( $cmd =~ /^speaki?t? (.+)/i ) {
@@ -5068,8 +4797,7 @@ sub process_external_command {
     return 1;
 }
 
-my ( @prev_x10_events, %prev_x10_units, $prev_x10_units_reset,
-    %x10_dim_bright_last_housecode_device );
+my ( @prev_x10_events, %prev_x10_units, $prev_x10_units_reset, %x10_dim_bright_last_housecode_device );
 
 sub process_serial_data {
     my ( $event_data, $prev_pass, $source ) = @_;
@@ -5100,18 +4828,13 @@ sub process_serial_data {
         if ( $event_data1 =~ /POLL/ ) {
 
             #***should check for mismatch of house and house2!
-            my ( $house, $device, $house2, $level ) =
-              $event_data1 =~ /(\S)(\S)(\S)POLL/;
+            my ( $house, $device, $house2, $level ) = $event_data1 =~ /(\S)(\S)(\S)POLL/;
 
             my $event_data = 'X' . $house . $device;
             if ( my @refs = &Device_Item::items_by_id($event_data) ) {
                 for my $ref (@refs) {
                     if ( $ref->{x10_id} ) {
-                        &print_log( $ref->{x10_id}
-                              . $house
-                              . "POLL: "
-                              . substr( $ref->{object_name}, 1 )
-                              . " polled" );
+                        &print_log( $ref->{x10_id} . $house . "POLL: " . substr( $ref->{object_name}, 1 ) . " polled" );
                     }
                 }
             }
@@ -5125,10 +4848,7 @@ sub process_serial_data {
         # code with no unit code and then the status.
         # Combine the two messages to successfully infer the status.
         elsif ( $event_data1 =~ /STATUS/ ) {
-            &print_log( "ed1:"
-                  . $event_data1
-                  . " prev_units : "
-                  . join( ",", keys %prev_x10_units ) );
+            &print_log( "ed1:" . $event_data1 . " prev_units : " . join( ",", keys %prev_x10_units ) );
 
             # new code here
             if ( $event_data1 !~ /(\S\S)STATUS_(\S+)/ ) {
@@ -5139,8 +4859,7 @@ sub process_serial_data {
             }
         }
         elsif ( $event_data1 =~ /&P/ ) {
-            my ( $house, $device, $house2, $level ) =
-              $event_data1 =~ /(\S)(\S)(\S)&P(.*)/;
+            my ( $house, $device, $house2, $level ) = $event_data1 =~ /(\S)(\S)(\S)&P(.*)/;
             $level -= 128 if ( $level > 128 );    #***move this to cm11 module
             my $level1 = ( ( $level / 63 ) * 100 );
             $level1 = int( $level1 + 0.5 );
@@ -5178,8 +4897,7 @@ sub process_serial_data {
 
             #           &print_log("ed1:" . $event_data1);
             #           my ($house, $device, $state) = $event_data1 =~ /(\S)(\S)STATUS_(\S+)/;
-            my ( $house, $device, $state ) =
-              $event_data1 =~ /(\S)(\S)\S{0,2}STATUS_(\S+)/;
+            my ( $house, $device, $state ) = $event_data1 =~ /(\S)(\S)\S{0,2}STATUS_(\S+)/;
 
             $event_data1 =~ s/\S\SSTATUS_$state//g;
             $event_data = "X" . $event_data1;
@@ -5204,25 +4922,21 @@ sub process_serial_data {
                             if (   ( lc($state) eq "on" )
                                 or ( lc($state) eq "off" ) )
                             {
-                                &print_log( $ref->{x10_id} . ": "
-                                      . substr( $ref->{object_name}, 1 )
-                                      . " reported new status: $state" )
+                                &print_log(
+                                    $ref->{x10_id} . ": " . substr( $ref->{object_name}, 1 ) . " reported new status: $state" )
                                   if (  ( lc( $ref->{state} ) ne 'status' )
                                     and ( lc( $ref->{state} ) ne 'manual' ) );
                                 set_receive $ref $state, 'status';
                             }
                         }
 
-                        print
-                          "CM11 Status results: data=$event_data1 event_data=$event_data state=$state\n"
+                        print "CM11 Status results: data=$event_data1 event_data=$event_data state=$state\n"
                           if $Debug{x10};
                     }
                 }
             }
             else {
-                &print_log(
-                    "Status request on undefined state: data=$event_data1 event_data=$event_data"
-                );
+                &print_log( "Status request on undefined state: data=$event_data1 event_data=$event_data" );
             }
             return unless $event_data1;
         }
@@ -5241,8 +4955,7 @@ sub process_serial_data {
 
                 #               print "db $event_data1 eq $prev_x10_events[$i]{data}\n";
                 if ( $event_data1 eq $prev_x10_events[$i]{data} ) {
-                    print_log
-                      "X10: Duplicate data ignored data=$event_data time=$time_diff"
+                    print_log "X10: Duplicate data ignored data=$event_data time=$time_diff"
                       if $config_parms{x10_errata} >= 3;
                     return;
                 }
@@ -5250,8 +4963,7 @@ sub process_serial_data {
         }
         unless ( $prev_pass or $source eq 'rf' ) {
             pop @prev_x10_events if @prev_x10_events > 4;
-            unshift @prev_x10_events,
-              { time => $loop_tickcount1, data => $event_data1 };
+            unshift @prev_x10_events, { time => $loop_tickcount1, data => $event_data1 };
         }
 
     }
@@ -5273,8 +4985,7 @@ sub process_serial_data {
             }
 
             # Allow for other processing
-            &Serial_match_hooks( $ref, $state, $event_data )
-              ;    # Created by &add_hooks
+            &Serial_match_hooks( $ref, $state, $event_data );    # Created by &add_hooks
         }
     }
 
@@ -5342,8 +5053,7 @@ sub process_serial_data {
         my $pos    = 1;
         while ( $pos < $length ) {
             last
-              if $event_data =~ /PRESET_DIM/
-              ;    # The DIM1 and DIM2 strings would get parsed as M1 and M2
+              if $event_data =~ /PRESET_DIM/;    # The DIM1 and DIM2 strings would get parsed as M1 and M2
             my $unit = substr( $event_data, $pos, 2 );
             if ( $unit =~ /([A-P][1-9A-G])/ ) {
                 undef %prev_x10_units if $prev_x10_units_reset;
@@ -5353,15 +5063,13 @@ sub process_serial_data {
             else {
                 $prev_x10_units_reset = 1;
                 undef %prev_x10_units
-                  if $unit =~ /[A-P][OP]/;   # Reset list if we see a all on/off
+                  if $unit =~ /[A-P][OP]/;       # Reset list if we see a all on/off
                 last
-                  if $unit =~
-                  /[A-P][LM]/;    # The rest of the string is bright/dim codes
+                  if $unit =~ /[A-P][LM]/;       # The rest of the string is bright/dim codes
             }
             $pos += 2;
         }
-        print "X10: Previous units=", keys %prev_x10_units,
-          " reset_flag=$prev_x10_units_reset\n"
+        print "X10: Previous units=", keys %prev_x10_units, " reset_flag=$prev_x10_units_reset\n"
           if $Debug{x10};
 
         # Check for codes All-on All-off
@@ -5387,10 +5095,8 @@ sub process_serial_data {
                 # I don't think non-cm11 interfaces will generate this??
                 #               my $dim_level = &ControlX10::CM11::dim_level_decode(substr($event_data, 3)) if $config_parms{cm11_port};
                 #               return 1 unless $dim_level;
-                my $dim_level =
-                  &x10_dim_level_decode( substr( $event_data, 3 ) );
-                $dim_level =
-                  ( $f_code eq 'M' ) ? '+' . $dim_level : '-' . $dim_level;
+                my $dim_level = &x10_dim_level_decode( substr( $event_data, 3 ) );
+                $dim_level = ( $f_code eq 'M' ) ? '+' . $dim_level : '-' . $dim_level;
 
                 #               $dim_level = ($f_code eq 'M') ? '+' . $dim_level : '-'  $dim_level;
                 print_log "X10: Dim/bright level=$dim_level event=$event_data "
@@ -5425,8 +5131,7 @@ sub process_serial_data {
                 my $prev_x10_time = $prev_x10_events[$i]{time};
                 last
                   unless $prev_x10_time
-                  and $prev_x10_time >
-                  ( $loop_tickcount1 - $config_parms{x10_multikey_delay} );
+                  and $prev_x10_time > ( $loop_tickcount1 - $config_parms{x10_multikey_delay} );
                 $prev_x10_event = $prev_x10_events[$i]{data} . $prev_x10_event;
             }
         }
@@ -5474,8 +5179,7 @@ sub proxy_send {
     my ( $interface, $function, @data ) = @_;
 
     my $address;
-    if ( $function eq 'speak' or $function eq 'play' or $function eq 'ibutton' )
-    {
+    if ( $function eq 'speak' or $function eq 'play' or $function eq 'ibutton' ) {
         $address = $interface;
     }
     else {
@@ -5495,21 +5199,18 @@ sub proxy_send {
 
     my $proxy = $proxy_servers{$address};
     unless ($proxy) {
-        print
-          "\nError in proxy_send:  no proxy server found for function=$function int=$interface address=$address data=@data\n";
+        print "\nError in proxy_send:  no proxy server found for function=$function int=$interface address=$address data=@data\n";
         return 0;
     }
 
-    print
-      "proxy data sent: int=$interface f=$function a=$address p=$proxy d=@data\n"
+    print "proxy data sent: int=$interface f=$function a=$address p=$proxy d=@data\n"
       if $Debug{proxy};
     $proxy->start unless $proxy->active;
     if ( $proxy->active ) {
         $proxy->set( join $;, $interface, $function, @data );
     }
     else {
-        print_log
-          "Error in proxy_send: proxy port not active for function=$function int=$interface address=$address data=@data";
+        print_log "Error in proxy_send: proxy port not active for function=$function int=$interface address=$address data=@data";
 
         #       return 0;  If we return 0, send_serial_data will try to send.
     }
@@ -5541,14 +5242,12 @@ sub process_x10_chunks {
     my $flag_found = 0;
     my $event_data_chunk;
     while ( $pos < $length ) {
-        print
-          "X10 db: try breaking $event_data into 4 and 2 character chunks:\n"
+        print "X10 db: try breaking $event_data into 4 and 2 character chunks:\n"
           if $Debug{x10};
 
         # Look for 4 character match
         #  - also match raw bright/dim commands (XaBcd is a match if B=L or M)
-        if ( $event_data_chunk = 'X' . substr( $event_data, $pos, 4 )
-            and ( &Device_Item::items_by_id($event_data_chunk) )
+        if ( $event_data_chunk = 'X' . substr( $event_data, $pos, 4 ) and ( &Device_Item::items_by_id($event_data_chunk) )
             or ( $event_data_chunk =~ /^X\S[ML]\S\S/ ) )
         {
             #           (substr($event_data, $pos) =~ /^\S[ML]/)) {
@@ -5592,9 +5291,7 @@ sub process_x10_chunks {
             $fc = 'OFF'     if $fc eq 'K';
             $fc = 'ALL_ON'  if $fc eq 'O';
             $fc = 'ALL_OFF' if $fc eq 'P';
-            &print_log(
-                "X10: Unmatched incoming data_chunk=$event_data_chunk ($hc $fc)"
-            ) if $config_parms{x10_errata} >= 2;
+            &print_log( "X10: Unmatched incoming data_chunk=$event_data_chunk ($hc $fc)" ) if $config_parms{x10_errata} >= 2;
             $pos += 2;
         }
     }
@@ -5610,18 +5307,12 @@ sub read_code_forced {
 
 sub read_code {
     my ($reload_mode) = @_;
-    my (
-        @files,          $file,       $file_dir,
-        $file_path,      @files_read, @files_changed,
-        @files_changed2, $file_time,  %noload_files
-    );
+    my ( @files, $file, $file_dir, $file_path, @files_read, @files_changed, @files_changed2, $file_time, %noload_files );
 
     $Reread = 1;
 
-    print_log( ( ($Startup) ? 'R' : 'Re-r' )
-        . "eading "
-          . ( ( $ENV{mh_parms} ) ? $ENV{mh_parms} : 'mh.private.ini' )
-          . " and mh.ini" );
+    print_log(
+        ( ($Startup) ? 'R' : 'Re-r' ) . "eading " . ( ( $ENV{mh_parms} ) ? $ENV{mh_parms} : 'mh.private.ini' ) . " and mh.ini" );
 
     read_parms unless $Startup;    # Re-read .ini parms, in case they changed
 
@@ -5631,11 +5322,10 @@ sub read_code {
     #  - %Local_Addresses is for backward compatibility ... maybe drop it some day
     %Local_Addresses =
       map { $_, 1 } split( ',', $config_parms{local_addresses} );
-    @Local_Addresses = split ',', $config_parms{local_addresses};
-    @Password_Allow_Clients = split /[, ]+/,
-      $config_parms{password_allow_clients};
+    @Local_Addresses        = split ',',     $config_parms{local_addresses};
+    @Password_Allow_Clients = split /[, ]+/, $config_parms{password_allow_clients};
 
-    &read_table_files();  # Re-create table code file, if any table file changed
+    &read_table_files();    # Re-create table code file, if any table file changed
 
     print "Reading code_dirs: @Code_Dirs\n";
     if ( @Requested_Files or $config_parms{only_load} ) {
@@ -5652,11 +5342,10 @@ sub read_code {
         }
 
         # Add selected members from code_dir_common
-        push @files_read,
-          &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
+        push @files_read, &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
 
         @files_read = grep( /^[a-z0-9].*\.(pl|mhp)$/i, @files_read )
-          ; # Must start with alphanumeric ... emacs edited checkpoints can start with #
+          ;    # Must start with alphanumeric ... emacs edited checkpoints can start with #
 
     }
     @files_read = map { lc } @files_read
@@ -5673,15 +5362,15 @@ sub read_code {
     undef @files_changed;
     undef @files_changed2;
     my %files_deleted = %file_code_times;
-    %noload_files = map { lc($_), 1 } (
-        split( ',', $config_parms{no_load} ),
-        &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 )
-    ) if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
+    %noload_files =
+      map { lc($_), 1 }
+      ( split( ',', $config_parms{no_load} ), &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 ) )
+      if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
 
     my %files_seen;
     for $file (@files_read) {
         next
-          if $file =~ /^read_table/; # Ignore table file readers in the user dir
+          if $file =~ /^read_table/;    # Ignore table file readers in the user dir
         ( print "File skipped due to -noload: $file\n" ), next
           if $noload_files{ lc($file) };
 
@@ -5689,8 +5378,7 @@ sub read_code {
         for my $code_dir (@Code_Dirs) {
             next unless -e "$code_dir/$file";
             if ($file_path) {
-                print
-                  "Duplicate file.\n -    Used: $file_path\n - Skipped: $code_dir/$file\n\n";
+                print "Duplicate file.\n -    Used: $file_path\n - Skipped: $code_dir/$file\n\n";
             }
             else {
                 $file_path = "$code_dir/$file";
@@ -5762,8 +5450,7 @@ sub read_misc_parms {
       if file_change( $config_parms{area_code_file} )
       or $Startup;
 
-    &Caller_ID::read_callerid_list( $config_parms{caller_id_file},
-        $config_parms{caller_id_reject_file} )
+    &Caller_ID::read_callerid_list( $config_parms{caller_id_file}, $config_parms{caller_id_reject_file} )
       if file_change( $config_parms{caller_id_file} )
       or file_change( $config_parms{caller_id_reject_file} )
       or $Startup;
@@ -5783,10 +5470,10 @@ sub convert_table_files {
     @files_read = grep( /^[a-z0-9].*\.mht$/i, @files_read );
 
     # See if we are supposed to skip any files
-    my %noload_files = map { lc($_), 1 } (
-        split( ',', $config_parms{no_load} ),
-        &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 )
-    ) if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
+    my %noload_files =
+      map { lc($_), 1 }
+      ( split( ',', $config_parms{no_load} ), &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 ) )
+      if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
 
     ## attempt to convert all *.mht files to xml
     require "table_A2XML.pm";
@@ -5828,10 +5515,10 @@ sub read_table_files {
     print_log "Reading $count .mht table files: @files_read";
 
     # See if we are supposed to skip any files
-    my %noload_files = map { lc($_), 1 } (
-        split( ',', $config_parms{no_load} ),
-        &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 )
-    ) if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
+    my %noload_files =
+      map { lc($_), 1 }
+      ( split( ',', $config_parms{no_load} ), &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 ) )
+      if -e "$config_parms{data_dir}/$config_parms{code_unselect}";
 
     # See if any of the files have changed
     my ($changed);
@@ -5851,14 +5538,12 @@ sub read_table_files {
         next if $noload_files{ lc($file) };
 
         #       (my $table_code_file = "$file_paths{$file}") =~ s/\.mht$/.mhp/i;
-        ( my $table_code_file = "$file_paths{$file}" ) =~
-          s/\.$table_type$/.mhp/i;
+        ( my $table_code_file = "$file_paths{$file}" ) =~ s/\.$table_type$/.mhp/i;
         print_log "Translating $file -> $table_code_file";
         open TABLE_IN,  "$file_paths{$file}";
         open TABLE_OUT, ">$table_code_file"
           or print_log "Error in writing to $table_code_file";
-        print TABLE_OUT
-          "#\n#@ Do NOT edit this file.  It was auto-generated from $file.\n#\n";
+        print TABLE_OUT "#\n#@ Do NOT edit this file.  It was auto-generated from $file.\n#\n";
         print TABLE_OUT "# Category = Other\n\n";
         my $format;
         my %formats_seen;
@@ -5906,8 +5591,7 @@ sub read_table_files {
         close TABLE_IN;
         close TABLE_OUT;
         if ( $format =~ /xml/ ) { $/ = "\n"; }
-        print_log
-          "Table format not recognized: file=$file mhp_file=$table_code_file."
+        print_log "Table format not recognized: file=$file mhp_file=$table_code_file."
           unless $format;
     }
 
@@ -5925,8 +5609,7 @@ sub set_app_parms {
             }
         }
         else {
-            print
-              "app_parms: func=$func -app $app not listed in mh.ini ${func}_apps parms\n"
+            print "app_parms: func=$func -app $app not listed in mh.ini ${func}_apps parms\n"
               if $Debug{parms};
         }
     }
@@ -5936,16 +5619,14 @@ sub setup_DBI {
     use vars '$DBI';
     return unless $config_parms{dbi_driver};
 
-    my $db =
-      "DBI:$main::config_parms{dbi_driver}:$main::config_parms{dbi_database}";
+    my $db = "DBI:$main::config_parms{dbi_driver}:$main::config_parms{dbi_database}";
     $db .= ":$config_parms{dbi_server}" if $config_parms{dbi_server};
     $db .= ":$config_parms{dbi_port}"   if $config_parms{dbi_port};
     print "Enabling DBI database:  $db\n";
 
     unless ( &my_use('DBI') ) {    # So we don't fail if DBI is not installed
         return
-          if $DBI = DBI->connect( $db, $config_parms{dbi_user},
-            $config_parms{dbi_password} );
+          if $DBI = DBI->connect( $db, $config_parms{dbi_user}, $config_parms{dbi_password} );
     }
 
     print " - Could not connect to database.\n";
@@ -6061,7 +5742,7 @@ sub read_user_code {
                 $record .= "\n\$Category = '$1';\n";    # Used in tk_widgets
                 push @{ $files_by_webname{$webname} }, $member_name;
             }
-            $webname =~ tr/ /\_/;    # Blanks are not allowed in urls
+            $webname =~ tr/ /\_/;                       # Blanks are not allowed in urls
             $member_sort_order{$member_name} = $1
               if $record =~ /\#\s*position\s*=\s*(\S+)/i;
 
@@ -6073,12 +5754,10 @@ sub read_user_code {
 
             #           my ($object, $type) = $record =~ /^\s{0,3}(\$\S+)\s*=\s*new\s+([^\s\(\;]+)/; # <- Did not parse on RH 9.0 perl 5.8!  Ok without last \s
             #           my ($object, $type) = $record =~ /^\s{0,3}(\$\S+)\s*=\s*new\s+([A-Za-z0-9\_\-]+)/;
-            my ( $object, $type ) =
-              $record =~ /^\s{0,3}(\$\S+)\s*=\s*new\s+([A-Za-z0-9:\_\-]+)/;
+            my ( $object, $type ) = $record =~ /^\s{0,3}(\$\S+)\s*=\s*new\s+([A-Za-z0-9:\_\-]+)/;
 
             # Allow for type->new(..)
-            ( $object, $type ) =
-              $record =~ /^\s{0,3}(\$\S+)\s*=\s*(\S+?) *-> *new/
+            ( $object, $type ) = $record =~ /^\s{0,3}(\$\S+)\s*=\s*(\S+?) *-> *new/
               unless $type;
 
             #           print "wn=$webname member=$member_name o=$object type=$type\n";
@@ -6102,8 +5781,7 @@ sub read_user_code {
                 $object_name_check{$object}{record} = $r_test;
                 $object_name_check{$object}{member} = $member_name;
 
-                push @Item_Code_Objects,
-                  &store_object_data( $object, $type, $webname, $member_name );
+                push @Item_Code_Objects, &store_object_data( $object, $type, $webname, $member_name );
             }
 
             # Find global records
@@ -6121,17 +5799,16 @@ sub read_user_code {
                 $record =~ /^our[\s\(]/   or    # Global 'our'
                 $record =~ /^use +vars\s/ or    # Global 'use vars'
                 $record =~ /^\s*hidden\s/
-                or    # These only needs to be done on code load
-                $record =~ /->\s*hidden/
-                or $record =~
-                /^\s*set_(authority|icon|info|order|fp_location)\s/
+                or                              # These only needs to be done on code load
+                   $record =~ /->\s*hidden/
+                or $record =~ /^\s*set_(authority|icon|info|order|fp_location)\s/
                 or $record =~ /->\s*set_(authority|icon|info|order|fp_location)/
                 or $record =~ /^\ {0,3}\S+\s*->\s*add[\s\(]/
                 or $record =~ /^\ {0,3}add\s/
               )
             {
                 $noloop_statement_flag = 1
-                  unless $pod_flag;    # Allow for multi-record statements
+                  unless $pod_flag;             # Allow for multi-record statements
             }
 
             if (   $noloop_flag
@@ -6163,8 +5840,7 @@ sub read_user_code {
         # Default the order of user files after common files,
         # so we can override functions if neede
         unless ( defined $member_sort_order{$member_name} ) {
-            $member_sort_order{$member_name} =
-              ( $file =~ /$config_parms{code_dir_common}/ ) ? 8 : 9;
+            $member_sort_order{$member_name} = ( $file =~ /$config_parms{code_dir_common}/ ) ? 8 : 9;
         }
 
         #       ($webname =~ /startup/i) ?  unshift(@Loop_Code, $temp) : push(@Loop_Code, $temp);
@@ -6201,13 +5877,11 @@ sub read_user_code {
     # do the 'object_name' reference and do symbolic var manipulation
     for ( sort keys %file_by_object_name ) {
         my @list = sort keys %{ $file_by_object_name{$_} };
-        @list = grep !/\[/, @list
-          ; # Do not 'use vars' objects that are members of pre-declared list arrays
+        @list = grep !/\[/, @list;                       # Do not 'use vars' objects that are members of pre-declared list arrays
         unshift @Item_Code, "use vars qw(@list);\n\n";
         unshift @Item_Code, "# List of $_ objects\n";
     }
-    push( @Item_Code, @Item_Code_Objects )
-      ;     # These have to come after the objects have been defined
+    push( @Item_Code, @Item_Code_Objects );              # These have to come after the objects have been defined
 
     &write_user_code;
 
@@ -6250,8 +5924,7 @@ sub read_user_code_loopcode {
         $allowed_errors = 10;
     }
     else {
-        print_log
-          "$member_name has $allowed_errors allowed errors before being disabled";
+        print_log "$member_name has $allowed_errors allowed errors before being disabled";
     }
     $sub_name =~ s/[- ]/_/g;    # Legalize sub name
     my $debug_print = '';
@@ -6295,8 +5968,7 @@ sub do_user_file {
         display "Error in do_user_file eval on $file: \n error: $@\n";
         if ( $Sub_Code{$member_name} ) {
             print_log "Reading in older code for $member_name";
-            $code =
-              &read_user_code_loopcode( $member_name, $Sub_Code{$member_name} );
+            $code = &read_user_code_loopcode( $member_name, $Sub_Code{$member_name} );
             eval $code;
             display "Error in 2nd do_user_file eval $file: \n error: $@\n"
               if $@;
@@ -6319,8 +5991,7 @@ sub run_voice_cmd {
 
     # Look for the first Voice_Cmd match
     my ( $ref, $said, $vocab_cmd ) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
-    print
-      "run_voice_cmd cmd=$cmd ref=$ref said=$said vocab=$vocab_cmd no_log=$no_log set_by=$set_by target=$respond_target\n"
+    print "run_voice_cmd cmd=$cmd ref=$ref said=$said vocab=$vocab_cmd no_log=$no_log set_by=$set_by target=$respond_target\n"
       if $Debug{misc};
     if ( $ref and $vocab eq $vocab_cmd ) {
         set $ref $said, $set_by, $no_log, $respond_target;
@@ -6331,8 +6002,7 @@ sub run_voice_cmd {
     # Also look for any Text_Cmd matches
     # ... maybe this should go under process_external_command?
     # ... if so, web RUN would not work.
-    my $text_cmd_matches =
-      &Text_Cmd::set_matches( $cmd, $set_by, $no_log, $respond_target );
+    my $text_cmd_matches = &Text_Cmd::set_matches( $cmd, $set_by, $no_log, $respond_target );
 
     return ( $ref or $text_cmd_matches ) ? 1 : 0;
 }
@@ -6352,15 +6022,13 @@ sub sendkeys_find_window {
     }
     else {
         my $window;
-        unless ( &WaitForAnyWindow( $title, \$window, 100, 200 ) or !$program )
-        {
+        unless ( &WaitForAnyWindow( $title, \$window, 100, 200 ) or !$program ) {
             print "Starting $program\n" if $Debug{misc};
             $program = "\"$program\"" if $program =~ /\x20/;
             run $program;
             print "Waiting for $title...\n" if $Debug{misc};
-            &WaitForAnyWindow( $title, \$window, $timeout, 200 )
-              ;                            # Wait for 2 seconds
-            select undef, undef, undef, .5;    # Give it a chance to get going
+            &WaitForAnyWindow( $title, \$window, $timeout, 200 );    # Wait for 2 seconds
+            select undef, undef, undef, .5;                          # Give it a chance to get going
         }
         if ($window) {
             print "Found window $title: $window\n" if $Debug{misc};
@@ -6373,11 +6041,7 @@ sub sendkeys_find_window {
     }
 }
 
-my (
-    $loop_speed_cnt, $loop_unix_cnt, $prev_time,
-    $prev_sec,       $prev_min,      $prev_hour,
-    $prev_mday,      $prev_month,    $prev_year
-);
+my ( $loop_speed_cnt, $loop_unix_cnt, $prev_time, $prev_sec, $prev_min, $prev_hour, $prev_mday, $prev_month, $prev_year );
 
 sub set_global_vars {
 
@@ -6416,26 +6080,22 @@ sub set_global_vars {
         {
             my $volume = int 100 * $DelayOccured / 30;
             if ( -e ( $Sounds{'mh_pause'} ) ) {
-                &play( file => 'mh_pause', volume => $volume )
-                  ;    # Defined in event_sounds.pl
+                &play( file => 'mh_pause', volume => $volume );    # Defined in event_sounds.pl
             }
             print_log "Paused for $DelayOccured seconds";
         }
-        logit "$config_parms{data_dir}/logs/mh_pause.$Year_Month_Now.log",
-          "mh paused for $DelayOccured seconds";
+        logit "$config_parms{data_dir}/logs/mh_pause.$Year_Month_Now.log", "mh paused for $DelayOccured seconds";
         if (    $DelayOccured > $config_parms{time_catchup_skip}
             and $config_parms{no_log} =~ /pause/ )
         {
-            print_log
-              "Skipping catchup mode. Pause of $DelayOccured > $config_parms{time_catchup_skip} seconds";
+            print_log "Skipping catchup mode. Pause of $DelayOccured > $config_parms{time_catchup_skip} seconds";
         }
         else {
             $Time_Start_time = $prev_time;
             set $Catchup_Mode 'mh_pause';
-            $Time_Increment = 1;
-            $config_parms{sleep_time} =
-              $Loop_Sleep_Time;    # In case we manually change it after startup
-            $Loop_Sleep_Time = 0;  # Go to full throttle catchup mode
+            $Time_Increment           = 1;
+            $config_parms{sleep_time} = $Loop_Sleep_Time;    # In case we manually change it after startup
+            $Loop_Sleep_Time          = 0;                   # Go to full throttle catchup mode
         }
     }
 
@@ -6444,8 +6104,7 @@ sub set_global_vars {
 
         # We are past Stop_time, exit mh
         if ( $Time_Stop_time and $Time_Stop_time < $Time ) {
-            my $msg =
-              "Exiting at specified stop time of $config_parms{time_stop}";
+            my $msg = "Exiting at specified stop time of $config_parms{time_stop}";
 
             #           &speak($msg);
             print_log $msg;
@@ -6459,8 +6118,7 @@ sub set_global_vars {
             and ( $Time + $Time_Increment ) > time )
         {
             if ( $$Catchup_Mode{state} eq 'startup' ) {
-                my $msg =
-                  "Caught up from start time of $config_parms{time_start}";
+                my $msg = "Caught up from start time of $config_parms{time_start}";
                 print_log $msg;
                 &speak($msg) unless $config_parms{time_start} eq 'resume';
 
@@ -6502,8 +6160,7 @@ sub set_global_vars {
     unless ( $prev_time == $Time ) {
 
         # Synchronize milli-second flags
-        $loop_tickcount2 = $loop_tickcount3 = $loop_tickcount4 =
-          $loop_tickcount1;
+        $loop_tickcount2 = $loop_tickcount3 = $loop_tickcount4 = $loop_tickcount1;
         $New_Msecond_100 = $New_Msecond_250 = $New_Msecond_500 = 1;
 
         $Info{loop_speed} = $loop_speed_cnt;
@@ -6522,8 +6179,7 @@ sub set_global_vars {
 
         $New_Second = 1;
         my $year_unix;
-        ( $Second, $Minute, $Hour, $Mday, $Month, $year_unix, $Wday ) =
-          localtime($Time);
+        ( $Second, $Minute, $Hour, $Mday, $Month, $year_unix, $Wday ) = localtime($Time);
         $Month++;
         $Day      = (qw(Sun Mon Tue Wed Thu Fri Sat))[$Wday];
         $prev_sec = $Second;
@@ -6578,14 +6234,11 @@ sub set_global_vars {
                     }
                     $Date_Now           = &time_date_stamp( 6,  $Time );
                     $Date_Now_Speakable = &time_date_stamp( 15, $Time );
-                    $Year_Month_Now =
-                      &time_date_stamp( 10, $Time );    # Useful for log files
-                    $Year = $year_unix + 1900;
+                    $Year_Month_Now     = &time_date_stamp( 10, $Time );    # Useful for log files
+                    $Year               = $year_unix + 1900;
                     $Year += 100 if $Year < 1970;
-                    &set_sun_time
-                      ;    # Get new sunrise/sunset times for the new day
-                    &set_moon_data
-                      ;    # Get new sunrise/sunset times for the new day
+                    &set_sun_time;                                          # Get new sunrise/sunset times for the new day
+                    &set_moon_data;                                         # Get new sunrise/sunset times for the new day
 
                     # Calander info at: http://www.pip.dknet.dk/~pip10160/cal/calendar20.txt
                     # From a anoter web page (no other info though)
@@ -6622,48 +6275,29 @@ sub set_global_vars {
 
                         #                       print "Checking holiday dates $config_parms{holiday_dates}\n";
                         undef $Holiday;
-                        for my $date_des ( split ',',
-                            $config_parms{holiday_dates} )
-                        {
+                        for my $date_des ( split ',', $config_parms{holiday_dates} ) {
                             my ( $month, $mday, $wday, $week, $year, $des );
-                            if ( ( $month, $wday, $week, $des ) =
-                                $date_des =~ m|(\d+)/(\d+)\^(-?\d+)\s*(.*)| )
-                            {
+                            if ( ( $month, $wday, $week, $des ) = $date_des =~ m|(\d+)/(\d+)\^(-?\d+)\s*(.*)| ) {
                                 my $week2 =
                                   ( $week < 0 )
-                                  ? int(
-                                    ( days_in( $Year, $Month ) - $Mday + 7 ) /
-                                      7 )
+                                  ? int( ( days_in( $Year, $Month ) - $Mday + 7 ) / 7 )
                                   : int( ( $Mday + 6 ) / 7 );
 
                                 #                               print "db0 m=$month wday=$wday week=$week week2=$week2 des=$des\n";
                                 if ( $month == $Month and $wday == $Wday ) {
                                     if (
-                                        (
-                                            $week > 0
-                                            and int( ( $Mday + 6 ) / 7 ) ==
-                                            $week
-                                        )
-                                        or (
-                                            $week < 0
-                                            and int(
-                                                (
-                                                    days_in( $Year, $Month ) -
-                                                      $Mday + 7
-                                                ) / 7
-                                            ) == abs($week)
-                                        )
+                                        ( $week > 0 and int( ( $Mday + 6 ) / 7 ) == $week )
+                                        or ( $week < 0
+                                            and int( ( days_in( $Year, $Month ) - $Mday + 7 ) / 7 ) == abs($week) )
                                       )
                                     {
                                         $des = 1
-                                          unless $des; # Description is optional
+                                          unless $des;    # Description is optional
                                         $Holiday = $des;
                                     }
                                 }
                             }
-                            elsif ( ( $month, $mday, $year, $des ) =
-                                $date_des =~ m|(\d+)/(\d+)/?(\d*)\s*(.*)| )
-                            {
+                            elsif ( ( $month, $mday, $year, $des ) = $date_des =~ m|(\d+)/(\d+)/?(\d*)\s*(.*)| ) {
                                 ( $mday, $month ) = ( $month, $mday )
                                   if $config_parms{date_format} =~ /ddmm/;
 
@@ -6705,8 +6339,7 @@ sub set_global_vars {
                 $Dark = 0;
             }
         }
-        $New_Second = $New_Minute = $New_Hour = $New_Day = $New_Week =
-          $New_Month = $New_Year = 0
+        $New_Second = $New_Minute = $New_Hour = $New_Day = $New_Week = $New_Month = $New_Year = 0
           if $Startup or $Reload;
 
         # More $New_Second stuff ...
@@ -6736,8 +6369,7 @@ sub set_global_vars {
             #            push @loop_tickcount_totals, $loop_tickcount_total;
             $Info{cpu_used} = 100 * $loop_tickcount_total / 1000
               if $loop_tickcount_total;
-            $Info{cpu_used} /= 2
-              ; # Heuristic ... maybe due to un-accounted for sleeps in non-user code?
+            $Info{cpu_used} /= 2;    # Heuristic ... maybe due to un-accounted for sleeps in non-user code?
             $loop_tickcount_total = 0;
         }
         $Info{cpu_used} = 100 if $Info{cpu_used} > 100;
@@ -6749,11 +6381,9 @@ sub set_global_vars {
         $Time_Uptime_Seconds = $Time - $Time_Startup_time;
         my $uptime_days;
         if ( $New_Minute
-            and 48 <
-            ( $uptime_days = $Time_Uptime_Seconds / ( 24 * 3600000 ) ) )
+            and 48 < ( $uptime_days = $Time_Uptime_Seconds / ( 24 * 3600000 ) ) )
         {
-            print_log
-              "Uptime: $uptime_days days.  Better re-start MisterHouse.  "
+            print_log "Uptime: $uptime_days days.  Better re-start MisterHouse.  "
               . "It will mess up after 49.7 (2**32 mill-seconds) days of uptime";
             &speak("Please restart misterhouse.  Uptime is $uptime_days days.")
               if $New_Hour
@@ -6761,16 +6391,13 @@ sub set_global_vars {
               and $Hour < 22;
         }
 
-        $Tk_objects{label_uptime_cpu} = sprintf( "CPU %s",
-            &time_diff( $Time_Boot_time, $Time, undef, 'numeric' ) );
+        $Tk_objects{label_uptime_cpu} = sprintf( "CPU %s", &time_diff( $Time_Boot_time, $Time, undef, 'numeric' ) );
 
         #                                               &time_diff($Time_Boot_time, ($loop_tickcount1)/1000, undef, 'numeric'));
-        $Tk_objects{label_uptime_mh} = sprintf( "MH %s",
-            &time_diff( $Time_Startup_time, $Time, undef, 'numeric' ) );
+        $Tk_objects{label_uptime_mh} = sprintf( "MH %s", &time_diff( $Time_Startup_time, $Time, undef, 'numeric' ) );
         my $cpu_used = $Info{cpu_used};
         if ( $cpu_used == 100 ) {
-            $cpu_used = ' 100%'
-              ; # Fixes jitter when system status bar visible and toolbar floating (or on side edge)
+            $cpu_used = ' 100%';    # Fixes jitter when system status bar visible and toolbar floating (or on side edge)
         }
         else {
             $cpu_used = sprintf( "%3.1f%%", $cpu_used );
@@ -6781,8 +6408,7 @@ sub set_global_vars {
             ? sprintf( " Loops %3d", $Info{loop_speed} )
             : ''
           );
-        $Tk_objects{label_memory_used} =
-          sprintf( "MB %3.1f/%3.1f", $Info{memory_virtual}, $Info{memory_real} )
+        $Tk_objects{label_memory_used} = sprintf( "MB %3.1f/%3.1f", $Info{memory_virtual}, $Info{memory_real} )
           if $Info{memory_virtual};
 
         # This is grandfathered for old Tk menus
@@ -6795,10 +6421,9 @@ sub set_global_vars {
     #   &object_states_save if $New_Minute and !($Minute % 5); $Time_Increment
     &object_states_save
       if $New_Minute
-      and !( $Time_Start_time or $Time_Stop_time )
-      ;    # Skip if in accelerated mode
+      and !( $Time_Start_time or $Time_Stop_time );    # Skip if in accelerated mode
 
-    &set_debug_data if $New_Second;    # Populate %Debug if debug changed
+    &set_debug_data if $New_Second;                    # Populate %Debug if debug changed
 
 }
 
@@ -6845,9 +6470,7 @@ sub generic_device_open {
     my $handle = new IO::File( $Generic_Devices{$name}{location}, $flags );
 
     if ( !defined $handle ) {
-        &print_log( "Can't open generic device $name: "
-              . $Generic_Devices{$name}{location}
-              . ": $!" );
+        &print_log( "Can't open generic device $name: " . $Generic_Devices{$name}{location} . ": $!" );
         return;
     }
 
@@ -6880,15 +6503,12 @@ sub read_from_generic_device {
         # &print_log("buffer is $buffer");
         $Generic_Devices{$name}{data} .= $buffer;
     }
-    if ( $! and $! != 11 )
-    {    # error 11 is "resource temporarily unavailable", we ignore it
+    if ( $! and $! != 11 ) {    # error 11 is "resource temporarily unavailable", we ignore it
         &print_log( "Error reading from $name: $! ", int($!) );
     }
     if ( $Generic_Devices{$name}{datatype} ne 'raw' ) {
         my $break = $Generic_Devices{$name}{break};
-        if ( my ( $record, $remainder ) =
-            $Generic_Devices{$name}{data} =~ /(.+?)$break(.*)/s )
-        {
+        if ( my ( $record, $remainder ) = $Generic_Devices{$name}{data} =~ /(.+?)$break(.*)/s ) {
             $Generic_Devices{$name}{data_record} = $record;
             $Generic_Devices{$name}{data}        = $remainder;
         }
@@ -6896,10 +6516,7 @@ sub read_from_generic_device {
 }
 
 sub serial_port_create {
-    my (
-        $name,   $port,   $baudrate, $handshake, $datatype,
-        $prefix, $parity, $databits, $stopbits
-    ) = @_;
+    my ( $name, $port, $baudrate, $handshake, $datatype, $prefix, $parity, $databits, $stopbits ) = @_;
 
     # *** This fixes COM ports on Win2K platforms, so INI documentation about this is unneeded.
 
@@ -6952,7 +6569,7 @@ sub serial_port_open {
     if ( $serial_port = $Serial_Ports{object_by_port}{$port} ) {
         print "   reusing serial object on port $port for $name\n";
         $Serial_Ports{$name}{object} = $serial_port;
-        return;    # First port gets to set baudrate etc
+        return;                             # First port gets to set baudrate etc
     }
     else {
         # Must do a 'new', even if re-opening a recently closed port :(
@@ -7012,15 +6629,12 @@ sub set_sun_time {
         time_zone => $config_parms{time_zone}
     );
 
-    print
-      "Latitude: $config_parms{latitude},  Longitude: $config_parms{longitude},  Time Zone: $config_parms{time_zone}\n";
+    print "Latitude: $config_parms{latitude},  Longitude: $config_parms{longitude},  Time Zone: $config_parms{time_zone}\n";
     $Time_Sunrise = &sun_time( type => 'rise', @parms );
     $Time_Sunset  = &sun_time( type => 'set',  @parms );
 
-    $Time_Sunrise_Twilight =
-      &sun_time( type => 'rise', twilight => $config_parms{twilight}, @parms );
-    $Time_Sunset_Twilight =
-      &sun_time( type => 'set', twilight => $config_parms{twilight}, @parms );
+    $Time_Sunrise_Twilight = &sun_time( type => 'rise', twilight => $config_parms{twilight}, @parms );
+    $Time_Sunset_Twilight  = &sun_time( type => 'set',  twilight => $config_parms{twilight}, @parms );
 
     if ( $config_parms{time_format} == 12 ) {
         $Time_Sunrise          = time_to_ampm $Time_Sunrise;
@@ -7030,8 +6644,7 @@ sub set_sun_time {
     }
 
     print "sunrise=$Time_Sunrise sunset=$Time_Sunset\n";
-    print
-      "sunrise twilight=$Time_Sunrise_Twilight sunset twilight=$Time_Sunset_Twilight\n";
+    print "sunrise twilight=$Time_Sunrise_Twilight sunset twilight=$Time_Sunset_Twilight\n";
 }
 
 sub set_moon_data {
@@ -7049,8 +6662,7 @@ sub set_moon_data {
     )[ int .5 + 8 * $phase[0] ];
     $Moon{brightness} = int 100 * $phase[1];
     $Moon{age}        = int $phase[2];
-    print
-      "The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old\n";
+    print "The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old\n";
 
     my @phases = Astro::MoonPhase::phasehunt( $Time + 3600 * 24 * 30 );
     my $month  = 3600 * 24 * 29.53058868;
@@ -7126,8 +6738,7 @@ sub socket_close {
     # See if we need to close the parent socket
     delete $Socket_Ports{$port_name}{sock}
       if $Socket_Ports{$port_name}{host_port}
-      and $Socket_Ports{$port_name}{host_port} =~
-      /\:/;    # Client, not server, socket
+      and $Socket_Ports{$port_name}{host_port} =~ /\:/;    # Client, not server, socket
 
     $Socket_Ports{$port_name}{inactive_this_pass_flag} = 1;
     $Socket_Ports{$port_name}{active_this_pass_flag}   = 0;
@@ -7163,9 +6774,7 @@ sub socket_open {
                 Proto     => 'udp',
                 PeerAddr  => $address,
                 Broadcast => 1
-              )
-              or
-              die "Couldn't start a udp peer server on $port_name $port: $@\n";
+            ) or die "Couldn't start a udp peer server on $port_name $port: $@\n";
         }
         else {
             $Socket_Ports{$port_name}{sock} = new IO::Socket::INET->new(
@@ -7185,8 +6794,7 @@ sub socket_open {
           $Socket_Ports{$port_name}{sock};    # UDP ports are always "active"
     }
     else {
-        print
-          "\nUnknown protocol in socket_open for socket port $port_name: proto=$proto port=$port\n\n";
+        print "\nUnknown protocol in socket_open for socket port $port_name: proto=$proto port=$port\n\n";
     }
 }
 
@@ -7219,15 +6827,13 @@ sub socket_has_data {
         ($nfound) = select( $rbit, undef, undef, $timeout );
         last
           if $nfound == -1
-          and !( $!{EINTR} )
-          ;    # break out of the retry loop if an error did occur but not EINTR
+          and !( $!{EINTR} );                # break out of the retry loop if an error did occur but not EINTR
         $loopmax--;
     } until ( $loopmax == 0 or ( $nfound >= 0 ) );
 
     if ( $nfound == -1 and !( $!{EINTR} ) ) {
-        &::print_log(
-            "WARN: socket_has_data encountered error condition: $!.  mh should recover from this."
-        ) if $main::Debug{socket};
+        &::print_log( "WARN: socket_has_data encountered error condition: $!.  mh should recover from this." )
+          if $main::Debug{socket};
     }
 
     return $nfound;
@@ -7255,9 +6861,7 @@ sub parse_func_parms {
 
 sub parse_func_parms2 {
     my ( $ref, $text ) = @_;
-    while ( my ( $key, $value, $text_new ) =
-        $text =~ /^\s*(\S+?)=(\S*)\s*(.*)/s )
-    {
+    while ( my ( $key, $value, $text_new ) = $text =~ /^\s*(\S+?)=(\S*)\s*(.*)/s ) {
         $text = $text_new;
 
         # If value has leading but not trailing quote, grab till next quote
@@ -7293,7 +6897,7 @@ sub respond {
         $target = $1;
         &parse_func_parms2( \%parms, $2 );
     }
-    $target = 'default' if $target =~ /\$/;  # Ignore goofy target=$object cases
+    $target = 'default' if $target =~ /\$/;    # Ignore goofy target=$object cases
 
     #   $target =~ s/\$//g;     # Avoid errors from target=$object
     #    my $p = join ',', %parms; print "db2 p=$p.\n";
@@ -7422,8 +7026,7 @@ sub respond_telnet {
             if ( ( $to eq 'all' ) or ( $client_ip_address eq $to ) ) {
                 eval "\$telnet_server->set(q~$text~,$client_num)";
                 if ($@) {
-                    print
-                      "respond telnet eval error: client=$parms{client} text=$parms{text} error=$@\n";
+                    print "respond telnet eval error: client=$parms{client} text=$parms{text} error=$@\n";
                 }
                 else {
                     # send a cr
@@ -7437,8 +7040,7 @@ sub respond_telnet {
         eval "\$telnet_server->set(q~$parms{text}~)";    #, $parms{to})";
 
         #    eval "\$telnet_server->set(q~$parms{text}~, $parms{arg1})";
-        print
-          "respond telnet eval error: client=$parms{client} text=$parms{text} error=$@\n"
+        print "respond telnet eval error: client=$parms{client} text=$parms{text} error=$@\n"
           if $@;
     }
 }
@@ -7446,12 +7048,10 @@ sub respond_telnet {
 sub respond_object_set {
     my (%parms) = @_;
     $parms{name} = '$' . $parms{name} unless $parms{name} =~ /^\$/;
-    print
-      "respond object_set: $parms{name}->set(q~$parms{text}~, $parms{arg1}, $parms{arg2})\n"
+    print "respond object_set: $parms{name}->set(q~$parms{text}~, $parms{arg1}, $parms{arg2})\n"
       if $Debug{respond};
     eval "$parms{name}->set(q~$parms{text}~, $parms{arg1}, $parms{arg2})";
-    print
-      "respond object_set eval error: name=$parms{name}, arg1=$parms{arg1}, error=$@\n"
+    print "respond object_set eval error: name=$parms{name}, arg1=$parms{arg1}, error=$@\n"
       if $@;
 }
 
@@ -7459,8 +7059,7 @@ sub speak {
     my ( $rooms, $display_time, $play );
 
     my %parms = &parse_func_parms(@_);
-    &set_app_parms( \%parms, 'speak' )
-      ;    # Set parms according to an optional app parm
+    &set_app_parms( \%parms, 'speak' );    # Set parms according to an optional app parm
 
     my $phrase = $parms{text};
 
@@ -7480,7 +7079,7 @@ sub speak {
     #}
 
     $parms{mode} = '' unless $parms{mode};
-    $parms{rooms} = $parms{room}    if $parms{room};   # Allow for room or rooms
+    $parms{rooms} = $parms{room}    if $parms{room};      # Allow for room or rooms
     $rooms        = $parms{rooms}   if $parms{rooms};
     $display_time = $parms{display} if $parms{display};
     $play         = $parms{play}    if $parms{play};
@@ -7501,7 +7100,7 @@ sub speak {
         &display(@_);    # Display full text
         $phrase = substr( $phrase, 0, $parms{length} ) . '.  Speech truncated.';
     }
-    else {    # Not truncuated, but it is a text file, so display it too (?)
+    else {               # Not truncuated, but it is a text file, so display it too (?)
         $display_time = 120
           if !$display_time
           and $phrase !~ /\n/
@@ -7552,14 +7151,8 @@ sub speak {
             and $leave_socket_open_action !~ /,'w'/ )
         {
             # Generate to_wave file unless webmute
-            if (
-                my $wav_file = &http_speak_to_wav_start(
-                    $phrase, $parms{voice}, $parms{compression}
-                )
-              )
-            {
-                $leave_socket_open_action =
-                  "&http_speak_to_wav_finish(qq|$phrase|, qq|$wav_file|)";
+            if ( my $wav_file = &http_speak_to_wav_start( $phrase, $parms{voice}, $parms{compression} ) ) {
+                $leave_socket_open_action = "&http_speak_to_wav_finish(qq|$phrase|, qq|$wav_file|)";
                 $leave_socket_open_check  = "!&Voice_Text::is_speaking_wav()";
                 $leave_socket_open_passes = 999;
 
@@ -7687,20 +7280,16 @@ sub speak {
 sub route_display_rooms {
     my (%parms) = @_;
     my ( %targets, %display_rooms, %display_groups );
-    &main::read_parm_hash( \%display_rooms,
-        $main::config_parms{'display_rooms'} );
-    &main::read_parm_hash( \%display_groups,
-        $main::config_parms{'display_groups'} );
+    &main::read_parm_hash( \%display_rooms,  $main::config_parms{'display_rooms'} );
+    &main::read_parm_hash( \%display_groups, $main::config_parms{'display_groups'} );
     for my $room ( split( /[,;|]/, $parms{display_rooms} ) ) {
         if ( defined( $display_groups{$room} ) ) {
 
             # then expand the group
             my @groups = split( /[,;|]/, $display_groups{$room} );
             for my $group_room (@groups) {
-                if ( !( defined( $targets{$group_room} ) ) )
-                {    # prevent duplicates on expansion
-                    my %room_parms =
-                      &parse_func_parms( $display_rooms{$group_room} );
+                if ( !( defined( $targets{$group_room} ) ) ) {    # prevent duplicates on expansion
+                    my %room_parms = &parse_func_parms( $display_rooms{$group_room} );
                     %{ $targets{$group_room} } = %room_parms;
                 }
             }
@@ -7709,17 +7298,14 @@ sub route_display_rooms {
 
             # then expand into all rooms
             for my $all_room ( keys %display_rooms ) {
-                if ( !( defined( $targets{$all_room} ) ) )
-                {    # prevent duplicates on expansion
-                    my %room_parms =
-                      &parse_func_parms( $display_rooms{$all_room} );
+                if ( !( defined( $targets{$all_room} ) ) ) {      # prevent duplicates on expansion
+                    my %room_parms = &parse_func_parms( $display_rooms{$all_room} );
                     %{ $targets{$all_room} } = %room_parms;
                 }
             }
         }
         else {
-            if ( !( defined( $targets{$room} ) ) )
-            {        # prevent duplicates on expansion
+            if ( !( defined( $targets{$room} ) ) ) {              # prevent duplicates on expansion
                 my %room_parms = &parse_func_parms( $display_rooms{$room} );
                 %{ $targets{$room} } = %room_parms;
             }
@@ -7818,12 +7404,11 @@ sub time_between {
     return 0 if $time1 == 0;    # Time_date string invalid
     return 0 if $time2 == 0;    # Time_date string invalid
     if ( $time2 < $time1 ) {    # This happens comparing across midnight
-        if ( ( $time1 - $Time ) > 43200 )
-        {                       # If Time1 is more than 12 hours into the future
-            $time1 = $time1 - 86400;    #    Subtract 24 hours from Time1
+        if ( ( $time1 - $Time ) > 43200 ) {    # If Time1 is more than 12 hours into the future
+            $time1 = $time1 - 86400;           #    Subtract 24 hours from Time1
         }
         else {
-            $time2 = $time2 + 86400;    #    Otherwise add 24 hours to Time2
+            $time2 = $time2 + 86400;           #    Otherwise add 24 hours to Time2
         }
     }
     return ( ( $Time >= $time1 ) && ( $Time <= $time2 ) );
@@ -7870,7 +7455,7 @@ sub time_now {
     }
 
     return unless $time_date =~ /\S/;    # Ignore empty entries
-    return if $time_date eq 'none';   # For use in bypassing timed events easily
+    return if $time_date eq 'none';      # For use in bypassing timed events easily
 
     # Allow time_now to match to the nearest minute, not the exact second
     #  - if we add a 'catchup mode', we can go back to checking on the exact second
@@ -7892,11 +7477,11 @@ sub time_random_offset {
     # Only on secondboundarys
     return unless $New_Second;
     return unless $time_date =~ /\S/;    # Ignore empty entries
-    return if $time_date eq 'none';   # For use in bypassing timed events easily
+    return if $time_date eq 'none';      # For use in bypassing timed events easily
 
     my $time_now = &my_str2time($time_date);
     unless ($time_now) {
-        my @caller = caller;          # This is not useful in user_code eval :(
+        my @caller = caller;             # This is not useful in user_code eval :(
         print "Bad time_now format:  $time_date  caller=@caller\n";
         return 0;
     }
@@ -7946,8 +7531,7 @@ sub system_info {
 
 sub display_weather_graph {
     my $type = shift;
-    browser
-      "http://localhost:$config_parms{http_port}/bin/weather_graph.pl?$type"
+    browser "http://localhost:$config_parms{http_port}/bin/weather_graph.pl?$type"
       if $Run_Members{'weather_rrd_update'};
 }
 
@@ -7960,8 +7544,7 @@ sub display_weather_conditions {
 }
 
 sub toggle_house_mode {
-    use vars '$mode_mh'
-      ;    # When would this object not exist?  Should be declared in here?
+    use vars '$mode_mh';    # When would this object not exist?  Should be declared in here?
 
     if ( ref $mode_mh ) {
 
@@ -7982,8 +7565,7 @@ sub toggle_house_mode {
 }
 
 sub toggle_security_mode {
-    use vars '$mode_security'
-      ;    # When would this object not exist?  Should be declared in here?
+    use vars '$mode_security';    # When would this object not exist?  Should be declared in here?
 
     if ( ref $mode_security ) {
 
@@ -8009,8 +7591,7 @@ sub ras_connect {
 
         # *** This is awful (good thing most won't use it!)
 
-        run
-          qq[rasdial "$config_parms{net_connect_entry}" $config_parms{net_connect_name} $config_parms{net_connect_password}];
+        run qq[rasdial "$config_parms{net_connect_entry}" $config_parms{net_connect_name} $config_parms{net_connect_password}];
         return 1;    # Worked as best we can tell at the moment.
     }
     else {
@@ -8069,14 +7650,13 @@ sub undo_last_action {
               )
             {
                 my $name = &pretty_object_name( $ref->{object_name} );
-                if ( $name !~ /undo/i ) {   # Don't undo the undo voice command!
-                    $msg =
-                      "Changing $name from $ref->{state} back to $ref->{state_prev}.";
+                if ( $name !~ /undo/i ) {    # Don't undo the undo voice command!
+                    $msg = "Changing $name from $ref->{state} back to $ref->{state_prev}.";
 
                     if ( ref $set_by and $set_by->can('respond') ) {
                         $set_by->respond("app=control $msg");
                     }
-                    else {                  # called by tk
+                    else {                   # called by tk
 
                         # No said or state_now called prior, so no RT, so no_chime=1
                         respond "target=$target no_chime=1 app=control $msg";
@@ -8091,8 +7671,7 @@ sub undo_last_action {
 
     }
 
-    respond
-      "target=$target app=control no_chime=1 No recent actions can be undone."
+    respond "target=$target app=control no_chime=1 No recent actions can be undone."
       unless $undid;
 
 }
@@ -8114,8 +7693,7 @@ sub write_user_code {
 
     # Add sleeps 1/$i-th way through user code.
     # Improves cache usage for less %cpu than 1 big sleep.
-    my $sleep_call =
-      "   \$loop_sleep_total += &sleep_time(\$Loop_Sleep_Time);\n";
+    my $sleep_call = "   \$loop_sleep_total += &sleep_time(\$Loop_Sleep_Time);\n";
     my $j = int @Loop_Code / ( $config_parms{sleep_count} - 1 )
       if $config_parms{sleep_count} > 1;
     for my $k ( 0 .. $config_parms{sleep_count} - 2 ) {
@@ -8126,13 +7704,10 @@ sub write_user_code {
 
     # join with '' so 'eof' markers are in col 1
     $user_code .= join( '',
-        @Item_Code,
-        "\n",
-        @Sub_Code,
+        @Item_Code, "\n", @Sub_Code,
         "#-----------------------------------\n\n",
         "sub loop_code { \n\n   \$loop_sleep_total = 0;\n",
-        @Loop_Code,
-        "\n}" );
+        @Loop_Code, "\n}" );
     my $user_code_file = "$config_parms{data_dir}/mh_temp.user_code";
     open( USERCODE, ">$user_code_file" )
       or print "Can not open debug user code file $user_code_file: $!\n";
@@ -8142,21 +7717,17 @@ sub write_user_code {
     &Reload_pre_hooks();    # Not sure if/when this would be used.
 
     &eval_user_code_reset;  # Re-initialize stuff
-    &eval_user_code_load
-      ;    # Look for real bad errors, caught when defining subroutine
-    &object_states_restore
-      ;    # Must be after Item_code variables have been defined
+    &eval_user_code_load;   # Look for real bad errors, caught when defining subroutine
+    &object_states_restore; # Must be after Item_code variables have been defined
 
     # Created by &add_hooks (after object states have been restored)
     # Note:  I don't think this is useful, as user code loop has not been run yet to add any hooks!
-    &Reload_post_hooks()
-      ;   #        Except, it IS useful when called from module code on startup.
+    &Reload_post_hooks();    #        Except, it IS useful when called from module code on startup.
 
     print "Activating voice commands\n";
     &Voice_Cmd::activate;
 
-    if ( $config_parms{listen} and $config_parms{listen} ne '0' )
-    {     # default listens, 0 starts up not listening
+    if ( $config_parms{listen} and $config_parms{listen} ne '0' ) {    # default listens, 0 starts up not listening
         print "Turning on microphone\n";
         &Voice_Cmd::mic('on');
     }
@@ -8176,11 +7747,9 @@ sub write_user_code {
 
 }
 
-my %table_hcodes =
-  qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
+my %table_hcodes = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
   I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
-my %table_dcodes =
-  qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
+my %table_dcodes = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
   9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
   A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
 
@@ -8188,14 +7757,12 @@ sub x10_dim_level_decode {
     my ($code) = @_;
 
     # Convert bit string to decimal
-    my $level_b = $table_hcodes{ substr( $code, 0, 1 ) }
-      . $table_dcodes{ substr( $code, 1, 1 ) };
+    my $level_b = $table_hcodes{ substr( $code, 0, 1 ) } . $table_dcodes{ substr( $code, 1, 1 ) };
     my $level_d = unpack( 'C', pack( 'B8', $level_b ) );
 
     # Varies from 36 to 201, by 11, then to 210 as a max.
     # 16 different values.  Round to nearest 5%, max of 95.
-    my $level_p =
-      int( 100 * $level_d / 211 );    # Do not allow 100% ... not a valid state?
+    my $level_p = int( 100 * $level_d / 211 );    # Do not allow 100% ... not a valid state?
     $level_p = $level_p - ( $level_p % 5 );
     print "CM11 debug: dim_code=$code leveld=$level_d level_p=$level_p\n"
       if $Debug{x10};
diff --git a/bin/mh_users_table.pl b/bin/mh_users_table.pl
index 1c61638b6..0a3b6be65 100644
--- a/bin/mh_users_table.pl
+++ b/bin/mh_users_table.pl
@@ -28,12 +28,7 @@
 print "<br>Last updated: $time_date</b>\n";
 print "<table cellpadding=2 border=1><tr>\n";
 for my $state_city (
-    sort {
-             length $data{$a}{state} <=> length $data{$b}{state}
-          or $data{$a}{state} cmp $data{$b}{state}
-          or $a cmp $b
-    } keys %data
-  )
+    sort { length $data{$a}{state} <=> length $data{$b}{state} or $data{$a}{state} cmp $data{$b}{state} or $a cmp $b } keys %data )
 {
     print "</tr><tr>\n" unless $j++ % 4;
     my $cnt = $data{$state_city}{count};
diff --git a/bin/mhsend b/bin/mhsend
index 8952f142c..0e0b5e264 100755
--- a/bin/mhsend
+++ b/bin/mhsend
@@ -23,10 +23,8 @@ my ( $Pgm_Path, $Pgm_Name, %parms );
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,  "h",         "help",       "host=s",
-        "port=s", "stdin",     "password=s", "log:s",
-        "file=s", "display:n", "state",      "speak",
-        "run"
+        \%parms,  "h",         "help",  "host=s", "port=s", "stdin", "password=s", "log:s",
+        "file=s", "display:n", "state", "speak",  "run"
     )
     or ( @ARGV == 0 and !$parms{stdin} )
     or $parms{h}
@@ -83,8 +81,7 @@ sub setup {
     BEGIN {
         ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
         ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-        eval
-          "use lib '$Pgm_Path/../lib'";  # Use BEGIN eval to keep perl2exe happy
+        eval "use lib '$Pgm_Path/../lib'";    # Use BEGIN eval to keep perl2exe happy
     }
 
     $parms{host} = 'localhost' unless $parms{host};
diff --git a/bin/monitor_weblog b/bin/monitor_weblog
index 58244d5db..d5143782b 100755
--- a/bin/monitor_weblog
+++ b/bin/monitor_weblog
@@ -28,14 +28,9 @@ use strict;
 
 my %parms;
 use Getopt::Long;
-if (
-    !&GetOptions(
-        \%parms,    "h",       "help",     "mailto=s",
-        "ignore=s", "runid=s", "outdir=s", "debug"
-    )
+if (  !&GetOptions( \%parms, "h", "help", "mailto=s", "ignore=s", "runid=s", "outdir=s", "debug" )
     or @ARGV > 1
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -77,24 +72,19 @@ my $log_pos = &open_log($log_file);
 
 print "Current log position=$log_pos\n";
 
-my ( %clients, %hits, $hits_hour, $hits_day, $clients_hour, $clients_day,
-    $last_active );
+my ( %clients, %hits, $hits_hour, $hits_day, $clients_hour, $clients_day, $last_active );
 my $id_cnt = 'WebGuy1';
 
 while (1) {
     sleep 2;
     my ( $sec, $min, $hour ) = (localtime)[ 0, 1, 2 ];
     if ( $min == 2 and $sec < 5 ) {
-        &speak(
-            "rooms=all $hits_hour web hits from $clients_hour clients in the last hour"
-        ) if $hits_hour > 5;
+        &speak( "rooms=all $hits_hour web hits from $clients_hour clients in the last hour" ) if $hits_hour > 5;
         $hits_hour    = 0;
         $clients_hour = 0;
     }
     elsif ( $hour == 20 and $min == 1 and $sec < 5 ) {
-        &speak(
-            "rooms=all Notice, there were $hits_day web hits from $clients_day clients in the last day"
-        ) if $hits_day > 1;
+        &speak( "rooms=all Notice, there were $hits_day web hits from $clients_day clients in the last day" ) if $hits_day > 1;
         $hits_day    = 0;
         $clients_day = 0;
     }
@@ -114,8 +104,7 @@ while (1) {
 
     seek( LOG, $log_pos, 0 );    # Reset end of file flag
     while (<LOG>) {
-        my ( $client, $day, $hour ) =
-          $_ =~ m!^(\S+) - - \[(\d+)/\w+/\d{4}:(\d+):\d+:\d+ [\d+-]+\]!;
+        my ( $client, $day, $hour ) = $_ =~ m!^(\S+) - - \[(\d+)/\w+/\d{4}:(\d+):\d+:\d+ [\d+-]+\]!;
         next unless defined $hour;
         $last_active = time;
 
@@ -196,8 +185,7 @@ sub speak_old {
         close $socket;
     }
     else {
-        print
-          "monitor_weblog error opening socket to $parms{mh_server} on port $parms{mh_port}: $!\n";
+        print "monitor_weblog error opening socket to $parms{mh_server} on port $parms{mh_port}: $!\n";
     }
 }
 
diff --git a/bin/mp3Rip.pl b/bin/mp3Rip.pl
index 67e8d9563..7f3b9deb7 100755
--- a/bin/mp3Rip.pl
+++ b/bin/mp3Rip.pl
@@ -82,14 +82,12 @@ sub compress_track {
         die "FATAL: The command '$cmd' failed: check the log file.\n";
     }
     unless ( -s "$output.tmp" ) {
-        die
-          "FATAL: The command '$cmd' produced a zero-length output file: $output.\n";
+        die "FATAL: The command '$cmd' produced a zero-length output file: $output.\n";
     }
     my $totaltime = &FormatTime( time() - $starttime );
     move( "$output.tmp", $output );
     system( 'chmod', 'a+r', $output );
-    print
-      "Done compressing track $track to $output (compress time: $totaltime)\n";
+    print "Done compressing track $track to $output (compress time: $totaltime)\n";
 }
 
 sub rip_track {
@@ -108,8 +106,7 @@ sub rip_track {
         die "FATAL: The command '$cmd' failed: check the log file.\n";
     }
     unless ( -s "$output.tmp" ) {
-        die
-          "FATAL: The command '$cmd' produced a zero-length output file: $output.\n";
+        die "FATAL: The command '$cmd' produced a zero-length output file: $output.\n";
     }
     my $totaltime = &FormatTime( time() - $starttime );
     move( "$output.tmp", $output );
@@ -206,8 +203,7 @@ sub rip_tracks {
         close DATA;
     }
     else {
-        print
-          "WARNING: Could not save disc data in file '$data{disc_data_file}': $!\n";
+        print "WARNING: Could not save disc data in file '$data{disc_data_file}': $!\n";
     }
 }
 
diff --git a/bin/net_ftp b/bin/net_ftp
index 07f6d1575..9633257fa 100755
--- a/bin/net_ftp
+++ b/bin/net_ftp
@@ -7,17 +7,15 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,         'h',         'help',   'user=s',
-        'password=s',    'server=s',  'dir=s',  'file=s',
-        'file_remote=s', 'command=s', 'type=s', 'passive=s'
+        \%parms, 'h',      'help',          'user=s',    'password=s', 'server=s',
+        'dir=s', 'file=s', 'file_remote=s', 'command=s', 'type=s',     'passive=s'
     )
     or @ARGV
     or !$parms{command}
diff --git a/bin/outlook_read b/bin/outlook_read
index b8bf1c44d..64f472081 100755
--- a/bin/outlook_read
+++ b/bin/outlook_read
@@ -37,22 +37,18 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 use Getopt::Long;
 my (%parms);
 if (
     !&GetOptions(
-        \%parms,  "version=s", "folder=s",   "quiet",
-        "debug",  "all",       "dump_body",  "pl_file=s",
-        "date=s", "days=s",    "date_end=s", "h",
-        "help"
+        \%parms,  "version=s", "folder=s",   "quiet", "debug", "all", "dump_body", "pl_file=s",
+        "date=s", "days=s",    "date_end=s", "h",     "help"
     )
     or @ARGV > 0
     or $parms{h}
@@ -116,11 +112,9 @@ sub setup {
 
     # Use EVENTS to run OLE as a single-threaded apartment, so MAPI.Session works
     use Win32::OLE qw(valof EVENTS);
-    use Win32::OLE::Variant
-      ; # Simply including this somehow auto-converts $start and $end times from Win32::OLE::Variant objects ?
+    use Win32::OLE::Variant;  # Simply including this somehow auto-converts $start and $end times from Win32::OLE::Variant objects ?
 
-    require 'handy_utilities.pl'
-      ;    # For misc. functions (e.g. time/date stamp routines)
+    require 'handy_utilities.pl';    # For misc. functions (e.g. time/date stamp routines)
 
     # Apparently the 97 way also works for Outlook 2000, so let that be the default.
     #   $parms{version} = '97' unless $parms{version};
@@ -162,13 +156,12 @@ sub setup {
     # Setup the defaults
     $parms{folder} = 'Calendar' unless $parms{folder};
     my $folder_number = $ol_folder{ $parms{folder} };
-    $parms{date} = &time_date_stamp(11) unless $parms{date};  # Returns mm/dd/yy
-    $parms{date_end} = $parms{date} unless $parms{date_end};
+    $parms{date}     = &time_date_stamp(11) unless $parms{date};       # Returns mm/dd/yy
+    $parms{date_end} = $parms{date}         unless $parms{date_end};
     $parms{date_end} = &time_date_stamp( 11, time + 3600 * 24 * $parms{days} )
       if $parms{days};
 
-    print
-      "Searching $parms{folder} num=$folder_number: Start: $parms{date}  Stop: $parms{date_end}\n"
+    print "Searching $parms{folder} num=$folder_number: Start: $parms{date}  Stop: $parms{date_end}\n"
       unless $parms{quiet};
 
     my ( $Outlook, $folder );
@@ -188,8 +181,7 @@ sub setup {
     }
 
     my $folder = $Outlook->GetDefaultFolder($folder_number)
-      or
-      die "Error, could not find folder $parms{folder} = $folder_number:\n  ",
+      or die "Error, could not find folder $parms{folder} = $folder_number:\n  ",
       Win32::OLE->LastError;
 
     if ( $parms{version} eq '97' ) {
@@ -205,8 +197,7 @@ sub setup {
           Win32::OLE->LastError;
     }
 
-    print
-      "folder=$parms{folder},folder_number=$folder_number,folder=$folder,items=$items\n\n"
+    print "folder=$parms{folder},folder_number=$folder_number,folder=$folder,items=$items\n\n"
       if $parms{debug};
 
     open( PL, ">$parms{pl_file}" )
@@ -224,8 +215,7 @@ sub find_items {
     if ( $parms{version} eq '97' ) {
         my $criteria;
         if ( $parms{folder} eq 'Calendar' ) {
-            $criteria =
-              qq{[Start] >= "$parms{date} 12:00 AM" and [Start] <= "$parms{date_end} 11:59 PM"};
+            $criteria = qq{[Start] >= "$parms{date} 12:00 AM" and [Start] <= "$parms{date_end} 11:59 PM"};
         }
         if ( !$parms{all} ) {
             $item = $items->Find($criteria);
@@ -307,8 +297,7 @@ sub create_vcr_event {
         $channel_commified = "0,$channel";
     }
     else {
-        $channel_commified =
-          substr( $channel, 0, 1 ) . "," . substr( $channel, 1, 1 );
+        $channel_commified = substr( $channel, 0, 1 ) . "," . substr( $channel, 1, 1 );
     }
 
     print "VCR on channel $channel from $start to $end\n" unless $parms{quiet};
diff --git a/bin/perltidyall b/bin/perltidyall
index 890fe629e..273963624 100755
--- a/bin/perltidyall
+++ b/bin/perltidyall
@@ -19,22 +19,19 @@ sub read_dir {
     while ( my $file = readdir(DIR) ) {
         next if ( $file =~ m/^\./ );
         next if ( -l "$dir_sub/$file" );    # Skip symlinks
-        if ( lc("$dir_sub/$file") =~ /^\.\.\/lib\/site/ )
-        {                                   #Skip distributed perl modules
+        if ( lc("$dir_sub/$file") =~ /^\.\.\/lib\/site/ ) {    #Skip distributed perl modules
             next;
         }
-        elsif ( -d "$dir_sub/$file" ) {     #Directory
+        elsif ( -d "$dir_sub/$file" ) {                        #Directory
             push( @dir_results, "$dir_sub/$file" );
         }
         elsif ( $file =~ m/\.(bak|ERR)$/i && $type eq 'delete' ) {
             push( @results, "$dir_sub/$file" );
         }
-        elsif ( $file =~ m/\.(pl|pod|pm|t)$/i && $type eq 'read' )
-        {                                   #These are perl extensions
+        elsif ( $file =~ m/\.(pl|pod|pm|t)$/i && $type eq 'read' ) {    #These are perl extensions
             push( @results, "$dir_sub/$file" );
         }
-        elsif ( $type eq 'read' )
-        {    #Unknown extension, look for perl interpreter in first line
+        elsif ( $type eq 'read' ) {                                     #Unknown extension, look for perl interpreter in first line
             open( my $fh2, '<', "$dir_sub/$file" ) || die "open $file: $!";
             my $possible = <$fh2> || next;
             next unless $possible =~ m/^#!.*perl\W/;
@@ -68,18 +65,15 @@ elsif ( $argument eq '' ) {
 
     print "\n-----------------------------\n\n";
     print "PerlTidyAll Complete\n\n";
-    print
-      "Any errors encountered while tidying the files have saved to the files "
+    print "Any errors encountered while tidying the files have saved to the files "
       . "identified above. If no *.ERR files are listed than no errors occured\n\n";
-    print
-      "Backups of all files that were changed have been saved as *.bak.  Please "
+    print "Backups of all files that were changed have been saved as *.bak.  Please "
       . "review the changes made and if you are satisfied with the results you can "
       . " delete the backup and error files by running the following command:\n\n";
     print "perltidyall --delete_bak_err\n\n";
 }
 else {
-    print
-      "\nERROR - Unrecognized Argument\n\nPerlTidyAll may be run without any "
+    print "\nERROR - Unrecognized Argument\n\nPerlTidyAll may be run without any "
       . "arguments or with the --delete_bak_err argument to delete backup and log"
       . " files.\n";
 }
diff --git a/bin/pocketsphinx b/bin/pocketsphinx
index 94d1da802..6ebb812ea 100755
--- a/bin/pocketsphinx
+++ b/bin/pocketsphinx
@@ -36,13 +36,10 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision: 1084 $ =~
-      /: (\S+)/;    # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision: 1084 $ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 use Getopt::Long;
@@ -81,9 +78,8 @@ $SIG{KILL} = \&signal_handler;
 #======================================================================
 if (
     !&GetOptions(
-        \%parms,      "h",          "help",        "host=s",
-        "port=i",     "log_file=s", "sent_file=s", "lm_file=s",
-        "hmm_file=s", "program=s",  "device=s",    "sample=i"
+        \%parms,       "h",         "help",       "host=s",    "port=i",   "log_file=s",
+        "sent_file=s", "lm_file=s", "hmm_file=s", "program=s", "device=s", "sample=i"
     )
     or ( $parms{h} or $parms{help} )
   )
diff --git a/bin/read_email b/bin/read_email
index 412abf68b..677e5a769 100755
--- a/bin/read_email
+++ b/bin/read_email
@@ -7,21 +7,14 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;
 use Getopt::Long;
-if (
-    !&GetOptions(
-        \%parms,    'h',          'help',     'debug',
-        'user=s',   'password=s', 'server=s', 'account=s',
-        'msgnum=s', 'file=s'
-    )
+if (  !&GetOptions( \%parms, 'h', 'help', 'debug', 'user=s', 'password=s', 'server=s', 'account=s', 'msgnum=s', 'file=s' )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
diff --git a/bin/report_weblog b/bin/report_weblog
index 62353f675..2c055c3e0 100755
--- a/bin/report_weblog
+++ b/bin/report_weblog
@@ -39,9 +39,7 @@ my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,        "h",        "help",   "mailto=s",
-        "mailserver=s", "ignore:s", "size=s", "type=s",
-        "runid=s",      "outdir=s", "debug"
+        \%parms, "h", "help", "mailto=s", "mailserver=s", "ignore:s", "size=s", "type=s", "runid=s", "outdir=s", "debug"
     )
     or @ARGV == 0
     or ( $parms{h} or $parms{help} )
@@ -123,25 +121,19 @@ sub read_data {
             #Fri 11/05/99 21:47:48 server_speak 200.200.200.5
             #Sun 09/21/03 20:29:07 192.168.0.81 /ia5/images/wind.gif
             # Read Apache log
-            my ( $client, $day, $hour, $min ) =
-              $_ =~ m!^(\S+) - - \[(\d+)/\w+/\d{4}:(\d+):(\d+):\d+ [\d+-]+\]!;
+            my ( $client, $day, $hour, $min ) = $_ =~ m!^(\S+) - - \[(\d+)/\w+/\d{4}:(\d+):(\d+):\d+ [\d+-]+\]!;
 
             # Alternate form of Apache log
-            ( $day, $hour, $min, $client ) =
-              $_ =~
-              /([a-z|A-Z]*) \d+\/\d+\/\d+(\d+):(\d+):\d+ ([a-z|A-Z|0-9|\.]*)/
+            ( $day, $hour, $min, $client ) = $_ =~ /([a-z|A-Z]*) \d+\/\d+\/\d+(\d+):(\d+):\d+ ([a-z|A-Z|0-9|\.]*)/
               unless $client;
 
             # Read Misterhouse log
             unless ( defined $hour ) {
                 my $ampm;
-                ( $day, $hour, $min, $ampm, $client ) =
-                  $_ =~ m!^\S+, +\S+ +(\d+) +(\d+):(\d+) (\S+) \S+ (\S+)!;
-                ( $day, $hour, $min, $ampm, $client ) =
-                  $_ =~ m!^\S+ +\S+ +(\d+) +(\d+):(\d+):\d+ +\S+ (\S+)!
+                ( $day, $hour, $min, $ampm, $client ) = $_ =~ m!^\S+, +\S+ +(\d+) +(\d+):(\d+) (\S+) \S+ (\S+)!;
+                ( $day, $hour, $min, $ampm, $client ) = $_ =~ m!^\S+ +\S+ +(\d+) +(\d+):(\d+):\d+ +\S+ (\S+)!
                   unless $client;
-                ( $day, $hour, $min, $client ) =
-                  $_ =~ m!^\S+ +\S+ +(\d+):(\d+):\d+ (\S+)!
+                ( $day, $hour, $min, $client ) = $_ =~ m!^\S+ +\S+ +(\d+):(\d+):\d+ (\S+)!
                   unless $client;    # Current format
 
                 #                print "db d=$day h=$hour ap=$ampm m=$min c=$client r=$_\n";
@@ -151,7 +143,7 @@ sub read_data {
             next unless defined $hour;
 
             # Ignore local clients
-            next if grep( $client =~ /^$_$/, @ignore_list ); # This takes longer
+            next if grep( $client =~ /^$_$/, @ignore_list );    # This takes longer
 
             #           next if grep($client eq $_, @ignore_list);
 
@@ -184,16 +176,14 @@ sub read_data {
       or die "Error, could not open ${prefix}dayhour.txt: $!\n";
     foreach ( sort { $a cmp $b } keys %{ $hits{dayhour} } ) {
         my $client_cnt = keys %{ $hits{dayhour_client}{$_} };
-        print DATAOUT
-          join( "\t", $_, int( $hits{dayhour}{$_} / 10 ), $client_cnt ), "\n";
+        print DATAOUT join( "\t", $_, int( $hits{dayhour}{$_} / 10 ), $client_cnt ), "\n";
     }
 
     open( DATAOUT, ">${prefix}day.txt" )
       or die "Error, could not open ${prefix}day.txt: $!\n";
     foreach ( sort { $a <=> $b } keys %{ $hits{day} } ) {
         my $client_cnt = keys %{ $hits{day_client}{$_} };
-        print DATAOUT join( "\t", $_, int( $hits{day}{$_} / 10 ), $client_cnt ),
-          "\n";
+        print DATAOUT join( "\t", $_, int( $hits{day}{$_} / 10 ), $client_cnt ), "\n";
     }
 
     open( DATAOUT, ">${prefix}client.txt" )
@@ -203,8 +193,7 @@ sub read_data {
         keys %{ $hits{client} }
       )
     {
-        print DATAOUT
-          join( "\t", $hits{client_time}{$_}, $hits{client}{$_}, $_ ), "\n";
+        print DATAOUT join( "\t", $hits{client_time}{$_}, $hits{client}{$_}, $_ ), "\n";
     }
 
     close DATAOUT;
diff --git a/bin/send_email b/bin/send_email
index 2289a1482..21beaa6e1 100755
--- a/bin/send_email
+++ b/bin/send_email
@@ -7,18 +7,15 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,      'h',         'help',      'user=s',
-        'password=s', 'server=s',  'account=s', 'from=s',
-        'to=s',       'subject=s', 'mime=s',    'text=s',
-        'file=s',     'filename=s'
+        \%parms, 'h',         'help',   'user=s', 'password=s', 'server=s', 'account=s', 'from=s',
+        'to=s',  'subject=s', 'mime=s', 'text=s', 'file=s',     'filename=s'
     )
     or @ARGV
     or ( $parms{h} or $parms{help} )
diff --git a/bin/send_verizon b/bin/send_verizon
index 9be3d21ab..2ff0089ee 100755
--- a/bin/send_verizon
+++ b/bin/send_verizon
@@ -25,8 +25,7 @@ sub send_text_message {
     print "Session ID='$run_id'" . "\n";
 
     print "\n";
-    my $formatted_msg =
-      &create_msg( to => $to, from => $from, msg => $msg, id => $run_id );
+    my $formatted_msg = &create_msg( to => $to, from => $from, msg => $msg, id => $run_id );
 
     &submit_message($formatted_msg);
 
@@ -56,8 +55,7 @@ Cookie: timeZoneOffset=240; @#nopop#=TCS; timeZoneOffset=240; @#nopop#=TCS
     $t->open( Host => "151.144.246.160", Port => 80 );
     $t->print($get_seq);
 
-    my ($reply) =
-      $t->waitfor('/path/');    # The word 'path' comes right after jrun ID
+    my ($reply) = $t->waitfor('/path/');    # The word 'path' comes right after jrun ID
 
     if ( $reply =~ /jrunsessionid=([0-9]*);/ ) {
 
diff --git a/bin/set_clock b/bin/set_clock
index b62c227ff..a5e2050db 100755
--- a/bin/set_clock
+++ b/bin/set_clock
@@ -23,22 +23,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 print "Command: $Pgm_Name @ARGV\n";
 print "Version: $Version\n";
 
 my %parms;
 use Getopt::Long;
-if (
-    !&GetOptions(
-        \%parms,    "h",        "help",   "server=s",
-        "method=s", "ignore=s", "no_set", "log=s"
-    )
+if (  !&GetOptions( \%parms, "h", "help", "server=s", "method=s", "ignore=s", "no_set", "log=s" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -133,8 +127,7 @@ else {
         }
     }
     $time_record =~ s/\n//g;
-    ( $julian_date, $date, $hour, $min, $sec ) =
-      $time_record =~ /(\S+) (\S+) (\d+):(\d+):(\d+) /
+    ( $julian_date, $date, $hour, $min, $sec ) = $time_record =~ /(\S+) (\S+) (\d+):(\d+):(\d+) /
       if $time_record;
     print "time_record:  $time_record\n";
 }
@@ -144,13 +137,11 @@ else {
 my ( $old_sec, $old_min, $old_hour, $mday, $mon, $year, $wday ) =
   ( localtime(time) )[ 0, 1, 2, 3, 4, 5, 6 ];
 $mon++;    # Jan = 0
-$date = sprintf( "%04d-%02d-%02d", 1900 + $year, $mon, $mday )
-  ;        # Use local date for logging
+$date = sprintf( "%04d-%02d-%02d", 1900 + $year, $mon, $mday );    # Use local date for logging
 
 if ( defined $sec ) {
-    printf( "Time from NIST   : %02d:%02d:%02d\n", $hour, $min, $sec );
-    printf( "Time local       : %02d:%02d:%02d\n",
-        $old_hour, $old_min, $old_sec );
+    printf( "Time from NIST   : %02d:%02d:%02d\n", $hour,     $min,     $sec );
+    printf( "Time local       : %02d:%02d:%02d\n", $old_hour, $old_min, $old_sec );
 
     my $min_diff = $min - $old_min;
     my $new_hour = $old_hour;
@@ -158,11 +149,9 @@ if ( defined $sec ) {
     if (    abs($min_diff) > $parms{ignore}
         and abs($min_diff) < ( 60 - $parms{ignore} ) )
     {
-        $data_logged =
-          "System clock NOT adjusted because difference of $min_diff minutes > $parms{ignore} minutes (-ignore parm)";
+        $data_logged = "System clock NOT adjusted because difference of $min_diff minutes > $parms{ignore} minutes (-ignore parm)";
         print $data_logged, "\n";
-        printf( LOG "%s %02d:%02d:%02d  %s\n",
-            $date, $old_hour, $old_min, $old_sec, $data_logged );
+        printf( LOG "%s %02d:%02d:%02d  %s\n", $date, $old_hour, $old_min, $old_sec, $data_logged );
         print LOG2 $data_logged;
         close LOG;
         close LOG2;
@@ -176,10 +165,7 @@ if ( defined $sec ) {
         $new_hour++;
     }
 
-    my $sec_diff =
-      60 * ( 60 * $new_hour + $min ) +
-      $sec -
-      ( 60 * ( 60 * $old_hour + $old_min ) + $old_sec );
+    my $sec_diff = 60 * ( 60 * $new_hour + $min ) + $sec - ( 60 * ( 60 * $old_hour + $old_min ) + $old_sec );
     if ( $parms{no_set} ) {
         $data_logged = "System clock NOT adjusted because of -no_set parm.";
     }
@@ -204,8 +190,7 @@ if ( defined $sec ) {
             $rc = system("date -s '$time_new'");
         }
         if ($rc) {
-            $data_logged =
-              "System clock NOT adjusted due to time command error. rc=$rc.";
+            $data_logged = "System clock NOT adjusted due to time command error. rc=$rc.";
         }
         else {
             $data_logged = "System clock adjusted.";
@@ -213,14 +198,12 @@ if ( defined $sec ) {
     }
 
     print "$sec_diff second difference.  $data_logged\n";
-    printf( LOG "%s %02d:%02d:%02d  %s second error.  $data_logged\n",
-        $date, $old_hour, $old_min, $old_sec, $sec_diff );
+    printf( LOG "%s %02d:%02d:%02d  %s second error.  $data_logged\n", $date, $old_hour, $old_min, $old_sec, $sec_diff );
     $data_returned = "$sec_diff second difference.  $data_logged";
 }
 else {
     print "Error from server.  Data recieved: $time_record\n";
-    printf( LOG "%s %02d:%02d:%02d  Internet error\n",
-        $date, $old_hour, $old_min, $old_sec );
+    printf( LOG "%s %02d:%02d:%02d  Internet error\n", $date, $old_hour, $old_min, $old_sec );
     $data_returned = "System clock not adjusted due to an internet error";
 }
 
diff --git a/bin/set_password b/bin/set_password
index 4a68a5123..5a4c7a250 100755
--- a/bin/set_password
+++ b/bin/set_password
@@ -27,20 +27,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions( \%parms, 'h', 'help', 'pw_file=s', 'password=s', 'user=s',
-        'check' )
+if (  !&GetOptions( \%parms, 'h', 'help', 'pw_file=s', 'password=s', 'user=s', 'check' )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -94,9 +90,8 @@ else {
 my ( %config_parms, %passwords );
 
 sub setup {
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
-    require 'handy_utilities.pl';    # For read_mh_opts funcion
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    require 'handy_utilities.pl';                                  # For read_mh_opts funcion
     &main::read_mh_opts( \%config_parms, $Pgm_Path );
 
     $parms{pw_file} = $config_parms{pw_file}       unless $parms{pw_file};
@@ -109,10 +104,8 @@ sub setup {
     if ($use_Tk) {
         eval "use Tk";
         if ($@) {
-            &pw_exit(
-                "\nYou either need the perl Tk package installed, or you need to use\n"
-                  . "the -password option.  For more help, type $Pgm_Name -h\n\n"
-            );
+            &pw_exit( "\nYou either need the perl Tk package installed, or you need to use\n"
+                  . "the -password option.  For more help, type $Pgm_Name -h\n\n" );
         }
         else {
 
@@ -166,29 +159,20 @@ sub pw_check {
         -font      => 'fixed',
         -takefocus => 1
     )->pack( -side => 'left' );
-    my $entry = $f1->Entry( -textvariable => \$pw, -width => 10, -show => '*' )
-      ->pack( -side => 'left' );
+    my $entry = $f1->Entry( -textvariable => \$pw, -width => 10, -show => '*' )->pack( -side => 'left' );
     $entry->bind( '<Return>', sub { &pw_check2($pw) } );
 
     #   $f2->Button(-text => "Continue", -command => sub{&pw_check2($pw)}) -> pack(-side => 'left');
-    $f3->Label(
-        -text => "To change your password, delete this file: $parms{pw_file}" )
-      ->pack( -side => 'left' );
+    $f3->Label( -text => "To change your password, delete this file: $parms{pw_file}" )->pack( -side => 'left' );
 }
 
 sub pw_create {
     my ( $pw1, $pw2 );
-    $f1->Label( -text => "  Enter your password:", -font => 'fixed' )
-      ->pack( -side => 'left' );
-    my $entry1 =
-      $f1->Entry( -textvariable => \$pw1, -width => 10, -show => '*' )
-      ->pack( -side => 'left' );
-
-    $f2->Label( -text => "ReEnter your password:", -font => 'fixed' )
-      ->pack( -side => 'left' );
-    my $entry2 =
-      $f2->Entry( -textvariable => \$pw2, -width => 10, -show => '*' )
-      ->pack( -side => 'left' );
+    $f1->Label( -text => "  Enter your password:", -font => 'fixed' )->pack( -side => 'left' );
+    my $entry1 = $f1->Entry( -textvariable => \$pw1, -width => 10, -show => '*' )->pack( -side => 'left' );
+
+    $f2->Label( -text => "ReEnter your password:", -font => 'fixed' )->pack( -side => 'left' );
+    my $entry2 = $f2->Entry( -textvariable => \$pw2, -width => 10, -show => '*' )->pack( -side => 'left' );
 
     $entry1->bind( '<Return>', sub { &pw_create2( $pw1, $pw2 ) } );
     $entry2->bind( '<Return>', sub { &pw_create2( $pw1, $pw2 ) } );
@@ -229,9 +213,8 @@ sub pw_create2 {
         #pw_exit 'Password has been saved';
         # Enable this as windows tk works!
         if ($use_Tk) {
-            my $pop1 = MainWindow->new();
-            my $label =
-              $pop1->Label( -text => "Password has been saved" )->pack;
+            my $pop1   = MainWindow->new();
+            my $label  = $pop1->Label( -text => "Password has been saved" )->pack;
             my $button = $pop1->Button(
                 -text    => "OK",
                 -command => sub { $pop1->destroy; pw_exit }
@@ -240,12 +223,9 @@ sub pw_create2 {
     }
     else {
         if ($use_Tk) {
-            my $pop1  = MainWindow->new();
-            my $label = $pop1->Label(
-                -text => "Password entries do not match. Please try again." )
-              ->pack;
-            $pop1->Button( -text => "OK", -command => sub { $pop1->destroy } )
-              ->pack;
+            my $pop1 = MainWindow->new();
+            my $label = $pop1->Label( -text => "Password entries do not match. Please try again." )->pack;
+            $pop1->Button( -text => "OK", -command => sub { $pop1->destroy } )->pack;
         }
     }
 }
diff --git a/bin/sun_time b/bin/sun_time
index 9db270c9f..cc4c71fbe 100755
--- a/bin/sun_time
+++ b/bin/sun_time
@@ -32,22 +32,15 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib/site'"; # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,      "h",           "help",   "return",
-        "latitude=s", "longitude=s", "no_dst", "time_zone=s",
-        "day_of_year=s"
-    )
+if (  !&GetOptions( \%parms, "h", "help", "return", "latitude=s", "longitude=s", "no_dst", "time_zone=s", "day_of_year=s" )
     or @ARGV != 0
     or $parms{h}
-    or $parms{help}
-  )
+    or $parms{help} )
 {
     print <<eof;
 
@@ -74,10 +67,7 @@ eof
 }
 
 # Globals
-my (
-    $A, $B, $C, $D, $E, $F, $G, $H, $I, $J, $K, $L,
-    $M, $N, $O, $P, $Q, $R, $S, $T, $U, $V, $yday
-);
+my ( $A, $B, $C, $D, $E, $F, $G, $H, $I, $J, $K, $L, $M, $N, $O, $P, $Q, $R, $S, $T, $U, $V, $yday );
 
 &setup_suntime;
 my ($sunrise) = &compute_time("rise");
@@ -131,13 +121,13 @@ sub compute_time {
     elsif ( $M > $A ) {
         $P += $B;
     }
-    $Q = .39782 * sin($M);           # Solar Declination
-    $Q = $Q / sqrt( -$Q * $Q + 1 );  # This is how the original author wrote it!
+    $Q = .39782 * sin($M);               # Solar Declination
+    $Q = $Q / sqrt( -$Q * $Q + 1 );      # This is how the original author wrote it!
     $Q = atan2( $Q, 1 );
 
     $S = $R - ( sin($Q) * sin($E) );
     $S = $S / ( cos($Q) * cos($E) );
-    return ( 0, 0 ) if abs($S) > 1;    # Null phenomenon
+    return ( 0, 0 ) if abs($S) > 1;      # Null phenomenon
     $S = $S / sqrt( -$S * $S + 1 );
     $S = $A - atan2( $S, 1 );
     $S = $D - $S if $rise_set eq "rise";
@@ -158,8 +148,8 @@ sub compute_time {
 
     BEGIN {
         eval "use lib '$Pgm_Path/../lib'";
-    }                                # Use BEGIN eval to keep perl2exe happy
-    require 'handy_utilities.pl';    # Has time_to_ampm
+    }                                           # Use BEGIN eval to keep perl2exe happy
+    require 'handy_utilities.pl';               # Has time_to_ampm
     print "db t=$time\n";
     return ( &main::time_to_ampm($time) );
 }
diff --git a/bin/terminalmenu-client.pl b/bin/terminalmenu-client.pl
index e5a7c398a..b423098d3 100755
--- a/bin/terminalmenu-client.pl
+++ b/bin/terminalmenu-client.pl
@@ -435,8 +435,7 @@ sub color2attr {
         $fgcolor = $1
           if $element =~ m/^(black|cyan|blue|red|green|magenta|yellow|white)$/i;
         $bgcolor = $1
-          if $element =~
-          m/^on_(black|cyan|blue|red|green|magenta|yellow|white)$/i;
+          if $element =~ m/^on_(black|cyan|blue|red|green|magenta|yellow|white)$/i;
         $bold    = 1 if $element =~ m/^bold$/i;
         $reverse = 1 if $element =~ m/^reverse$/i;
     }
diff --git a/bin/update_docs b/bin/update_docs
index c84f9e4e7..7e68ffac9 100755
--- a/bin/update_docs
+++ b/bin/update_docs
@@ -53,8 +53,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 use strict;
@@ -137,10 +136,8 @@ foreach my $libsubdir ( keys %libsubdirs ) {
             print "converting $libfile to $htmlfile\n";
             $changes++;
             pod2html(
-                "--title=$lib",         "--infile=$libfile",
-                "--outfile=$htmlfile",  "--header",
-                "--htmlroot=/docs/lib", "--htmldir=$htmldir/",
-                "--podroot=../lib",     "--podpath=.",
+                "--title=$lib",         "--infile=$libfile",   "--outfile=$htmlfile", "--header",
+                "--htmlroot=/docs/lib", "--htmldir=$htmldir/", "--podroot=../lib",    "--podpath=.",
                 "--css=/lib/pod.css",
             );
         }
@@ -209,11 +206,7 @@ if ($changes) {
         s/\//::/g;
         my $pod = "=item $_\n\n";
         if ( $packages{$_}{haspod} ) {
-            $pod .=
-                "L<$_|lib::"
-              . $packages{$_}{class}
-              . $packages{$_}{noext}
-              . "/$_>\n\n";
+            $pod .= "L<$_|lib::" . $packages{$_}{class} . $packages{$_}{noext} . "/$_>\n\n";
         }
         else {
             $pod .= "package $_ in $packages{$_}{pm} isn't documented yet\n\n";
@@ -257,14 +250,8 @@ closedir POD;
 my $docsi = ( stat($docdir) )[1];
 my $outi  = ( stat($outdir) )[1];
 print("[bin/update_docs] \$docsi:$docsi \$outi:$outi\n");
-if (
-    (
-           ( $docsi == $outi )
-        && ( $outi == 0 )
-        && ( abs_path($docdir) eq abs_path($outdir) )
-    )
-    || ( ( $docsi eq $outi ) && ( $outi != 0 ) )
-  )
+if (   ( ( $docsi == $outi ) && ( $outi == 0 ) && ( abs_path($docdir) eq abs_path($outdir) ) )
+    || ( ( $docsi eq $outi ) && ( $outi != 0 ) ) )
 {
     print "you should set the html_alias2_docs directory to a place outside"
       . " the mh distribution\n directory.  Otherwise, everytime this script is"
@@ -312,12 +299,8 @@ foreach my $doc ( keys %podfiles ) {
     if ( !-e "$outdir/$doc.html" or $pdate > $hdate ) {
         print "pod2html $podfile > $htmlfile\n";
 
-        pod2html(
-            "--infile=$podfile",  "--outfile=$htmlfile",
-            "--noheader",         "--htmldir=$outdir",
-            "--podroot=$docdir2", "--podpath=.",
-            "--css=/lib/pod.css", $ind
-        );
+        pod2html( "--infile=$podfile", "--outfile=$htmlfile", "--noheader", "--htmldir=$outdir",
+            "--podroot=$docdir2", "--podpath=.", "--css=/lib/pod.css", $ind );
     }
 }
 
diff --git a/bin/vv_prescript.pl b/bin/vv_prescript.pl
index 0ff69a662..7ff25105f 100755
--- a/bin/vv_prescript.pl
+++ b/bin/vv_prescript.pl
@@ -15,8 +15,7 @@
     if ( $state =~ /mute/ig ) {
         system("/usr/bin/amixer set Rear unmute 2>&1 > /dev/null");
         open( UNMUTE, "> /tmp/.vvo_speak.unmute" )
-          or die
-          "Can't create unmute file, check ownership of /tmp/.vvo_speak.unmute";
+          or die "Can't create unmute file, check ownership of /tmp/.vvo_speak.unmute";
         print UNMUTE "$state\n";
         close(UNMUTE);
         last;
diff --git a/bin/vv_tts.pl b/bin/vv_tts.pl
index ba8096f37..5983807c5 100755
--- a/bin/vv_tts.pl
+++ b/bin/vv_tts.pl
@@ -20,13 +20,11 @@
 #use vars '$Pgm_Root';           # So we can see it in eval var subs in read_parms
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;                           # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
@@ -34,18 +32,10 @@ BEGIN
 my $cmd;
 if (
     !&GetOptions(
-        \%parms,           "h",
-        "help",            "debug",
-        "nomixer",         "text=s",
-        "voice=s",         "text_first",
-        "volume=s",        "play_volume=s",
-        "voice_volume=s",  "default_volume=s",
-        "prescript=s",     "postscript=s",
-        "play=s",          "playcmd=s",
-        "default_sound=s", 'to_file=s',
-        "pa_control",      "xcmd_file=s",
-        "rooms=s",         "default_room=s",
-        "engine=s"
+        \%parms,       "h",            "help",     "debug",          "nomixer",         "text=s",
+        "voice=s",     "text_first",   "volume=s", "play_volume=s",  "voice_volume=s",  "default_volume=s",
+        "prescript=s", "postscript=s", "play=s",   "playcmd=s",      "default_sound=s", 'to_file=s',
+        "pa_control",  "xcmd_file=s",  "rooms=s",  "default_room=s", "engine=s"
     )
     or @ARGV
     or $parms{h}
@@ -114,8 +104,7 @@ BEGIN
     # printf("%s: lockfile exists, sleep ($cnt of 60)\n",$Pgm_Name,$cnt);
     sleep(1);
     if ( $cnt++ == 120 ) {
-        printf( "%s: timed out waiting for lock, lets go anyway.\n",
-            $Pgm_Name );
+        printf( "%s: timed out waiting for lock, lets go anyway.\n", $Pgm_Name );
     }
 }
 
@@ -130,9 +119,7 @@ BEGIN
 unless ( $parms{nomixer} ) {
     eval "use Audio::Mixer";
     if ($@) {
-        printf(
-            "\n%s: Audio::Mixer not installed ... volume control is disabled\n\n",
-            $Pgm_Name );
+        printf( "\n%s: Audio::Mixer not installed ... volume control is disabled\n\n", $Pgm_Name );
     }
     else {
         $have_mixer = 1;
@@ -195,22 +182,17 @@ ()
     if ( $parms{playcmd} and $parms{play} ne 'none' ) {
         if ($have_mixer) {
             if ( $parms{play_volume} ) {
-                printf(
-                    "%s: using play_volume($parms{play_volume}) for play sound\n",
-                    $Pgm_Name )
+                printf( "%s: using play_volume($parms{play_volume}) for play sound\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{play_volume} );
             }
             elsif ( $parms{volume} ) {
-                printf( "%s: using volume ($parms{volume}) for play sound\n",
-                    $Pgm_Name )
+                printf( "%s: using volume ($parms{volume}) for play sound\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{volume} );
             }
             elsif ( $parms{default_volume} ) {
-                printf(
-                    "%s: using default_volume ($parms{default_volume}) for play sound\n",
-                    $Pgm_Name )
+                printf( "%s: using default_volume ($parms{default_volume}) for play sound\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{default_volume} );
             }
@@ -232,22 +214,17 @@ sub speak_text {
     if ( $parms{text} ) {
         if ($have_mixer) {
             if ( $parms{voice_volume} ) {
-                printf(
-                    "%s: using voice_volume($parms{voice_volume}) for voice\n",
-                    $Pgm_Name )
+                printf( "%s: using voice_volume($parms{voice_volume}) for voice\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{voice_volume} );
             }
             elsif ( $parms{volume} ) {
-                printf( "%s: using volume ($parms{volume}) for voice\n",
-                    $Pgm_Name )
+                printf( "%s: using volume ($parms{volume}) for voice\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{volume} );
             }
             elsif ( $parms{default_volume} ) {
-                printf(
-                    "%s: using default_volume ($parms{default_volume}) for voice\n",
-                    $Pgm_Name )
+                printf( "%s: using default_volume ($parms{default_volume}) for voice\n", $Pgm_Name )
                   if $parms{debug};
                 &set_vol( $parms{default_volume} );
             }
@@ -261,8 +238,7 @@ sub speak_text {
                 unlink $parms{to_file};
                 my $h = eciNew() or die "ViaVoice: Unable to connect";
                 eciSetOutputFilename( $h, $parms{to_file} )
-                  or warn
-                  "ViaVoice: Unable to set output file: $parms{to_file}";
+                  or warn "ViaVoice: Unable to set output file: $parms{to_file}";
                 eciAddText( $h, $parms{text} )
                   or warn "ViaVoice Unable to add text";
                 eciSynthesize($h) or warn "ViaVoice Unable to synthesize text";
@@ -282,8 +258,7 @@ sub speak_text {
                 unlink $parms{to_file};
                 printf( "%s: running festival tts engine\n", $Pgm_Name )
                   if $parms{debug};
-                open( FEST,
-                    "| festival_client --ttw --output $parms{to_file}" );
+                open( FEST, "| festival_client --ttw --output $parms{to_file}" );
                 print FEST qq[$parms{text}];
                 close(FEST);
             }
@@ -345,15 +320,13 @@ sub save_vol {
     my @pcm = Audio::Mixer::get_cval('pcm');
     $old_vol = ( $vol[0] + $vol[1] ) / 2;
     $old_pcm = ( $pcm[0] + $pcm[1] ) / 2;
-    printf( "%s: saving current vol,pcm settings ($old_vol,$old_pcm)\n",
-        $Pgm_Name )
+    printf( "%s: saving current vol,pcm settings ($old_vol,$old_pcm)\n", $Pgm_Name )
       if $parms{debug};
     return;
 }
 
 sub restore_vol {
-    printf( "%s: restoring old vol,pcm settings ($old_vol, $old_pcm)\n",
-        $Pgm_Name )
+    printf( "%s: restoring old vol,pcm settings ($old_vol, $old_pcm)\n", $Pgm_Name )
       if $parms{debug};
     Audio::Mixer::set_cval( 'vol', $old_vol );
     Audio::Mixer::set_cval( 'pcm', $old_pcm );
@@ -365,7 +338,7 @@ sub write_xcmd_file {
     printf( "%s: opening xcmd_file:$xcmd_file\n", $Pgm_Name ) if $parms{debug};
     printf( "%s: writing to xcmd_file, rooms:$rooms\n", $Pgm_Name )
       if $parms{debug};
-    open( CMDFILE, "> $xcmd_file" );   # don't die because we will speak anyway.
+    open( CMDFILE, "> $xcmd_file" );    # don't die because we will speak anyway.
     print CMDFILE "set pa speaker to $rooms\n";
     close(CMDFILE);
     return;
diff --git a/bin/vv_tts_simple.pl b/bin/vv_tts_simple.pl
index a7bc86bc3..9c82535fa 100755
--- a/bin/vv_tts_simple.pl
+++ b/bin/vv_tts_simple.pl
@@ -22,8 +22,7 @@ package ViaVoiceTTS;
 
 my $text = shift @ARGV;
 
-print
-  "VOICE! t=$text v=$parms{voice} f=$parms{to_file} r=$parms{right} l=$parms{left}\n";
+print "VOICE! t=$text v=$parms{voice} f=$parms{to_file} r=$parms{right} l=$parms{left}\n";
 
 if ( $parms{to_file} ) {
     print "Saving text to $parms{to_file}\n";
diff --git a/bin/weather_rrd_update_graphs b/bin/weather_rrd_update_graphs
index 7f3af8554..20f00f8f6 100755
--- a/bin/weather_rrd_update_graphs
+++ b/bin/weather_rrd_update_graphs
@@ -40,53 +40,52 @@ EOF
 # from the .ini parameters weather_rrd_color_*
 # don't modify these colors locally, just set the right config parameters.
 
-our $coloraltbg        = 'EEEEEE';   # alternating (with white) background color
-our $colorna           = 'C0C0C0';   # color for unknown area or 0 for gaps
-our $colorzero         = '000000';   # color of zero line
-our $colorshadea       = '0000CC';   # share color A
-our $colorshadeb       = '0000CC';   # share color B
-our $colorwhite        = 'ffffff';   # color white
-our $colortemp         = '330099';   # outdoor temperature
-our $colortempavg      = 'ff0000';   # average outdoor temperature
-our $colordew          = '00ff00';   # outdoor dew point
-our $colorapparent     = '3300FF';   # apparent temperature
-our $colormoydir       = 'ff0000';   # average wind direcition
-our $colordir          = '330099';   # wind direction
-our $colormoyhumid     = 'ff0000';   # average outdoor humidity
-our $colorhumid        = '330099';   # outdoor humidity
-our $colormoypress     = 'ff0000';   # average air pressure
-our $colorpress        = '330099';   # air pressure
-our $colormoyspeed     = 'ff0000';   # average wind speed
-our $colorspeed        = '330099';   # wind speed
-our $colormoyrain      = 'ff0000';   # average total rain and average rain rate
-our $colorrainmax      = '000099';   # total rain
-our $colorrain         = '3300FF';   # color of rain
-our $colordewin        = 'ff9900';   # indoor dew point
-our $colortempin       = '990000';   # indoor temperature
-our $colortempspare1   = 'FF0000';   # spare temperature 1
-our $colortempspare2   = '990099';   # spare temperature 2
-our $colortempspare3   = 'CC0099';   # spare temperature 3
-our $colortempspare4   = 'CC33CC';   # spare temperature 4
-our $colortempspare5   = 'FF00FF';   # spare temperature 5
-our $colortempspare6   = 'FF99CC';   # spare temperature 6
-our $colortempspare7   = '99FF00';   # spare temperature 7
-our $colortempspare8   = '006600';   # spare temperature 8
-our $colortempspare9   = '66FFFF';   # spare temperature 9
-our $colortempspare10  = '0000CC';   # spare temperature 10
-our $colorhumidin      = '990000';   # indoor humidity
-our $colorhumidspare1  = 'FF0000';   # spare humidity 1
-our $colorhumidspare2  = '990099';   # spare humidity 2
-our $colorhumidspare3  = 'CC0099';   # spare humidity 3
-our $colorhumidspare4  = 'CC33CC';   # spare humidity 4
-our $colorhumidspare5  = 'FF00FF';   # spare humidity 5
-our $colorhumidspare6  = 'FF99CC';   # spare humidity 6
-our $colorhumidspare7  = '99FF00';   # spare humidity 7
-our $colorhumidspare8  = '006600';   # spare humidity 8
-our $colorhumidspare9  = '66FFFF';   # spare humidity 9
-our $colorhumidspare10 = '0000CC';   # spare humidity 10
-
-our $RRD_LAZY = 1
-  ; # set to 0 to always generate graphs, set to 1 to only generate graphs if necessary
+our $coloraltbg        = 'EEEEEE';    # alternating (with white) background color
+our $colorna           = 'C0C0C0';    # color for unknown area or 0 for gaps
+our $colorzero         = '000000';    # color of zero line
+our $colorshadea       = '0000CC';    # share color A
+our $colorshadeb       = '0000CC';    # share color B
+our $colorwhite        = 'ffffff';    # color white
+our $colortemp         = '330099';    # outdoor temperature
+our $colortempavg      = 'ff0000';    # average outdoor temperature
+our $colordew          = '00ff00';    # outdoor dew point
+our $colorapparent     = '3300FF';    # apparent temperature
+our $colormoydir       = 'ff0000';    # average wind direcition
+our $colordir          = '330099';    # wind direction
+our $colormoyhumid     = 'ff0000';    # average outdoor humidity
+our $colorhumid        = '330099';    # outdoor humidity
+our $colormoypress     = 'ff0000';    # average air pressure
+our $colorpress        = '330099';    # air pressure
+our $colormoyspeed     = 'ff0000';    # average wind speed
+our $colorspeed        = '330099';    # wind speed
+our $colormoyrain      = 'ff0000';    # average total rain and average rain rate
+our $colorrainmax      = '000099';    # total rain
+our $colorrain         = '3300FF';    # color of rain
+our $colordewin        = 'ff9900';    # indoor dew point
+our $colortempin       = '990000';    # indoor temperature
+our $colortempspare1   = 'FF0000';    # spare temperature 1
+our $colortempspare2   = '990099';    # spare temperature 2
+our $colortempspare3   = 'CC0099';    # spare temperature 3
+our $colortempspare4   = 'CC33CC';    # spare temperature 4
+our $colortempspare5   = 'FF00FF';    # spare temperature 5
+our $colortempspare6   = 'FF99CC';    # spare temperature 6
+our $colortempspare7   = '99FF00';    # spare temperature 7
+our $colortempspare8   = '006600';    # spare temperature 8
+our $colortempspare9   = '66FFFF';    # spare temperature 9
+our $colortempspare10  = '0000CC';    # spare temperature 10
+our $colorhumidin      = '990000';    # indoor humidity
+our $colorhumidspare1  = 'FF0000';    # spare humidity 1
+our $colorhumidspare2  = '990099';    # spare humidity 2
+our $colorhumidspare3  = 'CC0099';    # spare humidity 3
+our $colorhumidspare4  = 'CC33CC';    # spare humidity 4
+our $colorhumidspare5  = 'FF00FF';    # spare humidity 5
+our $colorhumidspare6  = 'FF99CC';    # spare humidity 6
+our $colorhumidspare7  = '99FF00';    # spare humidity 7
+our $colorhumidspare8  = '006600';    # spare humidity 8
+our $colorhumidspare9  = '66FFFF';    # spare humidity 9
+our $colorhumidspare10 = '0000CC';    # spare humidity 10
+
+our $RRD_LAZY = 1;                    # set to 0 to always generate graphs, set to 1 to only generate graphs if necessary
 $RRD_LAZY = 0 if $debug;
 
 # this block of variables is populated with values from the transfer file
@@ -118,8 +117,7 @@ our $footer2          = &get_weather_footer2;
 our $rrd_format_upper = uc($rrd_format);
 $rrd_format = lc($rrd_format);
 our $RRD_raw = $RRD;
-$RRD =~
-  s/:/\\\\\:/g;   # so that Windows filenames (with colons) are escaped properly
+$RRD =~ s/:/\\\\\:/g;    # so that Windows filenames (with colons) are escaped properly
 
 $ratio_sea_baro = 0 if $ratio_sea_baro eq '';
 
@@ -177,10 +175,7 @@ sub get_weather_footer1 {
     else {
         $colon = ':';
     }
-    $footer1 =
-        "Start time$colon $starttime   Step size$colon "
-      . convertstep($step)
-      . "   Data points$colon $datapoint";
+    $footer1 = "Start time$colon $starttime   Step size$colon " . convertstep($step) . "   Data points$colon $datapoint";
     return $footer1;
 }
 
@@ -247,85 +242,73 @@ sub create_rrdgraph_tempout {
             '6hour',
             'Temperatures last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Temperatures last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Temperatures last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Temperatures last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Temperatures last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Temperatures last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Temperatures last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Temperatures last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Temperatures last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Temperatures last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Temperatures last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Temperatures last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -338,8 +321,7 @@ sub create_rrdgraph_tempout {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : tempout RRDs::fetch : $err\n";
@@ -347,8 +329,7 @@ sub create_rrdgraph_tempout {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_tempout_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_tempout_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -380,26 +361,22 @@ sub create_rrdgraph_tempout {
               . "\"$celgtime->[3]\","
               . "\"DEF:mintemp=$RRD:temp:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintemp=mintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintemp=mintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmintemp=mintemp\","
               )
               . "\"DEF:maxtemp=$RRD:temp:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtemp=maxtemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtemp=maxtemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtemp=maxtemp\","
               )
               . "\"DEF:mindew=$RRD:dew:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmindew=mindew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmindew=mindew,32,-,5,9,/,*\","
                 : "\"CDEF:fmindew=mindew\","
               )
               . "\"DEF:maxdew=$RRD:dew:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxdew=maxdew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxdew=maxdew,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxdew=maxdew\","
               )
               . "\"DEF:dew=$RRD:dew:AVERAGE\","
@@ -409,44 +386,37 @@ sub create_rrdgraph_tempout {
               )
               . "\"DEF:apparent=$RRD:apparent:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fapparent=apparent,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fapparent=apparent,32,-,5,9,/,*\","
                 : "\"CDEF:fapparent=apparent\","
               )
               . "\"DEF:minapparent=$RRD:apparent:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fminapparent=minapparent,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fminapparent=minapparent,32,-,5,9,/,*\","
                 : "\"CDEF:fminapparent=minapparent\","
               )
               . "\"DEF:maxapparent=$RRD:apparent:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxapparent=maxapparent,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxapparent=maxapparent,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxapparent=maxapparent\","
               )
               . "\"DEF:minintemp=$RRD:intemp:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fminintemp=minintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fminintemp=minintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fminintemp=minintemp\","
               )
               . "\"DEF:maxintemp=$RRD:intemp:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxintemp=maxintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxintemp=maxintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxintemp=maxintemp\","
               )
               . "\"DEF:intemp=$RRD:intemp:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fintemp=intemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fintemp=intemp,32,-,5,9,/,*\","
                 : "\"CDEF:fintemp=intemp\","
               )
               . "\"DEF:indew=$RRD:indew:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:findew=indew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:findew=indew,32,-,5,9,/,*\","
                 : "\"CDEF:findew=indew\","
               )
               . qq^
@@ -482,8 +452,7 @@ sub create_rrdgraph_tempout {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -493,8 +462,8 @@ sub create_rrdgraph_tempout {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
         }
@@ -523,9 +492,8 @@ sub create_rrdgraph_tempin {
 
     # Sensors list for this graph
     my @list_sensors_graph = (
-        'intemp',     'indew',      'tempspare1', 'tempspare2',
-        'tempspare3', 'tempspare4', 'tempspare5', 'tempspare6',
-        'tempspare7', 'tempspare8', 'tempspare9', 'tempspare10'
+        'intemp',     'indew',      'tempspare1', 'tempspare2', 'tempspare3', 'tempspare4',
+        'tempspare5', 'tempspare6', 'tempspare7', 'tempspare8', 'tempspare9', 'tempspare10'
     );
 
     # Calcul max lenght of sensor name
@@ -542,85 +510,73 @@ sub create_rrdgraph_tempin {
             '6hour',
             'Temperatures last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Temperatures last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Temperatures last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Temperatures last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Temperatures last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Temperatures last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Temperatures last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Temperatures last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Temperatures last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Temperatures last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Temperatures last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Temperatures last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -633,8 +589,7 @@ sub create_rrdgraph_tempin {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : tempin RRDs::fetch : $err\n";
@@ -642,8 +597,7 @@ sub create_rrdgraph_tempin {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_tempin_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_tempin_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -675,242 +629,204 @@ sub create_rrdgraph_tempin {
               . "\"$celgtime->[3]\","
               . "\"DEF:mintemp=$RRD:temp:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintemp=mintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintemp=mintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmintemp=mintemp\","
               )
               . "\"DEF:maxtemp=$RRD:temp:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtemp=maxtemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtemp=maxtemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtemp=maxtemp\","
               )
 
               . "\"DEF:minintemp=$RRD:intemp:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fminintemp=minintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fminintemp=minintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fminintemp=minintemp\","
               )
               . "\"DEF:maxintemp=$RRD:intemp:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxintemp=maxintemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxintemp=maxintemp,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxintemp=maxintemp\","
               )
               . "\"DEF:intemp=$RRD:intemp:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fintemp=intemp,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fintemp=intemp,32,-,5,9,/,*\","
                 : "\"CDEF:fintemp=intemp\","
               )
 
               . "\"DEF:minindew=$RRD:indew:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fminindew=minindew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fminindew=minindew,32,-,5,9,/,*\","
                 : "\"CDEF:fminindew=minindew\","
               )
               . "\"DEF:maxindew=$RRD:indew:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxindew=maxindew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxindew=maxindew,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxindew=maxindew\","
               )
               . "\"DEF:indew=$RRD:indew:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:findew=indew,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:findew=indew,32,-,5,9,/,*\","
                 : "\"CDEF:findew=indew\","
               )
 
               . "\"DEF:mintempspare1=$RRD:tempspare1:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare1=mintempspare1,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare1=mintempspare1,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare1=mintempspare1\","
               )
               . "\"DEF:maxtempspare1=$RRD:tempspare1:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare1=maxtempspare1,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare1=maxtempspare1,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare1=maxtempspare1\","
               )
               . "\"DEF:tempspare1=$RRD:tempspare1:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare1=tempspare1,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare1=tempspare1,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare1=tempspare1\","
               )
 
               . "\"DEF:mintempspare2=$RRD:tempspare2:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare2=mintempspare2,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare2=mintempspare2,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare2=mintempspare2\","
               )
               . "\"DEF:maxtempspare2=$RRD:tempspare2:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare2=maxtempspare2,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare2=maxtempspare2,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare2=maxtempspare2\","
               )
               . "\"DEF:tempspare2=$RRD:tempspare2:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare2=tempspare2,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare2=tempspare2,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare2=tempspare2\","
               )
 
               . "\"DEF:mintempspare3=$RRD:tempspare3:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare3=mintempspare3,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare3=mintempspare3,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare3=mintempspare3\","
               )
               . "\"DEF:maxtempspare3=$RRD:tempspare3:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare3=maxtempspare3,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare3=maxtempspare3,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare3=maxtempspare3\","
               )
               . "\"DEF:tempspare3=$RRD:tempspare3:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare3=tempspare3,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare3=tempspare3,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare3=tempspare3\","
               )
 
               . "\"DEF:mintempspare4=$RRD:tempspare4:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare4=mintempspare4,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare4=mintempspare4,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare4=mintempspare4\","
               )
               . "\"DEF:maxtempspare4=$RRD:tempspare4:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare4=maxtempspare4,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare4=maxtempspare4,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare4=maxtempspare4\","
               )
               . "\"DEF:tempspare4=$RRD:tempspare4:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare4=tempspare4,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare4=tempspare4,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare4=tempspare4\","
               )
 
               . "\"DEF:mintempspare5=$RRD:tempspare5:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare5=mintempspare5,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare5=mintempspare5,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare5=mintempspare5\","
               )
               . "\"DEF:maxtempspare5=$RRD:tempspare5:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare5=maxtempspare5,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare5=maxtempspare5,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare5=maxtempspare5\","
               )
               . "\"DEF:tempspare5=$RRD:tempspare5:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare5=tempspare5,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare5=tempspare5,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare5=tempspare5\","
               )
 
               . "\"DEF:mintempspare6=$RRD:tempspare6:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare6=mintempspare6,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare6=mintempspare6,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare6=mintempspare6\","
               )
               . "\"DEF:maxtempspare6=$RRD:tempspare6:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare6=maxtempspare6,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare6=maxtempspare6,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare6=maxtempspare6\","
               )
               . "\"DEF:tempspare6=$RRD:tempspare6:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare6=tempspare6,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare6=tempspare6,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare6=tempspare6\","
               )
 
               . "\"DEF:mintempspare7=$RRD:tempspare7:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare7=mintempspare7,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare7=mintempspare7,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare7=mintempspare7\","
               )
               . "\"DEF:maxtempspare7=$RRD:tempspare7:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare7=maxtempspare7,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare7=maxtempspare7,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare7=maxtempspare7\","
               )
               . "\"DEF:tempspare7=$RRD:tempspare7:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare7=tempspare7,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare7=tempspare7,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare7=tempspare7\","
               )
 
               . "\"DEF:mintempspare8=$RRD:tempspare8:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare8=mintempspare8,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare8=mintempspare8,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare8=mintempspare8\","
               )
               . "\"DEF:maxtempspare8=$RRD:tempspare8:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare8=maxtempspare8,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare8=maxtempspare8,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare8=maxtempspare8\","
               )
               . "\"DEF:tempspare8=$RRD:tempspare8:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare8=tempspare8,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare8=tempspare8,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare8=tempspare8\","
               )
 
               . "\"DEF:mintempspare9=$RRD:tempspare9:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare9=mintempspare9,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare9=mintempspare9,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare9=mintempspare9\","
               )
               . "\"DEF:maxtempspare9=$RRD:tempspare9:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare9=maxtempspare9,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare9=maxtempspare9,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare9=maxtempspare9\","
               )
               . "\"DEF:tempspare9=$RRD:tempspare9:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare9=tempspare9,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare9=tempspare9,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare9=tempspare9\","
               )
 
               . "\"DEF:mintempspare10=$RRD:tempspare10:MIN\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmintempspare10=mintempspare10,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmintempspare10=mintempspare10,32,-,5,9,/,*\","
                 : "\"CDEF:fmintempspare10=mintempspare10\","
               )
               . "\"DEF:maxtempspare10=$RRD:tempspare10:MAX\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:fmaxtempspare10=maxtempspare10,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:fmaxtempspare10=maxtempspare10,32,-,5,9,/,*\","
                 : "\"CDEF:fmaxtempspare10=maxtempspare10\","
               )
               . "\"DEF:tempspare10=$RRD:tempspare10:AVERAGE\","
               . (
-                $weather_uom_temp eq 'C'
-                ? "\"CDEF:ftempspare10=tempspare10,32,-,5,9,/,*\","
+                $weather_uom_temp eq 'C' ? "\"CDEF:ftempspare10=tempspare10,32,-,5,9,/,*\","
                 : "\"CDEF:ftempspare10=tempspare10\","
               )
 
@@ -1049,8 +965,7 @@ sub create_rrdgraph_tempin {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -1060,8 +975,8 @@ sub create_rrdgraph_tempin {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -1094,85 +1009,73 @@ sub create_rrdgraph_winddir {
             '6hour',
             'Wind direction last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Wind direction last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Wind direction last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Wind direction last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Wind direction last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Wind direction last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Wind direction last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Wind direction last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Wind direction last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Wind direction last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Wind direction last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Wind direction last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -1185,8 +1088,7 @@ sub create_rrdgraph_winddir {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : winddir RRDs::fetch : $err\n";
@@ -1194,8 +1096,7 @@ sub create_rrdgraph_winddir {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_winddir_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_winddir_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -1242,8 +1143,7 @@ sub create_rrdgraph_winddir {
 "COMMENT:(0 N)-(45 NE)-(90 E)-(135 SE)-(180 S)-(225 SW)-(270 W)-(315 NW)-(360 N)\\\\c",
 "COMMENT:\\\\n",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -1253,8 +1153,8 @@ sub create_rrdgraph_winddir {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -1287,85 +1187,73 @@ sub create_rrdgraph_humout {
             '6hour',
             'Outdoor humidity last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Outdoor humidity last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Outdoor humidity last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Outdoor humidity last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Outdoor humidity last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Outdoor humidity last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Outdoor humidity last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Outdoor humidity last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Outdoor humidity last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Outdoor humidity last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Outdoor humidity last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Outdoor humidity last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -1378,8 +1266,7 @@ sub create_rrdgraph_humout {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : humout RRDs::fetch : $err\n";
@@ -1387,8 +1274,7 @@ sub create_rrdgraph_humout {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_humout_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_humout_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -1431,8 +1317,7 @@ sub create_rrdgraph_humout {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -1442,8 +1327,8 @@ sub create_rrdgraph_humout {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -1473,9 +1358,8 @@ sub create_rrdgraph_humin {
 
     # Sensors list for this graph
     my @list_sensors_graph = (
-        'inhumid',     'humidspare1', 'humidspare2', 'humidspare3',
-        'humidspare4', 'humidspare5', 'humidspare6', 'humidspare7',
-        'humidspare8', 'humidspare9', 'humidspare10'
+        'inhumid',     'humidspare1', 'humidspare2', 'humidspare3', 'humidspare4', 'humidspare5',
+        'humidspare6', 'humidspare7', 'humidspare8', 'humidspare9', 'humidspare10'
     );
 
     # Calcul max lenght of sensor name
@@ -1492,85 +1376,73 @@ sub create_rrdgraph_humin {
             '6hour',
             'Indoor humidity last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Indoor humidity last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Indoor humidity last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Indoor humidity last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Indoor humidity last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Indoor humidity last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Indoor humidity last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Indoor humidity last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Indoor humidity last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Indoor humidity last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Indoor humidity last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Indoor humidity last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -1583,8 +1455,7 @@ sub create_rrdgraph_humin {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : humin RRDs::fetch : $err\n";
@@ -1592,8 +1463,7 @@ sub create_rrdgraph_humin {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_humin_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_humin_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -1780,8 +1650,7 @@ sub create_rrdgraph_humin {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -1791,8 +1660,8 @@ sub create_rrdgraph_humin {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -1825,85 +1694,73 @@ sub create_rrdgraph_press {
             '6hour',
             'Barometric pressure last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Barometric pressure last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Barometric pressure last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Barometric pressure last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Barometric pressure last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Barometric pressure last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Barometric pressure last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Barometric pressure last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Barometric pressure last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Barometric pressure last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Barometric pressure last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Barometric pressure last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -1916,8 +1773,7 @@ sub create_rrdgraph_press {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : press RRDs::fetch : $err\n";
@@ -1925,8 +1781,7 @@ sub create_rrdgraph_press {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_press_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_press_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -1961,27 +1816,19 @@ sub create_rrdgraph_press {
               . "\"$celgtime->[3]\","
               . "\"DEF:minpress=$RRD:press:MIN\","
               . (
-                $weather_uom_baro eq 'mb'
-                ? "\"CDEF:fminpress=minpress,0.029529987508,/\","
+                $weather_uom_baro eq 'mb' ? "\"CDEF:fminpress=minpress,0.029529987508,/\","
                 : "\"CDEF:fminpress=minpress\","
               )
               . "\"DEF:maxpress=$RRD:press:MAX\","
               . (
-                $weather_uom_baro eq 'mb'
-                ? "\"CDEF:fmaxpress=maxpress,0.029529987508,/\","
+                $weather_uom_baro eq 'mb' ? "\"CDEF:fmaxpress=maxpress,0.029529987508,/\","
                 : "\"CDEF:fmaxpress=maxpress\","
               )
 ## Calculation for SeaLevel for Millibars and Inches
               . (
                 $weather_uom_baro eq 'mb'
-                ? "\"CDEF:seafvar=fvar,"
-                  . $altitude . ","
-                  . $ratio_sea_baro
-                  . ",3.2808399,*,/,+\","
-                : "\"CDEF:seafvar=fvar,0.029529987508,"
-                  . $altitude . ","
-                  . $ratio_sea_baro
-                  . ",3.2808399,*,/,*,+\","
+                ? "\"CDEF:seafvar=fvar," . $altitude . "," . $ratio_sea_baro . ",3.2808399,*,/,+\","
+                : "\"CDEF:seafvar=fvar,0.029529987508," . $altitude . "," . $ratio_sea_baro . ",3.2808399,*,/,*,+\","
               )
               . qq^
 "CDEF:wipeout=var,UN,INF,UNKN,IF",
@@ -2021,8 +1868,7 @@ sub create_rrdgraph_press {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -2032,8 +1878,8 @@ sub create_rrdgraph_press {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -2067,85 +1913,73 @@ sub create_rrdgraph_windspeed {
             '6hour',
             'Wind speed last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Wind speed last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Wind speed last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Wind speed last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Wind speed last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Wind speed last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Wind speed last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Wind speed last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Wind speed last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Wind speed last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Wind speed last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Wind speed last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -2158,8 +1992,7 @@ sub create_rrdgraph_windspeed {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : windspeed RRDs::fetch : $err\n";
@@ -2167,8 +2000,7 @@ sub create_rrdgraph_windspeed {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_windspeed_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_windspeed_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -2202,19 +2034,15 @@ sub create_rrdgraph_windspeed {
               . "\"$celgtime->[3]\","
               . "\"DEF:minspeed=$RRD:speed:MIN\","
               . (
-                $weather_uom_wind eq 'kph'
-                ? "\"CDEF:fminspeed=minspeed,1.609344,*\","
-                : $weather_uom_wind eq 'm/s'
-                ? "\"CDEF:fminspeed=minspeed,0.23694,/\","
-                : "\"CDEF:fminspeed=minspeed\","
+                  $weather_uom_wind eq 'kph' ? "\"CDEF:fminspeed=minspeed,1.609344,*\","
+                : $weather_uom_wind eq 'm/s' ? "\"CDEF:fminspeed=minspeed,0.23694,/\","
+                :                              "\"CDEF:fminspeed=minspeed\","
               )
               . "\"DEF:maxspeed=$RRD:speed:MAX\","
               . (
-                $weather_uom_wind eq 'kph'
-                ? "\"CDEF:fmaxspeed=maxspeed,1.609344,*\","
-                : $weather_uom_wind eq 'm/s'
-                ? "\"CDEF:fmaxpeed=maxpeed,0.23694,/\","
-                : "\"CDEF:fmaxspeed=maxspeed\","
+                  $weather_uom_wind eq 'kph' ? "\"CDEF:fmaxspeed=maxspeed,1.609344,*\","
+                : $weather_uom_wind eq 'm/s' ? "\"CDEF:fmaxpeed=maxpeed,0.23694,/\","
+                :                              "\"CDEF:fmaxspeed=maxspeed\","
               )
               . qq^
 "CDEF:wipeout=var,UN,INF,UNKN,IF",
@@ -2234,8 +2062,7 @@ sub create_rrdgraph_windspeed {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -2245,8 +2072,8 @@ sub create_rrdgraph_windspeed {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -2280,85 +2107,73 @@ sub create_rrdgraph_raintotal {
             '6hour',
             'Rain total last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Rain total last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Rain total last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Rain total last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Rain total last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Rain total last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Rain total last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Rain total last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Rain total last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Rain total last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Rain total last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Rain total last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -2371,8 +2186,7 @@ sub create_rrdgraph_raintotal {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : raintotal RRDs::fetch : $err\n";
@@ -2380,8 +2194,7 @@ sub create_rrdgraph_raintotal {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_raintotal_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_raintotal_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -2420,14 +2233,12 @@ sub create_rrdgraph_raintotal {
               . "\"$celgtime->[3]\","
               . "\"DEF:minrain=$RRD:rain:MIN\","
               . (
-                $weather_uom_rain eq 'mm'
-                ? "\"CDEF:fminrain=minrain,0.0393700787402,/\","
+                $weather_uom_rain eq 'mm' ? "\"CDEF:fminrain=minrain,0.0393700787402,/\","
                 : "\"CDEF:fminrain=minrain\","
               )
               . "\"DEF:maxrain=$RRD:rain:MAX\","
               . (
-                $weather_uom_rain eq 'mm'
-                ? "\"CDEF:fmaxrain=maxrain,0.0393700787402,/\","
+                $weather_uom_rain eq 'mm' ? "\"CDEF:fmaxrain=maxrain,0.0393700787402,/\","
                 : "\"CDEF:fmaxrain=maxrain\","
               )
               . qq^
@@ -2448,8 +2259,7 @@ sub create_rrdgraph_raintotal {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -2459,8 +2269,8 @@ sub create_rrdgraph_raintotal {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
@@ -2494,85 +2304,73 @@ sub create_rrdgraph_rainrate {
             '6hour',
             'Rain rate last 6 hours',
             '--x-grid","MINUTE:10:HOUR:1:MINUTE:30:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF',
-            "24000"
+            'CDEF:background=var,POP,LTIME,1200,%,600,LE,INF,UNKN,IF', "24000"
         ],
         [
             '12hour',
             'Rain rate last 12 hours',
             '--x-grid","MINUTE:15:HOUR:1:HOUR:1:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF',
-            "45000"
+            'CDEF:background=var,POP,LTIME,3600,%,1800,LE,INF,UNKN,IF', "45000"
         ],
         [
             '1day',
             'Rain rate last 1 day',
             '--x-grid","MINUTE:30:HOUR:1:HOUR:2:0:%H\:%M',
-            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF',
-            "90000"
+            'CDEF:background=fvar,POP,LTIME,7200,%,3600,LE,INF,UNKN,IF', "90000"
         ],
         [
             '2day',
             'Rain rate last 2 days',
             '--x-grid","HOUR:1:HOUR:4:HOUR:4:0:%H\:%M',
-            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF',
-            "180000"
+            'CDEF:background=var,POP,LTIME,21600,%,10800,LE,INF,UNKN,IF', "180000"
         ],
         [
             '1week',
             'Rain rate last 1 week',
             '--x-grid","HOUR:4:DAY:1:DAY:1:86400:%a %d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "648000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "648000"
         ],
         [
             '2week',
             'Rain rate last 2 weeks',
             '--x-grid","HOUR:8:DAY:1:DAY:1:86400:%d',
-            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF',
-            "1260000"
+            'CDEF:background=var,POP,LTIME,172800,%,86400,LE,INF,UNKN,IF', "1260000"
         ],
         [
             '1month',
             'Rain rate last 1 month',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "2700000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "2700000"
         ],
         [
             '2month',
             'Rain rate last 2 months',
             '--x-grid","DAY:1:WEEK:1:DAY:2:86400:%d',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "5400000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "5400000"
         ],
         [
             '6month',
             'Rain rate last 6 months',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "16848000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "16848000"
         ],
         [
             '1year',
             'Rain rate last 1 year',
             '--x-grid","WEEK:1:MONTH:1:MONTH:1:2592000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "33696000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "33696000"
         ],
         [
             '2year',
             'Rain rate last 2 years',
             '--x-grid","WEEK:2:MONTH:2:MONTH:2:5184000:%b-%y',
-            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF',
-            "67392000"
+            'CDEF:background=var,POP,LTIME,1209600,%,604800,LE,INF,UNKN,IF', "67392000"
         ],
         [
             '5year',
             'Rain rate last 5 years',
             '--x-grid","MONTH:1:YEAR:1:YEAR:1:31104000:%Y',
-            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF',
-            "168480000"
+            'CDEF:background=var,POP,LTIME,4838400,%,2419200,LE,INF,UNKN,IF', "168480000"
         ]
     ];
 
@@ -2586,8 +2384,7 @@ sub create_rrdgraph_rainrate {
               $secs / 600 * int( ( $RRD_LAST - $secs ) / ( $secs / 600 ) );
             $time2 = $secs / 600 * int( ($RRD_LAST) / ( $secs / 600 ) );
 
-            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw",
-              "AVERAGE", "-s", "$time1", "-e", "$time2";
+            ( $start, $step, $names, $array ) = RRDs::fetch "$RRD_raw", "AVERAGE", "-s", "$time1", "-e", "$time2";
             $err = RRDs::error;
             if ($err) {
                 print "ERROR : tempout RRDs::rainrate : $err\n";
@@ -2595,8 +2392,7 @@ sub create_rrdgraph_rainrate {
             }
             $datapoint = $#$array + 1;
             $footer1 = get_weather_footer1( $start, $step, $datapoint );
-            my $filename =
-              "$rrd_graph_dir/weather_rainrate_$celgtime->[0].$rrd_format";
+            my $filename = "$rrd_graph_dir/weather_rainrate_$celgtime->[0].$rrd_format";
             $str_graph = qq^RRDs::graph("$filename.new",
 "--title", "$celgtime->[1]",
 "--height","$height",
@@ -2637,14 +2433,12 @@ sub create_rrdgraph_rainrate {
               . "\"$celgtime->[3]\","
               . "\"DEF:minrate=$RRD:rate:MIN\","
               . (
-                $weather_uom_rainrate eq 'mm/hr'
-                ? "\"CDEF:fminrate=minrate,0.0393700787402,/\","
+                $weather_uom_rainrate eq 'mm/hr' ? "\"CDEF:fminrate=minrate,0.0393700787402,/\","
                 : "\"CDEF:fminrate=minrate\","
               )
               . "\"DEF:maxrate=$RRD:rate:MAX\","
               . (
-                $weather_uom_rainrate eq 'mm/hr'
-                ? "\"CDEF:fmaxrate=maxrate,0.0393700787402,/\","
+                $weather_uom_rainrate eq 'mm/hr' ? "\"CDEF:fmaxrate=maxrate,0.0393700787402,/\","
                 : "\"CDEF:fmaxrate=maxrate\","
               )
               . qq^
@@ -2663,8 +2457,7 @@ sub create_rrdgraph_rainrate {
 "AREA:wipeout#$colorna:No data\\\\n",
 "AREA:wipeout2#$colorna",
 ^
-              . "\"COMMENT:$footer1\\\\c\","
-              . "\"COMMENT:$footer2\\\\c\"" . ")";
+              . "\"COMMENT:$footer1\\\\c\"," . "\"COMMENT:$footer2\\\\c\"" . ")";
 
             print "\n$str_graph \n" if $debug;
             eval $str_graph;
@@ -2674,8 +2467,8 @@ sub create_rrdgraph_rainrate {
                 return;
             }
             else {
-                rename( $filename, "$filename.old" ) if ( -e $filename );
-                rename( "$filename.new", $filename ) if ( -e "$filename.new" );
+                rename( $filename,       "$filename.old" ) if ( -e $filename );
+                rename( "$filename.new", $filename )       if ( -e "$filename.new" );
                 unlink("$filename.old") if ( -e "$filename.old" );
             }
 
diff --git a/bin/xAP-bluetooth.pl b/bin/xAP-bluetooth.pl
index a2606f40b..5a03de805 100755
--- a/bin/xAP-bluetooth.pl
+++ b/bin/xAP-bluetooth.pl
@@ -25,8 +25,7 @@
 my ( $address, $name, $bt_threshold ) = @ARGV
   or die "Missing the phone mac address\n";
 
-printf "Will monitor bluetooth stats for address=%s name=%s device=%s\n",
-  $address, $name, devname($address);
+printf "Will monitor bluetooth stats for address=%s name=%s device=%s\n", $address, $name, devname($address);
 
 # Setup constants
 my ( $bt_debug, $bt_linger );
@@ -36,8 +35,7 @@
 
 $bt_debug = 0 unless $bt_debug;
 $bt_linger = 3
-  unless
-  $bt_linger;  # No. of measurements above/below threshold before changing state
+  unless $bt_linger;    # No. of measurements above/below threshold before changing state
 $bt_threshold = 1 unless defined $bt_threshold;
 
 my $XAP_PORT       = 3639;
@@ -65,8 +63,7 @@
 );
 
 if ($xap_listen) {
-    print "No hub active.  Listening on broadcast socket",
-      $xap_listen->sockport(), "\n";
+    print "No hub active.  Listening on broadcast socket", $xap_listen->sockport(), "\n";
 }
 else {
     # Hub is active.  Loop until we find an available port
@@ -113,16 +110,14 @@
 
 sub send_heartbeat {
     print "Sending heartbeat on port ", $xap_send->peerport, "\n" if $bt_debug;
-    print $xap_send
-      "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
+    print $xap_send "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
       . "source=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\ninterval=$HBEAT_INTERVAL\nport=$XAP_PORT\npid=$$\n}\n";
 }
 
 sub send_xap_data {
     my ( $address, $name, $status ) = @_;
     print "\nSending address=$address status=$status\n";
-    my $msg =
-      "xap-header\n{\nv=12\nhop=1\nuid=$XAP_GUID\nsource=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\n";
+    my $msg = "xap-header\n{\nv=12\nhop=1\nuid=$XAP_GUID\nsource=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\n";
     $msg .= "class=xap-bt.status\n}\nxap-bt.status\n{\n";
     $msg .= "address=$address\nname=$name\nstatus=$status\n}\n";
     print $xap_send $msg;
@@ -152,8 +147,7 @@ sub get_bt_status {
     push @bt_stack, $current_rssi;
 
     printf "[%s] a=%s, n=%s, s=%s, t=%s, l=%s, s=%s, stack=@bt_stack\n",
-      scalar localtime,
-      $address, $name, $current_rssi, $bt_threshold, $bt_linger, $state
+      scalar localtime, $address, $name, $current_rssi, $bt_threshold, $bt_linger, $state
       if $bt_debug;
 
     # Check if we need to change state
diff --git a/bin/xAP-festival.pl b/bin/xAP-festival.pl
index 0752517f5..dde3b4e35 100755
--- a/bin/xAP-festival.pl
+++ b/bin/xAP-festival.pl
@@ -53,8 +53,7 @@
     my $hostname = `hostname`;
     chomp $hostname;
     $hostname =~ s/^(.*?)\.(.*)$/$1/;
-    print
-      "A room was not specified using --room= so I'm using the hostname [$hostname]\n"
+    print "A room was not specified using --room= so I'm using the hostname [$hostname]\n"
       if $debug;
     $room = $hostname;
 }
@@ -109,8 +108,7 @@
 
     # If a hub is not active, bind directly for listening
     if ($xap_listen) {
-        print "No hub active.  Listening on broadcast socket ",
-          $xap_listen->sockport(), "\n"
+        print "No hub active.  Listening on broadcast socket ", $xap_listen->sockport(), "\n"
           if $debug;
     }
     else {
@@ -176,8 +174,7 @@ sub send_heartbeat {
     select undef, undef, undef, rand();    # Sleep a bit
 
     print "Sending heartbeat on port ", $xap_send->peerport, "\n" if ($debug);
-    print $xap_send
-      "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
+    print $xap_send "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
       . "source=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\ninterval=$HBEAT_INTERVAL\nport=$XAP_PORT\npid=$$\n}\n";
 }
 
@@ -214,16 +211,14 @@ sub speak {
     my $volume = shift;
     my $voice  = shift;
 
-    $volume = $volume / 100
-      ; # SABLE uses a floating point-number between zero and 1 to represent volume.
+    $volume = $volume / 100;    # SABLE uses a floating point-number between zero and 1 to represent volume.
 
     #  The SABLE tags are currently not working properly - it's reading them out
     #  $text = "<VOLUME LEVEL=".$volume.">".$text."<VOLUME>" if ($volume != 0.5);
     #  $text = "<SPEAKER GENDER=".$voice.">".$text."</SPEAKER>" if ($voice ne "");
 
     my $cmd;
-    my $telnet =
-      new Net::Telnet( Timeout => 5, Errmode => 'return', Port => 1314 );
+    my $telnet = new Net::Telnet( Timeout => 5, Errmode => 'return', Port => 1314 );
     if ( $telnet->open('localhost') ) {
         $cmd = "(SayText \"$text\")";
         $telnet->print($cmd);
diff --git a/bin/xAP-info.pl b/bin/xAP-info.pl
index cb6135893..65d703333 100755
--- a/bin/xAP-info.pl
+++ b/bin/xAP-info.pl
@@ -96,8 +96,7 @@
 sub newexten_callback {
     my (%params) = @_;
 
-    xap_extension( $params{'Extension'}, $params{'Context'},
-        $params{'Channel'} );
+    xap_extension( $params{'Extension'}, $params{'Context'}, $params{'Channel'} );
     default_callback(@_);
 
 }
@@ -160,8 +159,7 @@ sub xap_extension {
     $response = $response . "Outgoing.CallComplete\n";
     $response = $response . "{\n";
     $response = $response . "Phone=" . $p_number . "\n";
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime(time);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
     $year += 1900;
     $mon  += 1;
     $mon  = sprintf( "%02d", $mon );
@@ -169,15 +167,7 @@ sub xap_extension {
     $hour = sprintf( "%02d", $hour );
     $min  = sprintf( "%02d", $min );
     $sec  = sprintf( "%02d", $sec );
-    $response =
-        $response
-      . "DateTime="
-      . $year
-      . $mon
-      . $mday
-      . $hour
-      . $min
-      . $sec . "\n";
+    $response = $response . "DateTime=" . $year . $mon . $mday . $hour . $min . $sec . "\n";
     $response = $response . "Duration=00:00:00\n";
     $response = $response . "Context=" . $p_context . "\n";
     $response = $response . "Line=" . $p_line . "\n";
@@ -208,8 +198,7 @@ sub xap_cid {
     $response = $response . "{\n";
     $response = $response . "Type=" . "Voice" . "\n";
     $response = $response . "Phone=" . $p_number . "\n";
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime(time);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
     $year += 1900;
     $mon  += 1;
     $mon  = sprintf( "%02d", $mon );
@@ -217,15 +206,7 @@ sub xap_cid {
     $hour = sprintf( "%02d", $hour );
     $min  = sprintf( "%02d", $min );
     $sec  = sprintf( "%02d", $sec );
-    $response =
-        $response
-      . "DateTime="
-      . $year
-      . $mon
-      . $mday
-      . $hour
-      . $min
-      . $sec . "\n";
+    $response = $response . "DateTime=" . $year . $mon . $mday . $hour . $min . $sec . "\n";
     $response = $response . "RNNumber=" . $l_reason . "\n";
     $response = $response . "Name=" . $p_name . "\n";
     $response = $response . "Line=" . $p_line . "\n";
diff --git a/bin/xAP-speech.pl b/bin/xAP-speech.pl
index 57b37fb15..c8a6d2b6a 100755
--- a/bin/xAP-speech.pl
+++ b/bin/xAP-speech.pl
@@ -52,8 +52,7 @@
     my $hostname = `hostname`;
     chomp $hostname;
     $hostname =~ s/^(.*?)\.(.*)$/$1/;
-    print
-      "A room was not specified using --room= so I'm using the hostname [$hostname]\n"
+    print "A room was not specified using --room= so I'm using the hostname [$hostname]\n"
       if $debug;
     $room = $hostname;
 }
@@ -124,8 +123,7 @@
 
     # If a hub is not active, bind directly for listening
     if ($xap_listen) {
-        print "No hub active.  Listening on broadcast socket ",
-          $xap_listen->sockport(), "\n"
+        print "No hub active.  Listening on broadcast socket ", $xap_listen->sockport(), "\n"
           if $debug;
     }
     else {
@@ -185,8 +183,7 @@
 
 sub send_heartbeat {
     print "Sending heartbeat on port ", $xap_send->peerport, "\n" if ($debug);
-    print $xap_send
-      "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
+    print $xap_send "xap-hbeat\n{\nv=12\nhop=1\nuid=$XAP_GUID\nclass=xap-hbeat.alive\n"
       . "source=$XAP_ME.$XAP_SOURCE.$XAP_INSTANCE\ninterval=$HBEAT_INTERVAL\nport=$XAP_PORT\npid=$$\n}\n";
 }
 
@@ -224,8 +221,7 @@ sub speak {
     my $volume = shift;
     my $voice  = shift;
     my $cmd;
-    $volume = $volume / 100
-      ; # SABLE uses a floating point-number between zero and 1 to represent volume.
+    $volume = $volume / 100;    # SABLE uses a floating point-number between zero and 1 to represent volume.
 
     #    The SABLE tags are currently not working properly - it's reading them out
     #    $text = "<VOLUME LEVEL=".$volume.">".$text."<VOLUME>" if ($volume != 0.5);
diff --git a/code/bruce/audrey.pl b/code/bruce/audrey.pl
index 9b9a0a098..b17fcca4f 100644
--- a/code/bruce/audrey.pl
+++ b/code/bruce/audrey.pl
@@ -21,26 +21,18 @@
 
 =cut
 
-$v_audrey_led_on =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light on");
-$v_audrey_led_off =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light off");
-$v_audrey_led_blink =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light blink");
-
-$v_audrey_screen_on =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey screen on");
-$v_audrey_screen_off =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey screen off");
-
-$v_audrey_photos =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey to photo screen");
-
-$v_audrey_wav =
-  new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey to a wav file");
-
-$v_audrey_tagline =
-  new Voice_Cmd("Read tag line to [,all,Kitchen,Piano,Bedroom] Audrey");
+$v_audrey_led_on    = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light on");
+$v_audrey_led_off   = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light off");
+$v_audrey_led_blink = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey light blink");
+
+$v_audrey_screen_on  = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey screen on");
+$v_audrey_screen_off = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey screen off");
+
+$v_audrey_photos = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey to photo screen");
+
+$v_audrey_wav = new Voice_Cmd("Set [,all,Kitchen,Piano,Bedroom] Audrey to a wav file");
+
+$v_audrey_tagline = new Voice_Cmd("Read tag line to [,all,Kitchen,Piano,Bedroom] Audrey");
 
 &audrey( 'led', 'on',    $state ) if $state = said $v_audrey_led_on;
 &audrey( 'led', 'off',   $state ) if $state = said $v_audrey_led_off;
diff --git a/code/bruce/backup.pl b/code/bruce/backup.pl
index 55b85718c..e458b7bfa 100644
--- a/code/bruce/backup.pl
+++ b/code/bruce/backup.pl
@@ -3,37 +3,31 @@
 
 #@ Backup important computer files, using mh/bin/backup_data
 
-$backup_process = new Process_Item;
-$backup_process_v =
-  new Voice_Cmd 'Run [daily,daily laptop,monthly,monthly laptop] backup';
-$backup_process_v->set_info(
-    'Daily backups store recently change files, monthly stores them all');
+$backup_process   = new Process_Item;
+$backup_process_v = new Voice_Cmd 'Run [daily,daily laptop,monthly,monthly laptop] backup';
+$backup_process_v->set_info('Daily backups store recently change files, monthly stores them all');
 
 run_voice_cmd 'Run daily backup'   if $New_Day;
 run_voice_cmd 'Run monthly backup' if $New_Month;
 
 if ( $state = said $backup_process_v) {
     speak "Starting $state backup";
-    my $pgm =
-      ( $state =~ /daily/ ) ? 'backup_data -no_date -age 120' : 'backup_data';
+    my $pgm = ( $state =~ /daily/ ) ? 'backup_data -no_date -age 120' : 'backup_data';
 
     # Laptop is done seperatly, since it is not always connected
     if ( $state =~ /laptop/ ) {
-        set $backup_process $pgm
-          . ' -file /backup/laurie_laptop -size 5000 //acer/d/l';
+        set $backup_process $pgm . ' -file /backup/laurie_laptop -size 5000 //acer/d/l';
 
         #       set $backup_process $pgm . ' -file /backup/laurie_laptop -size 5000 //tp/d/l';
     }
     else {
         set $backup_process
           $pgm . ' -file f:/backup/linux_bin //misterhouse.net/bin',
-          $pgm
-          . ' -file f:/backup/www -size 1000 -skip "(/eq$)|(/old$)" //misterhouse.net/www //misterhouse.net/public',
+          $pgm . ' -file f:/backup/www -size 1000 -skip "(/eq$)|(/old$)" //misterhouse.net/www //misterhouse.net/public',
 
           #            $pgm . ' -file f:/backup/laurie -size 5000 /l',
           $pgm . ' -file f:/backup/mh_articles -size 100000 //nas/mh/articles',
-          $pgm
-          . ' -file f:/backup/mh -skip "(/upload$)|(/tv$)|(/compile/p2)|(/articles$)" //nas/mh /bin';
+          $pgm . ' -file f:/backup/mh -skip "(/upload$)|(/tv$)|(/compile/p2)|(/articles$)" //nas/mh /bin';
 
         #            $pgm . ' -file //misterhouse.net/i/backup/laurie -size 5000 /l',
         #            $pgm . ' -file //misterhouse.net/i/backup/mh_articles -size 100000 /misterhouse/articles',
diff --git a/code/bruce/curtains.pl b/code/bruce/curtains.pl
index da9dc0cfa..236bfabbb 100644
--- a/code/bruce/curtains.pl
+++ b/code/bruce/curtains.pl
@@ -16,11 +16,9 @@
 run_voice_cmd 'close the living room curtains'
   if time_cron '0 18 * * 1-5' and $Save{curtain_living} ne CLOSED;
 
-$curtain_living = new X10_Appliance('OC');
-$v_curtain_living =
-  new Voice_Cmd('[open,close,change] the living room curtains');
-$v_curtain_living->set_info(
-    "Use change if this X10 toggled curtain gets out of sync");
+$curtain_living   = new X10_Appliance('OC');
+$v_curtain_living = new Voice_Cmd('[open,close,change] the living room curtains');
+$v_curtain_living->set_info("Use change if this X10 toggled curtain gets out of sync");
 
 $timer_curtain_living = new Timer();
 
@@ -105,9 +103,7 @@
             and defined $Weather{TempOutdoor}
             and $Weather{TempOutdoor} < 50 )
         {
-            speak
-              "Notice, the sun is dim at $analog{sun_sensor} percent, and it is cold outside "
-              . "at "
+            speak "Notice, the sun is dim at $analog{sun_sensor} percent, and it is cold outside " . "at "
               . round( $Weather{TempOutdoor} )
               . " degrees, so I'm closing the curtains at $Time_Now";
             &curtains_all(CLOSE);
@@ -122,9 +118,7 @@
             and defined $Weather{TempOutdoor}
             and $Weather{TempOutdoor} < 45 )
         {
-            speak
-              "Notice, the sun is bright at $analog{sun_sensor} percent, and it is cold outside "
-              . "at "
+            speak "Notice, the sun is bright at $analog{sun_sensor} percent, and it is cold outside " . "at "
               . round( $Weather{TempOutdoor} )
               . " degrees, so I am opening the curtains at $Time_Now";
             &curtains_all(OPEN);
@@ -154,10 +148,7 @@ sub curtains_all {
     else {
         # Do the X10 curtain
         #       run_voice_cmd "$action the living room curtains";
-        @curtains = (
-            'bedroom', $action, 'family', $action,
-            'zack',    $action, 'nick',   $action
-        );
+        @curtains = ( 'bedroom', $action, 'family', $action, 'zack', $action, 'nick', $action );
 
         #       @curtains = ('bedroom', $action, 'family' , $action,                  'nick', $action);
     }
@@ -197,7 +188,7 @@ sub curtain_on {
     # Since we share timer and relay ... one at a time
     if ( active $timer_curtain) {
         speak "Reset";
-        run_action $timer_curtain; # Prematurely turn off the previous curtain's relay
+        run_action $timer_curtain;    # Prematurely turn off the previous curtain's relay
     }
 
     set $timer_curtain $time, "&main::curtain_off('$room');";
diff --git a/code/bruce/date_reminders.pl b/code/bruce/date_reminders.pl
index 03d4d2ad4..ea29eeb13 100644
--- a/code/bruce/date_reminders.pl
+++ b/code/bruce/date_reminders.pl
@@ -2,10 +2,8 @@
 
 #@ Announces misc. reminders.
 
-$plant_talk =
-  new File_Item("$config_parms{data_dir}/remarks/list_plant_talk.txt");
-speak(
-    "rooms=all voice=Claire The plants want to be watered.  They gave me the following message:"
+$plant_talk = new File_Item("$config_parms{data_dir}/remarks/list_plant_talk.txt");
+speak( "rooms=all voice=Claire The plants want to be watered.  They gave me the following message:"
       . &Voice_Text::set_voice( 'male', read_next $plant_talk) )
   if time_cron('20 12,16,18 * * 0');
 
@@ -35,9 +33,7 @@
 sub speak_anniversary {
     my ( $year, $person, $type ) = @_;
     my $years = &speakify_numbers( $Year - $year );
-    speak(
-        "voice=Claire Listen up everybody.  Today is ${person}'s $years $type!"
-    );
+    speak( "voice=Claire Listen up everybody.  Today is ${person}'s $years $type!" );
 }
 
 &speak_anniversary( 1953, 'Mal & Beth', 'anniversary' )
diff --git a/code/bruce/door_monitor.pl b/code/bruce/door_monitor.pl
index 5a82b28a4..a1a1ae924 100644
--- a/code/bruce/door_monitor.pl
+++ b/code/bruce/door_monitor.pl
@@ -20,13 +20,7 @@
 }
 
 # Note:  testing on state $item seems to reset it!! use $item->{state} instead :(
-if (
-    (
-            time_cron('0,5,10,15,30,45 22,23 * * *')
-        and ( OPENED eq ( $garage_door->{state} ) )
-        and inactive $timer_garage_door)
-  )
-{
+if ( ( time_cron('0,5,10,15,30,45 22,23 * * *') and ( OPENED eq ( $garage_door->{state} ) ) and inactive $timer_garage_door) ) {
     &speak(
         mode => 'unmuted',
         text => "The garage door has been left opened."
@@ -131,8 +125,7 @@
 
 if ( expired $timer_garage_movement) {
     set $garage_light OFF;
-    print_log
-      "Garage timer expired: light=$$garage_light{state} lights=$$garage_lights{state}";
+    print_log "Garage timer expired: light=$$garage_light{state} lights=$$garage_lights{state}";
 
     #    set $garage_light  OFF if $garage_light  ne 'OFF';
     #    set $garage_lights OFF if $garage_lights ne 'OFF';
diff --git a/code/bruce/email_scan.pl b/code/bruce/email_scan.pl
index 604062e0e..dc69fc7e3 100644
--- a/code/bruce/email_scan.pl
+++ b/code/bruce/email_scan.pl
@@ -6,8 +6,7 @@
 # get_email_scan_file and $p_get_email are created by internet_mail.pl
 if ( done_now $p_get_email and -e $get_email_scan_file ) {
     for my $line ( file_read $get_email_scan_file) {
-        my ( $from, $to, $subject, $body ) =
-          $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+        my ( $from, $to, $subject, $body ) = $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
 
         # Detect mh http server port is down from NetWhistle mail
         #       display  text => "$Time_Date: $subject\n", time => 0, window_name => 'debug', append => 'top';
@@ -15,8 +14,7 @@
             socket_close 'http';
 
             #           &socket_restart('http');
-            my $msg =
-              "Notice, http server was detected down, so I just restarted it.  $subject\n  $body";
+            my $msg = "Notice, http server was detected down, so I just restarted it.  $subject\n  $body";
             display text => $msg, time => 0, font => 'fixed';
             speak rooms => 'all', text => 'HTTP server was just restarted';
         }
diff --git a/code/bruce/get_email_rule.pl b/code/bruce/get_email_rule.pl
index 60cace06c..f052b9f73 100644
--- a/code/bruce/get_email_rule.pl
+++ b/code/bruce/get_email_rule.pl
@@ -6,8 +6,7 @@
 sub get_email_rule {
     my ( $from, $to, $subject, $from_full, $body ) = @_;
 
-    print
-      "Debug in get_email_rule: to=$to from=$from from_full=$from_full subject=$subject\n"
+    print "Debug in get_email_rule: to=$to from=$from from_full=$from_full subject=$subject\n"
       if $Debug{email};
 
     # Junk mail is out of control.   Filter only for good stuff
@@ -18,7 +17,7 @@ sub get_email_rule {
     return if $from =~ /^\s+$/;
 
     #   print "dbx1 email_rule f=$from. t=$to s=$subject\n";
-    return if $from_full =~ /newsletter/;    # Covers [newsletter@x10.com]
+    return                if $from_full =~ /newsletter/;              # Covers [newsletter@x10.com]
     return 'The S F gals' if $to =~ /FEM-SF/;
     return 'The S F gals' if $to =~ /sfpanet/;
     return                if $to =~ /par\@/;
@@ -59,17 +58,15 @@ sub get_email_rule {
     return 'filtered - klug'
       if $to =~ /klug/i;    # filtered -> will not be spoken (like blank)
     return 'filtered no store'
-      if $from =~ /\S+[0-9]{3,}/
-      ;    # If we get a joe#### type address, assume it is junk mail.
+      if $from =~ /\S+[0-9]{3,}/;    # If we get a joe#### type address, assume it is junk mail.
     return 'filtered no store'
-      if $from =~
-      /[0-9]{5,}/;   # If we get a ######  type address, assume it is junk mail.
+      if $from =~ /[0-9]{5,}/;       # If we get a ######  type address, assume it is junk mail.
     return 'filtered no store' if $from_words > 3;
 
     #   return 'junk mail'             if $from =~ /[0-9]{5,}/;    # If we get a ######  type address, assume it is junk mail.
 
-    $from =~ s/\./ Dot /g;    # ...change "." to the word "Dot"
-    $from =~ s/\@/ At /g;     # ...change \@  to the word "At"
+    $from =~ s/\./ Dot /g;           # ...change "." to the word "Dot"
+    $from =~ s/\@/ At /g;            # ...change \@  to the word "At"
 
     return $from;
 }
diff --git a/code/bruce/heat_cool.pl b/code/bruce/heat_cool.pl
index 29b18c8f9..296345946 100644
--- a/code/bruce/heat_cool.pl
+++ b/code/bruce/heat_cool.pl
@@ -27,8 +27,7 @@
     and $Hour > 9
     and $Hour < 16 )
 {
-    speak
-      "Notice, the sun as warmed us up to $Weather{TempIndoor} degrees, so I am turning the fans on at $Time_Now";
+    speak "Notice, the sun as warmed us up to $Weather{TempIndoor} degrees, so I am turning the fans on at $Time_Now";
     set $furnace_fan ON;
     set $living_room_fan ON;
     set $bedroom_fan ON;
@@ -39,8 +38,7 @@
     and $Weather{TempIndoor}
     and ( $Weather{TempIndoor} < 74 or $Hour > 18 ) )
 {
-    speak
-      "Notice, it has cooled down to $Weather{TempIndoor} degrees, so I am turning the fans off at $Time_Now";
+    speak "Notice, it has cooled down to $Weather{TempIndoor} degrees, so I am turning the fans off at $Time_Now";
     set $furnace_fan OFF;
     set $living_room_fan OFF;
     set $bedroom_fan OFF;
@@ -58,10 +56,8 @@
     and $Weather{TempIndoor} < ( $Save{heat_temp} - $hyster ) )
 {
     my $heat_time_diff = &time_diff( $Save{heat_time}, $Time );
-    speak
-      "Turning furnace heat on after $heat_time_diff at $Weather{TempIndoor} degrees";
-    print_log
-      "Furnace heat has been turned on: temp=$Weather{TempIndoor} time=$heat_time_diff";
+    speak "Turning furnace heat on after $heat_time_diff at $Weather{TempIndoor} degrees";
+    print_log "Furnace heat has been turned on: temp=$Weather{TempIndoor} time=$heat_time_diff";
     logit(
         "$config_parms{data_dir}/logs/furnace.$Year_Month_Now.log",
         "state=on   temp=$Weather{TempIndoor}  time=$heat_time_diff  "
@@ -76,14 +72,10 @@
     and $Weather{TempIndoor} > ( $Save{heat_temp} + $hyster ) )
 {
     my $heat_time_diff = &time_diff( $Save{heat_time}, $Time );
-    speak
-      "Turning furnace heat off after $heat_time_diff at $Weather{TempIndoor} degrees";
-    print_log
-      "Furnace heat has been turned off: temp=$Weather{TempIndoor} time=$heat_time_diff";
-    logit(
-        "$config_parms{data_dir}/logs/furnace.$Year_Month_Now.log",
-        "state=off  temp=$Weather{TempIndoor}  time=$heat_time_diff"
-    );
+    speak "Turning furnace heat off after $heat_time_diff at $Weather{TempIndoor} degrees";
+    print_log "Furnace heat has been turned off: temp=$Weather{TempIndoor} time=$heat_time_diff";
+    logit( "$config_parms{data_dir}/logs/furnace.$Year_Month_Now.log",
+        "state=off  temp=$Weather{TempIndoor}  time=$heat_time_diff" );
     set $furnace_heat OFF;
     $Save{heat_time} = $Time;
 }
@@ -91,35 +83,22 @@
 # Safeguard to make we don't leave the furnace heat on if somehow its state got lost
 #  - skip if we already set for this pass
 
-if (
-    new_minute 10
-    and !(
-        $furnace_heat->{state_next_pass}
-        and @{ $furnace_heat->{state_next_pass} }
-    )
-  )
+if ( new_minute 10
+    and !( $furnace_heat->{state_next_pass} and @{ $furnace_heat->{state_next_pass} } ) )
 {
-    if (
-        (
-                $Weather{TempIndoor}
-            and $Weather{TempIndoor} > ( $Save{heat_temp} + $hyster + 0.5 )
-        )
-        and $Weather{TempOutdoor} < 50
-      )
+    if ( ( $Weather{TempIndoor} and $Weather{TempIndoor} > ( $Save{heat_temp} + $hyster + 0.5 ) )
+        and $Weather{TempOutdoor} < 50 )
     {
         if ( $state ne OFF ) {
             my $heat_time_diff = $Time - $Save{heat_time};
             $heat_time_diff = &time_diff($heat_time_diff);
-            my $msg =
-              "Danger Will Winterson, the furnace has been left on for $heat_time_diff.";
-            $msg .=
-              "The outdoor temperature is $Weather{TempOutdoor} degrees and indoor is $Weather{TempIndoor} degrees";
+            my $msg = "Danger Will Winterson, the furnace has been left on for $heat_time_diff.";
+            $msg .= "The outdoor temperature is $Weather{TempOutdoor} degrees and indoor is $Weather{TempIndoor} degrees";
             $msg .= "I am turning that silly furnace off";
             display $msg, 0;
             speak $msg;
         }
-        print_log
-          "Furnace heat was left on.  Turning off at $Weather{TempIndoor} degrees";
+        print_log "Furnace heat was left on.  Turning off at $Weather{TempIndoor} degrees";
         set $furnace_heat OFF;
     }
 
diff --git a/code/bruce/iButton_bruce.pl b/code/bruce/iButton_bruce.pl
index f37db2871..3990c0172 100644
--- a/code/bruce/iButton_bruce.pl
+++ b/code/bruce/iButton_bruce.pl
@@ -25,13 +25,10 @@
 =cut
 
 $v_iButton_readtemps = new Voice_Cmd "Read the iButton temperature buttons";
-$v_iButton_readtemps->set_info(
-    'This reads all all iButton temperature devices.  Takes a while (.6 s per device)'
-);
+$v_iButton_readtemps->set_info( 'This reads all all iButton temperature devices.  Takes a while (.6 s per device)' );
 $v_iButton_readtemp = new Voice_Cmd "Read the iButton temperature [1,2,3,4]";
 
-$v_iButton_readtemp->set_info(
-    'Read only the temperature from a specific button');
+$v_iButton_readtemp->set_info('Read only the temperature from a specific button');
 $v_iButton_readtemp->set_authority('anyone');
 
 $v_iButton_relay1 = new Voice_Cmd "Turn on relay1 [on,off]";
@@ -43,12 +40,9 @@
 $ib_relay1 = new iButton '120000001187d206', undef, 'A';
 $ib_relay2 = new iButton '120000001187d206', undef, 'B';
 
-$remark_bad = new File_Item "$config_parms{data_dir}/remarks/personal_bad.txt",
-  'Ok';
-$remark_good =
-  new File_Item "$config_parms{data_dir}/remarks/personal_good.txt", 'Ok';
-$f_deep_thoughts_ib =
-  new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
+$remark_bad  = new File_Item "$config_parms{data_dir}/remarks/personal_bad.txt",  'Ok';
+$remark_good = new File_Item "$config_parms{data_dir}/remarks/personal_good.txt", 'Ok';
+$f_deep_thoughts_ib = new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
 
 speak
   voice => 'next',
diff --git a/code/bruce/iridium_check_events.pl b/code/bruce/iridium_check_events.pl
index bd96104cf..db79b719d 100644
--- a/code/bruce/iridium_check_events.pl
+++ b/code/bruce/iridium_check_events.pl
@@ -7,14 +7,14 @@
     my %iridium_timer_intervals = map { $_, 1 } ( 15, 30, 90 );
     if ( $iridium_timer_intervals{$time_left} ) {
         my $pitch = int 10 * ( 1 - $time_left / 60 );
-        $pitch = ''; # Skip this idea ... not all TTS engines do pitch that well
+        $pitch = '';    # Skip this idea ... not all TTS engines do pitch that well
         speak "app=timer pitch=$pitch $time_left seconds till flash";
 
     }
 }
 if ( expired $iridium_timer) {
     speak "app=timer pitch=10 Iridium flash now occuring";
-    play 'timer2';    # Set in event_sounds.pl
+    play 'timer2';      # Set in event_sounds.pl
 }
 
 if (    $Dark
@@ -22,34 +22,28 @@
     and -0 <= $config_parms{iridium_brightness} )
 {
     set $iridium_timer 120 + 10;
-    my $msg =
-      "Notice: Iridium satellite 42 will have a magnitude -0 flare in 2 minutes ";
+    my $msg = "Notice: Iridium satellite 42 will have a magnitude -0 flare in 2 minutes ";
     $msg .= "at an altitude of 58, azimuth of 132.";
     speak "app=timer $msg";
-    display "Flare will occur at: Mon, Mar 20 03/20/06 07:40:10 PM.  \n" . $msg,
-      600;
+    display "Flare will occur at: Mon, Mar 20 03/20/06 07:40:10 PM.  \n" . $msg, 600;
 }
 if (    $Dark
     and time_now '03/21/06  07:34 PM - 0:02'
     and -8 <= $config_parms{iridium_brightness} )
 {
     set $iridium_timer 120 + 7;
-    my $msg =
-      "Notice: Iridium satellite 80 will have a magnitude -8 flare in 2 minutes ";
+    my $msg = "Notice: Iridium satellite 80 will have a magnitude -8 flare in 2 minutes ";
     $msg .= "at an altitude of 58, azimuth of 132.";
     speak "app=timer $msg";
-    display "Flare will occur at: Tue, Mar 21 03/21/06 07:34:07 PM.  \n" . $msg,
-      600;
+    display "Flare will occur at: Tue, Mar 21 03/21/06 07:34:07 PM.  \n" . $msg, 600;
 }
 if (    $Dark
     and time_now '03/22/06  07:28 PM - 0:02'
     and -1 <= $config_parms{iridium_brightness} )
 {
     set $iridium_timer 120 + 3;
-    my $msg =
-      "Notice: Iridium satellite 81 will have a magnitude -1 flare in 2 minutes ";
+    my $msg = "Notice: Iridium satellite 81 will have a magnitude -1 flare in 2 minutes ";
     $msg .= "at an altitude of 57, azimuth of 131.";
     speak "app=timer $msg";
-    display "Flare will occur at: Wed, Mar 22 03/22/06 07:28:03 PM.  \n" . $msg,
-      600;
+    display "Flare will occur at: Wed, Mar 22 03/22/06 07:28:03 PM.  \n" . $msg, 600;
 }
diff --git a/code/bruce/items.pl b/code/bruce/items.pl
index 79d7d15e3..4e8eaec34 100644
--- a/code/bruce/items.pl
+++ b/code/bruce/items.pl
@@ -17,8 +17,7 @@
 #$garage_movement_light= new Serial_Item('XI1');
 #$garage_movement      = new Serial_Item('XI2');   # Do not respond to XIJ (on), so do not use X10_Item
 $garage_movement_light = new Serial_Item('XJ1');
-$garage_movement =
-  new Serial_Item('XJ2');   # Do not respond to XIJ (on), so do not use X10_Item
+$garage_movement       = new Serial_Item('XJ2');    # Do not respond to XIJ (on), so do not use X10_Item
 $garage_movement->set_icon('motion');
 
 # These are the dark/light signals that the motions sensors send ... ignore them
@@ -31,12 +30,12 @@
 #$motion_sensor_ignore -> add            ('XAK');
 #$motion_sensor_ignore ->{no_log} = 1; # Avoid logging by mh/code/common/mh_control.pl
 
-$sensor_hall->{no_log}     = 1;  # Avoid logging by mh/code/common/mh_control.pl
-$sensor_bathroom->{no_log} = 1;  # Avoid logging by mh/code/common/mh_control.pl
-$garage_lights->{no_speak} = 1;  # Avoid speaking by pa_control.pl
+$sensor_hall->{no_log}     = 1;    # Avoid logging by mh/code/common/mh_control.pl
+$sensor_bathroom->{no_log} = 1;    # Avoid logging by mh/code/common/mh_control.pl
+$garage_lights->{no_speak} = 1;    # Avoid speaking by pa_control.pl
 
 $bathroom_light->set_icon('motion');
-$bathroom_light->{no_log} = 1;   # Avoid logging by mh/code/common/mh_control.pl
+$bathroom_light->{no_log} = 1;     # Avoid logging by mh/code/common/mh_control.pl
 $toggle_bathroom_light = new Serial_Item( 'XPE', 'toggle' );
 $toggle_bathroom_light->tie_items($bathroom_light);
 
diff --git a/code/bruce/lcd.pl b/code/bruce/lcd.pl
index a80b9fba5..9bb805333 100644
--- a/code/bruce/lcd.pl
+++ b/code/bruce/lcd.pl
@@ -50,8 +50,7 @@
 
 # Allow for manual start/stop of lcd menu
 $v_lcdproc_control = new Voice_Cmd '[Start,Stop] the lcdproc client';
-$v_lcdproc_control->set_info(
-    'Connects to the lcdproc server, used to display LCD data.');
+$v_lcdproc_control->set_info('Connects to the lcdproc server, used to display LCD data.');
 run_voice_cmd 'Start the lcdproc client' if time_now '11 pm';    # Daily restart
 
 if ( $state = said $v_lcdproc_control) {
@@ -60,8 +59,7 @@
 
 if ( $Save{phone_callerid_data} ne $Save{phone_callerid_data_prev} ) {
     $Save{phone_callerid_data} =~ s/phone_call.wav,//g;
-    set $lcd1 &time_date_stamp( 6, $Time ) . ' ' . &time_date_stamp( 8, $Time ),
-      split "\n", $Save{phone_callerid_data};
+    set $lcd1 &time_date_stamp( 6, $Time ) . ' ' . &time_date_stamp( 8, $Time ), split "\n", $Save{phone_callerid_data};
     $Save{phone_callerid_data_prev} = $Save{phone_callerid_data};
 }
 
diff --git a/code/bruce/lights.pl b/code/bruce/lights.pl
index b95b825c8..37ccceaef 100644
--- a/code/bruce/lights.pl
+++ b/code/bruce/lights.pl
@@ -88,16 +88,10 @@
 #}
 
 set $nick_reading_light OFF if time_cron '00 9,17,23 * * * ';
-if (
-    (
-           $nick_reading_light->{state_now} eq ON
-        or $all_lights_on_nick->{state_now}
-    )
-    and time_greater_than '11:45 PM'
-  )
+if ( ( $nick_reading_light->{state_now} eq ON or $all_lights_on_nick->{state_now} )
+    and time_greater_than '11:45 PM' )
 {
-    speak
-      "room=nick Master Nick, you bad boy.  It is time to sleep, not to speak.";
+    speak "room=nick Master Nick, you bad boy.  It is time to sleep, not to speak.";
     set $nick_reading_light OFF;
 }
 
diff --git a/code/bruce/mailbox.pl b/code/bruce/mailbox.pl
index 8e264a0a9..35b74b1f5 100644
--- a/code/bruce/mailbox.pl
+++ b/code/bruce/mailbox.pl
@@ -19,8 +19,7 @@
         and time_less_than("6:00 PM") )
     {
         speak "mail reminder has been set";
-        set $timer_mailbox2 30 * 60,
-          'speak("rooms=all Notice, you have mail in the mailbox")', 8;
+        set $timer_mailbox2 30 * 60, 'speak("rooms=all Notice, you have mail in the mailbox")', 8;
     }
 }
 
diff --git a/code/bruce/mh_zip.pl b/code/bruce/mh_zip.pl
index 8ff2099f8..35952b733 100644
--- a/code/bruce/mh_zip.pl
+++ b/code/bruce/mh_zip.pl
@@ -3,14 +3,10 @@
 #@ Zips up the MisterHouse test distribution.  Runs nightly.
 
 $v_zip_code = new Voice_Cmd 'Zip up misterhouse source code';
-$v_zip_code->set_info(
-    'Zips up the current code to http://misterhouse.net/public/misterhouse_src_test.zip'
-);
+$v_zip_code->set_info( 'Zips up the current code to http://misterhouse.net/public/misterhouse_src_test.zip' );
 
 $v_zip_win = new Voice_Cmd 'Zip up misterhouse windows code';
-$v_zip_win->set_info(
-    'Compile and zip the windows mh.exe to http://misterhouse.net/public/misterhouse_win_test.zip'
-);
+$v_zip_win->set_info( 'Compile and zip the windows mh.exe to http://misterhouse.net/public/misterhouse_win_test.zip' );
 
 # Note:  run_zip_test calls run_zip which will install copy on linux box also
 
diff --git a/code/bruce/monitor_dj.pl b/code/bruce/monitor_dj.pl
index 46777f8cd..b4ed3a240 100644
--- a/code/bruce/monitor_dj.pl
+++ b/code/bruce/monitor_dj.pl
@@ -59,9 +59,8 @@
 $winamp_prod = new Voice_Cmd 'Restore Winamp';
 
 if ( said $winamp_prod) {
-    if ( my $window =
-        &sendkeys_find_window( 'winamp', $config_parms{mp3_program} ) )
-    {
+    if ( my $window = &sendkeys_find_window( 'winamp', $config_parms{mp3_program} ) ) {
+
         # None of this works to resotr a window :(
         #       my $keys = '\\alt\\te\\ret\\';
         #       my $keys = '\\CTRLp';
diff --git a/code/bruce/monitor_game_time.pl b/code/bruce/monitor_game_time.pl
index fd689a911..debe12b3b 100644
--- a/code/bruce/monitor_game_time.pl
+++ b/code/bruce/monitor_game_time.pl
@@ -3,13 +3,11 @@
 
 #@ Commands to monitor computer game time
 
-$check_game_time =
-  new Voice_Cmd "Display Nick's [all,total,daily] game time log";
+$check_game_time = new Voice_Cmd "Display Nick's [all,total,daily] game time log";
 
 if ( $state = said $check_game_time) {
     display
-      text =>
-      scalar file_tail( '//warp/c/mh/data/logs/eqtime_totals.log', 100 ),
+      text   => scalar file_tail( '//warp/c/mh/data/logs/eqtime_totals.log', 100 ),
       time   => 200,
       title  => 'Total eq time log',
       font   => 'fixed',
diff --git a/code/bruce/monitor_lan.pl b/code/bruce/monitor_lan.pl
index cc2875c2b..fbda4940b 100644
--- a/code/bruce/monitor_lan.pl
+++ b/code/bruce/monitor_lan.pl
@@ -7,12 +7,8 @@
 $lan_code = new Voice_Cmd '[enable,disable] local lan code';
 
 if ( $state = said $lan_code) {
-    for my $member (
-        'monitor_shoutcast', 'lcd',
-        'audrey',            'monitor_mh',
-        'speak_proxy',       'monitor_house_im'
-      )
-    {
+    for my $member ( 'monitor_shoutcast', 'lcd', 'audrey', 'monitor_mh', 'speak_proxy', 'monitor_house_im' ) {
+
         #       $state = (($Run_Members{$member}) ? 'disable' : 'enable') if $state eq 'toggle';
         if ( $state eq 'disable' ) {
             print_log "Disabling local lan code file $member";
diff --git a/code/bruce/monitor_programs.pl b/code/bruce/monitor_programs.pl
index 864da2a51..2f795d9dd 100644
--- a/code/bruce/monitor_programs.pl
+++ b/code/bruce/monitor_programs.pl
@@ -9,15 +9,12 @@
 
 =cut
 
-$monitor_programs = new Voice_Cmd
-  'What programs are running on [localhost,C1,C2,WARP,Z,P90,House]';
-$monitor_programs->set_info(
-    'Uses Windows WMI to monitor programs on other computers in the house');
+$monitor_programs = new Voice_Cmd 'What programs are running on [localhost,C1,C2,WARP,Z,P90,House]';
+$monitor_programs->set_info('Uses Windows WMI to monitor programs on other computers in the house');
 
 $active_programs = new Generic_Item;
 
-my $monitor_program_results =
-  "$config_parms{data_dir}/find_program_results.txt";
+my $monitor_program_results = "$config_parms{data_dir}/find_program_results.txt";
 $monitor_programs_p = new Process_Item;
 $monitor_programs_p->set_output($monitor_program_results);
 
@@ -38,10 +35,8 @@
         set $active_programs $programs;
     }
     else {
-        logit "$config_parms{data_dir}/logs/monitor_programs.log",
-          "$box: $programs";
-        display $results . "\nPrograms: $programs", 30,
-          "Program Monitor results for $box", 'fixed'
+        logit "$config_parms{data_dir}/logs/monitor_programs.log", "$box: $programs";
+        display $results . "\nPrograms: $programs", 30, "Program Monitor results for $box", 'fixed'
           if $monitor_programs_p->{done_action} eq 'display';
     }
 
diff --git a/code/bruce/monitor_router_bruce.pl b/code/bruce/monitor_router_bruce.pl
index a8c3ee4b7..50b78d8a8 100644
--- a/code/bruce/monitor_router_bruce.pl
+++ b/code/bruce/monitor_router_bruce.pl
@@ -17,8 +17,7 @@
             my $hour  = round $Save{"router_time_$name"} / 60,       1;
             my $hourt = round $Save{"router_total_time_$name"} / 60, 1;
             my $msg   = "Notice, $name time is $hour hours (total: $hourt)";
-            logit "$config_parms{data_dir}/logs/$name.totals.log",
-              "---------------------"
+            logit "$config_parms{data_dir}/logs/$name.totals.log", "---------------------"
               if $New_Week;
             logit "$config_parms{data_dir}/logs/$name.totals.log", $msg;
         }
@@ -49,8 +48,7 @@ sub check_router_times {
 
         #       print_log "$name time: $hour hours";
         #       print_log "Web $name time: $hour hours" unless $Save{"router_time_$name"} % 10;
-        if ( $Save{"router_time_$name"} - $Save{"router_time_prev_$name"} > 15 )
-        {
+        if ( $Save{"router_time_$name"} - $Save{"router_time_prev_$name"} > 15 ) {
             $Save{"router_time_prev_$name"} = $Save{"router_time_$name"};
             my $name2 = $name;
             $name2 =~ tr/_/ /;
@@ -62,11 +60,9 @@ sub check_router_times {
             elsif ( time_greater_than '10 PM'
                 and ( $Day ne 'Fri' and $Day ne 'Sat' ) )
             {
-                speak
-                  "voice=>female3 rooms=nick mode=unmuted Notice, $name2 detected after hours";
+                speak "voice=>female3 rooms=nick mode=unmuted Notice, $name2 detected after hours";
             }
-            logit "$config_parms{data_dir}/logs/$name.$Year_Month_Now.log",
-              $msg;
+            logit "$config_parms{data_dir}/logs/$name.$Year_Month_Now.log", $msg;
         }
     }
 }
@@ -74,7 +70,6 @@ sub check_router_times {
 $check_web_hits = new Voice_Cmd 'Check web server hits';
 
 if ( said $check_web_hits) {
-    speak
-      "$Save{server_hits_hour} web hits from $Save{server_clients_hour} clients in the last hour. "
+    speak "$Save{server_hits_hour} web hits from $Save{server_clients_hour} clients in the last hour. "
       . "$Save{server_hits_day} web hits from $Save{server_clients_day} clients in the last day.";
 }
diff --git a/code/bruce/monitor_shoutcast.pl b/code/bruce/monitor_shoutcast.pl
index 6635c315c..9175b8cc3 100644
--- a/code/bruce/monitor_shoutcast.pl
+++ b/code/bruce/monitor_shoutcast.pl
@@ -36,14 +36,10 @@
 # Check to see if the winamp shoutcast player is playing or connected
 #  - this requires the httpq winamp plugin
 $v_shoutcast_check = new Voice_Cmd 'Check the shoutcast player';
-$v_shoutcast_check->set_info(
-    'Will check the status the shoutcast winamp player and server');
+$v_shoutcast_check->set_info('Will check the status the shoutcast winamp player and server');
 
-$v_shoutcast_connect =
-  new Voice_Cmd '[Connect,Disconnect] the shoutcast player';
-$v_shoutcast_connect->set_info(
-    'Use this to connect or disconnect the shoutcast winamp player from the shoutcast server'
-);
+$v_shoutcast_connect = new Voice_Cmd '[Connect,Disconnect] the shoutcast player';
+$v_shoutcast_connect->set_info( 'Use this to connect or disconnect the shoutcast winamp player from the shoutcast server' );
 
 my $sc_player_url;
 if ($Reload) {
@@ -54,35 +50,21 @@
 if ( said $v_shoutcast_check) {
 
     # 0 => stopped, 1 => playing, 3 => paused
-    $temp =
-      '  playing='
-      . filter_cr get
-      "$sc_player_url/isplaying?p=$config_parms{mp3_program_password}";
-    $temp .= ',  time='
-      . int(
-        (
-            filter_cr get
-              "$sc_player_url/getoutputtime?p=$config_parms{mp3_program_password}&a=0"
-        ) / 60000
-      );
-    $temp .=
-      ' minutes,  status='
-      . filter_cr get
-      "$sc_player_url/shoutcast_status?p=$config_parms{mp3_program_password}";
+    $temp = '  playing=' . filter_cr get "$sc_player_url/isplaying?p=$config_parms{mp3_program_password}";
+    $temp .= ',  time=' . int( ( filter_cr get "$sc_player_url/getoutputtime?p=$config_parms{mp3_program_password}&a=0" ) / 60000 );
+    $temp .= ' minutes,  status=' . filter_cr get "$sc_player_url/shoutcast_status?p=$config_parms{mp3_program_password}";
     print_log "Shoutcast data: $temp";
 }
 
 if ( $state = said $v_shoutcast_connect) {
     print_log "Connectiong to $sc_player_url";
-    my $status = filter_cr get
-      "$sc_player_url/shoutcast_status?p=$config_parms{mp3_program_password}";
+    my $status = filter_cr get "$sc_player_url/shoutcast_status?p=$config_parms{mp3_program_password}";
     if ( $state eq 'Connect' ) {
         if ( $status =~ /sent/ ) {
             print_log "Shoutcast player already connected: $status";
         }
         else {
-            $status = filter_cr get
-              "$sc_player_url/shoutcast_connect?p=$config_parms{mp3_program_password}";
+            $status = filter_cr get "$sc_player_url/shoutcast_connect?p=$config_parms{mp3_program_password}";
             print_log "Shoutcast connect status: $status";
         }
     }
@@ -91,8 +73,7 @@
             print_log "Shoutcast player already disconnected";
         }
         else {
-            $status = filter_cr get
-              "$sc_player_url/shoutcast_connect?p=$config_parms{mp3_program_password}";
+            $status = filter_cr get "$sc_player_url/shoutcast_connect?p=$config_parms{mp3_program_password}";
             print_log "Shoutcast disconnect status: $status";
         }
     }
@@ -100,13 +81,11 @@
 
 # Open the port ... check periodically, in case server was restarted.
 
-$shoutcast_server =
-  new Socket_Item( undef, undef, $config_parms{shoutcast_server}, 'shoutcast' );
+$shoutcast_server = new Socket_Item( undef, undef, $config_parms{shoutcast_server}, 'shoutcast' );
 $shoutcast_log = new File_Item( $config_parms{shoutcast_log} );
 
 $v_shoutcast_server = new Voice_Cmd '[Start,Stop] the shoutcast server monitor';
-$v_shoutcast_server->set_info(
-    'The shoutcast server monitor announces when new listeners come');
+$v_shoutcast_server->set_info('The shoutcast server monitor announces when new listeners come');
 
 print "Shoutcast server close\n"     if inactive_now $shoutcast_server;
 print "Shoutcast server started\n"   if active_now $shoutcast_server;
@@ -121,8 +100,7 @@
 
     #   speak 'Shoutcast monitor started' unless $Startup;
 
-    print_log
-      "Starting a connection to the shoutcast server $config_parms{shoutcast_server}";
+    print_log "Starting a connection to the shoutcast server $config_parms{shoutcast_server}";
     start $shoutcast_server;
 
     # Use HTTP with shoutcast 1.1+
@@ -150,9 +128,7 @@
 my ( %shoutcast_clients, $shoutcast_record );
 
 if (   $config_parms{shoutcast_server} and $state = said $shoutcast_server
-    or $config_parms{shoutcast_log}
-    and $New_Second
-    and $state = said $shoutcast_log)
+    or $config_parms{shoutcast_log} and $New_Second and $state = said $shoutcast_log)
 {
     # Can somehow get multiple reports on one record ... us only the last one.
     #<12/30/00@07:16:59> [dest: 192.168.0.2] connection closed (15 seconds) (UID: 78)[L: 0]<12/30/00@14:40:14> [dest: 192.168.0.2] starting stream (UID: 84)[L: 1]...
@@ -174,18 +150,15 @@
 
 # This will be true when the DNS lookup started above finishes
 if ( my ( $domain_name, $name_short ) = net_domain_name_done 'shoutcast' ) {
-    my ( $ip_address, $status ) =
-      $shoutcast_record =~ /: ?(\S+)\] ([^\(\[\,]+)/;
+    my ( $ip_address, $status ) = $shoutcast_record =~ /: ?(\S+)\] ([^\(\[\,]+)/;
 
     #   my $Save{shoutcast_users} = $1 if $shoutcast_record =~ /\((\d+)\/\d+/; # looking for the first number here: (1/4)
     $Save{shoutcast_users} = $1
-      if $shoutcast_record =~
-      /\[L: *(\d+)/;    # looking for the first number here: [L: 1]
+      if $shoutcast_record =~ /\[L: *(\d+)/;    # looking for the first number here: [L: 1]
 
-    print_log
-      "shoutcast users=$Save{shoutcast_users} domain=$domain_name, status=$status, ip=$ip_address, r=$shoutcast_record";
+    print_log "shoutcast users=$Save{shoutcast_users} domain=$domain_name, status=$status, ip=$ip_address, r=$shoutcast_record";
 
-    $name_short =~ s/[\d\.]/ /g;    # Get rid of digits and dots
+    $name_short =~ s/[\d\.]/ /g;                # Get rid of digits and dots
     $name_short = 'unknown'
       if $name_short =~ /^ *$/ or is_local_address $ip_address;
 
@@ -223,7 +196,8 @@
     }
 
     #   display("$Time_Now: $msg", 0);
-    logit( "$config_parms{data_dir}/logs/shoutcast_server.$Year_Month_Now.log",
+    logit(
+        "$config_parms{data_dir}/logs/shoutcast_server.$Year_Month_Now.log",
         "domain=$domain_name ip=$ip_address status=$status count=$Save{shoutcast_users}"
     );
 }
diff --git a/code/bruce/monitors.pl b/code/bruce/monitors.pl
index ce6982c16..97bf00571 100644
--- a/code/bruce/monitors.pl
+++ b/code/bruce/monitors.pl
@@ -37,8 +37,7 @@
     or said $v_phone_minutes_zack)
 {
     my $msg = "Zack, you have $Save{phone_minutes_left} phone minutes left.";
-    $msg .=
-      " $Save{phone_minutes_left_day} per day for the next $Save{phone_minutes_days} days";
+    $msg .= " $Save{phone_minutes_left_day} per day for the next $Save{phone_minutes_days} days";
     speak "app=notice $msg";
     $msg = file_tail "$config_parms{data_dir}/logs/phone_minutes.log", 30;
     display
diff --git a/code/bruce/mp3_control.pl b/code/bruce/mp3_control.pl
index 5b3d77d11..a155a863b 100644
--- a/code/bruce/mp3_control.pl
+++ b/code/bruce/mp3_control.pl
@@ -5,8 +5,7 @@
 #$v_mp3_control1 = new  Voice_Cmd("Set the house mp3 player to [$mp3_states]");
 $v_mp3_control2 = new Voice_Cmd("Set Zacks mp3 player to [$mp3_states]");
 $v_mp3_control3 = new Voice_Cmd("Set Nicks mp3 player to [$mp3_states]");
-$v_mp3_control4 =
-  new Voice_Cmd("Set the shoutcast mp3 player to [$mp3_states]");
+$v_mp3_control4 = new Voice_Cmd("Set the shoutcast mp3 player to [$mp3_states]");
 $v_mp3_control5 = new Voice_Cmd("Set the phone mp3 player to [$mp3_states]");
 
 #&mp3_control($state, 'house') if $state = said $v_mp3_control1;
diff --git a/code/bruce/phone_weeder.pl b/code/bruce/phone_weeder.pl
index c8e8d1154..50f1f5639 100644
--- a/code/bruce/phone_weeder.pl
+++ b/code/bruce/phone_weeder.pl
@@ -14,11 +14,9 @@
     # Ignore garbage data (ascii is between ! thru ~)
     $caller_id_data = '' if $caller_id_data !~ /^[\n\r\t !-~]+$/;
 
-    my ( $caller, $cid_number, $cid_name ) =
-      &Caller_ID::make_speakable($caller_id_data);
+    my ( $caller, $cid_number, $cid_name ) = &Caller_ID::make_speakable($caller_id_data);
     if ( $caller =~ /\.wav$/ ) {
-        $caller =
-          "phone_call.wav,$caller,phone_call.wav,$caller"; # Prefix 'phone call'
+        $caller = "phone_call.wav,$caller,phone_call.wav,$caller";    # Prefix 'phone call'
     }
     else {
         $caller = "Call from $caller.  Line 1 call is from $caller.";
@@ -29,8 +27,7 @@
     # If we have other callerID interfaces (e.g. phone_modem.pl)
     # lets not repeat ourselfs here.
     unless ( $Time - $Save{phone_callerid_Time} < 3 ) {
-        $Save{phone_callerid_data} =
-          sprintf( "%02d:%02d %s\n%s", $Hour, $Minute, $cid_number, $caller );
+        $Save{phone_callerid_data} = sprintf( "%02d:%02d %s\n%s", $Hour, $Minute, $cid_number, $caller );
         $Save{phone_callerid_Time} = $Time;
 
         # On startup, old callerid strings might be sent ... ignore them
@@ -42,15 +39,13 @@
             "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
             "$cid_number name=$cid_name data=$caller_id_data line=1"
         );
-        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-            $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
+        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
     }
 }
 
 # Log outgoing phone numbers
 if ( $state = state_now $phonetone) {
-    logit( "$config_parms{data_dir}/phone/logs/phone.$Year_Month_Now.log",
-        $state );
+    logit( "$config_parms{data_dir}/phone/logs/phone.$Year_Month_Now.log", $state );
     print_log "Phone data: $state";
 }
 
diff --git a/code/bruce/reports.pl b/code/bruce/reports.pl
index f17568f05..4f10b7fe2 100644
--- a/code/bruce/reports.pl
+++ b/code/bruce/reports.pl
@@ -4,9 +4,7 @@
 #@  - requires gnuplot (see report_weblog for a pointer).
 
 $v_report_weblog = new Voice_Cmd('Generate weblog reports');
-$v_report_weblog->set_info(
-    'Run report_weblog to summarize hits on the mh web server.  This is automatically run once a day'
-);
+$v_report_weblog->set_info( 'Run report_weblog to summarize hits on the mh web server.  This is automatically run once a day' );
 $p_report_weblog = new Process_Item;
 
 if ( said $v_report_weblog or time_now '5:05 AM' ) {
@@ -18,9 +16,7 @@
 
 if ( done_now $p_report_weblog) {
     print_log "Copying weblog reports";
-    copy( "$config_parms{data_dir}/logs/mh_month_dayhour.png",
-        "//misterhouse/projects/logs" );
-    copy( "$config_parms{data_dir}/logs/mh_month_day.png",
-        "//misterhouse/projects/logs" );
+    copy( "$config_parms{data_dir}/logs/mh_month_dayhour.png", "//misterhouse/projects/logs" );
+    copy( "$config_parms{data_dir}/logs/mh_month_day.png",     "//misterhouse/projects/logs" );
     run "$config_parms{browser} http://misterhouse.net/stats.html";
 }
diff --git a/code/bruce/school_clock.pl b/code/bruce/school_clock.pl
index 3418b2394..91f6466a7 100644
--- a/code/bruce/school_clock.pl
+++ b/code/bruce/school_clock.pl
@@ -5,8 +5,7 @@
 unless ( $Save{sleeping_kids} ) {
 
     #   speak "The time is $Time_Now" if time_cron '40,44,46,48 6 * * 1-5';
-    speak "room=nick,zack $Time_Now. Kids leave in "
-      . plural( 48 - $Minute, 'minute' )
+    speak "room=nick,zack $Time_Now. Kids leave in " . plural( 48 - $Minute, 'minute' )
       if time_cron '30,35,40,44,46,48,50 6 * * 1-5';
 
     if ( time_cron '43,49,52 6 * * 1-5' ) {
diff --git a/code/bruce/school_closing.pl b/code/bruce/school_closing.pl
index a82249739..bc2b2700b 100644
--- a/code/bruce/school_closing.pl
+++ b/code/bruce/school_closing.pl
@@ -51,10 +51,8 @@
             $status =~ s/\.gif//;
         }
         if ( $status and $status !~ /on[ _]?time/ ) {
-            speak
-              "rooms=all Important school notice from K R O C. School status: $status";
-            speak
-              "rooms=all Important school notice from K R O C. School status: $status";
+            speak "rooms=all Important school notice from K R O C. School status: $status";
+            speak "rooms=all Important school notice from K R O C. School status: $status";
         }
         else {
             print_log "School status from KROC:  $image";
@@ -71,10 +69,8 @@
         my $status = $1;
         chomp $status;
         if ($status) {
-            speak
-              "rooms=all Important school notice from K T T C.  School status: $status";
-            speak
-              "rooms=all Important school notice from K T T C.  School status: $status";
+            speak "rooms=all Important school notice from K T T C.  School status: $status";
+            speak "rooms=all Important school notice from K T T C.  School status: $status";
         }
     }
 
diff --git a/code/bruce/sensors.pl b/code/bruce/sensors.pl
index 3a7aa40fe..e853062aa 100644
--- a/code/bruce/sensors.pl
+++ b/code/bruce/sensors.pl
@@ -34,13 +34,13 @@
     $analog{temp_living} = convert_k2f( state $temp_living/ 10 );
     $analog{temp_nick}   = convert_k2f( state $temp_nick/ 10 );
     $analog{temp_zack}   = convert_k2f( state $temp_zack/ 10 );
-    $Weather{sun_sensor} = $analog{sun_sensor};    # Used in weather_monitor.pl
+    $Weather{sun_sensor} = $analog{sun_sensor};                     # Used in weather_monitor.pl
 
     #   $Weather{TempSpare1} = $analog{sun_sensor}; # Used in weather_rrd_graph.pl
     #   $Weather{TempSpare1} = $analog{temp_living}; # Used in weather_rrd_graph.pl
-    $Weather{TempSpare1} = $analog{temp_outside}; # Used in weather_rrd_graph.pl
-    $Weather{TempSpare2} = $analog{temp_nick};    # Used in weather_rrd_graph.pl
-    $Weather{TempSpare3} = $analog{temp_zack};    # Used in weather_rrd_graph.pl
+    $Weather{TempSpare1} = $analog{temp_outside};    # Used in weather_rrd_graph.pl
+    $Weather{TempSpare2} = $analog{temp_nick};       # Used in weather_rrd_graph.pl
+    $Weather{TempSpare3} = $analog{temp_zack};       # Used in weather_rrd_graph.pl
 
     #    print_log "sun=$analog{sun_sensor} temp_in=$analog{temp_living} temp_out=$analog{temp_outside}";
     #    logit("e:/logs/DATAHI.log", "Humidity Downstairs $analog{humidity_inside}");
@@ -89,8 +89,7 @@ sub analog_read {
             }
 
             my $analog_data_avg = 0;
-            grep( $analog_data_avg += $_,
-                @{ $analog_data_avg_data{$analog_port_bit} } );
+            grep( $analog_data_avg += $_, @{ $analog_data_avg_data{$analog_port_bit} } );
             $analog_data_avg /= 5;
             $ref->{state} = $analog_data_avg;
 
diff --git a/code/bruce/startup.pl b/code/bruce/startup.pl
index c8435c627..9911e4628 100644
--- a/code/bruce/startup.pl
+++ b/code/bruce/startup.pl
@@ -8,9 +8,7 @@
 #speak volume => 75 if $Startup;
 
 $v_initialize_serial_port = new Voice_Cmd("Initialize the serial port");
-$v_initialize_serial_port->set_info(
-    'This will initialize the weeder digital ports.  Automatically done on startup'
-);
+$v_initialize_serial_port->set_info( 'This will initialize the weeder digital ports.  Automatically done on startup' );
 
 # In case a power fail reset the weeder boards (... they default to output only)
 set $v_initialize_serial_port 1 if $Startup;
@@ -18,9 +16,7 @@
 if ( said $v_initialize_serial_port) {
 
     # Make sure these sensors are in switch mode and read their status
-    for my $ref ( $back_door, $garage_entry_door, $front_door,
-        $entry_door, $garage_door, $wireless1, $mailbox )
-    {
+    for my $ref ( $back_door, $garage_entry_door, $front_door, $entry_door, $garage_door, $wireless1, $mailbox ) {
         set $ref 'init';
     }
 
diff --git a/code/bruce/test_code_hooks.pl b/code/bruce/test_code_hooks.pl
index 34a735f38..f24be9a2a 100644
--- a/code/bruce/test_code_hooks.pl
+++ b/code/bruce/test_code_hooks.pl
@@ -15,8 +15,7 @@ sub test_speak_hook {
 }
 
 $v_test_play = new Voice_Cmd 'Test the play code hooks';
-tie_event $v_test_play
-  "&play(rooms => 'living', time => 5, file => 'sound_beep1.wav')";
+tie_event $v_test_play "&play(rooms => 'living', time => 5, file => 'sound_beep1.wav')";
 
 $v_test_speak = new Voice_Cmd 'Test the speak code hooks';
 tie_event $v_test_speak "&speak('rooms=all Testing speak hook')";
diff --git a/code/bruce/test_stuff.pl b/code/bruce/test_stuff.pl
index be46208a2..5fa06aca4 100644
--- a/code/bruce/test_stuff.pl
+++ b/code/bruce/test_stuff.pl
@@ -28,15 +28,13 @@
     elsif ( $state eq 'c' ) {
         print_log "testing sun_time";
         @ARGV = ();
-        my $results = do 'sun_time'
-          ;    # Use do so we can run from compiled mh, without perl installed
+        my $results = do 'sun_time';    # Use do so we can run from compiled mh, without perl installed
         print_msg "results=$results";
     }
 
     # Test read_next on a file of records
     elsif ( $state eq 'd' ) {
-        my $plant_talk =
-          new File_Item("$config_parms{data_dir}/remarks/list_plant_talk.txt");
+        my $plant_talk = new File_Item("$config_parms{data_dir}/remarks/list_plant_talk.txt");
         speak "Plant talk: " . read_next $plant_talk;
     }
 
@@ -97,14 +95,7 @@
 
     # Test the batch function
     elsif ( $state eq 'k' ) {
-        my @pgms = (
-            "echo 'starting'",
-            "sleep 5",
-            "call speak 'starting test'",
-            "sleep 5",
-            "call speak 'all done'",
-            "sleep 5"
-        );
+        my @pgms = ( "echo 'starting'", "sleep 5", "call speak 'starting test'", "sleep 5", "call speak 'all done'", "sleep 5" );
         batch(@pgms);
     }
     elsif ( $state eq 'l' and $Save{test_input2} ) {
@@ -136,8 +127,7 @@
         print_log "Testing Setupsup sendkeys to outlook";
         my $window;
         if ( &WaitForAnyWindow( 'Outlook', \$window, 1000, 100 ) ) {
-            &SendKeys( $window, "\\alt\\te\\ret\\", 1, 500 )
-              ;    # Send alt Tools sEnd Return (for all accounts)
+            &SendKeys( $window, "\\alt\\te\\ret\\", 1, 500 );    # Send alt Tools sEnd Return (for all accounts)
         }
         else {
             print_log "Outlook is not running";
diff --git a/code/bruce/test_weather.pl b/code/bruce/test_weather.pl
index f4647e4a9..095a434dc 100644
--- a/code/bruce/test_weather.pl
+++ b/code/bruce/test_weather.pl
@@ -3,8 +3,7 @@
 #@ Teset getting weather data using Geo??WeatherNOAA
 
 use Geo::WeatherNOAA;
-$test_weather =
-  new Voice_Cmd("Get weather test for [New York,Portland,Baltimore]");
+$test_weather = new Voice_Cmd("Get weather test for [New York,Portland,Baltimore]");
 $test_weather->set_info('Test finding weather for a few different cities');
 
 if ( my $city = said $test_weather) {
diff --git a/code/bruce/test_web_functions.pl b/code/bruce/test_web_functions.pl
index 9113009ea..7608e67be 100644
--- a/code/bruce/test_web_functions.pl
+++ b/code/bruce/test_web_functions.pl
@@ -2,8 +2,7 @@
 # Category=Test
 
 sub web_func1 {
-    return "uptime = "
-      . &time_diff( $Time_Startup_time, $Time, undef, 'numeric' );
+    return "uptime = " . &time_diff( $Time_Startup_time, $Time, undef, 'numeric' );
 }
 
 sub web_func2 {
diff --git a/code/bruce/test_x10.pl b/code/bruce/test_x10.pl
index 9035d077b..704b05f7d 100644
--- a/code/bruce/test_x10.pl
+++ b/code/bruce/test_x10.pl
@@ -24,8 +24,7 @@ sub check_x10_data {
 }
 if ( $state = state_now $test_x10_rf2) {
     my $set_by = get_set_by $test_x10_rf2;
-    print_log
-      "test_x10_rf2 a set to $state by $test_x10_rf2->{set_by} sb=$set_by";
+    print_log "test_x10_rf2 a set to $state by $test_x10_rf2->{set_by} sb=$set_by";
     print_log "test_x10_rf2 b set to $state by $test_x10_rf2->{set_by}"
       if get_set_by $test_x10_rf2 eq "rf";
 }
diff --git a/code/bruce/test_x10_light.pl b/code/bruce/test_x10_light.pl
index 6d10bc55b..a4dbb010a 100644
--- a/code/bruce/test_x10_light.pl
+++ b/code/bruce/test_x10_light.pl
@@ -2,8 +2,7 @@
 
 #@ Test x10 light commands
 
-$v_test_light_timed =
-  new Voice_Cmd("Turn the Outside lights off in [1,5,10,30,60] minutes");
+$v_test_light_timed = new Voice_Cmd("Turn the Outside lights off in [1,5,10,30,60] minutes");
 $v_test_light_timed->set_info('A test of the set_with_timer X10_Item method');
 set_with_timer $camera_light ON, $state * 60
   if $state = said $v_test_light_timed;
@@ -16,8 +15,7 @@
 );
 
 #v_test_light2 = new Voice_Cmd("Set bathroom light to [on,off,brighten,dim,-50,+20,+50,+70,50,10%,12%,30%,60%,70%,&P1,&P2,&P3,&P13,&P10,&P30,&P40,&P50,&P60,&P80,fred]");
-$v_test_light1->set_info(
-    'Test sending some extended X10 states to a fancy LM14 X10 module');
+$v_test_light1->set_info('Test sending some extended X10 states to a fancy LM14 X10 module');
 
 if ( $state = said $v_test_light1) {
     print_log "Camera light set to $state";
@@ -33,9 +31,7 @@
     set $bathroom_light $state;
 }
 
-$v_test_lights = new Voice_Cmd(
-    "{please, } {turn the, } test lights [on,off,&P13,&P10,&P15,&P20,10%,20%,70%,&P60]"
-);
+$v_test_lights = new Voice_Cmd( "{please, } {turn the, } test lights [on,off,&P13,&P10,&P15,&P20,10%,20%,70%,&P60]" );
 
 #$v_test_lights-> set_info('Test sending some extended X10 states to a fancy LM14 X10 module');
 #$test_lights   = new X10_Item('C9');
diff --git a/code/bruce/timers2.pl b/code/bruce/timers2.pl
index bf445e828..ca35e44ff 100644
--- a/code/bruce/timers2.pl
+++ b/code/bruce/timers2.pl
@@ -3,8 +3,7 @@
 #@ Create a launry timer
 
 $v_laundry_timer = new Voice_Cmd('Laundry timer [on,off]');
-$v_laundry_timer->set_info(
-    'Set a 35 minute timer to remind when the cloths are washed/dried');
+$v_laundry_timer->set_info('Set a 35 minute timer to remind when the cloths are washed/dried');
 
 $timer_laundry = new Timer;
 
@@ -39,13 +38,11 @@ sub laundry_reminder {
         'are having dinner',
         'are electrocuting each other with static'
     );
-    speak "rooms=all The laundry clothes "
-      . $laundry_reminders[ int rand @laundry_reminders ];
+    speak "rooms=all The laundry clothes " . $laundry_reminders[ int rand @laundry_reminders ];
 }
 
 $v_tramp_timer = new Voice_Cmd('[Start,Stop] the tramp timer');
-$v_tramp_timer->set_info(
-    'Set a timer for fair usage on the trampoline.  Peace will rule :)');
+$v_tramp_timer->set_info('Set a timer for fair usage on the trampoline.  Peace will rule :)');
 
 $timer_tramp = new Timer;
 if ( 'Start' eq said $v_tramp_timer) {
diff --git a/code/bruce/tk_frames_big.pl b/code/bruce/tk_frames_big.pl
index 18bdab708..bce976d7f 100644
--- a/code/bruce/tk_frames_big.pl
+++ b/code/bruce/tk_frames_big.pl
@@ -27,10 +27,8 @@
         print "Creating new tk frames\n";
 
         # Create top and bottom frames
-        $Tk_objects{fl} =
-          $MW->Frame->pack(qw/-side left  -fill both -expand 1/);
-        $Tk_objects{fr} =
-          $MW->Frame->pack(qw/-side right -fill both -expand 1/);
+        $Tk_objects{fl} = $MW->Frame->pack(qw/-side left  -fill both -expand 1/);
+        $Tk_objects{fr} = $MW->Frame->pack(qw/-side right -fill both -expand 1/);
 
         # Create top left and tk grid frames
         $Tk_objects{fll} =
@@ -63,8 +61,7 @@
             -setgrid    => 'true',
             -font       => $config_parms{tk_font}
         )->pack(qw/-side top -expand 1 -fill both/);
-        $Tk_objects{speak_window}->insert( '0.0', ( join "\n", @Speak_Log ) )
-          ;    # Seed with previous entries
+        $Tk_objects{speak_window}->insert( '0.0', ( join "\n", @Speak_Log ) );    # Seed with previous entries
 
         $Tk_objects{log_window} = $Tk_objects{fr}->Scrolled(
             'Text',
@@ -76,8 +73,7 @@
             -setgrid    => 'true',
             -font       => $config_parms{tk_font}
         )->pack(qw/-side top -expand 1 -fill both/);
-        $Tk_objects{log_window}->insert( '0.0', ( join "\n", @Print_Log ) )
-          ;    # Seed with previous entries
+        $Tk_objects{log_window}->insert( '0.0', ( join "\n", @Print_Log ) );      # Seed with previous entries
 
     }
 
diff --git a/code/bruce/tk_widgets_bruce.pl b/code/bruce/tk_widgets_bruce.pl
index a1e2bda4b..6b91e664f 100644
--- a/code/bruce/tk_widgets_bruce.pl
+++ b/code/bruce/tk_widgets_bruce.pl
@@ -23,9 +23,8 @@
     &tk_mbutton( 'Help', \&help );
 
     &tk_button(
-        'Reload (F1)', \&read_code,   'Pause (F2)', \&toggle_pause,
-        ' Exit (F3) ', \&sig_handler, 'Debug (F4)', \&toggle_debug,
-        'Log (F5)',    \&toggle_log
+        'Reload (F1)', \&read_code,    'Pause (F2)', \&toggle_pause, ' Exit (F3) ', \&sig_handler,
+        'Debug (F4)',  \&toggle_debug, 'Log (F5)',   \&toggle_log
     );
 
     &tk_label( \$Tk_objects{label_time} );
@@ -50,23 +49,16 @@
 
     # Category=MisterHouse
     # $search_code_string is defined in mh/code/common/mh_control.pl
-    &tk_entry(
-        'Code Search',    $search_code_string,
-        'Command Search', $search_command_string
-    ) if $Run_Members{mh_control};
+    &tk_entry( 'Code Search', $search_code_string, 'Command Search', $search_command_string ) if $Run_Members{mh_control};
     &tk_entry( "Volume", $mh_volume, 'Debug flag', \$config_parms{debug} )
       if $Run_Members{mh_sound};
 
     # Category=Music
-    &tk_entry( 'MP3 Search', \$Save{mp3_search}, 'MP3 Genre',
-        \$Save{mp3_Genre} )
+    &tk_entry( 'MP3 Search', \$Save{mp3_search}, 'MP3 Genre', \$Save{mp3_Genre} )
       if $Run_Members{mp3_playlist};
 
     # Category=Phone
-    &tk_entry(
-        'Phone Search', \$Save{phone_search},
-        'Photo Search', \$Save{photo_search}
-    );
+    &tk_entry( 'Phone Search', \$Save{phone_search}, 'Photo Search', \$Save{photo_search} );
 
     # Category=TV
     &tk_entry( 'TV search', \$Save{tv_search}, 'TV dates', \$Save{tv_days} )
@@ -78,20 +70,14 @@
     &tk_entry( 'Wakeup Time', \$Save{wakeup_time} ) if $Run_Members{wakeup};
 
     &tk_checkbutton(
-        'Sleeping Parents', \$Save{sleeping_parents},
-        'Sleeping Nick',    \$Save{sleeping_nick},
+        'Sleeping Parents', \$Save{sleeping_parents}, 'Sleeping Nick', \$Save{sleeping_nick},
         'Sleeping Zack',    \$Save{sleeping_zack}
     );
-    &tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time},
-        [ '6:20 am', '6:30 am', '6:40 am', '7:00 am', 'none' ] )
+    &tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time}, [ '6:20 am', '6:30 am', '6:40 am', '7:00 am', 'none' ] )
       if $Run_Members{wakeup};
 
     # Category=MisterHouse
-    &tk_radiobutton(
-        'Mode', \$Save{mode},
-        [ 'normal', 'mute', 'offline' ],
-        [ 'Normal', 'Mute', 'Offline' ]
-    );
+    &tk_radiobutton( 'Mode', \$Save{mode}, [ 'normal', 'mute', 'offline' ], [ 'Normal', 'Mute', 'Offline' ] );
 
     #    &tk_radiobutton('VR Mode',  \$tk_vr_mode, ['awake', 'asleep', 'off'], ['Awake', 'Asleep', 'Off']) if $Run_Members{viavoice_control};
 
@@ -116,42 +102,22 @@
     $tk_heat_cool->grid(qw/-columnspan 5 -sticky w/);
 
     # Category=Internet
-    &tk_radiobutton(
-        'Ping Test',
-        \$Save{ping_test_flag},
-        [ 1,    0 ],
-        [ 'On', 'Off' ]
-    ) if $Run_Members{internet_connect_check};
+    &tk_radiobutton( 'Ping Test', \$Save{ping_test_flag}, [ 1, 0 ], [ 'On', 'Off' ] ) if $Run_Members{internet_connect_check};
 
     &tk_radiobutton( 'Check email', \$Save{email_check}, [ 'no', 'yes' ] )
       if $Run_Members{internet_mail};
-    &tk_radiobutton(
-        'Internet Speak',
-        \$config_parms{internet_speak_flag},
-        [ 'none', 'local', 'some', 'all' ]
-    ) if $Run_Members{speak_server};
+    &tk_radiobutton( 'Internet Speak', \$config_parms{internet_speak_flag}, [ 'none', 'local', 'some', 'all' ] )
+      if $Run_Members{speak_server};
 
     # Category=GPS tracking
     if ( $Run_Members{tracking_aprs} ) {
-        &tk_radiobutton(
-            'APRS Speak',
-            \$config_parms{tracking_speakflag},
-            [ 'none', 'family', 'GPS', 'WX', 'all' ]
-        );
-        &tk_radiobutton(
-            'APRS Print',
-            \$config_parms{tracking_printflag},
-            [ 'none', 'family', 'GPS', 'WX', 'all' ]
-        );
+        &tk_radiobutton( 'APRS Speak', \$config_parms{tracking_speakflag}, [ 'none', 'family', 'GPS', 'WX', 'all' ] );
+        &tk_radiobutton( 'APRS Print', \$config_parms{tracking_printflag}, [ 'none', 'family', 'GPS', 'WX', 'all' ] );
     }
 
     # Category=MisterHouse
     &tk_radiobutton( 'X10 errata', \$config_parms{x10_errata}, [ 1, 2, 3, 4 ] );
-    &tk_radiobutton(
-        'Web format',
-        \$config_parms{web_format},
-        [ 'default', 1, 2 ]
-    );
+    &tk_radiobutton( 'Web format', \$config_parms{web_format}, [ 'default', 1, 2 ] );
 
 }
 
diff --git a/code/bruce/tracking_aprs.pl b/code/bruce/tracking_aprs.pl
index f854af179..9ffca99d0 100644
--- a/code/bruce/tracking_aprs.pl
+++ b/code/bruce/tracking_aprs.pl
@@ -105,16 +105,14 @@ sub reload_aprs_data {
     set $tnc_output 'HEADERLN OFF';    # Keep Header and data on the same line
 
     set $tnc_output 'converse';
-    print_log
-      "Tracking Interface has been Initialized...Callsign $config_parms{tracking_callsign}";
+    print_log "Tracking Interface has been Initialized...Callsign $config_parms{tracking_callsign}";
 }
 
 # Send position 4 times a day (server flushes data every 6 hours)
 # Tracked at: http://map.aprs.net:8000/kc0eqv-1
 # Tracked at: http://www.findu.com/cgi-bin/find.cgi?kc0eqv-1
 $v_send_position = new Voice_Cmd("Send my APRS Position");
-set_info $v_send_position
-  "Send the house latitude/longitude: $config_parms{latitude}, $config_parms{longitude}."
+set_info $v_send_position "Send the house latitude/longitude: $config_parms{latitude}, $config_parms{longitude}."
   . "Not all that useful, since the house does not move too often :)";
 
 if ( $state = said $v_send_position or time_cron('0 2,8,14,20 * * *') ) {
@@ -124,28 +122,23 @@ sub reload_aprs_data {
     print_log "aprs position string: $tnc_output->{id_by_state}{position}";
 }
 $v_wx_query = new Voice_Cmd("APRS Weather Query");
-$v_wx_query->set_info(
-    'Send out a weather query to nearby APRS weather stations');
+$v_wx_query->set_info('Send out a weather query to nearby APRS weather stations');
 if ( $state = said $v_wx_query) {
     set $tnc_output 'wxquery';
     respond "Weather query requested";
 }
 
 $v_send_test_email = new Voice_Cmd("Send APRS email to myself");
-set_info $v_send_test_email
-  'Use an APRS internet gateway to send a test email from my house,'
+set_info $v_send_test_email 'Use an APRS internet gateway to send a test email from my house,'
   . 'thru the ham radio, to an Inetnet gateway receiver, and thru the internet back to my house.  Pretty useful eh?';
 if ( $state = said $v_send_test_email) {
-    print_log
-      "aprs mail sent to $config_parms{net_mail_user}\@$config_parms{net_mail_server}";
-    set $tnc_output
-      ":EMAIL    :$config_parms{net_mail_user}\@$config_parms{net_mail_server} Test E-Mail - $Time";
+    print_log "aprs mail sent to $config_parms{net_mail_user}\@$config_parms{net_mail_server}";
+    set $tnc_output ":EMAIL    :$config_parms{net_mail_user}\@$config_parms{net_mail_server} Test E-Mail - $Time";
     respond "Email sent";
 }
 
 $v_send_test_icq = new Voice_Cmd("Send APRS ICQ msg to myself");
-$v_send_test_icq->set_info(
-    'Send a test ICQ message, via a ham radio APRS connection');
+$v_send_test_icq->set_info('Send a test ICQ message, via a ham radio APRS connection');
 if ( $state = said $v_send_test_icq) {
     set $tnc_output ":ICQSERVE :967794 Test Msg - $Time";
     respond "ICQ message sent";
@@ -193,26 +186,20 @@ sub reload_aprs_data {
         $callsign_data{$callsign}{time} = $Time;
 
         # Convert from minutes-seconds
-        $GPSLatitude = (
-            substr( $GPSLatitude, 0, 2 ) +
-              ( substr( $GPSLatitude, 2, 8 ) / 60 ) );
-        $GPSLongitude = (
-            substr( $GPSLongitude, 0, 3 ) +
-              ( substr( $GPSLongitude, 3, 8 ) / 60 ) );
+        $GPSLatitude  = ( substr( $GPSLatitude,  0, 2 ) + ( substr( $GPSLatitude,  2, 8 ) / 60 ) );
+        $GPSLongitude = ( substr( $GPSLongitude, 0, 3 ) + ( substr( $GPSLongitude, 3, 8 ) / 60 ) );
 
         # convert the GPS Speed to MPH
         $GPSSpeed = round( ( $GPSSpeed * 1.853248 ) / 1.609344 );
 
         # aprs longitude is not negative
         my $GPSDistance =
-          &great_circle_distance( $GPSLatitude, $GPSLongitude,
-            $config_parms{latitude}, abs $config_parms{longitude} );
+          &great_circle_distance( $GPSLatitude, $GPSLongitude, $config_parms{latitude}, abs $config_parms{longitude} );
 
         # Skip if the car has not moved since last time or its been a while (unless distant internet data)
         if (
                ( $Debug{'aprs'} )
-            or
-            ( abs( $callsign_data{$callsign}{distance} - $GPSDistance ) > .1 )
+            or ( abs( $callsign_data{$callsign}{distance} - $GPSDistance ) > .1 )
             or ( ( $Time - $callsign_data{$callsign}{time_logged} ) > 1800
                 and $GPSDistance < 500 )
           )
@@ -228,16 +215,12 @@ sub reload_aprs_data {
                 chomp $GPSTempCompLine;
 
                 #               my ($GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong) = (split(',', $GPSTempCompLine))[0, 1, 2];
-                my ( $GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong ) =
-                  $GPSTempCompLine =~ /(.+), *(\S+), *(\S+)/;
+                my ( $GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong ) = $GPSTempCompLine =~ /(.+), *(\S+), *(\S+)/;
                 next unless $GPSTempCompLong;
                 next if $GPSTempCompPlace =~ /^\#/;    # Allow for comments
 
                 # Calculate distance station is away from pos file
-                my $GPSTempCompDist = &great_circle_distance(
-                    $GPSLatitude,    $GPSLongitude,
-                    $GPSTempCompLat, $GPSTempCompLong
-                );
+                my $GPSTempCompDist = &great_circle_distance( $GPSLatitude, $GPSLongitude, $GPSTempCompLat, $GPSTempCompLong );
 
                 #               print "tracking db $GPSTempCompPlace, $GPSTempCompLat, $GPSTempCompLong dist=$GPSTempCompDist.\n";
                 if ( $GPSTempCompDist < $GPSCompDist ) {
@@ -245,12 +228,8 @@ sub reload_aprs_data {
                     $GPSCompDist  = $GPSTempCompDist;
 
                     # Calculate direction
-                    $GPSCompCourse = int(
-                        atan2(
-                            $GPSTempCompLong - $GPSLongitude,
-                            $GPSLatitude - $GPSTempCompLat
-                        ) * 180 / 3.14159265
-                    );
+                    $GPSCompCourse =
+                      int( atan2( $GPSTempCompLong - $GPSLongitude, $GPSLatitude - $GPSTempCompLat ) * 180 / 3.14159265 );
                     $GPSCompCourse += 360 if $GPSCompCourse < 0;
                     $GPSCompCourse = convert_direction $GPSCompCourse;
 
@@ -259,14 +238,12 @@ sub reload_aprs_data {
             }
 
             logit( "$config_parms{data_dir}/logs/aprs_gps.$Year_Month_Now.log",
-                "$callsign $GPSLatitude $GPSLongitude $GPSSpeed $GPSCourse $GPSDistance $GPSCompDist $GPSCompPlace"
-            );
+                "$callsign $GPSLatitude $GPSLongitude $GPSSpeed $GPSCourse $GPSDistance $GPSCompDist $GPSCompPlace" );
 
             $GPSCompPlace = 'home'       unless $GPSCompPlace;
             $GPSCompDist  = $GPSDistance unless $GPSCompDist;
 
-            $GPSCourse =
-              convert_direction $GPSCourse;    # Convert from degrees to NSEW.
+            $GPSCourse = convert_direction $GPSCourse;    # Convert from degrees to NSEW.
 
             my $callsign2 =
               ( $gps_names{$callsign}{name} )
@@ -278,24 +255,20 @@ sub reload_aprs_data {
             $msg2 =
               ( $GPSCompDist < 1 )
               ? " near $GPSCompPlace"
-              : &plural( $GPSCompDist, 'mile' )
-              . " $GPSCompCourse of $GPSCompPlace";
+              : &plural( $GPSCompDist, 'mile' ) . " $GPSCompCourse of $GPSCompPlace";
             if ($GPSSpeed) {
-                $msg1 = sprintf( '%-10s is traveling %10s at %2d mph ',
-                    $callsign2, $GPSCourse, $GPSSpeed );
+                $msg1 = sprintf( '%-10s is traveling %10s at %2d mph ', $callsign2, $GPSCourse, $GPSSpeed );
             }
             else {
                 #               $msg1 = sprintf('%10s is parked %24s', $callsign2);
-                $msg1 =
-                  sprintf( '%-10s is parked    %10s          ', $callsign2 );
+                $msg1 = sprintf( '%-10s is parked    %10s          ', $callsign2 );
                 $msg2 =~ s/ near / at   /;
             }
             $msg3 = $msg1 . $msg2;
 
             if (
-                ( $callsign2 =~ /$config_parms{tracking_printflag}/i )
-                or ( $gps_names{$callsign}{group} eq
-                    $config_parms{tracking_printflag} )
+                   ( $callsign2 =~ /$config_parms{tracking_printflag}/i )
+                or ( $gps_names{$callsign}{group} eq $config_parms{tracking_printflag} )
                 or (   $config_parms{tracking_printflag} eq 'all'
                     or $config_parms{tracking_printflag} eq 'GPS' )
               )
@@ -303,9 +276,7 @@ sub reload_aprs_data {
                 print_log $msg3;
             }
 
-            my $track_flag =
-              ( $gps_names{$callsign}{group} eq
-                  $config_parms{tracking_speakflag} )
+            my $track_flag = ( $gps_names{$callsign}{group} eq $config_parms{tracking_speakflag} )
               or ( $callsign2 =~ /$config_parms{tracking_speakflag}/i );
 
             if (   $track_flag
@@ -323,40 +294,33 @@ sub reload_aprs_data {
                 #http://www.mapblast.com/myblast/map.mb?CT=44.079669%3A-92.506829%3A10000                             pre 09/2002
                 #http://www.vicinity.com/gif?&CT=44.3189816666667:-91.9015866666667:10000&FAM=myblast&W=600&H=350    post 09/2002
 
-                $html =
-                  qq[<FORM ACTION='/SET:last_response' target='speech';\n];
+                $html = qq[<FORM ACTION='/SET:last_response' target='speech';\n];
                 $html .= qq[<tr><td>$Date_Now $Time_Now</td><td>$msg1</td>\n];
 
                 #               $html .= qq|<td><a href="http://www.mapblast.com/myblast/map.mb?CT=$y\%3A$x\%3A10000">$msg2</a></td>\n|;
                 #               $html .= qq|<td><a href="http://www.vicinity.com/gif?&CT=$y\%3A$x\%3A10000&FAM=myblast&W=600&H=350">$msg2</a></td>\n|;
                 my $msg_map = "On $Date_Now $msg1 $msg2";
                 $msg_map =~ s/ /%20/g;
-                $html .=
-                  qq|<td><a href="/bin/display_map.pl?$x&$y&$msg_map">$msg2</a></td>\n|;
+                $html .= qq|<td><a href="/bin/display_map.pl?$x&$y&$msg_map">$msg2</a></td>\n|;
 
-                $html .=
-                  qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
+                $html .= qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
                 $x = -$x;    # For logging form data in .pos
-                $html .=
-                  qq[<INPUT name=aprs_location_loc type='hidden' value='$y,$x'></td></tr></FORM>\n\n];
+                $html .= qq[<INPUT name=aprs_location_loc type='hidden' value='$y,$x'></td></tr></FORM>\n\n];
 
                 #               $html  = qq[<li>$Date_Now $Time_Now:   $msg1 <a href=\"http://www.mapblast.com/myblast/map.mb?];
                 #               $html .= qq[CT=$y\%3A$x\%3A10000">];
 ##              $html .= qq[&GC=X:$x|Y:$y|LT:$y|LN:$x|LS:8000|&IC=$y:$x:100:$callsign2&CMD=MAP\">];
                 #               $html .= qq[\n$msg2</a>\n\n];
 
-                logit "$config_parms{tracking_dir}/today.txt", $msg3 . "\n",
-                  undef, 1;
-                logit "$config_parms{tracking_dir}/week1.txt", $msg3 . "\n",
-                  undef, 1;
+                logit "$config_parms{tracking_dir}/today.txt", $msg3 . "\n", undef, 1;
+                logit "$config_parms{tracking_dir}/week1.txt", $msg3 . "\n", undef, 1;
                 logit "$config_parms{tracking_dir}/today.html", $html, 0, 1;
                 logit "$config_parms{tracking_dir}/week1.html", $html, 0, 1;
 
                 # If we have not sent email recently, set a timer
                 # so we send it shortly after the car has stopped.
                 if ( ( $Save{tracking_email_time} + 1800 ) < time ) {
-                    set $timer_tracking_email 5 *
-                      60;    # Send 5 minutes after the car has stopped
+                    set $timer_tracking_email 5 * 60;    # Send 5 minutes after the car has stopped
                 }
             }
 
@@ -364,27 +328,21 @@ sub reload_aprs_data {
 
                 # Save last know location
                 $msg3 =~ s/ is / was /;
-                $Save{ 'aprs_whereis_' . lc $callsign2 } = 'On '
-                  . &time_date_stamp(15) . ' at '
-                  . &time_date_stamp(5) . ', '
-                  . $msg3;
-                $Save{ 'aprs_whereis2_' . lc $callsign2 } =
-                  sprintf "%2d:%02d %2d", $Hour, $Minute, .5 + $GPSDistance;
+                $Save{ 'aprs_whereis_' . lc $callsign2 } =
+                  'On ' . &time_date_stamp(15) . ' at ' . &time_date_stamp(5) . ', ' . $msg3;
+                $Save{ 'aprs_whereis2_' . lc $callsign2 } = sprintf "%2d:%02d %2d", $Hour, $Minute, .5 + $GPSDistance;
 
                 # Start/stop internet monitor if needed
                 if ( $gps_names{$callsign}{group} eq 'family' ) {
-                    if ( !$Save{"aprs_track_$callsign2"} and $GPSDistance > 20 )
-                    {
+                    if ( !$Save{"aprs_track_$callsign2"} and $GPSDistance > 20 ) {
                         $Save{"aprs_track_$callsign2"} = $Time;
-                        speak
-                          "voice=female2 $callsign2 is $GPSDistance miles from home.  Starting an internet aprs monitor";
+                        speak "voice=female2 $callsign2 is $GPSDistance miles from home.  Starting an internet aprs monitor";
                     }
                     elsif ( $Save{"aprs_track_$callsign2"}
                         and $GPSDistance < 20 )
                     {
                         $Save{"aprs_track_$callsign2"} = 0;
-                        speak
-                          "voice=female2 $callsign2 is $GPSDistance miles from home.  Stopping the internet aprs monitor";
+                        speak "voice=female2 $callsign2 is $GPSDistance miles from home.  Stopping the internet aprs monitor";
                     }
                 }
             }
@@ -397,9 +355,8 @@ sub great_circle_distance {
     my ( $lat1, $lon1, $lat2, $lon2 ) = map { &degrees_to_radians($_) } @_;
 
     #   my $radius = 6367; # km
-    my $radius = 3956;                              # miles
-    my $d = ( sin( ( $lat2 - $lat1 ) / 2 ) )**2 +
-      cos($lat1) * cos($lat2) * ( sin( ( $lon2 - $lon1 ) / 2 ) )**2;
+    my $radius = 3956;                                                                                             # miles
+    my $d = ( sin( ( $lat2 - $lat1 ) / 2 ) )**2 + cos($lat1) * cos($lat2) * ( sin( ( $lon2 - $lon1 ) / 2 ) )**2;
     $d = $radius * 2 * atan2( sqrt($d), sqrt( 1 - $d ) );
 
     #   print "db d=$d l=$lat1,$lon1,$lat2,$lon2\n";
@@ -419,8 +376,7 @@ sub degrees_to_radians {
 respond $Save{"aprs_whereis_$state"} if $state = said $aprs_whereis;
 
 $v_send_tracking = new Voice_Cmd 'Send tracking log';
-$v_send_tracking->set_info(
-    'Send the APRS car tracking log to instant message.');
+$v_send_tracking->set_info('Send the APRS car tracking log to instant message.');
 if ( expired $timer_tracking_email or said $v_send_tracking) {
     $Save{tracking_email_time} = time;
     print_log "Sending email tracker to $config_parms{tracking_mailto}";
@@ -439,13 +395,9 @@ sub degrees_to_radians {
 
 # Allow for finding vehicles via aprs->internet gateways
 $aprs_whereis3   = new Voice_Cmd "Find [$gps_tracked]";
-$aprs_whereis3m1 = new Voice_Cmd
-  "Start [$gps_tracked] aprs monitor";    # Only turn on during road trips
-$aprs_whereis3m2 = new Voice_Cmd
-  "Stop [$gps_tracked] aprs monitor";     # Only turn on during road trips
-$aprs_whereis3->set_info(
-    'This will find a vehicle using internet gateway data when it is away from home'
-);
+$aprs_whereis3m1 = new Voice_Cmd "Start [$gps_tracked] aprs monitor";    # Only turn on during road trips
+$aprs_whereis3m2 = new Voice_Cmd "Stop [$gps_tracked] aprs monitor";     # Only turn on during road trips
+$aprs_whereis3->set_info( 'This will find a vehicle using internet gateway data when it is away from home' );
 $get_aprs_p = new Process_Item;
 
 $Save{"aprs_track_$state"} = $Time if $state = state_now $aprs_whereis3m1;
@@ -462,8 +414,7 @@ sub degrees_to_radians {
 my $get_aprs_f = "$config_parms{data_dir}/web/get_aprs.html";
 if ( $state = said $aprs_whereis3) {
     my $vehicle = $gps_names{$state}{callsign};
-    set $get_aprs_p
-      qq[get_url "http://www.findu.com/cgi-bin/rawposit.cgi?call=$vehicle&start=12&length=12" "$get_aprs_f"];
+    set $get_aprs_p qq[get_url "http://www.findu.com/cgi-bin/rawposit.cgi?call=$vehicle&start=12&length=12" "$get_aprs_f"];
     start $get_aprs_p;
 }
 
@@ -471,11 +422,9 @@ sub degrees_to_radians {
     my $html = file_read $get_aprs_f;
 
     # Pick last aprs record
-    my ($record) =
-      $html =~ /.+^(.+)<br>/sm; # s -> . matches newline  m -> ^ matches newline
+    my ($record) = $html =~ /.+^(.+)<br>/sm;    # s -> . matches newline  m -> ^ matches newline
     set_data $tnc_output $record unless $record eq $Save{aprs_track_data};
-    $Save{aprs_track_data} =
-      $record;                  # Save this, so we can see when data changes
+    $Save{aprs_track_data} = $record;           # Save this, so we can see when data changes
 
     #   print "db2 get_aprs data:$record.\n";
 }
@@ -490,33 +439,26 @@ sub degrees_to_radians {
 }
 
 if ($New_Week) {
-    file_cat "$config_parms{tracking_dir}/week1.html",
-      "$config_parms{tracking_dir}/old/${Year_Month_Now}.html", 'top';
-    file_cat "$config_parms{tracking_dir}/week1.txt",
-      "$config_parms{tracking_dir}/old/${Year_Month_Now}.txt", 'top';
-    rename "$config_parms{tracking_dir}/week1.html",
-      "$config_parms{tracking_dir}/week2.html"
+    file_cat "$config_parms{tracking_dir}/week1.html", "$config_parms{tracking_dir}/old/${Year_Month_Now}.html", 'top';
+    file_cat "$config_parms{tracking_dir}/week1.txt",  "$config_parms{tracking_dir}/old/${Year_Month_Now}.txt",  'top';
+    rename "$config_parms{tracking_dir}/week1.html", "$config_parms{tracking_dir}/week2.html"
       or print_log "Error in aprs rename 2: $!";
-    rename "$config_parms{tracking_dir}/week1.txt",
-      "$config_parms{tracking_dir}/week2.txt"
+    rename "$config_parms{tracking_dir}/week1.txt", "$config_parms{tracking_dir}/week2.txt"
       or print_log "Error in aprs rename 2: $!";
-    my $html =
-      qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n];
+    my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n];
     logit "$config_parms{tracking_dir}/week1.html", $html, 1;
 
 }
 
 # Add an index entry for the new months entry in aprs/old
 if ($New_Month) {
-    my $html =
-      qq[<li><a href=\"$Year_Month_Now.html\">$Year_Month_Now.html</a>\n];
+    my $html = qq[<li><a href=\"$Year_Month_Now.html\">$Year_Month_Now.html</a>\n];
     logit "$config_parms{tracking_dir}/old/index.html", $html, 0, 1;
     display 'debug: check aprs/old/index.html for new entry', 0;
 }
 
 $v_show_tracking = new Voice_Cmd '{Show,Display} {the, } car log';
-$v_show_tracking->set_info(
-    'Display the web page that shows where our cars have been');
+$v_show_tracking->set_info('Display the web page that shows where our cars have been');
 
 browser "$config_parms{tracking_dir}/today.html" if said $v_show_tracking;
 
@@ -547,14 +489,10 @@ sub degrees_to_radians {
 sub menu_vehicle_log {
     my ($name) = @_;
     my ( @data, $count );
-    for (
-        grep /The $name/,
-        &file_read("$config_parms{tracking_dir}/week1.txt"),
-        &file_read("$config_parms{tracking_dir}/week2.txt")
-      )
+    for ( grep /The $name/, &file_read("$config_parms{tracking_dir}/week1.txt"),
+        &file_read("$config_parms{tracking_dir}/week2.txt") )
     {
-        my ( $day, $date, $time, $text ) =
-          $_ =~ /(\S+) (\S+) (\S+) The $name + is +(.+)/;
+        my ( $day, $date, $time, $text ) = $_ =~ /(\S+) (\S+) (\S+) The $name + is +(.+)/;
         $time = time_to_ampm $time;
         $text =~ s/traveling +//g;
         $text =~ s/ +/ /g;
diff --git a/code/bruce/voice_ms.pl b/code/bruce/voice_ms.pl
index 91a51e0ad..e985ef4bd 100644
--- a/code/bruce/voice_ms.pl
+++ b/code/bruce/voice_ms.pl
@@ -2,12 +2,9 @@
 # Category=Voice
 
 $voice_reset = new Voice_Cmd 'Reset M S Voice';
-$voice_reset->set_info(
-    'This is needed to work around a MSVoice bug.  Use it if it stops responding'
-);
+$voice_reset->set_info( 'This is needed to work around a MSVoice bug.  Use it if it stops responding' );
 
 if ( said $voice_reset) {
-    unlink
-      'c:/Program Files/Common Files/Microsoft Shared/SpeechEngines/MSCSR/amengpc.env';
+    unlink 'c:/Program Files/Common Files/Microsoft Shared/SpeechEngines/MSCSR/amengpc.env';
     print_log 'File was reset.  Restart MSVoice';
 }
diff --git a/code/bruce/wakeup.pl b/code/bruce/wakeup.pl
index 018e0eede..09241f7af 100644
--- a/code/bruce/wakeup.pl
+++ b/code/bruce/wakeup.pl
@@ -98,11 +98,8 @@
         $Save{sleeping_nick} = 0;
 
         #       $Save{sleeping_zack} = 0;
-        speak
-          "rooms=bedroom mode=unmute Good morning Parents.  It is now $Time_Now on $Date_Now_Speakable.";
-        speak "rooms=bedroom mode=unmute The outside temperature is "
-          . round( $Weather{TempOutdoor} )
-          . " degrees";
+        speak "rooms=bedroom mode=unmute Good morning Parents.  It is now $Time_Now on $Date_Now_Speakable.";
+        speak "rooms=bedroom mode=unmute The outside temperature is " . round( $Weather{TempOutdoor} ) . " degrees";
 
         run_voice_cmd 'Check for school closing';
 
diff --git a/code/bruce/weather.pl b/code/bruce/weather.pl
index 00f3ea02b..d83ab45b1 100644
--- a/code/bruce/weather.pl
+++ b/code/bruce/weather.pl
@@ -50,8 +50,7 @@
 $p_weather_page = new Process_Item;
 $v_weather_page = new Voice_Cmd('[Get,Read,Show,Short] internet weather');
 $v_weather_page->set_info(
-    "Weather conditions and forecast for $config_parms{city}, $config_parms{state}  $config_parms{country}"
-);
+    "Weather conditions and forecast for $config_parms{city}, $config_parms{state}  $config_parms{country}" );
 $v_weather_page->set_authority('anyone');
 
 #speak($f_weather_page)
@@ -142,17 +141,12 @@
 
     # Details stored here
     my ($update_time) = $text =~ /Updated: (.+?, 20\d\d)/;
-    my ( $temp_F, $temp_C ) =
-      $text =~ /Temperature.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $temp_F, $temp_C ) = $text =~ /Temperature.+?(.+?) degrees.+?\/ (.+?) degrees/;
     my ($humidity) = $text =~ /Humidity (.+?)%/;
-    my ( $dewpoint_F, $dewpoint_C ) =
-      $text =~ /Dewpoint.+?(.+?) degrees.+?\/ (.+?) degrees/;
-    my ( $windchill_F, $windchill_C ) =
-      $text =~ /Windchill.+?(.+?) degrees.+?\/ (.+?) degrees/;
-    my ( $wind_dir, $wind_mph, $wind_kph ) =
-      $text =~ /Wind (.+?) at (\d+?) mph \/ (.+?) km\/h/;
-    my ( $pressure_in, $pressure_hPa ) =
-      $text =~ /Pressure (.+?) in \/ (.+?) hPa/;
+    my ( $dewpoint_F,  $dewpoint_C )  = $text =~ /Dewpoint.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $windchill_F, $windchill_C ) = $text =~ /Windchill.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $wind_dir, $wind_mph, $wind_kph ) = $text =~ /Wind (.+?) at (\d+?) mph \/ (.+?) km\/h/;
+    my ( $pressure_in, $pressure_hPa ) = $text =~ /Pressure (.+?) in \/ (.+?) hPa/;
     my ($conditions) = $text =~ /Conditions (.+?)\n/;
     my ($clouds)     = $text =~ /Clouds (.+?)Sunrise/s;
     my ($today)      = $text =~ /Today(.+?)Tonight/s;
@@ -181,8 +175,7 @@
 
     my $data   = file_read($f_weather_log_html);
     my $header = "<HTML><HEAD><TITLE>Weather records</TITLE>\r\n";
-    $header .=
-      "<link rel=STYLESHEET href='../../list.css' type=text/css></HEAD>\r\n";
+    $header .= "<link rel=STYLESHEET href='../../list.css' type=text/css></HEAD>\r\n";
     $header .= "<BODY><table border=1>\r\n";
     $header .= "<tr><td>Date/time</td><td>Temp</td>\r\n";
     $header .= "<td>Humidity</td><td>Dewpoint</td>\r\n";
@@ -199,6 +192,5 @@
     );
     file_write( $f_weather_page, $text );
     display $f_weather_page;
-    browser
-      "http://localhost:$config_parms{http_port}/data/web/${WeatherFile}_log.html";
+    browser "http://localhost:$config_parms{http_port}/data/web/${WeatherFile}_log.html";
 }
diff --git a/code/bruce/weather_log.pl b/code/bruce/weather_log.pl
index e607710ac..8c20e5161 100644
--- a/code/bruce/weather_log.pl
+++ b/code/bruce/weather_log.pl
@@ -3,11 +3,9 @@
 #@ Logs weather data
 
 # Use Generic_Item so we can save between reloads/restarts
-my @weather_vars =
-  qw(TempIndoor TempOutdoor WindChill HumidIndoor HumidOutdoor WindAvgSpeed sun_sensor);
+my @weather_vars = qw(TempIndoor TempOutdoor WindChill HumidIndoor HumidOutdoor WindAvgSpeed sun_sensor);
 $weather_stats = new Generic_Item;
-$weather_stats->restore_data( 'count',
-    ( map { $_ . '_min', $_ . '_max', $_ . '_avg' } @weather_vars ) )
+$weather_stats->restore_data( 'count', ( map { $_ . '_min', $_ . '_max', $_ . '_avg' } @weather_vars ) )
   if $Reload;
 
 # Log data and keep stats
diff --git a/code/bruce/weather_monitor_bruce.pl b/code/bruce/weather_monitor_bruce.pl
index 7959b6bc6..30135701e 100644
--- a/code/bruce/weather_monitor_bruce.pl
+++ b/code/bruce/weather_monitor_bruce.pl
@@ -16,6 +16,5 @@
     set $weather_outside_flag 'cooler';
 }
 if ( $state = state_now $weather_outside_flag) {
-    speak
-      "app=notice Weather notice.  The temperature is now $state outside than inside at $Weather{TempOutdoor} degrees";
+    speak "app=notice Weather notice.  The temperature is now $state outside than inside at $Weather{TempOutdoor} degrees";
 }
diff --git a/code/bruce/weatherpoint.pl b/code/bruce/weatherpoint.pl
index dd69b9227..f4a003816 100644
--- a/code/bruce/weatherpoint.pl
+++ b/code/bruce/weatherpoint.pl
@@ -13,17 +13,12 @@
 
 my $f_weatherpoint_page = "$config_parms{data_dir}/web/weatherpoint.txt";
 my $f_weatherpoint_html = "$config_parms{data_dir}/web/weatherpoint.html";
-$p_weatherpoint_page = new Process_Item(
-    "get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\"");
-$v_get_weatherpoint = new Voice_Cmd('Get weather point');
+$p_weatherpoint_page = new Process_Item("get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\"");
+$v_get_weatherpoint  = new Voice_Cmd('Get weather point');
 
 #if ($Startup or $Reload) {  # Used for testing
-if (
-    (
-        time_cron '17 0,4,5,6,8,12,16,20 * * *'
-        or $state = said $v_get_weatherpoint)
-    and &net_connect_check
-  )
+if ( ( time_cron '17 0,4,5,6,8,12,16,20 * * *' or $state = said $v_get_weatherpoint)
+    and &net_connect_check )
 {
     print_log "Retrieving weatherpoint weather...";
     start $p_weatherpoint_page;
@@ -33,8 +28,7 @@
     my $text = file_read $f_weatherpoint_html;
 
     # Find beginning of table and replace table tag
-    $text =~
-      s/.+<b>5-Day Forecast.+?width=468>(.+)/<table border=0 cellpadding=0 cellspacing=0 width=500>$1/s;
+    $text =~ s/.+<b>5-Day Forecast.+?width=468>(.+)/<table border=0 cellpadding=0 cellspacing=0 width=500>$1/s;
 
     # Find last TH tag and add all needed closing tags
     $text =~ s/(.+)<\/th>.+/$1<\/th><\/tr><\/table>/s;
diff --git a/code/bruce/web_sub.pl b/code/bruce/web_sub.pl
index 633dcf350..69d607295 100644
--- a/code/bruce/web_sub.pl
+++ b/code/bruce/web_sub.pl
@@ -7,8 +7,7 @@
 sub web_status_line {
     my $html;
     $html .= qq[&nbsp;<img src='/ia5/images/car.gif' border=0>];
-    $html .=
-      qq[&nbsp;$Save{'aprs_whereis2_the car'}/$Save{'aprs_whereis2_the van'}\n];
+    $html .= qq[&nbsp;$Save{'aprs_whereis2_the car'}/$Save{'aprs_whereis2_the van'}\n];
     return $html;
 }
 
diff --git a/code/bruce/web_sub_ron.pl b/code/bruce/web_sub_ron.pl
index 2f79c9864..1a935b170 100644
--- a/code/bruce/web_sub_ron.pl
+++ b/code/bruce/web_sub_ron.pl
@@ -3,8 +3,7 @@
 
 # Write today's calender (UNIX) facts.
 if ($New_Day) {
-    run
-      qq[calendar -A 1 -f /usr/share/calendar/calendar.world >$config_parms{html_dir}/ia5/calendar/calendar.txt];
+    run qq[calendar -A 1 -f /usr/share/calendar/calendar.world >$config_parms{html_dir}/ia5/calendar/calendar.txt];
     return;
 }
 
@@ -24,16 +23,14 @@ sub deskgrab {
         "$config_parms{html_dir}/ia5/cameras/captures/desk_tmp.jpg",
         "$config_parms{html_dir}/ia5/cameras/captures/desk_latest.jpg"
     );
-    run
-      qq[/mh/bin_my/cqcam -q 100 -32+ -j -x 320 -y 240 >$config_parms{html_dir}/ia5/cameras/captures/desk_tmp.jpg];
+    run qq[/mh/bin_my/cqcam -q 100 -32+ -j -x 320 -y 240 >$config_parms{html_dir}/ia5/cameras/captures/desk_tmp.jpg];
     return;
 }
 
 # Save a small fortune cookie every hour
 # for use on menu.shtml.
 if ( $New_Hour and !$OS_win ) {
-    run
-      qq[/usr/games/fortune -s >$config_parms{html_dir}/ia5/house/fortune.txt];
+    run qq[/usr/games/fortune -s >$config_parms{html_dir}/ia5/house/fortune.txt];
     return;
 }
 
diff --git a/code/bruce/webcam_light.pl b/code/bruce/webcam_light.pl
index 20d9df17a..b23c3de3b 100644
--- a/code/bruce/webcam_light.pl
+++ b/code/bruce/webcam_light.pl
@@ -4,10 +4,8 @@
 
 $webcam_light = new X10_Item('B1');
 
-$v_webcam_light =
-  new Voice_Cmd("WebCam light [on,off,-30,-50,-80,+30,+50,+80]");
-$v_webcam_light->set_info(
-    'A light in our kitchen that is controllable by anyone on the internet');
+$v_webcam_light = new Voice_Cmd("WebCam light [on,off,-30,-50,-80,+30,+50,+80]");
+$v_webcam_light->set_info('A light in our kitchen that is controllable by anyone on the internet');
 
 if ( $state = said $v_webcam_light) {
     set $webcam_light $state;
@@ -30,8 +28,7 @@
     #    my $msg = "Internet message: " . &html_unescape($Save{web_text1});
     my $msg = "Internet message: " . $Save{web_text1};
     speak $msg;
-    &display( $msg, 120, 'webcam text' )
-      ;    # Number is how many seconds till autoclose
+    &display( $msg, 120, 'webcam text' );    # Number is how many seconds till autoclose
 
     #    display $msg;
     $Save{web_text1} = '';
diff --git a/code/bruce/webcam_monitor.pl b/code/bruce/webcam_monitor.pl
index b42b72c14..78ed335ee 100644
--- a/code/bruce/webcam_monitor.pl
+++ b/code/bruce/webcam_monitor.pl
@@ -25,8 +25,7 @@
             my $member = $camera . sprintf "__%03d.jpg", $Save{$index};
             my $file2 = "$config_parms{data_dir}/web/motion/$member";
 
-            copy $file,
-              "$config_parms{data_dir}/web/motion/${camera}_Latest.jpg";
+            copy $file, "$config_parms{data_dir}/web/motion/${camera}_Latest.jpg";
             copy $file, $file2;
 
             # These can be monitored from other code files (e.g. motion monitoring)
diff --git a/code/bruce/wxserver_server.pl b/code/bruce/wxserver_server.pl
index 0160d8b32..a07468212 100644
--- a/code/bruce/wxserver_server.pl
+++ b/code/bruce/wxserver_server.pl
@@ -10,8 +10,7 @@
 #
 #my $WxServerVersionID = 'mh server_wxserver.pl V0.0.1';
 
-$ServerWxServer =
-  new Socket_Item( undef, undef, 'server_wxserver', undef, 'tcp', 'raw' );
+$ServerWxServer = new Socket_Item( undef, undef, 'server_wxserver', undef, 'tcp', 'raw' );
 
 #                                  Ref             m        b    Units  units
 my %WxCommandSet = (
diff --git a/code/common/LitterFree.pl b/code/common/LitterFree.pl
index ebdd4a5ea..215620d94 100644
--- a/code/common/LitterFree.pl
+++ b/code/common/LitterFree.pl
@@ -19,10 +19,8 @@
 # appliance module ($LitterBox) and a sensor mounted inside the box ($Litterbox_Movement).
 
 # Adjust the following two values to your preference
-my $litter_timeout = 960
-  ; # Time the sensor must be inactive before a flush begins.  Currently 16 minutes.
-my $litter_cycle_timeout =
-  1980;    # LitterFree cycle time (wash and dry).  It's about 33 minutes.
+my $litter_timeout       = 960;     # Time the sensor must be inactive before a flush begins.  Currently 16 minutes.
+my $litter_cycle_timeout = 1980;    # LitterFree cycle time (wash and dry).  It's about 33 minutes.
 
 my $litterboxstate   = 'OFF';
 my $littercyclestate = 'OFF';
diff --git a/code/common/UIRT2_learning.pl b/code/common/UIRT2_learning.pl
index ce43839b9..3b8a05801 100644
--- a/code/common/UIRT2_learning.pl
+++ b/code/common/UIRT2_learning.pl
@@ -23,8 +23,7 @@
 
 =cut
 
-my ( @devices, @functions, $prev_device, $current_device, $current_function,
-    $ofa_html );
+my ( @devices, @functions, $prev_device, $current_device, $current_function, $ofa_html );
 use vars '$uirt2_function_pcode';
 
 use UIRT2;
@@ -32,13 +31,11 @@
 
 if ($Reload) {
     &IR_Utils::init_ir_utils;
-    $Included_HTML{'IR'} =
-      '<!--#include code="&uirt2_update_html"-->' . "\n\n\n";
+    $Included_HTML{'IR'} = '<!--#include code="&uirt2_update_html"-->' . "\n\n\n";
     $ofa_html = &ofa_html;
 }
 
-$uirt2_test = new Voice_Cmd(
-    "uirt2 debug [version,raw,uir,struct,gpio,replay,learn,dump codes]");
+$uirt2_test = new Voice_Cmd("uirt2 debug [version,raw,uir,struct,gpio,replay,learn,dump codes]");
 
 if ( my $state = said $uirt2_test) {
     UIRT2::get_version()    if $state eq 'version';
@@ -115,12 +112,9 @@ sub uirt2_update_html {
           . $_
           . "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp\n";
     }
-    my ( $frequency, $repeat, $code1, $code2 ) =
-      UIRT2::get_ir_code( $current_device, $current_function );
+    my ( $frequency, $repeat, $code1, $code2 ) = UIRT2::get_ir_code( $current_device, $current_function );
     my $pronto;
-    ($pronto) =
-      UIRT2::raw_to_pronto(
-        UIRT2::struct_to_raw( $frequency, $repeat, $code1, $code2 ) );
+    ($pronto) = UIRT2::raw_to_pronto( UIRT2::struct_to_raw( $frequency, $repeat, $code1, $code2 ) );
     $html .= '
       </select></td>
       <td valign=top>
@@ -141,8 +135,7 @@ sub uirt2_update_html {
       . ( $frequency == 38 ? ' checked' : '' ) . '>38
       <input type="radio" value="40" name=$uirt2_function_frequency'
       . ( $frequency == 40 ? ' checked' : '' ) . '>40 kHz 
-      &nbsp&nbsp&nbsp Repeat <input value="' . $repeat
-      . '" size="5" name=$uirt2_function_repeat>
+      &nbsp&nbsp&nbsp Repeat <input value="' . $repeat . '" size="5" name=$uirt2_function_repeat>
       &nbsp&nbsp&nbsp <input type=submit value="Modify" name=$uirt2_function_modify><br>
 	Generate from Protocol Spec<br>
       Protocol <select name="$uirt2_gen_protocol">
@@ -179,8 +172,7 @@ sub uirt2_update_html {
     my $raw = UIRT2::last_learned();
     $html .= '
       Last learned raw code (for debugging)<br>
-      <textarea name=$uirt2_function_raw Rows=8 COLS=100 wrap="hard">' . $raw
-      . '</textarea>  
+      <textarea name=$uirt2_function_raw Rows=8 COLS=100 wrap="hard">' . $raw . '</textarea>  
       ' if $raw;
     $html .= '
       <a target="control" href="SUB;referer?uirt2_update_html()">Refresh</a><br>
@@ -254,9 +246,9 @@ sub uirt2_update_html {
     $current_device = $device                  if $device;
     my $func = state $uirt2_function_list;
     my $function;
-    $function = $functions[$func]             if $func =~ /\d+/;
-    $function = uc state $uirt2_function_text if state $uirt2_function_text;
-    $current_function = $function if $function;
+    $function         = $functions[$func]             if $func =~ /\d+/;
+    $function         = uc state $uirt2_function_text if state $uirt2_function_text;
+    $current_function = $function                     if $function;
     my $frequency = state $uirt2_function_frequency;
     my $repeat    = 1;
     print_log "Learning device $device function $function";
@@ -304,21 +296,14 @@ sub uirt2_update_html {
     my $device = $current_device;
     my $func   = state $uirt2_function_list;
     my $function;
-    $function = $functions[$func]             if $func =~ /\d+/;
-    $function = uc state $uirt2_function_text if state $uirt2_function_text;
-    $current_function = $function if $function;
+    $function         = $functions[$func]             if $func =~ /\d+/;
+    $function         = uc state $uirt2_function_text if state $uirt2_function_text;
+    $current_function = $function                     if $function;
     my $repeat = 1;
 
     #	my $pcode = state $uirt2_function_pcode;
-    print_log
-      "Importing device $device function $function pronto $uirt2_function_pcode";
-    UIRT2::set_ir_code(
-        $device,
-        $function,
-        UIRT2::raw_to_struct(
-            UIRT2::pronto_to_raw( $uirt2_function_pcode, $repeat )
-        )
-    );
+    print_log "Importing device $device function $function pronto $uirt2_function_pcode";
+    UIRT2::set_ir_code( $device, $function, UIRT2::raw_to_struct( UIRT2::pronto_to_raw( $uirt2_function_pcode, $repeat ) ) );
 }
 
 if ( state_now $uirt2_function_new) {
@@ -332,8 +317,7 @@ sub uirt2_update_html {
     $funcnew = uc state $uirt2_function_text if state $uirt2_function_text;
     $current_function = $funcnew if $funcnew;
     print_log "Creating device $device function $funcnew";
-    UIRT2::set_ir_code( $device, $funcnew, $frequency, $repeat, $code1,
-        $code2 );
+    UIRT2::set_ir_code( $device, $funcnew, $frequency, $repeat, $code1, $code2 );
 }
 
 if ( state_now $uirt2_function_modify) {
@@ -345,8 +329,7 @@ sub uirt2_update_html {
     my $repeat    = state $uirt2_function_repeat;
     $repeat = 1 unless $repeat =~ /^\d+$/;
     print_log "Modlfying device $device function $function";
-    UIRT2::set_ir_code( $device, $function, $frequency, $repeat, $code1,
-        $code2 );
+    UIRT2::set_ir_code( $device, $function, $frequency, $repeat, $code1, $code2 );
 }
 
 $uirt2_gen_protocol = new Generic_Item;
@@ -361,17 +344,8 @@ sub uirt2_update_html {
     my $gen_device   = state $uirt2_gen_device;
     my $gen_function = state $uirt2_gen_function;
     print_log "Generating device $device function $function";
-    UIRT2::set_ir_code(
-        $device,
-        $function,
-        UIRT2::raw_to_struct(
-            UIRT2::pronto_to_raw(
-                &IR_Utils::generate_pronto(
-                    $gen_protocol, $gen_device, $gen_function
-                )
-            )
-        )
-    );
+    UIRT2::set_ir_code( $device, $function,
+        UIRT2::raw_to_struct( UIRT2::pronto_to_raw( &IR_Utils::generate_pronto( $gen_protocol, $gen_device, $gen_function ) ) ) );
 }
 
 $uirt2_dvc_file = new Generic_Item;
@@ -383,9 +357,7 @@ sub uirt2_update_html {
     my ( $device, $repeat, %prontos ) = &IR_Utils::read_dvc_file($dvc_file);
     print_log "Generating device $device from DVC file $dvc_file";
     foreach my $function ( keys %prontos ) {
-        UIRT2::set_ir_code( $device, $function,
-            UIRT2::raw_to_struct( UIRT2::pronto_to_raw( $prontos{$function} ) )
-        );
+        UIRT2::set_ir_code( $device, $function, UIRT2::raw_to_struct( UIRT2::pronto_to_raw( $prontos{$function} ) ) );
     }
 }
 
@@ -399,14 +371,8 @@ sub ofa_html {
         $list .= "<br>\n\t$mfgs "    if $mfgs ne $mfgs_prev;
         $list .= ", "                if $mfgs eq $mfgs_prev;
         $list .=
-            "<a target='control' href=" . '"'
-          . "SUB;referer?uirt2_add_ofa_device('$mfgs $sub','$type','$code')"
-          . '"'
-          . ">$code</a>";
-        $list .=
-            " [<a target='speech' href=" . '"'
-          . "SUB;send_ofa_key('$type','$code','POWER')" . '"'
-          . ">test</a>]";
+          "<a target='control' href=" . '"' . "SUB;referer?uirt2_add_ofa_device('$mfgs $sub','$type','$code')" . '"' . ">$code</a>";
+        $list .= " [<a target='speech' href=" . '"' . "SUB;send_ofa_key('$type','$code','POWER')" . '"' . ">test</a>]";
         $sub_prev  = "$sub$;$type";
         $mfgs_prev = $mfgs;
     }
@@ -421,8 +387,7 @@ sub uirt2_add_ofa_device {
     print_log "Adding device $device_name $type $code";
     my ( $repeat, %prontos ) = &IR_Utils::generate_ofa_device( $type, $code );
     while ( my ( $key, $pronto ) = each %prontos ) {
-        UIRT2::set_ir_code( $device_name, $key,
-            UIRT2::raw_to_struct( UIRT2::pronto_to_raw( $pronto, $repeat ) ) );
+        UIRT2::set_ir_code( $device_name, $key, UIRT2::raw_to_struct( UIRT2::pronto_to_raw( $pronto, $repeat ) ) );
     }
     $current_device   = uc $device_name;
     $current_function = '';
@@ -434,12 +399,9 @@ sub send_ofa_key {
     my $key  = shift;
     my %keys = &IR_Utils::get_ofa_keys( $type, $code );
     my $efc  = $keys{$key};
-    my ( $protocol, $device, $function ) =
-      &IR_Utils::get_function( $type, $code, $efc );
-    print
-      "$type $code $key protocol $protocol efc $efc device $device function $function\n";
-    my ( $pronto, $repeat ) =
-      &IR_Utils::generate_pronto( uc $protocol, $device, $function );
+    my ( $protocol, $device, $function ) = &IR_Utils::get_function( $type, $code, $efc );
+    print "$type $code $key protocol $protocol efc $efc device $device function $function\n";
+    my ( $pronto, $repeat ) = &IR_Utils::generate_pronto( uc $protocol, $device, $function );
     UIRT2::transmit_pronto( $pronto, $repeat );
 }
 
@@ -449,9 +411,7 @@ sub dump_codes {
     my @functions = UIRT2::list_functions($current_device)
       if $current_device ne '';
     foreach ( sort @functions ) {
-        my ($pronto) =
-          UIRT2::raw_to_pronto(
-            UIRT2::struct_to_raw( UIRT2::get_ir_code( $current_device, $_ ) ) );
+        my ($pronto) = UIRT2::raw_to_pronto( UIRT2::struct_to_raw( UIRT2::get_ir_code( $current_device, $_ ) ) );
         print "$_ = $pronto\n\n";
     }
 }
diff --git a/code/common/USB_UIRT_learning.pl b/code/common/USB_UIRT_learning.pl
index c407c15ae..f6bce4177 100644
--- a/code/common/USB_UIRT_learning.pl
+++ b/code/common/USB_UIRT_learning.pl
@@ -23,8 +23,7 @@
 
 =cut
 
-my ( @devices, @functions, $prev_device, $current_device, $current_function,
-    $ofa_html );
+my ( @devices, @functions, $prev_device, $current_device, $current_function, $ofa_html );
 use vars '$usb_uirt_function_code';
 
 use USB_UIRT;
@@ -32,13 +31,11 @@
 
 if ($Reload) {
     &IR_Utils::init_ir_utils;
-    $Included_HTML{'IR'} =
-      '<!--#include code="&usb_uirt_update_html"-->' . "\n\n\n";
+    $Included_HTML{'IR'} = '<!--#include code="&usb_uirt_update_html"-->' . "\n\n\n";
     $ofa_html = &ofa_html;
 }
 
-$usb_uirt_test = new Voice_Cmd(
-    "usb_uirt debug [version,raw,oldraw,uir,get config,learn,dump codes]");
+$usb_uirt_test = new Voice_Cmd("usb_uirt debug [version,raw,oldraw,uir,get config,learn,dump codes]");
 
 if ( my $state = said $usb_uirt_test) {
     USB_UIRT::get_version()    if $state eq 'version';
@@ -115,8 +112,7 @@ sub usb_uirt_update_html {
           . $_
           . "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp\n";
     }
-    my ( $frequency, $repeat, $code1, $code2 ) =
-      USB_UIRT::get_ir_code( $current_device, $current_function );
+    my ( $frequency, $repeat, $code1, $code2 ) = USB_UIRT::get_ir_code( $current_device, $current_function );
     my ( $pronto, $raw );
     if ( $code1 =~ /^0000 / ) {
         $pronto = lc $code1;
@@ -124,9 +120,7 @@ sub usb_uirt_update_html {
     else {
         $raw = $code1;
         $raw .= " $code2" if $code2;
-        ($pronto) =
-          USB_UIRT::raw_to_pronto(
-            USB_UIRT::struct_to_raw( $frequency, $repeat, $code1, $code2 ) );
+        ($pronto) = USB_UIRT::raw_to_pronto( USB_UIRT::struct_to_raw( $frequency, $repeat, $code1, $code2 ) );
     }
 
     #      <input type=submit value="Learn" name=$usb_uirt_function_learn>
@@ -141,8 +135,7 @@ sub usb_uirt_update_html {
       <input type=submit name=$usb_uirt_function_send value="Send"><br>
       Frequency <input size="3" value="'
       . $frequency . '" name=$usb_uirt_function_frequency>
-      &nbsp&nbsp&nbsp Repeat <input value="' . $repeat
-      . '" size="2" name=$usb_uirt_function_repeat>
+      &nbsp&nbsp&nbsp Repeat <input value="' . $repeat . '" size="2" name=$usb_uirt_function_repeat>
       &nbsp&nbsp&nbsp <input type=submit value="Modify" name=$usb_uirt_function_modify><br>
       </td></tr>
       <tr><td colspan=4>
@@ -258,9 +251,9 @@ sub usb_uirt_update_html {
 if ( state_now $usb_uirt_function_learn) {
     my $dev = state $usb_uirt_device_list;
     my $device;
-    $device = $devices[$dev] if $dev =~ /\d+/;
-    $device = state $usb_uirt_device_text if state $usb_uirt_device_text;
-    $current_device = $device if $device;
+    $device         = $devices[$dev]              if $dev =~ /\d+/;
+    $device         = state $usb_uirt_device_text if state $usb_uirt_device_text;
+    $current_device = $device                     if $device;
     my $func = state $usb_uirt_function_list;
     my $function;
     $function = $functions[$func] if $func =~ /\d+/;
@@ -294,10 +287,8 @@ sub usb_uirt_update_html {
     my $function;
     $function         = $functions[$func] if $func =~ /\d+/;
     $current_function = $function         if $function;
-    my ( $frequency, $repeat, $code1, $code2 ) =
-      USB_UIRT::get_ir_code( $current_device, $current_function );
-    print_log
-      "Sending device $device function $function frequency $frequency repeat $repeat code1 $code1 code2 $code2";
+    my ( $frequency, $repeat, $code1, $code2 ) = USB_UIRT::get_ir_code( $current_device, $current_function );
+    print_log "Sending device $device function $function frequency $frequency repeat $repeat code1 $code1 code2 $code2";
     USB_UIRT::set( $device, $function );
 }
 
@@ -332,10 +323,8 @@ sub usb_uirt_update_html {
         $code1 =~ s/[\r\n]+//gs;
         ( $code1, $code2 ) = split ' ', $code1;
     }
-    print_log
-      "Importing device $device function $function code $usb_uirt_function_code";
-    USB_UIRT::set_ir_code( $device, $function, $frequency, $repeat, $code1,
-        $code2 );
+    print_log "Importing device $device function $function code $usb_uirt_function_code";
+    USB_UIRT::set_ir_code( $device, $function, $frequency, $repeat, $code1, $code2 );
 }
 
 if ( state_now $usb_uirt_function_new) {
@@ -360,22 +349,19 @@ sub usb_uirt_update_html {
         ( $code1, $code2 ) = split ' ', $code1;
     }
     print_log "Creating device $device function $funcnew";
-    USB_UIRT::set_ir_code( $device, $funcnew, $frequency, $repeat, $code1,
-        $code2 );
+    USB_UIRT::set_ir_code( $device, $funcnew, $frequency, $repeat, $code1, $code2 );
 }
 
 if ( state_now $usb_uirt_function_modify) {
     my $device   = $current_device;
     my $function = $current_function;
-    my ( $frequency, $repeat, $code1, $code2 ) =
-      USB_UIRT::get_ir_code( $current_device, $current_function );
+    my ( $frequency, $repeat, $code1, $code2 ) = USB_UIRT::get_ir_code( $current_device, $current_function );
     $frequency = state $usb_uirt_function_frequency;
     $repeat    = state $usb_uirt_function_repeat;
     $repeat    = 3 unless $repeat =~ /^\d+$/ and $repeat > 0;
     $repeat    = 50 unless $repeat =~ /^\d+$/ and $repeat < 50;
     print_log "Modifying device $device function $function";
-    USB_UIRT::set_ir_code( $device, $function, $frequency, $repeat, $code1,
-        $code2 );
+    USB_UIRT::set_ir_code( $device, $function, $frequency, $repeat, $code1, $code2 );
 }
 
 $usb_uirt_gen_protocol = new Generic_Item;
@@ -395,8 +381,7 @@ sub usb_uirt_update_html {
     my $gen_device   = state $usb_uirt_gen_device;
     my $gen_function = state $usb_uirt_gen_function;
     print_log "Generating device $device function $function";
-    my ( $pronto, $repeat ) =
-      &IR_Utils::generate_pronto( $gen_protocol, $gen_device, $gen_function );
+    my ( $pronto, $repeat ) = &IR_Utils::generate_pronto( $gen_protocol, $gen_device, $gen_function );
     USB_UIRT::set_ir_code( $device, $function, '', $repeat, $pronto );
 }
 
@@ -409,8 +394,7 @@ sub usb_uirt_update_html {
     my ( $device, $repeat, %prontos ) = &IR_Utils::read_dvc_file($dvc_file);
     print_log "Generating device $device from DVC file $dvc_file";
     foreach my $function ( keys %prontos ) {
-        USB_UIRT::set_ir_code( $device, $function, '', $repeat,
-            $prontos{$function} );
+        USB_UIRT::set_ir_code( $device, $function, '', $repeat, $prontos{$function} );
     }
 }
 
@@ -424,18 +408,14 @@ sub ofa_html {
 You do not need to create a device or function above.<p>';
     foreach (&IR_Utils::ofa_bysub) {
         my ( $sub, $type, $mfgs, $code ) = split "$;";
-        $list .= "<p>\n$sub ($type)" if "$sub$;$type" ne $sub_prev;
+        $list .= "<p>\n$sub ($type)"                  if "$sub$;$type" ne $sub_prev;
         $list .= "<br>\n\t&nbsp&nbsp&nbsp&nbsp$mfgs " if $mfgs ne $mfgs_prev;
-        $list .= ", " if $mfgs eq $mfgs_prev;
+        $list .= ", "                                 if $mfgs eq $mfgs_prev;
         $list .=
             "<a target='control' href=" . '"'
-          . "SUB;referer?usb_uirt_add_ofa_device('$mfgs $sub','$type','$code')"
-          . '"'
+          . "SUB;referer?usb_uirt_add_ofa_device('$mfgs $sub','$type','$code')" . '"'
           . ">$code</a>";
-        $list .=
-            " [<a target='speech' href=" . '"'
-          . "SUB;send_ofa_key('$type','$code','POWER')" . '"'
-          . ">test</a>]";
+        $list .= " [<a target='speech' href=" . '"' . "SUB;send_ofa_key('$type','$code','POWER')" . '"' . ">test</a>]";
         $sub_prev  = "$sub$;$type";
         $mfgs_prev = $mfgs;
     }
@@ -462,12 +442,9 @@ sub send_ofa_key {
     my $key  = shift;
     my %keys = &IR_Utils::get_ofa_keys( $type, $code );
     my $efc  = $keys{$key};
-    my ( $protocol, $device, $function ) =
-      &IR_Utils::get_function( $type, $code, $efc );
-    print
-      "$type $code $key protocol $protocol efc $efc device $device function $function\n";
-    my ( $pronto, $repeat ) =
-      &IR_Utils::generate_pronto( uc $protocol, $device, $function );
+    my ( $protocol, $device, $function ) = &IR_Utils::get_function( $type, $code, $efc );
+    print "$type $code $key protocol $protocol efc $efc device $device function $function\n";
+    my ( $pronto, $repeat ) = &IR_Utils::generate_pronto( uc $protocol, $device, $function );
     USB_UIRT::transmit_pronto( $pronto, $repeat );
 }
 
diff --git a/code/common/android_server.pl b/code/common/android_server.pl
index c61483272..4b6f07459 100644
--- a/code/common/android_server.pl
+++ b/code/common/android_server.pl
@@ -94,8 +94,7 @@
     }
 }
 
-$v_android_volume =
-  new Voice_Cmd("Set Android Volume to [0,10,20,30,40,50,60,70,80,90,100]");
+$v_android_volume = new Voice_Cmd("Set Android Volume to [0,10,20,30,40,50,60,70,80,90,100]");
 if ( defined said $v_android_volume) {
     my $volume = $v_android_volume->state();
     &android_volume( "all", $volume );
@@ -123,8 +122,7 @@
 
     # Fetch socket and ip_address
     $client    = $main::Socket_Ports{server_android}{socka};
-    $client_ip = $main::Socket_Ports{server_android}{client_ip_address} . ":"
-      . $main::Socket_Ports{server_android}{client_port};
+    $client_ip = $main::Socket_Ports{server_android}{client_ip_address} . ":" . $main::Socket_Ports{server_android}{client_port};
 
     # Check for JSON message
     if ( $state =~ /^{/ ) {
@@ -154,25 +152,21 @@
     else {
         my $port;
         ( $pass, $device, $port, $room ) = split /,/, $state;
-        &print_log(
-            "android_server:: legacy_login_request:: pass: $pass device: $device, port: $port, room: $room"
-        ) if $Debug{android};
+        &print_log( "android_server:: legacy_login_request:: pass: $pass device: $device, port: $port, room: $room" )
+          if $Debug{android};
         delete $androidClients{$client_ip}{version};
     }
 
     if ( my $user = password_check $pass, 'server_android' ) {
         $room = $client_ip unless defined $room;
-        &print_log(
-            "android_server:: login_accepted:: user: $user room: $room device: $device ip: $client_ip client: $client "
-        ) if $Debug{android};
+        &print_log( "android_server:: login_accepted:: user: $user room: $room device: $device ip: $client_ip client: $client " )
+          if $Debug{android};
         $androidClients{$client_ip}{room}   = $room;
         $androidClients{$client_ip}{client} = $client;
         $response_data{status}              = "success";
     }
     else {
-        &print_log(
-            "android_server:: login_denied:: room: $room device: $device ip: $client_ip"
-        ) if $Debug{android};
+        &print_log( "android_server:: login_denied:: room: $room device: $device ip: $client_ip" ) if $Debug{android};
         delete $androidClients{$client_ip};
         $response_data{status} = "failed";
     }
@@ -249,8 +243,7 @@ sub file_ready_for_android {
     foreach my $client_ip ( keys %androidClients ) {
         my $room   = lc $androidClients{$client_ip}{room};
         my $client = $androidClients{$client_ip}{client};
-        &print_log(
-            "file_ready_for_android ip: $client_ip room: $room client: $client")
+        &print_log("file_ready_for_android ip: $client_ip room: $room client: $client")
           if $Debug{android};
         my %data;
         $data{url} = $speakFile;
@@ -397,8 +390,7 @@ sub android_volume {
 sub android_xml {
 
     my ( $request, $options ) = @_;
-    my ( $xml, $xml_types, $xml_groups, $xml_categories, $xml_vars,
-        $xml_objects );
+    my ( $xml, $xml_types, $xml_groups, $xml_categories, $xml_vars, $xml_objects );
 
     return &android_usage unless $request;
 
@@ -567,8 +559,7 @@ sub android_object_detail {
 
     my $prefix = '  ' x $depth;
     if ( $object->can('android_xml') ) {
-        $xml_objects .=
-          $object->android_xml( $depth + 1, $fields, 0, $attributes );
+        $xml_objects .= $object->android_xml( $depth + 1, $fields, 0, $attributes );
     }
     else {
         $xml_objects .= $prefix . "<object>\n";
@@ -629,9 +620,7 @@ sub android_usage {
         my $url = "/sub?android_xml($r)";
         $html .= "<h2>$r</h2>\n<p><a href='$url'>$url</a></p>\n<ul>\n";
         foreach my $opt ( sort keys %options ) {
-            if ( $options{$opt}{applyto} eq 'all' or grep /^$r$/,
-                split /\|/, $options{$opt}{applyto} )
-            {
+            if ( $options{$opt}{applyto} eq 'all' or grep /^$r$/, split /\|/, $options{$opt}{applyto} ) {
                 $url = "/sub?android_xml($r,$opt";
                 if ( defined $options{$opt}{example} ) {
                     foreach ( split /\|/, $options{$opt}{example} ) {
diff --git a/code/common/aqualink.pl b/code/common/aqualink.pl
index 935af8a07..47e86c608 100644
--- a/code/common/aqualink.pl
+++ b/code/common/aqualink.pl
@@ -161,8 +161,7 @@
             my $LED15 = vec( chr($4), 2, 2 );
             my $LED16 = vec( chr($4), 3, 2 );
 
-            speak
-              "Pump $LED7 Heater $LED15 $LED16 Spa $LED6 AUX1 $LED5 AUX2 $LED4 AUX3 $LED3";
+            speak "Pump $LED7 Heater $LED15 $LED16 Spa $LED6 AUX1 $LED5 AUX2 $LED4 AUX3 $LED3";
         }
 
         if ( $command eq 'OPTIONS' ) {
@@ -337,8 +336,7 @@
                     speak "It is now ready.";
                 }
                 else {
-                    my $TimeLeft = int( ( 96 - $value ) / .7 )
-                      ; # My heater can raise the spa temp 7 degrees in 10 minutes
+                    my $TimeLeft = int( ( 96 - $value ) / .7 );    # My heater can raise the spa temp 7 degrees in 10 minutes
                     speak "It should be ready in $TimeLeft minutes.";
                 }
             }
@@ -553,8 +551,7 @@
 $v_pool_AUX1_chk = new Voice_Cmd("Check the $AUX1 status");
 if ( said $v_pool_AUX1_chk) {
     if ( $Cleaner eq '1' ) {
-        $v_pool_AUX1_chk->respond(
-            "app=pool Your system doesn't use AUX 1 - Use Cleaner instead.");
+        $v_pool_AUX1_chk->respond("app=pool Your system doesn't use AUX 1 - Use Cleaner instead.");
     }
     else {
         $v_pool_AUX1_chk->respond("app=pool Checking $AUX1 status.");
@@ -660,8 +657,7 @@
     run_after_delay 10, "run_voice_cmd 'Check the spa heater status'";
     run_after_delay 12, "run_voice_cmd 'Check the spa temperature'";
     run_after_delay 14, "run_voice_cmd 'Check the pool cleaner'";
-    run_after_delay 16,
-      "run_voice_cmd 'Check the pool auxiliary device 3 status'";
+    run_after_delay 16, "run_voice_cmd 'Check the pool auxiliary device 3 status'";
     run_after_delay 18, "run_voice_cmd 'Check the air temperature'";
 }
 
@@ -669,8 +665,7 @@ sub logspa {
     my $text  = @_;
     my $spadb = "$config_parms{data_dir}/log/spa.log";
     open( SPADB, ">>$spadb" );
-    print SPADB
-      "$Date_Now $Time_Now $Save{PoolSpaTemp} $Save{PoolAirTemp} $text\n";
+    print SPADB "$Date_Now $Time_Now $Save{PoolSpaTemp} $Save{PoolAirTemp} $text\n";
     close SPADB;
 }
 
diff --git a/code/common/audrey_control.pl b/code/common/audrey_control.pl
index 1e71db7b1..d5753ce3f 100644
--- a/code/common/audrey_control.pl
+++ b/code/common/audrey_control.pl
@@ -128,13 +128,10 @@
 $v_audrey_top_light   = new Voice_Cmd("Audrey top light [on,off,blinking]");
 $v_audrey_mail_light  = new Voice_Cmd("Audrey mail light [on,off,blinking]");
 $v_audrey_both_lights = new Voice_Cmd("Audrey lights both [on,off,blinking]");
-$v_audrey_beeps      = new Voice_Cmd("Audrey beeps [enabled,disabled,stopped]");
-$v_audrey_sound_play = new Voice_Cmd(
-    "Play Audrey sound number [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]"
-);
-$v_audrey_volume = new Voice_Cmd(
-    "Set Audrey volume to [1,10,20,25,30,40,50,60,70,75,80,90,100]");
-$v_audrey_remote = new Voice_Cmd(
+$v_audrey_beeps       = new Voice_Cmd("Audrey beeps [enabled,disabled,stopped]");
+$v_audrey_sound_play  = new Voice_Cmd( "Play Audrey sound number [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]" );
+$v_audrey_volume      = new Voice_Cmd("Set Audrey volume to [1,10,20,25,30,40,50,60,70,75,80,90,100]");
+$v_audrey_remote      = new Voice_Cmd(
     "Push Audrey Button [browser,address_book,date_book,audrey_options,power_button,turn_knob_left,push_knob,turn_knob_right,mail,tab,enter]"
 );
 $v_audrey_sound_play_by_name = new Voice_Cmd(
@@ -143,15 +140,13 @@
 
 if ( said $v_audrey_select) {
     my $state = $v_audrey_select->{state};
-    $v_audrey_select->respond(
-        "$state Audrey selected on IP $AudreyList{$state}");
+    $v_audrey_select->respond("$state Audrey selected on IP $AudreyList{$state}");
     $Save{current_audrey} = $AudreyList{$state};
 }
 
 if ( said $v_audrey_screen) {
     my $state = $v_audrey_screen->{state};
-    $v_audrey_screen->respond(
-        "$Save{current_audrey} Audrey screen set to $state");
+    $v_audrey_screen->respond("$Save{current_audrey} Audrey screen set to $state");
     $state = 0   if $state eq 'asleep';
     $state = 1   if $state eq 'awake';
     $state = "t" if $state eq 'toggle';
@@ -160,8 +155,7 @@
 
 if ( said $v_audrey_top_light) {
     my $state = $v_audrey_top_light->{state};
-    $v_audrey_top_light->respond(
-        "$Save{current_audrey} Audrey top light set to $state");
+    $v_audrey_top_light->respond("$Save{current_audrey} Audrey top light set to $state");
     $state = 0 if $state eq 'off';
     $state = 1 if $state eq 'on';
     $state = 2 if $state eq 'blinking';
@@ -170,8 +164,7 @@
 
 if ( said $v_audrey_mail_light) {
     my $state = $v_audrey_mail_light->{state};
-    $v_audrey_mail_light->respond(
-        "$Save{current_audrey} Audrey mail light set to $state");
+    $v_audrey_mail_light->respond("$Save{current_audrey} Audrey mail light set to $state");
     $state = 0 if $state eq 'off';
     $state = 1 if $state eq 'on';
     $state = 2 if $state eq 'blinking';
@@ -180,8 +173,7 @@
 
 if ( said $v_audrey_both_lights) {
     my $state = $v_audrey_both_lights->{state};
-    $v_audrey_both_lights->respond(
-        "Both $Save{current_audrey} Audrey lights set to $state");
+    $v_audrey_both_lights->respond("Both $Save{current_audrey} Audrey lights set to $state");
     $state = 0 if $state eq 'off';
     $state = 1 if $state eq 'on';
     $state = 2 if $state eq 'blinking';
@@ -191,8 +183,7 @@
 
 if ( said $v_audrey_beeps) {
     my $state = $v_audrey_beeps->{state};
-    $v_audrey_beeps->respond(
-        "$Save{current_audrey} Audrey beeps set to $state");
+    $v_audrey_beeps->respond("$Save{current_audrey} Audrey beeps set to $state");
     $state = 1 if $state eq 'stopped';
     $state = 2 if $state eq 'disabled';
     $state = 3 if $state eq 'enabled';
@@ -201,8 +192,7 @@
 
 if ( said $v_audrey_sound_play_by_name) {
     my $state = $v_audrey_sound_play_by_name->{state};
-    $v_audrey_sound_play_by_name->respond(
-        "Playing $Save{current_audrey} Audrey sound $state");
+    $v_audrey_sound_play_by_name->respond("Playing $Save{current_audrey} Audrey sound $state");
     $state = 0  if $state eq 'cancel';
     $state = 1  if $state eq 'check';
     $state = 2  if $state eq 'copy';
@@ -227,22 +217,19 @@
 
 if ( said $v_audrey_sound_play) {
     my $state = $v_audrey_sound_play->{state};
-    $v_audrey_sound_play->respond(
-        "Playing $Save{current_audrey} Audrey sound $state");
+    $v_audrey_sound_play->respond("Playing $Save{current_audrey} Audrey sound $state");
     get "http://$Save{current_audrey}/beep.shtml?0 $state";
 }
 
 if ( said $v_audrey_volume) {
     my $state = $v_audrey_volume->{state};
-    $v_audrey_volume->respond(
-        "Setting $Save{current_audrey} Audrey volume to $state");
+    $v_audrey_volume->respond("Setting $Save{current_audrey} Audrey volume to $state");
     get "http://$Save{current_audrey}/volume.shtml?$state";
 }
 
 if ( said $v_audrey_remote) {
     my $state = $v_audrey_remote->{state};
-    $v_audrey_remote->respond(
-        "Pushing $Save{current_audrey} Audrey button $state");
+    $v_audrey_remote->respond("Pushing $Save{current_audrey} Audrey button $state");
     $state = '@BRW'  if $state eq 'browser';
     $state = '@ADR'  if $state eq 'address_book';
     $state = '@DAT'  if $state eq 'date_book';
diff --git a/code/common/audrey_control2.pl b/code/common/audrey_control2.pl
index 1455077f4..99b607038 100644
--- a/code/common/audrey_control2.pl
+++ b/code/common/audrey_control2.pl
@@ -87,52 +87,35 @@
 
 # Voice commands for Audrey functions
 
-$v_audrey_mail_led_on =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light on" );
-$v_audrey_mail_led_off =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light off" );
-$v_audrey_mail_led_blink =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light blink" );
-
-$v_audrey_top_led_on =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey top light on" );
-$v_audrey_top_led_off =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey top light off" );
-$v_audrey_top_led_blink =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey top light blink" );
-
-$v_audrey_both_leds_on =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights on" );
-$v_audrey_both_leds_off =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights off" );
-$v_audrey_both_leds_blink =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights blink" );
-
-$v_audrey_screen_on = new Voice_Cmd( "Set [" . $listNM . "] Audrey screen on" );
-$v_audrey_screen_off =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey screen off" );
-
-$v_audrey_photos =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey to photo screen" );
+$v_audrey_mail_led_on    = new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light on" );
+$v_audrey_mail_led_off   = new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light off" );
+$v_audrey_mail_led_blink = new Voice_Cmd( "Set [" . $listNM . "] Audrey mail light blink" );
+
+$v_audrey_top_led_on    = new Voice_Cmd( "Set [" . $listNM . "] Audrey top light on" );
+$v_audrey_top_led_off   = new Voice_Cmd( "Set [" . $listNM . "] Audrey top light off" );
+$v_audrey_top_led_blink = new Voice_Cmd( "Set [" . $listNM . "] Audrey top light blink" );
+
+$v_audrey_both_leds_on    = new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights on" );
+$v_audrey_both_leds_off   = new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights off" );
+$v_audrey_both_leds_blink = new Voice_Cmd( "Set [" . $listNM . "] Audrey both lights blink" );
+
+$v_audrey_screen_on  = new Voice_Cmd( "Set [" . $listNM . "] Audrey screen on" );
+$v_audrey_screen_off = new Voice_Cmd( "Set [" . $listNM . "] Audrey screen off" );
+
+$v_audrey_photos = new Voice_Cmd( "Set [" . $listNM . "] Audrey to photo screen" );
 
 $v_audrey_wav = new Voice_Cmd( "Set [" . $listNM . "] Audrey to a wav file" );
 
-$v_audrey_tagline =
-  new Voice_Cmd( "Read tag line to [" . $listNM . "] Audrey" );
+$v_audrey_tagline = new Voice_Cmd( "Read tag line to [" . $listNM . "] Audrey" );
 
 $v_audrey_music_on  = new Voice_Cmd( "Set [" . $listNM . "] Audrey music on" );
 $v_audrey_music_off = new Voice_Cmd( "Set [" . $listNM . "] Audrey music off" );
 
-$v_audrey_volume_0 =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 0" );
-$v_audrey_volume_20 =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 20" );
-$v_audrey_volume_50 =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 50" );
-$v_audrey_volume_75 =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 75" );
-$v_audrey_volume_100 =
-  new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 100" );
+$v_audrey_volume_0   = new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 0" );
+$v_audrey_volume_20  = new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 20" );
+$v_audrey_volume_50  = new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 50" );
+$v_audrey_volume_75  = new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 75" );
+$v_audrey_volume_100 = new Voice_Cmd( "Set [" . $listNM . "] Audrey Volume to 100" );
 
 $v_audrey_reboot = new Voice_Cmd( "Reboot [" . $listNM . "] Audrey" );
 
@@ -426,12 +409,10 @@ sub audrey {
 
                 #get "http://$address/cgi-bin/mpctrl?action=$astate&file=http://192.168.0.150:8010";
                 if ( $config_parms{mp3_stream_server_port} ) {
-                    $audrey_cmd =
-                      "http://$address/cgi-bin/mpctrl?action=$astate\\&file=$config_parms{mp3_stream_server_port}";
+                    $audrey_cmd = "http://$address/cgi-bin/mpctrl?action=$astate\\&file=$config_parms{mp3_stream_server_port}";
                 }
                 else {
-                    $audrey_cmd =
-                      "http://$address/cgi-bin/mpctrl?action=$astate\\&file=http://192.168.0.150:8010";
+                    $audrey_cmd = "http://$address/cgi-bin/mpctrl?action=$astate\\&file=http://192.168.0.150:8010";
                 }
             }
             elsif ( $mode eq 'volume' ) {
diff --git a/code/common/audrey_monitor.pl b/code/common/audrey_monitor.pl
index 280612647..25b2cad6d 100644
--- a/code/common/audrey_monitor.pl
+++ b/code/common/audrey_monitor.pl
@@ -39,8 +39,7 @@
         my $AResetting = "";
 
         # For fun lets see if we have a MrAudrey Image running
-        my $audreyInfo = get "http://$Aip[$Acount]/SystemProfile.shtml",
-          "/dev/null";
+        my $audreyInfo = get "http://$Aip[$Acount]/SystemProfile.shtml", "/dev/null";
         my ( $audreyHead, $audreyString ) = split '\:<br>\W', $audreyInfo;
         my ( $audreyVer,  $audreyRest )   = split '<br>',     $audreyString;
         ( $audreyHead,   $audreyRest ) = split '</b></br>\W', $audreyHead;
@@ -50,8 +49,7 @@
 
         # First we ping Audrey to see if she is responding
         if ( !&net_ping( $Aip[$Acount] ) ) {
-            speak $Aname[$Acount]
-              . " Audrey not responding, resetting her power.";
+            speak $Aname[$Acount] . " Audrey not responding, resetting her power.";
             eval "set_with_timer \$audrey_power_$Aname[$Acount] OFF, 1";
             $AResetting = "$Aname[$Acount]";
         }
@@ -63,14 +61,12 @@
 
         if ( !$AResetting ) {
             if ( !$audreyInfo ) {
-                speak
-                  "$Aname[$Acount] Audrey Server not responding, resetting her power.";
+                speak "$Aname[$Acount] Audrey Server not responding, resetting her power.";
                 eval "set_with_timer \$audrey_power_$Aname[$Acount] OFF, 1";
                 $AResetting = "$Aname[$Acount]";
             }
             else {
-                print_log
-                  "The $Aname[$Acount] Audrey at $Aip[$Acount] is UP and Serving - OK";
+                print_log "The $Aname[$Acount] Audrey at $Aip[$Acount] is UP and Serving - OK";
             }
 
         }
diff --git a/code/common/audreyspeak.pl b/code/common/audreyspeak.pl
index f303c55c4..ba120a553 100644
--- a/code/common/audreyspeak.pl
+++ b/code/common/audreyspeak.pl
@@ -111,8 +111,7 @@ sub file_ready_for_audrey {
         my ( $room, $ip ) = $audrey =~ /(\S+)\-(\S+)/;
         $room = lc $room;
         if ( grep( /$room/, @{ $parms{audreySpeakRooms} } ) ) {
-            run
-              "get_url -quiet http://$ip/mhspeak.shtml?http://$MHWeb/$speakFile /dev/null";
+            run "get_url -quiet http://$ip/mhspeak.shtml?http://$MHWeb/$speakFile /dev/null";
         }
     }
 }
diff --git a/code/common/audreyspeak_volume.pl b/code/common/audreyspeak_volume.pl
index 761217dbd..15f2f7d18 100644
--- a/code/common/audreyspeak_volume.pl
+++ b/code/common/audreyspeak_volume.pl
@@ -62,8 +62,7 @@
 &Speak_parms_add_hook( \&Audrey_volume_adjust ) if $Reload;
 &Play_parms_add_hook( \&Audrey_volume_adjust )  if $Reload;
 
-my ( $audreyWrIndex, $audreyRdIndex, $audreyMaxIndex, @speakRooms,
-    @speakVolume );
+my ( $audreyWrIndex, $audreyRdIndex, $audreyMaxIndex, @speakRooms, @speakVolume );
 
 #MH is about to say or play something.  Adjust the volume if necessary.
 sub Audrey_volume_adjust {
@@ -74,8 +73,7 @@ sub Audrey_volume_adjust {
       or (  $Save{mode}
         and ( $Save{mode} eq 'mute' or $Save{mode} eq 'offline' )
         and $$parms{mode} !~ /unmute/i );
-    $volume =~ s/%//g
-      ; # Audrey doesn't like percent signs in the volume setting.  It should be a raw number from 0 to 100.
+    $volume =~ s/%//g;    # Audrey doesn't like percent signs in the volume setting.  It should be a raw number from 0 to 100.
 
     #   my $MHWeb = get_ip_address . ":" . $config_parms{http_port};
     #   my $MHWeb = hostname() . ":" . $config_parms{http_port};
@@ -102,8 +100,7 @@ sub Audrey_volume_adjust {
             my $ip   = $2;
             if ( grep( /$room/, @rooms ) ) {
                 push @audreyRooms, $room;
-                run
-                  "get_url -quiet http://$ip/cgi-bin/volume?$volume /dev/null";
+                run "get_url -quiet http://$ip/cgi-bin/volume?$volume /dev/null";
             }
         }
         @rooms = @audreyRooms;
diff --git a/code/common/azureus_info.pl b/code/common/azureus_info.pl
index 1bd48e015..ff1f9f4d3 100644
--- a/code/common/azureus_info.pl
+++ b/code/common/azureus_info.pl
@@ -76,24 +76,18 @@
 
     if ( not defined @{ $ref->{DOWNLOADS}->{DOWNLOAD} } ) {
         my @tmp_acn =
-          keys %active_torrents;  #only print error if there are active torrents
-        print_log
-          "AzInfo: WARNING: Torrent array undefined! ($#tmp_acn active torrents)"
+          keys %active_torrents;    #only print error if there are active torrents
+        print_log "AzInfo: WARNING: Torrent array undefined! ($#tmp_acn active torrents)"
           if ( $#tmp_acn >= 1 );
     }
     else {
 
         foreach my $torrent ( @{ $ref->{DOWNLOADS}->{DOWNLOAD} } ) {
-            print
-              "DB: $Time_Now Looking for $torrent->{TORRENT}->{HASH}=$active_torrents{$torrent->{TORRENT}->{HASH}}->{NAME}\n"
+            print "DB: $Time_Now Looking for $torrent->{TORRENT}->{HASH}=$active_torrents{$torrent->{TORRENT}->{HASH}}->{NAME}\n"
               if $az_debug;
             print Dumper(%active_torrents) if $az_debug;
-            unless (
-                defined $active_torrents{ $torrent->{TORRENT}->{HASH} }->{NAME}
-              )
-            {
-                print_log
-                  "Torrent: New torrent $torrent->{TORRENT}->{NAME} added.";
+            unless ( defined $active_torrents{ $torrent->{TORRENT}->{HASH} }->{NAME} ) {
+                print_log "Torrent: New torrent $torrent->{TORRENT}->{NAME} added.";
                 my ($t_notify) =
                   split( /[\.' '_]/, $torrent->{TORRENT}->{NAME} );
                 speak( rooms => "all", text => "Download $t_notify started" );
@@ -107,45 +101,36 @@
 
             }
             else {
-                print
-                  "DB: $Time_Now Updating $torrent->{TORRENT}->{HASH}=$active_torrents{$torrent->{TORRENT}->{HASH}}->{NAME}\n"
+                print "DB: $Time_Now Updating $torrent->{TORRENT}->{HASH}=$active_torrents{$torrent->{TORRENT}->{HASH}}->{NAME}\n"
                   if $az_debug;
                 $active_torrents{ $torrent->{TORRENT}->{HASH} }->{FLAG} = 2;
-                unless ( $active_torrents{ $torrent->{TORRENT}->{HASH} }
-                    ->{DOWNLOAD_STATUS} eq $torrent->{DOWNLOAD_STATUS} )
-                {
-                    print_log
-                      "Torrent: $torrent->{TORRENT}->{NAME} Changed status to $torrent->{DOWNLOAD_STATUS}";
+                unless ( $active_torrents{ $torrent->{TORRENT}->{HASH} }->{DOWNLOAD_STATUS} eq $torrent->{DOWNLOAD_STATUS} ) {
+                    print_log "Torrent: $torrent->{TORRENT}->{NAME} Changed status to $torrent->{DOWNLOAD_STATUS}";
                     if ( $torrent->{DOWNLOAD_STATUS} eq 'Seeding' ) {
                         my ($t_notify) =
                           split( /[\.' '_]/, $torrent->{TORRENT}->{NAME} );
-                        print_log
-                          "Torrent: $torrent->{TORRENT}->{NAME} completed at $Time_Now";
+                        print_log "Torrent: $torrent->{TORRENT}->{NAME} completed at $Time_Now";
                         speak(
                             rooms => "all",
                             text  => "Download $t_notify completed"
                         );
                     }
-                    $active_torrents{ $torrent->{TORRENT}->{HASH} }
-                      ->{DOWNLOAD_STATUS} = $torrent->{DOWNLOAD_STATUS};
+                    $active_torrents{ $torrent->{TORRENT}->{HASH} }->{DOWNLOAD_STATUS} = $torrent->{DOWNLOAD_STATUS};
                 }
 
                 #-------------------------------------------------------
                 # Test area for active torrents
                 if ( ( $torrent->{HASH_FAILS} > 50 )
-                    and
-                    !$active_torrents{ $torrent->{TORRENT}->{HASH} }->{HASH_ERR}
-                  )
+                    and !$active_torrents{ $torrent->{TORRENT}->{HASH} }->{HASH_ERR} )
                 {
-                    $active_torrents{ $torrent->{TORRENT}->{HASH} }->{HASH_ERR}
-                      = 1;
-                    print_log
-                      "Torrent: Warning! $torrent->{TORRENT}->{NAME} has more than 50 hash errors!";
+                    $active_torrents{ $torrent->{TORRENT}->{HASH} }->{HASH_ERR} =
+                      1;
+                    print_log "Torrent: Warning! $torrent->{TORRENT}->{NAME} has more than 50 hash errors!";
                     my ($t_notify) =
                       split( /[\.' '_]/, $torrent->{TORRENT}->{NAME} );
                     speak(
                         rooms => "all",
-                        text => "Download $t_notify has a high number of errors"
+                        text  => "Download $t_notify has a high number of errors"
                     );
                 }
 
@@ -156,34 +141,21 @@
                             (
                                 $torrent->{DOWNLOADED}->{RAW} -
                                   $torrent->{DISCARDED}->{RAW} -
-                                  (
-                                    $torrent->{HASH_FAILS} *
-                                      $torrent->{TORRENT}->{PIECE_LENGTH}
-                                  )
+                                  ( $torrent->{HASH_FAILS} * $torrent->{TORRENT}->{PIECE_LENGTH} )
                             ) / $torrent->{TORRENT}->{SIZE}->{RAW}
                         ) * $config_parms{azinfo_progress}
                     );
-                    if (
-                        int($t_completed) !=
-                        $active_torrents{ $torrent->{TORRENT}->{HASH} }
-                        ->{COMPLETION} )
-                    {
-                        my $t_save =
-                          $active_torrents{ $torrent->{TORRENT}->{HASH} }
-                          ->{COMPLETION} * $config_parms{azinfo_file};
-                        $active_torrents{ $torrent->{TORRENT}->{HASH} }
-                          ->{COMPLETION} = int($t_completed);
+                    if ( int($t_completed) != $active_torrents{ $torrent->{TORRENT}->{HASH} }->{COMPLETION} ) {
+                        my $t_save = $active_torrents{ $torrent->{TORRENT}->{HASH} }->{COMPLETION} * $config_parms{azinfo_file};
+                        $active_torrents{ $torrent->{TORRENT}->{HASH} }->{COMPLETION} = int($t_completed);
                         my $t_db = $t_completed;
-                        $t_completed = $t_completed *
-                          ( 100 / $config_parms{azinfo_progress} );
-                        print_log
-                          "Torrent: $torrent->{TORRENT}->{NAME} now at $t_completed%";
+                        $t_completed = $t_completed * ( 100 / $config_parms{azinfo_progress} );
+                        print_log "Torrent: $torrent->{TORRENT}->{NAME} now at $t_completed%";
                         my ($t_notify) =
                           split( /[\.' '_]/, $torrent->{TORRENT}->{NAME} );
                         speak(
                             rooms => "all",
-                            text =>
-                              "Download $t_notify now at $t_completed percent"
+                            text  => "Download $t_notify now at $t_completed percent"
                         ) if ( $t_completed < 100 );
                     }
                 }
@@ -194,19 +166,16 @@
         }
 
         while ( my $hash = each %active_torrents ) {
-            print
-              "DB: $Time_Now Checking for removal $hash=$active_torrents{$hash}->{NAME}\n"
+            print "DB: $Time_Now Checking for removal $hash=$active_torrents{$hash}->{NAME}\n"
               if $az_debug;
             if ( $active_torrents{$hash}->{FLAG} == 0 ) {
-                print_log
-                  "Torrent: $active_torrents{$hash}->{NAME} Has been removed";
+                print_log "Torrent: $active_torrents{$hash}->{NAME} Has been removed";
                 delete $active_torrents{$hash};
                 print Dumper(%active_torrents) if $az_debug;
             }
             else {
                 $active_torrents{$hash}->{FLAG}--;
-                print
-                  "DB: $Time_Now Found $hash=$active_torrents{$hash}->{NAME} flag=$active_torrents{$hash}->{FLAG}\n"
+                print "DB: $Time_Now Found $hash=$active_torrents{$hash}->{NAME} flag=$active_torrents{$hash}->{FLAG}\n"
                   if $az_debug;
 
             }
@@ -223,8 +192,7 @@ sub web_torrents {
     my $html_footer    = ();
     my $tor_dl         = 0;
     my $tor_seed       = 0;
-    my $name_length =
-      45;    ## Limited to 45 characters to display nice on the Audrey's
+    my $name_length    = 45;    ## Limited to 45 characters to display nice on the Audrey's
 
     #if file doesn't exist print error, else
     if ( not( -f $config_parms{azinfo_file} ) ) {
@@ -253,8 +221,7 @@ sub web_torrents {
 </style>
 </head>
 <body>"
-          . &html_header(
-            "Error: Temporary problem reading stats file. Try again");
+          . &html_header("Error: Temporary problem reading stats file. Try again");
         $html .= "</body>";
         my $html_page = &html_page( '', $html );
         return &html_page( '', $html );
@@ -264,12 +231,10 @@ sub web_torrents {
 
         if ( $torrent->{DOWNLOAD_STATUS} eq 'Seeding' ) {
             $tor_seed++;
-            $html_seed_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
+            $html_seed_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
             my $t_name = sprintf( "%-30s", $torrent->{TORRENT}->{NAME} );
             $html_seed_data .= "<td nowrap>$t_name</td>";
-            $html_seed_data .=
-              "<td nowrap>$torrent->{UPLOAD_SPEED}->{TEXT}</td><tr>\n";
+            $html_seed_data .= "<td nowrap>$torrent->{UPLOAD_SPEED}->{TEXT}</td><tr>\n";
         }
 
         else {
@@ -286,8 +251,7 @@ sub web_torrents {
 
             my $t_name = $torrent->{TORRENT}->{NAME};
             if ( length( $torrent->{TORRENT}->{NAME} ) > $name_length ) {
-                $t_name = substr( $torrent->{TORRENT}->{NAME}, 0,
-                    ( $name_length - 3 ) );
+                $t_name = substr( $torrent->{TORRENT}->{NAME}, 0, ( $name_length - 3 ) );
                 $t_name .= "...";
             }
             my $t_completed = sprintf(
@@ -296,32 +260,26 @@ sub web_torrents {
                     (
                         $torrent->{DOWNLOADED}->{RAW} -
                           $torrent->{DISCARDED}->{RAW} -
-                          (
-                            $torrent->{HASH_FAILS} *
-                              $torrent->{TORRENT}->{PIECE_LENGTH}
-                          )
+                          ( $torrent->{HASH_FAILS} * $torrent->{TORRENT}->{PIECE_LENGTH} )
                     ) / $torrent->{TORRENT}->{SIZE}->{RAW}
                 ) * 100
             );
 
-            $html_dl_data .=
-              "<td nowrap><a href=\"SUB?web_torrent_details($torrent->{TORRENT}->{HASH})\">$t_name</a></td>";
+            $html_dl_data .= "<td nowrap><a href=\"SUB?web_torrent_details($torrent->{TORRENT}->{HASH})\">$t_name</a></td>";
 
             if ( $torrent->{DOWNLOAD_STATUS} =~ m/downloading/i ) {
-                if ( $torrent->{ETA} eq chr(0x221e) )
-                {    ##www1.tip.nl/~t876506/utf8tbl.html
+                if ( $torrent->{ETA} eq chr(0x221e) ) {    ##www1.tip.nl/~t876506/utf8tbl.html
                     $html_dl_data .= "<td nowrap><i>tbd</i></td>";
                 }
                 else {
                     $html_dl_data .= "<td nowrap>$torrent->{ETA}</td>";
                 }
             }
-            else {    #Problem with torrent, not downloading
+            else {                                         #Problem with torrent, not downloading
                 $html_dl_data .= "<td nowrap>$torrent->{DOWNLOAD_STATUS}</td>";
             }
             $html_dl_data .= "<td nowrap>$t_completed</td>";
-            $html_dl_data .=
-              "<td nowrap>$torrent->{DOWNLOAD_SPEED}->{TEXT}</td>";
+            $html_dl_data .= "<td nowrap>$torrent->{DOWNLOAD_SPEED}->{TEXT}</td>";
             $html_dl_data .= "</tr>\n";
         }
     }
@@ -343,10 +301,8 @@ sub web_torrents {
     $html_seed_hdr .=
       "<table width=100% cellspacing=2><tbody><font face=COURIER size=2><tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left'>Name";
     if ( $config_parms{azinfo_webgui} ) {
-        $html_seed_hdr .=
-          "  <a href=\"SUB;referer?web_torrent_control(seeds,startall)\">( START ALL )</a>   ";
-        $html_seed_hdr .=
-          "  <a href=\"SUB;referer?web_torrent_control(seeds,stopall)\">( STOP ALL )</a>   ";
+        $html_seed_hdr .= "  <a href=\"SUB;referer?web_torrent_control(seeds,startall)\">( START ALL )</a>   ";
+        $html_seed_hdr .= "  <a href=\"SUB;referer?web_torrent_control(seeds,stopall)\">( STOP ALL )</a>   ";
     }
     $html_seed_hdr .= "</th><th align='left'>Upload Speed</th>";
 
@@ -368,13 +324,10 @@ sub web_torrents {
         $html .=
           "<table width=100% cellspacing=2><tbody><font face=COURIER size=2><tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left'>Name";
         if ( $config_parms{azinfo_webgui} ) {
-            $html .=
-              "  <a href=\"SUB;no_response?web_torrent_control(downloads,startall)\">( START ALL )</a>   ";
-            $html .=
-              "  <a href=\"SUB;no_response?web_torrent_control(downloads,stopall)\">( STOP ALL )</a>   ";
+            $html .= "  <a href=\"SUB;no_response?web_torrent_control(downloads,startall)\">( START ALL )</a>   ";
+            $html .= "  <a href=\"SUB;no_response?web_torrent_control(downloads,stopall)\">( STOP ALL )</a>   ";
         }
-        $html .=
-          "</th><th align='left'>ETA</th><th align='left'>Completed</th><th align='left'>Download Speed</th>";
+        $html .= "</th><th align='left'>ETA</th><th align='left'>Completed</th><th align='left'>Download Speed</th>";
         $html .= $html_dl_data;
     }
 
@@ -416,13 +369,7 @@ sub web_torrent_details {
         return &html_page( '', $html );
     }
 
-    my $ref = eval {
-        XMLin(
-            $config_parms{azinfo_file},
-            forcearray    => ['DOWNLOAD'],
-            suppressempty => undef
-        );
-    };
+    my $ref = eval { XMLin( $config_parms{azinfo_file}, forcearray => ['DOWNLOAD'], suppressempty => undef ); };
     if ($@) {
         print_log "AzInfo_Web: ERROR: Problem parsing Azureus Stats XML:$@";
         my $html = "<html>
@@ -433,8 +380,7 @@ sub web_torrent_details {
 </style>
 </head>
 <body>"
-          . &html_header(
-            "Error: Temporary problem reading stats file. Try again");
+          . &html_header("Error: Temporary problem reading stats file. Try again");
         $html .= "</body>";
         my $html_page = &html_page( '', $html );
         return &html_page( '', $html );
@@ -453,14 +399,11 @@ sub web_torrent_details {
             $html_data .=
               "<table width=100% cellspacing=2><tbody><font face=COURIER size=2><tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left' colspan=\"3\">Transfer";
             if ( $config_parms{azinfo_webgui} ) {
-                $html_data .=
-                  "  <a href=\"SUB;referer?web_torrent_control($torrent->{TORRENT}->{HASH},start)\">(START)</a>   ";
-                $html_data .=
-                  "  <a href=\"SUB;referer?web_torrent_control($torrent->{TORRENT}->{HASH},stop)\">(STOP)</a>   ";
+                $html_data .= "  <a href=\"SUB;referer?web_torrent_control($torrent->{TORRENT}->{HASH},start)\">(START)</a>   ";
+                $html_data .= "  <a href=\"SUB;referer?web_torrent_control($torrent->{TORRENT}->{HASH},stop)\">(STOP)</a>   ";
             }
             $html_data .= "</th>\n";
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
             $html_data .= "<td nowrap>Time Elapsed: $torrent->{ELAPSED}</td>";
             $html_data .= "<td nowrap>Time Remaining:";
             if ( $torrent->{ETA} eq chr(0x221e) ) {
@@ -475,45 +418,31 @@ sub web_torrent_details {
                     (
                         $torrent->{DOWNLOADED}->{RAW} -
                           $torrent->{DISCARDED}->{RAW} -
-                          (
-                            $torrent->{HASH_FAILS} *
-                              $torrent->{TORRENT}->{PIECE_LENGTH}
-                          )
+                          ( $torrent->{HASH_FAILS} * $torrent->{TORRENT}->{PIECE_LENGTH} )
                     ) / $torrent->{TORRENT}->{SIZE}->{RAW}
                 ) * 100
             );
             $html_data .= "<td nowrap>Completed: $t_completed</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td nowrap>Downloaded: $torrent->{DOWNLOADED}->{TEXT}</td>";
-            $html_data .=
-              "<td nowrap>Download Speed: $torrent->{DOWNLOAD_SPEED}->{TEXT}</td>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td nowrap>Downloaded: $torrent->{DOWNLOADED}->{TEXT}</td>";
+            $html_data .= "<td nowrap>Download Speed: $torrent->{DOWNLOAD_SPEED}->{TEXT}</td>";
             $html_data .= "<td ";
             if ( $torrent->{HASH_FAILS} > 30 ) {
                 $html_data .= "bgcolor='#FFCC00' ";
             }
-            $html_data .=
-              "nowrap>Hash Fails: $torrent->{HASH_FAILS}</td></tr>\n";
+            $html_data .= "nowrap>Hash Fails: $torrent->{HASH_FAILS}</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td nowrap>Uploaded: $torrent->{UPLOADED}->{TEXT}</td>";
-            $html_data .=
-              "<td nowrap>Upload Speed: $torrent->{UPLOAD_SPEED}->{TEXT}</td>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td nowrap>Uploaded: $torrent->{UPLOADED}->{TEXT}</td>";
+            $html_data .= "<td nowrap>Upload Speed: $torrent->{UPLOAD_SPEED}->{TEXT}</td>";
             my $t_ratio = $torrent->{SHARE_RATIO} / 1000;
             $html_data .= "<td nowrap>Share Ratio: $t_ratio</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td nowrap>Seeds: $torrent->{TOTAL_SEEDS} Connected</td>";
-            $html_data .=
-              "<td nowrap>Peers: $torrent->{TOTAL_LEECHERS} Connected</td>";
-            $html_data .=
-              "<td nowrap>Swarm Speed: $torrent->{TOTAL_SPEED}->{TEXT}</td></tr>\n";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td nowrap>Seeds: $torrent->{TOTAL_SEEDS} Connected</td>";
+            $html_data .= "<td nowrap>Peers: $torrent->{TOTAL_LEECHERS} Connected</td>";
+            $html_data .= "<td nowrap>Swarm Speed: $torrent->{TOTAL_SPEED}->{TEXT}</td></tr>\n";
 
             $html_data .= "</table>\n";
 
@@ -521,42 +450,30 @@ sub web_torrent_details {
             $html_data .=
               "<table width=100% cellspacing=2><tbody><font face=COURIER size=2><tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left' colspan=\"3\">Info</th>";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
             my $t_name = sprintf( "%-30s", $torrent->{TORRENT}->{NAME} );
-            $html_data .=
-              "<td colspan=\"3\" nowrap>File Name: $t_name</td></tr>";
+            $html_data .= "<td colspan=\"3\" nowrap>File Name: $t_name</td></tr>";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
             my $t_save = sprintf( "%-30s", $torrent->{DOWNLOAD_DIR} );
             $html_data .= "<td colspan=\"3\" nowrap>Save in: $t_save</td></tr>";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td colspan=\"3\" nowrap>Hash: $torrent->{TORRENT}->{HASH}</td></tr>\n";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td colspan=\"3\" nowrap>Hash: $torrent->{TORRENT}->{HASH}</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td nowrap>\# of Pieces: $torrent->{TORRENT}->{PIECE_COUNT}</td>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td nowrap>\# of Pieces: $torrent->{TORRENT}->{PIECE_COUNT}</td>";
             my $t_plength =
               sprintf( "%4.2f", $torrent->{TORRENT}->{PIECE_LENGTH} / 1000 );
             $html_data .= "<td nowrap>Size: $t_plength kb</td>\n";
-            $html_data .=
-              "<td nowrap>Total Size: $torrent->{TORRENT}->{SIZE}->{TEXT}</td></tr>\n";
+            $html_data .= "<td nowrap>Total Size: $torrent->{TORRENT}->{SIZE}->{TEXT}</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
-            $html_data .=
-              "<td nowrap>Tracker Status: $torrent->{TRACKER_STATUS}</td>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<td nowrap>Tracker Status: $torrent->{TRACKER_STATUS}</td>";
             my $t_time = gmtime $torrent->{TORRENT}->{CREATION_DATE};
-            $html_data .=
-              "<td colspan=\"2\" nowrap>Created on: $t_time</td></tr>\n";
+            $html_data .= "<td colspan=\"2\" nowrap>Created on: $t_time</td></tr>\n";
 
-            $html_data .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+            $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
             $html_data .= "<td colspan=\"3\" nowrap>Comment: ";
 
             if ( defined $torrent->{TORRENT}->{COMMENT} ) {
@@ -585,8 +502,7 @@ sub web_torrent_details {
 
     if ( $found == 0 ) {
         $html .= &html_header("Cannot find Torrent! ");
-        print_log
-          "Torrent: Error, Web_Torrent_Details cannot find torrent hash=$hash";
+        print_log "Torrent: Error, Web_Torrent_Details cannot find torrent hash=$hash";
     }
 
     $html .= "</body>";
@@ -599,8 +515,7 @@ sub web_torrent_details {
 sub web_torrent_control {
 
     my ( $hash, $action ) = @_;
-    my $control_url =
-      "http://$config_parms{azinfo_webgui_ip}:$config_parms{azinfo_webgui_port}/index.tmpl";
+    my $control_url = "http://$config_parms{azinfo_webgui_ip}:$config_parms{azinfo_webgui_port}/index.tmpl";
     my $control_id = substr $hash, 0, 5;
 
     print_log "AzInfo: AzControl: changing torrent $hash to $action";
diff --git a/code/common/barcode_inventory.pl b/code/common/barcode_inventory.pl
index 96488cee6..dd63a1dc7 100644
--- a/code/common/barcode_inventory.pl
+++ b/code/common/barcode_inventory.pl
@@ -17,8 +17,7 @@
     display $results;
 }
 
-if ( my $scan = state_now $barcode_data and state $barcode_mode =~ /inventory/ )
-{
+if ( my $scan = state_now $barcode_data and state $barcode_mode =~ /inventory/ ) {
     my ( $type, $code, $isbn ) = split ' ', $scan;
     my $mode = state $barcode_mode;
 
diff --git a/code/common/barcode_scan.pl b/code/common/barcode_scan.pl
index bf6444a0d..800d42703 100644
--- a/code/common/barcode_scan.pl
+++ b/code/common/barcode_scan.pl
@@ -23,21 +23,12 @@
 
 $barcode_data = new Generic_Item;
 $barcode_mode = new Generic_Item;
-$barcode_mode->set_states(
-    'web',
-    'add inventory',
-    'delete inventory',
-    'query inventory',
-    'clear inventory'
-);
+$barcode_mode->set_states( 'web', 'add inventory', 'delete inventory', 'query inventory', 'clear inventory' );
 $barcode_mode->set_authority('anyone');
 
-$v_barcode_mode = new Voice_Cmd(
-    'Change barcode scan to [entry,add inventory,delete inventory,query inventory,clear inventory] mode'
-);
-$v_barcode_mode->set_info(
-    'Controls what you want to do with barcode scans.  Web will create urls, inventory updates a database'
-);
+$v_barcode_mode =
+  new Voice_Cmd( 'Change barcode scan to [entry,add inventory,delete inventory,query inventory,clear inventory] mode' );
+$v_barcode_mode->set_info( 'Controls what you want to do with barcode scans.  Web will create urls, inventory updates a database' );
 $v_barcode_mode->set_authority('anyone');
 $v_barcode_mode->tie_items($barcode_mode);
 $v_barcode_mode->tie_event('respond "app=scanner Scanner set to $state mode"');
@@ -60,8 +51,7 @@
 
     my ( $scanner_sn, $type, $code ) = barcode_decode($state);
 
-    $state =~
-      s/^\..+?\./\./;    # Drop the scanner Serial Number data from the logs
+    $state =~ s/^\..+?\./\./;        # Drop the scanner Serial Number data from the logs
     ${ $$barcode_scan{state_log} }[0] = "$Time_Date $state";
     my $mode = state $barcode_mode;
     print_log "Barcode scan: $mode $state";
@@ -136,8 +126,7 @@
         }    # only if missing the CheckDigit
         $Info{barcode_data} = $code unless $Info{barcode_data};
         print_log "Barcode data: $type $code";
-        set $barcode_data
-          "$type $code"; # This is what get used elsewhere (e.g. barcode_web.pl)
+        set $barcode_data "$type $code";    # This is what get used elsewhere (e.g. barcode_web.pl)
     }
 }
 
diff --git a/code/common/barcode_web.pl b/code/common/barcode_web.pl
index 5a65eac81..bdcb9dbd9 100644
--- a/code/common/barcode_web.pl
+++ b/code/common/barcode_web.pl
@@ -18,8 +18,7 @@ sub barcode_web_results {
 
     # Build a web page with search options
     my $html;
-    $html .=
-      "<head><META HTTP-EQUIV='pragma' CONTENT='nocache'</meta></head>\n";
+    $html .= "<head><META HTTP-EQUIV='pragma' CONTENT='nocache'</meta></head>\n";
 
     #   $html .= "<META HTTP-EQUIV='expires' CONTENT='0'>\n";
     $html .= "<base target='other'>\n";
@@ -28,33 +27,29 @@ sub barcode_web_results {
 
     # If a book, fire the browser to Amazon
     if ($isbn) {
+        $html .= "<li><a href=http://www.amazon.com/exec/obidos/ISBN=$isbn>Amazon.com</a>\n";
         $html .=
-          "<li><a href=http://www.amazon.com/exec/obidos/ISBN=$isbn>Amazon.com</a>\n";
-        $html .=
-          "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
+            "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
           . "code=$isbn&mediaType=Book&searchType=ISBNUPC>Borders.com</a>\n";
-        $html .=
-          "<li><a href=http://shop.barnesandnoble.com/BookSearch/search.asp?ISBN=$isbn>Barnes & Nobel</a>\n";
-        $html .=
-          "<li><a href=http://www.price-hunter.net/booksearch/bottom.cgi?isbn=$isbn>Price-hunter price search</a>\n";
+        $html .= "<li><a href=http://shop.barnesandnoble.com/BookSearch/search.asp?ISBN=$isbn>Barnes & Nobel</a>\n";
+        $html .= "<li><a href=http://www.price-hunter.net/booksearch/bottom.cgi?isbn=$isbn>Price-hunter price search</a>\n";
     }
 
     # If a UPC ...
     else {
         #       $html .= "<li><a href=http://www.barpoint.com/frame.cfm?UPCNumber=$code>BarPoint: Most anything</a>\n";
         $html .=
-          "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
+            "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
           . "code=$code&mediaType=Music&searchType=ISBNUPC>Music search at borders.com</a>";
         $html .=
-          "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
+            "<li><a href=http://search.borders.com/fcgi-bin/db2www/search/search.d2w/Details?"
           . "code=$code&mediaType=Video&searchType=ISBNUPC>Video search at borders.com</a>";
+        $html .= "<li><a href=http://www.upcdatabase.com/item.pl?upc=$code>UPC search at upcdatabase.com</a>";
         $html .=
-          "<li><a href=http://www.upcdatabase.com/item.pl?upc=$code>UPC search at upcdatabase.com</a>";
-        $html .=
-          "<li><a href=http://wwwapps.ups.com/etracking/tracking.cgi?tracknums_displayed=5"
+            "<li><a href=http://wwwapps.ups.com/etracking/tracking.cgi?tracknums_displayed=5"
           . "&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber1=$code>UPS Tracking</a>\n";
         $html .=
-          "<li><a href=http://fedex.com/cgi-bin/tracking?action=track&language=english&cntry_code=us "
+            "<li><a href=http://fedex.com/cgi-bin/tracking?action=track&language=english&cntry_code=us "
           . "&tracknumbers=$code>FedEx Tracking</a>\n";
     }
 
diff --git a/code/common/benchmarks.pl b/code/common/benchmarks.pl
index 92e6ff09c..a4a153611 100644
--- a/code/common/benchmarks.pl
+++ b/code/common/benchmarks.pl
@@ -6,8 +6,7 @@
 #    mh -voice_cmd 0 -voice_text 0 -weeder_port none
 
 $v_what_speed = new Voice_Cmd 'What is your [max,normal] speed';
-$v_what_speed->set_info(
-    'Runs mh at max speed for a few seconds, then reports Passes Per Second');
+$v_what_speed->set_info('Runs mh at max speed for a few seconds, then reports Passes Per Second');
 
 $timer_speed_check = new Timer;
 if ( said $v_what_speed) {
@@ -33,18 +32,14 @@
     $Loop_Tk_Passes  = $config_parms{tk_passes};
     print "Speeds2 = @Loop_Speeds\n";
     $v_what_speed->respond(
-            "app=pc $Info{cpu_used}% of cpu, $Info{loop_speed} loops/sec, and "
-          . ( int $Info{memory_real} )
-          . " megabytes" );
+        "app=pc $Info{cpu_used}% of cpu, $Info{loop_speed} loops/sec, and " . ( int $Info{memory_real} ) . " megabytes" );
 }
 
 my $speed_benchmark_count = 0;
 
-$v_speed_benchmark =
-  new Voice_Cmd '[Start a by name,Start a by speed,Stop the] speed benchmark';
+$v_speed_benchmark = new Voice_Cmd '[Start a by name,Start a by speed,Stop the] speed benchmark';
 $v_speed_benchmark->set_info(
-    'This will suspend normal mh while it benchmarks each code member individually. It can take few minutes.'
-);
+    'This will suspend normal mh while it benchmarks each code member individually. It can take few minutes.' );
 if ( said $v_speed_benchmark) {
     my $msg;
     if ( $v_speed_benchmark->{state} eq 'Stop the' ) {
@@ -55,10 +50,7 @@
     else {
         $Benchmark_Members{on_off_flag} = $speed_benchmark_count = 1
           unless $speed_benchmark_count;
-        $msg =
-            'Speed benchmark started by '
-          . ( ( $v_speed_benchmark->{state} =~ /name/i ) ? 'name' : 'speed' )
-          . '.';
+        $msg = 'Speed benchmark started by ' . ( ( $v_speed_benchmark->{state} =~ /name/i ) ? 'name' : 'speed' ) . '.';
     }
     $v_speed_benchmark->respond("app=pc $msg");
 
@@ -66,18 +58,11 @@
 $speed_benchmark_count++ if $speed_benchmark_count;
 
 if ( $speed_benchmark_count and ( new_second 5 or said $v_speed_benchmark) ) {
-    my $log =
-      "Benchmark report.  Loop count=$speed_benchmark_count.  The following is in milliseconds\n";
+    my $log = "Benchmark report.  Loop count=$speed_benchmark_count.  The following is in milliseconds\n";
     my $by_speed = ( state $v_speed_benchmark =~ /speed/ ) ? 1 : 0;
     my @log;
-    for my $member (
-        sort {
-            $by_speed and ( $Benchmark_Members{$b} <=> $Benchmark_Members{$a} )
-              or $a cmp $b
-        } ' OTHER',
-        ' USER',
-        keys %Run_Members
-      )
+    for my $member ( sort { $by_speed and ( $Benchmark_Members{$b} <=> $Benchmark_Members{$a} ) or $a cmp $b } ' OTHER',
+        ' USER', keys %Run_Members )
     {    # Use Run_Members so we get all members on the 1st pass
         push @log, sprintf "  %-22s avg=%5.2f total=%5d", $member,
           $Benchmark_Members{$member} / $speed_benchmark_count,
@@ -88,10 +73,7 @@
     if ( $#log > 100 ) {
         my $i = 1 + int $#log / 3;
         for my $j ( 0 .. $i ) {
-            $log .=
-                $log[$j] . " | "
-              . $log[ $j + $i ] . " | "
-              . $log[ $j + 2 * $i ] . "\n";
+            $log .= $log[$j] . " | " . $log[ $j + $i ] . " | " . $log[ $j + 2 * $i ] . "\n";
         }
     }
     elsif ( $#log > 20 ) {
diff --git a/code/common/bsc.pl b/code/common/bsc.pl
index a4aa28a6c..66f40ba1a 100644
--- a/code/common/bsc.pl
+++ b/code/common/bsc.pl
@@ -39,7 +39,7 @@
 
 my $bsc_prefer_abstract = $::config_parms{bsc_prefer_abstract};
 $bsc_prefer_abstract = 0
-  unless $bsc_prefer_abstract;   # support x10 devices in favor of abstract ones
+  unless $bsc_prefer_abstract;    # support x10 devices in favor of abstract ones
 
 if ($::Startup) {
     $bsc_x10_device      = new BSCMH_Item(BSCMH_Item::DEVICE_TYPE_X10);
@@ -56,8 +56,7 @@
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_TRANSMITTER);
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_RF_RECEIVER);
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_GARAGE_DOOR);
-        $bsc_x10_device
-          ->register_device_type(BSCMH_Item::X10_IRRIGATION_CONTROLLER);
+        $bsc_x10_device->register_device_type(BSCMH_Item::X10_IRRIGATION_CONTROLLER);
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_SWITCHLINC);
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_TEMPLINC);
         $bsc_x10_device->register_device_type(BSCMH_Item::X10_OTE);
@@ -71,8 +70,7 @@
 
     # TO-DO handle ability to enable/disable presence monitoring
     if ( 1 == 1 ) {
-        $bsc_presence_device
-          ->register_device_type(BSCMH_Item::PRESENCE_MONITOR);
+        $bsc_presence_device->register_device_type(BSCMH_Item::PRESENCE_MONITOR);
     }
 
     # initiate sending a block of info messages for all devices handled by this BSCMH item
diff --git a/code/common/callerid.pl b/code/common/callerid.pl
index 60eba3060..fb1b8e6e8 100644
--- a/code/common/callerid.pl
+++ b/code/common/callerid.pl
@@ -33,22 +33,16 @@
 =cut
 
 # Use this for each of your cid hardware interfaces
-$cid_interface1 = new Telephony_Interface(
-    $config_parms{callerid_name},
-    $config_parms{callerid_port},
-    $config_parms{callerid_type}
-);
+$cid_interface1 =
+  new Telephony_Interface( $config_parms{callerid_name}, $config_parms{callerid_port}, $config_parms{callerid_type} );
 $cid_item = new CID_Lookup($cid_interface1);
 
 my $cid_interface2;
 
 if ( $Startup and defined( $config_parms{callerid2_name} ) ) {
     print_log("Creating and adding 2nd Caller ID interface");
-    $cid_interface2 = new Telephony_Interface(
-        $config_parms{callerid2_name},
-        $config_parms{callerid2_port},
-        $config_parms{callerid2_type}
-    );
+    $cid_interface2 =
+      new Telephony_Interface( $config_parms{callerid2_name}, $config_parms{callerid2_port}, $config_parms{callerid2_type} );
     {
         $cid_item->add($cid_interface2);
     }    # the brace brackets keep mh from pulling this line out of the loop
@@ -61,9 +55,8 @@
 $PhoneKillTimer = new Timer;
 
 # These objects will enable cid logging and announcing
-$cid_log = new CID_Log($cid_item);    # Enables logging
-$cid_server =
-  new CID_Server($cid_item);   # Enables YAC, Acid, and xAP/xPL callerid clients
+$cid_log    = new CID_Log($cid_item);       # Enables logging
+$cid_server = new CID_Server($cid_item);    # Enables YAC, Acid, and xAP/xPL callerid clients
 
 # Add one of these for each YAC client:  http://www.sunflowerhead.com/software/yac
 #$cid_client1 = new CID_Server_YAC('localhost');
@@ -74,27 +67,20 @@
 #$cid_announce  = new CID_Announce($cid_item, 'Call from $first $last');
 
 # Setup commands we can use to run tests without the modem
-$cid_interface_test = new Voice_Cmd(
-    'Test callerid [0,1,2,3,4,5,6,7,8,9,offhook,UKknown,UK unknown]');
+$cid_interface_test = new Voice_Cmd('Test callerid [0,1,2,3,4,5,6,7,8,9,offhook,UKknown,UK unknown]');
 if ( defined( $state = state_now $cid_interface_test) ) {
     set_test $cid_interface1 'RING' if $state == 0;
-    set_test $cid_interface1
-      'DATE = 1215 TIME = 1249 NMBR = 5071234560 NAME = WINTER LAUREL  '
+    set_test $cid_interface1 'DATE = 1215 TIME = 1249 NMBR = 5071234560 NAME = WINTER LAUREL  '
       if $state == 1;
-    set_test $cid_interface1
-      'DATE = 1215 TIME = 1249 NAME = BUSH, GEORGE W  NMBR = 2021230001'
+    set_test $cid_interface1 'DATE = 1215 TIME = 1249 NAME = BUSH, GEORGE W  NMBR = 2021230001'
       if $state == 2;
-    set_test $cid_interface2
-      '###DATE12151248...NMBR2021230002...NAMEBUSH GEORGE +++'
+    set_test $cid_interface2 '###DATE12151248...NMBR2021230002...NAMEBUSH GEORGE +++'
       if $state == 3;
-    set_test $cid_interface1
-      'DATE = 1215 TIME = 1249 NMBR = 4061230003      NAME = '
+    set_test $cid_interface1 'DATE = 1215 TIME = 1249 NMBR = 4061230003      NAME = '
       if $state == 4;
-    set_test $cid_interface1
-      'DATE = 1215 TIME = 1249 NAME = BUSH GEORGE W   NMBR = 2021230003'
+    set_test $cid_interface1 'DATE = 1215 TIME = 1249 NAME = BUSH GEORGE W   NMBR = 2021230003'
       if $state == 5;
-    set_test $cid_interface1
-      'DATE = 1215 TIME = 1249 NAME = BUSH,GEORGE W   NMBR = 2021230003'
+    set_test $cid_interface1 'DATE = 1215 TIME = 1249 NAME = BUSH,GEORGE W   NMBR = 2021230003'
       if $state == 6;
     set_test $cid_interface2 '###DATE01061252...NMBR...NAME-UNKNOWN CALLER-+++'
       if $state == 7;
@@ -146,9 +132,7 @@ sub phonestopper {
 
 sub cid_handler {
     my ( $p_state, $p_setby ) = @_;
-    print_log "Callerid: "
-      . $p_setby->cid_name() . ' '
-      . $p_setby->cid_number();
+    print_log "Callerid: " . $p_setby->cid_name() . ' ' . $p_setby->cid_number();
     my $msg = "\n\nPhone Call on $Time_Date";
     $msg .= "\nLine: " . $p_setby->address();
     $msg .= "\nFirst: " . $p_setby->first();
diff --git a/code/common/camera_gphoto2.pl b/code/common/camera_gphoto2.pl
index 56db8529e..4eb224b59 100644
--- a/code/common/camera_gphoto2.pl
+++ b/code/common/camera_gphoto2.pl
@@ -59,8 +59,7 @@
 =cut
 
 my $gphoto2_dir = "$config_parms{data_dir}/photos";
-my ( $gphoto2_state, $dir, $gphoto2_camera_cnt, $gphoto2_old_disk_cnt,
-    $gphoto2_new_disk_cnt, $gphoto2_file );
+my ( $gphoto2_state, $dir, $gphoto2_camera_cnt, $gphoto2_old_disk_cnt, $gphoto2_new_disk_cnt, $gphoto2_file );
 
 if ($Reload) {
     $gphoto2_dir = "$config_parms{gphoto2_dir}" if "$config_parms{gphoto2_dir}";
@@ -114,9 +113,7 @@
         if ( $config_parms{gphoto2_automatic} ) {
             if ( $gphoto2_camera_cnt > 0 ) {
                 $gphoto2_state = 'download';
-                speak( text =>
-                      "I found $gphoto2_camera_cnt digital camera images for download"
-                );
+                speak( text => "I found $gphoto2_camera_cnt digital camera images for download" );
             }
             else {
                 $gphoto2_state = 'idle';
@@ -124,9 +121,7 @@
         }
         else {
             print_log "gphoto detect: $gphoto2_camera_cnt images found";
-            speak( text =>
-                  "I found $gphoto2_camera_cnt digital camera images for download"
-            );
+            speak( text => "I found $gphoto2_camera_cnt digital camera images for download" );
         }
     }
 
@@ -142,11 +137,8 @@
         close DIR;
         $gphoto2_new_disk_cnt -= $gphoto2_old_disk_cnt;
         if ( $gphoto2_new_disk_cnt == $gphoto2_camera_cnt ) {
-            print_log
-              "$gphoto2_new_disk_cnt images successfully downloaded from digital camera";
-            speak( text =>
-                  "$gphoto2_new_disk_cnt images successfully downloaded from digital camera"
-            );
+            print_log "$gphoto2_new_disk_cnt images successfully downloaded from digital camera";
+            speak( text => "$gphoto2_new_disk_cnt images successfully downloaded from digital camera" );
             if ( $config_parms{gphoto2_automatic} ) {
                 $gphoto2_state = 'erase';
             }
@@ -165,11 +157,8 @@
 
     # erase is now complete, let's clean up our state
     elsif ( $gphoto2_state eq 'erase' ) {
-        print_log
-          "$gphoto2_camera_cnt images successfully erased from digital camera";
-        speak( text =>
-              "$gphoto2_camera_cnt images successfully erased from digital camera"
-        );
+        print_log "$gphoto2_camera_cnt images successfully erased from digital camera";
+        speak( text => "$gphoto2_camera_cnt images successfully erased from digital camera" );
         if ( $config_parms{gphoto2_automatic} ) {
             $gphoto2_state = 'idle';
         }
@@ -235,8 +224,7 @@
         }
         else {
             print_log "gphoto download: no images detected for download";
-            speak( text =>
-                  "sorry, no digital camera images detected for download" );
+            speak( text => "sorry, no digital camera images detected for download" );
         }
     }
 
@@ -252,9 +240,7 @@
         }
         else {
             print_log "digital camera erase disabled, last download failed";
-            speak( text =>
-                  "sorry, digital camera erase disabled, last download failed"
-            );
+            speak( text => "sorry, digital camera erase disabled, last download failed" );
         }
     }
 }
diff --git a/code/common/clock_map2.pl b/code/common/clock_map2.pl
index 9cd3b21fb..1bdea36be 100644
--- a/code/common/clock_map2.pl
+++ b/code/common/clock_map2.pl
@@ -11,9 +11,8 @@
   "http://www.fourmilab.ch/cgi-bin/uncgi/Earth?img=learth.evif&imgsize=150&dynimg=y&opt=-p&lat=&lon=&alt=&tle=&date=0&utc=&jd=";
 my $MAPDIR    = "$Pgm_Root/web/newclock/maps";
 my $f_get_map = "$config_parms{data_dir}/earth_jpg.data";
-my $min_size = 20000;    #minimum size to test if a jpg has been downloaded
-$p_get_map = new Process_Item(
-    "get_url -quiet \"$URL\" $config_parms{data_dir}/earth_jpg.data");
+my $min_size  = 20000;                                      #minimum size to test if a jpg has been downloaded
+$p_get_map = new Process_Item("get_url -quiet \"$URL\" $config_parms{data_dir}/earth_jpg.data");
 
 # Update earth.jpg for each Hour, once a week
 
diff --git a/code/common/cm11_control.pl b/code/common/cm11_control.pl
index 47417cafd..c0439ec83 100644
--- a/code/common/cm11_control.pl
+++ b/code/common/cm11_control.pl
@@ -11,8 +11,7 @@
         if ( $state eq 'Stop' or $state eq 'Reset' ) {
             if ( $main::Serial_Ports{'cm11'}{object}->close ) {
                 print "CM11 port was closed\n";
-                delete $Serial_Ports{object_by_port}
-                  { $Serial_Ports{'cm11'}{port} };
+                delete $Serial_Ports{object_by_port}{ $Serial_Ports{'cm11'}{port} };
             }
             else {
                 print "CM11 port failed to close\n";
diff --git a/code/common/cm11_monitor.pl b/code/common/cm11_monitor.pl
index b8f7277cd..947947a53 100644
--- a/code/common/cm11_monitor.pl
+++ b/code/common/cm11_monitor.pl
@@ -10,8 +10,7 @@
 $cm11_monitor         = new Generic_Item();
 $timer_x10_inactivity = new Timer();
 $v_cm11_control       = new Voice_Cmd "[Start,Stop,Reset] the CM11 port";
-$v_cm11_control->set_info(
-    'Controls the CM11 X10 controller. Reset if it sticks.');
+$v_cm11_control->set_info('Controls the CM11 X10 controller. Reset if it sticks.');
 if ($Reload) {
     Serial_data_add_hook( \&cm11_monitor );
     my $timeout = $config_parms{cm11_timeout};
@@ -33,8 +32,8 @@ sub cm11_monitor {
 
     print_log "Reset cm11 inactivity timer $current_unit $state"
       if $config_parms{x10_errata} >= 3;
-    set $timer_x10_inactivity 1800, \&cm11_unstick
-      ; #every half hour without activity triggers a restart.  Otherwise cm11 remains lost in space."
+    set $timer_x10_inactivity 1800,
+      \&cm11_unstick;    #every half hour without activity triggers a restart.  Otherwise cm11 remains lost in space."
 }
 
 sub cm11_unstick {
@@ -61,8 +60,7 @@ sub cm11_control {
         if ( $state eq 'Stop' or $state eq 'Reset' ) {
             if ( $main::Serial_Ports{'cm11'}{object}->close ) {
                 print "CM11 port was closed\n" if $Debug{cm11};
-                delete $Serial_Ports{object_by_port}
-                  { $Serial_Ports{'cm11'}{port} };
+                delete $Serial_Ports{object_by_port}{ $Serial_Ports{'cm11'}{port} };
             }
             else {
                 print "CM11 port failed to close\n" if $Debug{cm11};
diff --git a/code/common/comic_dailystrips.pl b/code/common/comic_dailystrips.pl
index b02b0ec0b..f3740d5ee 100644
--- a/code/common/comic_dailystrips.pl
+++ b/code/common/comic_dailystrips.pl
@@ -13,8 +13,7 @@
 
 $v_dailystrip_update = new Voice_Cmd '[Update,Clean] the daily comic strips';
 $v_dailystrip_update->set_info(
-    "Runs the dailystrip program to retrieve comics specified in mh.ini parm comics: $config_parms{comics}"
-);
+    "Runs the dailystrip program to retrieve comics specified in mh.ini parm comics: $config_parms{comics}" );
 
 # *** We need to get the corners and FP icons, etc. out of the graphics root!
 # *** set_icon short-circuits the matching logic with no recourse
@@ -24,8 +23,7 @@
 if ( $state = said $v_dailystrip_update) {
     my $comics_dir = &html_alias('/comics');
     if ( $state eq 'Update' ) {
-        $v_dailystrip_update->respond(
-            "app=comics Retrieving daily comic strips...");
+        $v_dailystrip_update->respond("app=comics Retrieving daily comic strips...");
         my $cmd = "${Pgm_Path}/mh -run dailystrips ";
         $cmd .= "--defs $config_parms{html_dir}/comics/dailystrips/strips.def ";
         $cmd .= "--local --basedir $comics_dir --save --nostale ";
@@ -38,8 +36,7 @@
         run $cmd;
     }
     else {
-        $v_dailystrip_update->respond(
-            "app=comics Cleaning out old comic strips...");
+        $v_dailystrip_update->respond("app=comics Cleaning out old comic strips...");
         run "mh -run dailystrips-clean --dir $comics_dir 14";
     }
 }
@@ -47,8 +44,7 @@
 $v_dailystrips_email = new Voice_Cmd 'Email daily comics';
 
 if ( said $v_dailystrips_email) {
-    $v_dailystrips_email->respond(
-        "app=comics image=email Mailing daily comic strips...");
+    $v_dailystrips_email->respond("app=comics image=email Mailing daily comic strips...");
     my $comics_dir = &html_alias('/comics');
     my $to         = $config_parms{comics_sendto} || "";
     my $baseref    = $config_parms{comics_baseref}
@@ -69,13 +65,11 @@
     &trigger_set(
         "time_now '4 am' and net_connect_check",
         "run_voice_cmd 'Update the daily comic strips'",
-        'NoExpire',
-        'update comics'
+        'NoExpire', 'update comics'
     ) unless &trigger_get('update comics');
     &trigger_set(
         "time_now '5 am' and net_connect_check",
         "run_voice_cmd 'Clean the daily comic strips'",
-        'NoExpire',
-        'clean comics'
+        'NoExpire', 'clean comics'
     ) unless &trigger_get('clean comics');
 }
diff --git a/code/common/computer_disk_space.pl b/code/common/computer_disk_space.pl
index 384d8ab16..0684b0d98 100644
--- a/code/common/computer_disk_space.pl
+++ b/code/common/computer_disk_space.pl
@@ -7,8 +7,7 @@
 if ($OS_win) {
     my $disk_drives = '';
     $disk_drives = join( ',', Win32::DriveInfo::DrivesInUse() );
-    $v_disk_space =
-      new Voice_Cmd("How much disk space is available on [$disk_drives]");
+    $v_disk_space = new Voice_Cmd("How much disk space is available on [$disk_drives]");
     $v_disk_space->set_info('This works only on Windows platforms');
     $v_disk_space2 = new Voice_Cmd("Show disk space");
     $v_disk_space2->set_info('Shows disk space on all drives');
@@ -21,19 +20,14 @@
 # Create trigger to check disk space requirements periodically
 
 if ($Reload) {
-    &trigger_set(
-        "time_cron '0 18 * * 6'",
-        "run_voice_cmd('Check disk space')",
-        'NoExpire',
-        'check disk space'
-    ) unless &trigger_get('check disk space');
+    &trigger_set( "time_cron '0 18 * * 6'", "run_voice_cmd('Check disk space')", 'NoExpire', 'check disk space' )
+      unless &trigger_get('check disk space');
 }
 
 if ( said $v_disk_space3) {
     my $drive;
 
-    if ( $Pgm_Path =~ /^([A-Z]):/i )
-    {    # Need check for network shares (\\machine\share)
+    if ( $Pgm_Path =~ /^([A-Z]):/i ) {    # Need check for network shares (\\machine\share)
 
         my $msg       = '';
         my $important = 0;
@@ -44,18 +38,15 @@
         $free = int( $free / 10**6 );
 
         if ( $free < 1000 ) {
-            $msg =
-              ' That is cutting it close. Time to empty the recycle bin and clear temporary Internet files.';
+            $msg       = ' That is cutting it close. Time to empty the recycle bin and clear temporary Internet files.';
             $important = 1;
         }
 
         $v_disk_space3->respond(
-            "app=pc important=$important I am installed on drive $drive. There are $free megabytes free.$msg"
-        );
+            "app=pc important=$important I am installed on drive $drive. There are $free megabytes free.$msg" );
     }
     else {
-        $v_disk_space3->respond(
-            "app=pc I cannot determine the drive space requirements");
+        $v_disk_space3->respond("app=pc I cannot determine the drive space requirements");
     }
 
 }
@@ -64,12 +55,7 @@
     my $state = $v_disk_space->{state};
     my ( $total, $free ) = ( Win32::DriveInfo::DriveSpace($state) )[ 5, 6 ];
     $v_disk_space->respond(
-        sprintf(
-            "app=pc There is %d out of %d megabytes of space available on drive $state",
-            $free / 10**6,
-            $total / 10**6
-        )
-    );
+        sprintf( "app=pc There is %d out of %d megabytes of space available on drive $state", $free / 10**6, $total / 10**6 ) );
 }
 
 if ( said $v_disk_space2) {
@@ -88,15 +74,13 @@
         $free_by_drive{$drive}  = $free;
         $report .= sprintf( "%14s: %6.1f / %6.1f\n", $drive, $free, $total );
     }
-    $report .=
-      "\n\nDisk drive space (free / total megabytes) sorted by free space:\n";
+    $report .= "\n\nDisk drive space (free / total megabytes) sorted by free space:\n";
     for my $drive (
         sort { $free_by_drive{$a} <=> $free_by_drive{$b} or $a cmp $b }
         keys %free_by_drive
       )
     {
-        $report .= sprintf( "%14s: %6.1f / %6.1f\n",
-            $drive, $free_by_drive{$drive}, $total_by_drive{$drive} );
+        $report .= sprintf( "%14s: %6.1f / %6.1f\n", $drive, $free_by_drive{$drive}, $total_by_drive{$drive} );
     }
     display $report, 30, 'Disk use report', 'fixed';
     $v_disk_space2->respond("app=pc Here is the report on disk space.");
diff --git a/code/common/deep_thought.pl b/code/common/deep_thought.pl
index f6cb7b89a..0a38e37b3 100644
--- a/code/common/deep_thought.pl
+++ b/code/common/deep_thought.pl
@@ -5,17 +5,14 @@
 
 #noloop=start
 my $f_deep_thought = "$config_parms{data_dir}/remarks/deep_thought.txt";
-$f_deep_thoughts =
-  new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
+$f_deep_thoughts     = new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
 $v_deep_thought      = new Voice_Cmd('What is the deep thought');
 $v_deep_thought_next = new Voice_Cmd('What is the next deep thought');
-$v_deep_thought->set_info(
-    'The deep thoughts are creative, goofy, and fun sayings from SNL');
+$v_deep_thought->set_info('The deep thoughts are creative, goofy, and fun sayings from SNL');
 $v_deep_thought_next->set_authority('anyone');
 
 my $temp_deep_thought = join( ',', &Voice_Text::list_voices );
-$v_deep_thought_voice = new Voice_Cmd
-  "Speak deep thought with voice [$temp_deep_thought,random,next]";
+$v_deep_thought_voice = new Voice_Cmd "Speak deep thought with voice [$temp_deep_thought,random,next]";
 $v_deep_thought_voice->set_authority('anyone');
 
 $house_tagline = new File_Item("$config_parms{data_dir}/remarks/1100tags.txt");
@@ -25,8 +22,7 @@
 
 $v_deep_thought->tie_event('&read_deep_thought($v_deep_thought)');
 $v_deep_thought_next->tie_event('&read_deep_thought($v_deep_thought_next)');
-$v_deep_thought_voice->tie_event(
-    '&read_deep_thought($v_deep_thought_voice, $state)');
+$v_deep_thought_voice->tie_event('&read_deep_thought($v_deep_thought_voice, $state)');
 
 #noloop=stop
 
diff --git a/code/common/disable_code.pl b/code/common/disable_code.pl
index 75f0bf12e..4fbb4258f 100644
--- a/code/common/disable_code.pl
+++ b/code/common/disable_code.pl
@@ -9,17 +9,14 @@
 
 if ($Reload) {
     for my $member ( split ',', $Save{code_members_off} ) {
-        print_log
-          "Member $member has been disabled.  Re-enable with 'toggle code member $member'";
+        print_log "Member $member has been disabled.  Re-enable with 'toggle code member $member'";
         $code_members_off{$member}++;
         $Run_Members{$member} = 0;
     }
 }
 
-$v_toggle_run_members =
-  new Voice_Cmd "[Disable,Enable,List status of] all code files";
-$v_toggle_run_members->set_info(
-    'Use this for debug.  Turns all code files on or off');
+$v_toggle_run_members = new Voice_Cmd "[Disable,Enable,List status of] all code files";
+$v_toggle_run_members->set_info('Use this for debug.  Turns all code files on or off');
 
 if ( $state = said $v_toggle_run_members) {
     print_log "$state all code members";
@@ -66,10 +63,8 @@
 # Allow for disabling each member for a period of time
 my ( @disable_members, $disable_member, $disable_member_time );
 
-$disable_code =
-  new Voice_Cmd 'Disable code test [.01,.1,.3,.6,1,10,60,300] minutes';
-$disable_code->set_info(
-    'Use this to debug problems by sequentially turning off code files');
+$disable_code = new Voice_Cmd 'Disable code test [.01,.1,.3,.6,1,10,60,300] minutes';
+$disable_code->set_info('Use this to debug problems by sequentially turning off code files');
 $disable_code_timer = new Timer;
 
 if ( $state = said $disable_code) {
diff --git a/code/common/display_alpha.pl b/code/common/display_alpha.pl
index 6693b33d5..53a8a1387 100644
--- a/code/common/display_alpha.pl
+++ b/code/common/display_alpha.pl
@@ -25,10 +25,10 @@
   ; #(From status line Web script) In case mh_sound is not running ( *** Should use eval to trap errors here, rather than declaring the var)
 
 # noloop=start
-my $now_playing;   #last displayed song title
-my $player_mode;   #last reported mode
-my $timer_set_by;  #app that last set the display timer
-my $temp_flag;     # alternates between indoor and outdoor temperatures on clock
+my $now_playing;     #last displayed song title
+my $player_mode;     #last reported mode
+my $timer_set_by;    #app that last set the display timer
+my $temp_flag;       # alternates between indoor and outdoor temperatures on clock
 
 # noloop=stop
 
@@ -37,11 +37,10 @@
 $display_alpha_test1 = new Voice_Cmd
   "Test alpha display mode [hold,flash,rollup,rolldown,rollleft,rollright,wipeup,wipedown,wipeleft,wiperight,rollup2,auto,wipein2,wipeout2,wipein,wipeout,rotates,explode,clock,sparkle,twinkle,snow,interlock,switch,slide,spray,starburst,welcome,slotmachine,newsflash,trumpet,cyclecolors,thankyou,nosmoking,dontdrinkanddrive,runninganimal,fireworks,turbocar,cherrybomb]";
 $display_alpha_test1->set_info('Tests alphanumeric display modes');
-$display_alpha_test2 = new Voice_Cmd
-  "Test alpha display color [red,green,amber,darkred,darkgreen,brown,orange,yellow,rainbow1,rainbow2,mix,auto]";
+$display_alpha_test2 =
+  new Voice_Cmd "Test alpha display color [red,green,amber,darkred,darkgreen,brown,orange,yellow,rainbow1,rainbow2,mix,auto]";
 $display_alpha_test2->set_info('Tests alphanumeric display colors');
-$display_alpha_test3 =
-  new Voice_Cmd "Test alpha display font [small,large,fancy]";
+$display_alpha_test3 = new Voice_Cmd "Test alpha display font [small,large,fancy]";
 $display_alpha_test3->set_info('Tests alphanumeric display fonts');
 
 if ($Reload) {
@@ -80,9 +79,7 @@ sub display_im_message {
         #&display('wait=1 speed=faster device=alpha image=space3 mode=sparkle font=small .');
         #&display('wait=1 speed=faster device=alpha image=space2 font=small .');
         #&display('wait=1 device=alpha image=space mode=sparkle font=small .');
-        &display( "device=alpha mode=sparkle app="
-              . ( ( lc($pgm) eq 'aol' ) ? 'aim' : lc($pgm) )
-              . " $from:\x1c2$text" );
+        &display( "device=alpha mode=sparkle app=" . ( ( lc($pgm) eq 'aol' ) ? 'aim' : lc($pgm) ) . " $from:\x1c2$text" );
         &set_display_timer( 10, 'im' );
     }
 }
@@ -93,9 +90,7 @@ sub display_im_status {
         and $status ne $status_old
         and $user ne $config_parms{net_aim_name} )
     {
-        &display( "device=alpha app="
-              . ( ( lc($pgm) eq 'aol' ) ? 'aim' : lc($pgm) )
-              . " $user $status" );
+        &display( "device=alpha app=" . ( ( lc($pgm) eq 'aol' ) ? 'aim' : lc($pgm) ) . " $user $status" );
         &set_display_timer( 10, 'im' );
     }
 }
@@ -141,9 +136,7 @@ sub update_clock {
         # Allow for older format, displaying indoor/outdoor at the same time
         if ( $config_parms{Display_Alpha_clock_format} == 1 ) {
             $display = &time_date_stamp(8);    # 12:52
-            $display .= ' '
-              . int( $Weather{TempIndoor} ) . ' '
-              . int( $Weather{TempOutdoor} );
+            $display .= ' ' . int( $Weather{TempIndoor} ) . ' ' . int( $Weather{TempOutdoor} );
 
             #	$display .= ' ' . int($Weather{HumidOutdoor}) if defined $Weather{HumidOutdoor};
             $display .= ' ' . substr( $Day, 0, 1 ) . $Mday;
@@ -169,16 +162,13 @@ sub update_clock {
                 $temp_flag = !$temp_flag;
             }
             else {
-                if ( defined $Weather{TempIndoor} ) {  # Can fit one temperature
-                    $display .= " \x1c7\x1a5"
-                      . int( $Weather{TempIndoor} + .5 )
-                      ;    # '\x1c7' is inline code for color 7
+                if ( defined $Weather{TempIndoor} ) {    # Can fit one temperature
+                    $display .= " \x1c7\x1a5" . int( $Weather{TempIndoor} + .5 );    # '\x1c7' is inline code for color 7
                 }
                 elsif ( defined $Weather{TempOutdoor} ) {
                     my $color = '4';
                     $color = '2' if $Weather{TempOutdoor} < 80;
-                    $display .=
-                      " \x1c$color\x1a5" . int( $Weather{TempOutdoor} + .5 );
+                    $display .= " \x1c$color\x1a5" . int( $Weather{TempOutdoor} + .5 );
                 }
             }
         }
@@ -188,7 +178,7 @@ sub update_clock {
           if $Save{display_text} and ( $Time - $Save{display_time} ) < 400;
 
         if ( new_minute and !( $Minute % $freq ) )
-        { #display optional extra info every n minutes (and not when clock is forced after timer!)
+        {    #display optional extra info every n minutes (and not when clock is forced after timer!)
 
             my $options =
               ( $config_parms{Display_Alpha_clock_options} )
@@ -205,19 +195,12 @@ sub update_clock {
                         ) ? 'sunrise' : 'sunset';
                     }
                     if ( $parm eq 'sunrise' ) {
-                        &display(
-                            "wait=1 device=alpha app=sunrise image=sunset Rise $Time_Sunrise"
-                        );
-                        &display(
-                            "wait=1 device=alpha app=sunrise Rise $Time_Sunrise"
-                        );
+                        &display( "wait=1 device=alpha app=sunrise image=sunset Rise $Time_Sunrise" );
+                        &display( "wait=1 device=alpha app=sunrise Rise $Time_Sunrise" );
                     }
                     else {
-                        &display(
-                            "wait=1 device=alpha app=sunset image=sunrise Set $Time_Sunset"
-                        );
-                        &display(
-                            "wait=1 device=alpha app=sunset Set $Time_Sunset");
+                        &display( "wait=1 device=alpha app=sunset image=sunrise Set $Time_Sunset" );
+                        &display("wait=1 device=alpha app=sunset Set $Time_Sunset");
                     }
 
                     #display(device=>'alpha', speed=>'faster', mode=>'hold', image=>'sunrise', wait => 1, font=>'small', text=>"Sunset $Time_Sunset");
@@ -227,40 +210,29 @@ sub update_clock {
                 }
                 elsif ( $parm eq 'mode' ) {
                     if ( $Save{mode} ne 'normal' ) {
-                        &display(
-                            "wait=1 device=alpha image=house color=red mode=flash app=mode $Save{mode} mode"
-                        );
+                        &display( "wait=1 device=alpha image=house color=red mode=flash app=mode $Save{mode} mode" );
                     }
                     else {
-                        &display(
-                            "wait=1 device=alpha image=house app=mode Normal mode"
-                        );
+                        &display( "wait=1 device=alpha image=house app=mode Normal mode" );
                     }
                     if ( $mode_security->{state} eq 'armed' ) {
-                        &display(
-                            "wait=1 device=alpha color=red mode=flash app=security Security armed"
-                        );
+                        &display( "wait=1 device=alpha color=red mode=flash app=security Security armed" );
                     }
                     else {
-                        &display(
-                            "wait=1 device=alpha app=security Security unarmed"
-                        );
+                        &display( "wait=1 device=alpha app=security Security unarmed" );
                     }
                     if ( $mode_sleeping->{state} ne 'nobody' ) {
-                        &display(
-                            "wait=1 device=alpha color=red mode=flash app=security "
+                        &display( "wait=1 device=alpha color=red mode=flash app=security "
                               . ucfirst( $mode_sleeping->{state} )
                               . " are asleep" );
                     }
                 }
                 elsif ( $parm eq 'im' ) {
                     if ($oscar::aim_connected) {
-                        &display(
-                            "wait=1 device=alpha app=aol Connected to AOL");
+                        &display("wait=1 device=alpha app=aol Connected to AOL");
                     }
                     if ($oscar::icq_connected) {
-                        &display(
-                            "wait=1 device=alpha app=icq Connected to ICQ");
+                        &display("wait=1 device=alpha app=icq Connected to ICQ");
                     }
                 }
                 elsif ( $parm eq 'volume' ) {
@@ -269,9 +241,7 @@ sub update_clock {
                         my $sl_vol    = state $mh_volume;
                         my $vol_image = &volume_image($sl_vol);
 
-                        &display(
-                            "wait=1 device=alpha app=volume image=$vol_image Volume: $sl_vol"
-                        ) if defined $sl_vol;
+                        &display( "wait=1 device=alpha app=volume image=$vol_image Volume: $sl_vol" ) if defined $sl_vol;
                     }
 
                 }
@@ -281,9 +251,7 @@ sub update_clock {
                     if ( $Save{NowPlayingPlaylist} ) {
                         my $playlist = $Save{NowPlayingPlaylist};
                         $playlist =~ s/_/\x20/;
-                        &display(
-                            "wait=1 device=alpha app=music Playlist: $playlist"
-                        );
+                        &display( "wait=1 device=alpha app=music Playlist: $playlist" );
                     }
 
                     my $playing = $Save{NowPlaying};
@@ -294,28 +262,20 @@ sub update_clock {
                         $song = $playing unless $song;
 
                         if ( $Save{mp3_mode} == 1 ) {    #playing
-                            &display(
-                                "wait=1 device=alpha app=music image=play $song"
-                            );
+                            &display( "wait=1 device=alpha app=music image=play $song" );
                         }
                         elsif ( $Save{mp3_mode} == 3 ) {    #paused
-                            &display(
-                                "wait=1 device=alpha app=music image=pause $song"
-                            );
+                            &display( "wait=1 device=alpha app=music image=pause $song" );
                         }
                         elsif ( $Save{mp3_mode} == 0 ) {    #stopped
-                            &display(
-                                "wait=1 device=alpha app=music image=stop $song"
-                            );
+                            &display( "wait=1 device=alpha app=music image=stop $song" );
                         }
                         &display("wait=1 device=alpha mode=auto $artist")
                           if $artist;
                     }
 
-                    use vars '$dvd_marquee'
-                      ;    # In case no DVD-ROM or player installed/configured
-                    use vars '$dvd_player'
-                      ;    # In case no DVD-ROM or player installed/configured
+                    use vars '$dvd_marquee';                # In case no DVD-ROM or player installed/configured
+                    use vars '$dvd_player';                 # In case no DVD-ROM or player installed/configured
 
                     # *** Test without dvd module loaded!
 
@@ -334,9 +294,7 @@ sub update_clock {
 
                 }
                 elsif ( $parm eq 'email' ) {
-                    &display(
-                        "wait=1 device=alpha app=email Email: $Save{email_flag}"
-                    ) if $Save{email_flag};
+                    &display( "wait=1 device=alpha app=email Email: $Save{email_flag}" ) if $Save{email_flag};
                 }
                 elsif ( $parm eq 'weather' ) {
 
@@ -354,22 +312,15 @@ sub update_clock {
                       and $Weather{Warning} !~ /adjusted/i
                       and $Weather{Warning} !~ /updated/i
                       and $Weather{Warning} !~ /removed/i;
-                    &display(
-                        "wait=1 device=alpha app=weather $Weather{Summary_Short}"
-                    ) if $Weather{Summary_Short};
-                    &display(
-                        "wait=1 device=alpha app=weather $Weather{chance_of_rain}"
-                    ) if $Weather{chance_of_rain};
+                    &display( "wait=1 device=alpha app=weather $Weather{Summary_Short}" )  if $Weather{Summary_Short};
+                    &display( "wait=1 device=alpha app=weather $Weather{chance_of_rain}" ) if $Weather{chance_of_rain};
                 }
                 elsif ( $parm eq 'news' ) {
-                    &display(
-                        "wait=1 device=alpha app=news $Save{news_ap_headline}")
+                    &display("wait=1 device=alpha app=news $Save{news_ap_headline}")
                       if $Save{news_ap_headline};
                 }
                 elsif ( $parm eq 'stocks' ) {
-                    &display(
-                        "wait=1 device=alpha app=stocks $Save{stock_data1} $Save{stock_data2}"
-                    ) if $Save{stock_data1};
+                    &display( "wait=1 device=alpha app=stocks $Save{stock_data1} $Save{stock_data2}" ) if $Save{stock_data1};
                 }
                 elsif ( $parm eq 'tv' ) {
                     &display("wait=1 device=alpha app=tv $Save{tv_favorites}")
@@ -384,25 +335,17 @@ sub update_clock {
                       and defined $Weather{TempIndoor};
                 }
                 elsif ( $parm eq 'holiday' ) {
-                    &display(
-                        "wait=1 device=alpha app=holiday Today is $Holiday");
+                    &display("wait=1 device=alpha app=holiday Today is $Holiday");
                 }
                 elsif ( $parm eq 'demo' )
-                { # useless stuff to pad out default sequence (looks stupid if there aren't enough info providers)
-                    &display(
-                        "wait=1 device=alpha mode=nosmoking font=small It's bad for me"
-                    );
-                    &display(
-                        "wait=1 device=alpha app=games mode=slotmachine Play again in $freq minutes"
-                    );
-                    &display(
-                        "wait=1 device=alpha app=control mode=fireworks Misterhouse is cool!"
-                    );
+                {    # useless stuff to pad out default sequence (looks stupid if there aren't enough info providers)
+                    &display( "wait=1 device=alpha mode=nosmoking font=small It's bad for me" );
+                    &display( "wait=1 device=alpha app=games mode=slotmachine Play again in $freq minutes" );
+                    &display( "wait=1 device=alpha app=control mode=fireworks Misterhouse is cool!" );
                 }
 
             }
-            set_display_timer 60,
-              undef;    # *** Need heuristic here (60 may not be appropriate!)
+            set_display_timer 60, undef;    # *** Need heuristic here (60 may not be appropriate!)
         }
         display
           device => 'alpha',
@@ -413,8 +356,7 @@ sub update_clock {
 }
 
 &update_clock()
-  if
-  expired $display_alpha_timer; #will step on messages sent from other modules (logic belongs in pm)
+  if expired $display_alpha_timer;          #will step on messages sent from other modules (logic belongs in pm)
 
 # Allow for various incoming xAP data to be displayed
 # *** xAP monitoring of weather data belongs in its own module!
@@ -458,8 +400,7 @@ sub update_clock {
             $duration = $$p{'display.slimp3'}{duration};
             $color    = 'green';
         }
-        elsif ( $state =~ /display.alpha/ )
-        {    # *** What module sends these packets?
+        elsif ( $state =~ /display.alpha/ ) {    # *** What module sends these packets?
             $text     = $$p{'display.alpha'}{text};
             $mode     = $$p{'display.alpha'}{mode};
             $color    = $$p{'display.alpha'}{color};
@@ -469,8 +410,8 @@ sub update_clock {
 
     # Echo new music tracks (e.g. sent by slimserver)
     elsif ( $class eq 'xap-audio.playlist.event' and $state =~ /now.playing/ ) {
-        $text  = $$p{'now.playing'}{artist} . ': ' . $$p{'now.playing'}{title};
-        $color = 'orange';
+        $text     = $$p{'now.playing'}{artist} . ': ' . $$p{'now.playing'}{title};
+        $color    = 'orange';
         $duration = 10;
     }
     if ($text) {
@@ -516,10 +457,9 @@ sub Display_Alpha::send_hook {
 
     $duration = $parms{duration};
     $duration = $config_parms{Display_Alpha_echo_duration} unless $duration;
-    $duration = 45 unless $duration;    #default is 45 seconds
+    $duration = 45 unless $duration;                                           #default is 45 seconds
 
-    set_display_timer $duration,
-      undef;    #keeps the clock from overwriting the message too quickly
+    set_display_timer $duration, undef;    #keeps the clock from overwriting the message too quickly
 }
 
 if ( $state = said $display_alpha_test1) {
@@ -532,8 +472,7 @@ sub Display_Alpha::send_hook {
             or $state eq 'cyclecolors' )
       )
     {
-        respond
-          "This mode does not work on older displays. Default display should be in $state mode.";
+        respond "This mode does not work on older displays. Default display should be in $state mode.";
     }
     else {
         respond "Default display should be in $state mode.";
@@ -552,17 +491,15 @@ sub Display_Alpha::send_hook {
     respond "Default display should be in $state font.";
     display
       device => 'alpha',
-      text =>
-      "Testing font $state !@#$%^&*()0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-      font => $state;
+      text   => "Testing font $state !@#$%^&*()0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+      font   => $state;
 
 }
 
 # Trigger to update clock
 
 if ($Reload) {
-    &trigger_set( 'new_minute', '&update_clock', 'NoExpire',
-        'update alpha clock' )
+    &trigger_set( 'new_minute', '&update_clock', 'NoExpire', 'update alpha clock' )
       unless &trigger_get('update alpha clock');
 }
 
@@ -570,8 +507,7 @@ sub Display_Alpha::send_hook {
 
 if ($Startup) {
     display( device => 'alpha', text => 'System restarted', app => 'startup' );
-    set $display_alpha_timer 7
-      ;    # set timer here as this does not go through speech hook
+    set $display_alpha_timer 7;    # set timer here as this does not go through speech hook
 }
 
 # Echo local speech to the display
@@ -582,8 +518,7 @@ sub Display_Alpha::send_hook {
 
 if (    &can_interrupt('music')
     and $Save{NowPlaying}
-    and
-    ( $now_playing ne $Save{NowPlaying} or $player_mode != $Save{mp3_mode} ) )
+    and ( $now_playing ne $Save{NowPlaying} or $player_mode != $Save{mp3_mode} ) )
 {
     if ( $Save{mp3_mode} == 1 ) {    #playing
         my $playing = $Save{NowPlaying};
@@ -607,13 +542,13 @@ sub Display_Alpha::send_hook {
                 text   => $song
             );
         }
-        &set_display_timer( 12, 'music' );   #show new song title for 12 seconds
+        &set_display_timer( 12, 'music' );    #show new song title for 12 seconds
     }
     $now_playing = $Save{NowPlaying};
     $player_mode = $Save{mp3_mode};
 }
 
-my %da_data;                                 # noloop
+my %da_data;                                  # noloop
 
 if (    &can_interrupt('email')
     and $Save{email_flag}
@@ -626,14 +561,10 @@ sub Display_Alpha::send_hook {
 
     if ( $da_data{email_flag} =~ /^[ \d]+$/ ) {
         if ( $da_data{email_flag} < $Save{email_flag} ) {    #You have mail!
-            $email_msg =
-                'You have '
-              . ( $Save{email_flag} )
-              . ' email message'
-              . ( ( $Save{email_flag} > 1 ) ? 's' : '' );
+            $email_msg = 'You have ' . ( $Save{email_flag} ) . ' email message' . ( ( $Save{email_flag} > 1 ) ? 's' : '' );
         }
     }
-    else {    # Allow for non-numeric email flags
+    else {                                                   # Allow for non-numeric email flags
         if (    $da_data{email_flag}
             and $da_data{email_flag} ne $Save{email_flag} )
         {
@@ -642,7 +573,7 @@ sub Display_Alpha::send_hook {
     }
     if ($email_msg) {
         &display( device => 'alpha', app => 'email', text => $email_msg );
-        &set_display_timer( 12, 'email' );  #show new email count for 12 seconds
+        &set_display_timer( 12, 'email' );                   #show new email count for 12 seconds
     }
 
     $da_data{email_flag} = $Save{email_flag};
@@ -667,8 +598,7 @@ sub Display_Alpha::send_hook {
     $da_data{news_headline} = $Save{news_ap_headline};
 }
 
-if ( $Weather{Warning} and ( $da_data{weather_warning} ne $Weather{Warning} ) )
-{
+if ( $Weather{Warning} and ( $da_data{weather_warning} ne $Weather{Warning} ) ) {
 
     if (    $da_data{weather_warning} ne $Weather{Warning}
         and $Weather{Warning} !~ /updated/i
@@ -695,8 +625,7 @@ sub Display_Alpha::send_hook {
 
 }
 
-if ( $state = state_now $mh_volume)
-{    # *** Oops tk slider widget not setting state
+if ( $state = state_now $mh_volume) {    # *** Oops tk slider widget not setting state
     my $sl_vol    = state $mh_volume;
     my $vol_image = &volume_image($sl_vol);
 
diff --git a/code/common/display_mythtv.pl b/code/common/display_mythtv.pl
index e06d2b5f7..867fec3ec 100644
--- a/code/common/display_mythtv.pl
+++ b/code/common/display_mythtv.pl
@@ -24,12 +24,10 @@ sub display_mythtv {
     my $container = lc ${args}{container};
     my $text      = ${args}{text};
 
-    print_log
-      "display_mythtv() address=$address, container=$container, text=$text"
+    print_log "display_mythtv() address=$address, container=$container, text=$text"
       if $Debug{display_mythtv};
 
-    my $mythtv_osd =
-      new Socket_Item( undef, undef, $address, 'display_mythtv', 'udp' );
+    my $mythtv_osd = new Socket_Item( undef, undef, $address, 'display_mythtv', 'udp' );
     start $mythtv_osd;
 
     if ( not defined $container or $container eq '' or $container eq 'cid' ) {
@@ -60,8 +58,7 @@ sub display_mythtv {
 
     }
     else {
-        print_log
-          "display_mythtv: MythTV container \'$container\' not available";
+        print_log "display_mythtv: MythTV container \'$container\' not available";
     }
 
     stop $mythtv_osd;
diff --git a/code/common/display_osd232.pl b/code/common/display_osd232.pl
index fb5d161cf..7c1ee2acb 100644
--- a/code/common/display_osd232.pl
+++ b/code/common/display_osd232.pl
@@ -18,8 +18,7 @@
 
     &init_osd232();
 
-    my $weatherpage =
-      new Display_osd232page( PAGENAME => "Weather", FLIPRATE => 20 );
+    my $weatherpage = new Display_osd232page( PAGENAME => "Weather", FLIPRATE => 20 );
     $weatherpage->addline(
         "temptext",
         TEXT      => "Temp:",
@@ -91,8 +90,7 @@
         TEXTCOLOR => osdCLRwhite
     );
 
-    my $securitypage =
-      new Display_osd232page( PAGENAME => "Security", FLIPRATE => 5 );
+    my $securitypage = new Display_osd232page( PAGENAME => "Security", FLIPRATE => 5 );
     $securitypage->addline(
         "securitytext",
         TEXT      => "Last Security Event:",
diff --git a/code/common/display_slimserver.pl b/code/common/display_slimserver.pl
index 648227ed9..9a387ea21 100644
--- a/code/common/display_slimserver.pl
+++ b/code/common/display_slimserver.pl
@@ -58,8 +58,7 @@ sub slimserver_display {
         for my $player ( split ',', $config_parms{slimserver_players} ) {
             $player =~ s/^\s*(.*)\s*$/$1/;
             &xAP::send( 'xPL', "slimdev-slimserv.$player",
-                'osd.basic' =>
-                  { command => 'write', text => $text, delay => $duration } );
+                'osd.basic' => { command => 'write', text => $text, delay => $duration } );
         }
     }
     else {
diff --git a/code/common/dvd_player.pl b/code/common/dvd_player.pl
index 1eb1ff05c..686f763bd 100644
--- a/code/common/dvd_player.pl
+++ b/code/common/dvd_player.pl
@@ -49,13 +49,12 @@
 
 #***Point voice commands to error messages if objects not created!
 #***Set info, icons? Use info in help
-$v_dvd_control = new Voice_Cmd( "DVD movie [$dvd_states]", 0 );
-$v_dvd_movie =
-  new Voice_Cmd( "Show DVD movie [$config_parms{dvd_favorites}]", 0 );
-$v_dvd_attractions = new Voice_Cmd( "What is showing on DVD", 0 );
-$v_dvd_help        = new Voice_Cmd( "DVD movie help",         0 );
+$v_dvd_control     = new Voice_Cmd( "DVD movie [$dvd_states]",                       0 );
+$v_dvd_movie       = new Voice_Cmd( "Show DVD movie [$config_parms{dvd_favorites}]", 0 );
+$v_dvd_attractions = new Voice_Cmd( "What is showing on DVD",                        0 );
+$v_dvd_help        = new Voice_Cmd( "DVD movie help",                                0 );
 $f_dvd             = new File_Item("$Pgm_Path/dvd.txt");
-$p_dvd = new Process_Item("dir_to_file $config_parms{dvd_drive} dvd.txt");
+$p_dvd             = new Process_Item("dir_to_file $config_parms{dvd_drive} dvd.txt");
 
 #noloop=stop
 
@@ -87,8 +86,7 @@ sub refresh_marquee {
 if ( $state = said $v_dvd_attractions) {
     &refresh_marquee();
     &respond( "app=movie mode=rotates $config_parms{dvd_favorites}"
-          . ( ( $dvd_marquee->{state} ) ? " plus $dvd_marquee->{state}" : '' )
-    );
+          . ( ( $dvd_marquee->{state} ) ? " plus $dvd_marquee->{state}" : '' ) );
 }
 if ( $state = said $v_dvd_control) {
     &refresh_marquee() if $state eq 'play';
diff --git a/code/common/dvd_releases.pl b/code/common/dvd_releases.pl
index 0155c8a38..b73c0add6 100644
--- a/code/common/dvd_releases.pl
+++ b/code/common/dvd_releases.pl
@@ -5,12 +5,7 @@
 my $f_get_new_dvds    = "$config_parms{data_dir}/web/new_dvds.html";
 my $f_top_dvds        = "$config_parms{data_dir}/web/top_dvds.html";
 my $f_this_weeks_dvds = "$config_parms{data_dir}/web/this_weeks_dvds.html";
-my @dvd_sections      = (
-    'Top DVDs',
-    'This Week\'s New DVDs',
-    'Last Week\'s New DVDs',
-    'Next Week\'s New DVDs'
-);
+my @dvd_sections      = ( 'Top DVDs', 'This Week\'s New DVDs', 'Last Week\'s New DVDs', 'Next Week\'s New DVDs' );
 $v_get_new_dvds = new Voice_Cmd '[Get,Check] DVD Info';
 $v_get_new_dvds->set_info('Gets DVD information from the Internet');
 $v_read_new_dvds = new Voice_Cmd 'Read [' . ( join ',', @dvd_sections ) . ']';
@@ -18,8 +13,7 @@
 
 # *** Set authority to anyone for the last one!
 
-$p_get_new_dvds =
-  new Process_Item "get_url http://www.videoeta.com/dvd.html $f_get_new_dvds";
+$p_get_new_dvds = new Process_Item "get_url http://www.videoeta.com/dvd.html $f_get_new_dvds";
 
 if ( my $state = said $v_read_new_dvds) {
     if ( $Save{$state} ) {
@@ -54,12 +48,10 @@
         }
         if ( $section and $html =~ m|href="(.+)">(.+)</a><br>| ) {
             if ( $section eq "This Week's New DVDs" ) {
-                $this_week_html .=
-                  "<li><a href=\"http://www.videoeta.com$1\">$2</a></li>";
+                $this_week_html .= "<li><a href=\"http://www.videoeta.com$1\">$2</a></li>";
             }
             elsif ( $section eq "Top DVDs" ) {
-                $top_dvds_html .=
-                  "<li><a href=\"http://www.videoeta.com$1\">$2</a></li>";
+                $top_dvds_html .= "<li><a href=\"http://www.videoeta.com$1\">$2</a></li>";
             }
             else {
                 print $section;
@@ -90,27 +82,21 @@
 
 if ($Reload) {
     if ( $Run_Members{'internet_dialup'} ) {
-        &trigger_set(
-            "state_now \$net_connect eq 'connected'",
-            "run_voice_cmd 'Get DVD Info'",
-            'NoExpire',
-            'get dvd info'
-        ) unless &trigger_get('get dvd info');
+        &trigger_set( "state_now \$net_connect eq 'connected'", "run_voice_cmd 'Get DVD Info'", 'NoExpire', 'get dvd info' )
+          unless &trigger_get('get dvd info');
     }
     else {
         &trigger_set(
             "time_now '4 pm' and time_cron('* * * * 1') and &net_connect_check",
             "run_voice_cmd 'Get DVD Info'",
-            'NoExpire',
-            'get dvd info'
+            'NoExpire', 'get dvd info'
         ) unless &trigger_get('get dvd info');
     }
 
     &trigger_set(
         "time_now '5 pm' and time_cron('* * * * 1') and &net_connect_check",
         qq|run_voice_cmd "Read This Week's New DVDs"|,
-        'NoExpire',
-        'read dvd releases'
+        'NoExpire', 'read dvd releases'
     ) unless &trigger_get('read dvd releases');
 
 }
diff --git a/code/common/eBay.pl b/code/common/eBay.pl
index 1da273479..0ed2cc510 100644
--- a/code/common/eBay.pl
+++ b/code/common/eBay.pl
@@ -42,21 +42,16 @@
 $v_check_ebay = new Voice_Cmd('Check eBay');
 $v_check_ebay->set_info('Checks current eBay status');
 
-$f_ebay_login1_headers =
-  new File_Item "$config_parms{data_dir}/web/ebay_login1.headers";
-$p_ebay_login1 = new Process_Item(
-    qq[get_url -header "$f_ebay_login1_headers->{file}" "https://signin.ebay.com/ws2/eBayISAPI.dll?SignIn" "/dev/null" ]
-);
+$f_ebay_login1_headers = new File_Item "$config_parms{data_dir}/web/ebay_login1.headers";
+$p_ebay_login1         = new Process_Item(
+    qq[get_url -header "$f_ebay_login1_headers->{file}" "https://signin.ebay.com/ws2/eBayISAPI.dll?SignIn" "/dev/null" ] );
 
-$f_ebay_login2_html =
-  new File_Item "$config_parms{data_dir}/web/ebay_login2.html";
-$f_ebay_login2_headers =
-  new File_Item "$config_parms{data_dir}/web/ebay_login2.headers";
+$f_ebay_login2_html    = new File_Item "$config_parms{data_dir}/web/ebay_login2.html";
+$f_ebay_login2_headers = new File_Item "$config_parms{data_dir}/web/ebay_login2.headers";
 my $url_ebay_login2 = 'https://signin.ebay.com/ws/eBayISAPI.dll?UsingSSL=1';
 $p_ebay_login2 = new Process_Item;
 
-$f_ebay_watching =
-  new File_Item "$config_parms{data_dir}/web/ebay_watching.html";
+$f_ebay_watching = new File_Item "$config_parms{data_dir}/web/ebay_watching.html";
 my $url_ebay_watching =
   'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWatching&ssPageName=STRK:ME:LNLK';
 $p_ebay_watching = new Process_Item;
@@ -67,8 +62,7 @@
 $p_ebay_bidding = new Process_Item;
 
 $f_ebay_won = new File_Item "$config_parms{data_dir}/web/ebay_won.html";
-my $url_ebay_won =
-  'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWon&ssPageName=STRK:ME:LNLK';
+my $url_ebay_won = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayWon&ssPageName=STRK:ME:LNLK';
 $p_ebay_won = new Process_Item;
 
 $f_ebay_selling = new File_Item "$config_parms{data_dir}/web/ebay_selling.html";
@@ -77,18 +71,15 @@
 $p_ebay_selling = new Process_Item;
 
 $f_ebay_sold = new File_Item "$config_parms{data_dir}/web/ebay_sold.html";
-my $url_ebay_sold =
-  'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySold&ssPageName=STRK:ME:LNLK';
+my $url_ebay_sold = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBaySold&ssPageName=STRK:ME:LNLK';
 $p_ebay_sold = new Process_Item;
 
 $f_ebay_unsold = new File_Item "$config_parms{data_dir}/web/ebay_unsold.html";
-my $url_ebay_unsold =
-  'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayUnsold&ssPageName=STRK:ME:LNLK';
+my $url_ebay_unsold = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayUnsold&ssPageName=STRK:ME:LNLK';
 $p_ebay_unsold = new Process_Item;
 
 $f_ebay_lost = new File_Item "$config_parms{data_dir}/web/ebay_lost.html";
-my $url_ebay_lost =
-  'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayLost&ssPageName=STRK:ME:LNLK';
+my $url_ebay_lost = 'http://my.ebay.com/ws/eBayISAPI.dll?MyeBay&LogUID=slidekb&CurrentPage=MyeBayLost&ssPageName=STRK:ME:LNLK';
 $p_ebay_lost = new Process_Item;
 
 my $ebay_cookies;
@@ -98,14 +89,10 @@
 my $next_ebay_event          = 0;
 my $ebay_logging_in          = 0;
 my $ebay_last_error_reported = 0;
+my ( %ebay_watching, %ebay_bidding, %ebay_won, %ebay_selling, %ebay_sold, %ebay_unsold, %ebay_lost, %ebay_end_times );
 my (
-    %ebay_watching, %ebay_bidding, %ebay_won,  %ebay_selling,
-    %ebay_sold,     %ebay_unsold,  %ebay_lost, %ebay_end_times
-);
-my (
-    %last_ebay_watching, %last_ebay_bidding, %last_ebay_won,
-    %last_ebay_selling,  %last_ebay_sold,    %last_ebay_unsold,
-    %last_ebay_lost
+    %last_ebay_watching, %last_ebay_bidding, %last_ebay_won, %last_ebay_selling,
+    %last_ebay_sold,     %last_ebay_unsold,  %last_ebay_lost
 );
 
 sub report_ebay_error($) {
@@ -132,8 +119,7 @@ ($)
             }
             else {
                 $proceed = 0;
-                print_log
-                  "Allowing previous login attempt more time to complete";
+                print_log "Allowing previous login attempt more time to complete";
             }
         }
         if ($proceed) {
@@ -172,17 +158,14 @@ ($)
 sub get_ebay_data {
     print_log "eBay: Getting data...";
     unless ( $config_parms{eBay_check} ) {
-        $config_parms{eBay_check} =
-          'watching|bidding|won|selling|sold|unsold|lost';
+        $config_parms{eBay_check} = 'watching|bidding|won|selling|sold|unsold|lost';
     }
     if ( $config_parms{eBay_check} =~ /\bwatching\b/ ) {
 
         # Update watching
         unlink $f_ebay_watching->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_watching->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_watching" "$f_ebay_watching->{file}"]
-        );
+        $p_ebay_watching->set( qq[get_url -cookies "$cookies" "$url_ebay_watching" "$f_ebay_watching->{file}"] );
         $p_ebay_watching->start();
     }
 
@@ -191,9 +174,7 @@ sub get_ebay_data {
         # Update bidding
         unlink $f_ebay_bidding->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_bidding->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_bidding" "$f_ebay_bidding->{file}"]
-        );
+        $p_ebay_bidding->set( qq[get_url -cookies "$cookies" "$url_ebay_bidding" "$f_ebay_bidding->{file}"] );
         $p_ebay_bidding->start();
     }
 
@@ -202,9 +183,7 @@ sub get_ebay_data {
         # Update wins
         unlink $f_ebay_won->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_won->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_won" "$f_ebay_won->{file}"]
-        );
+        $p_ebay_won->set( qq[get_url -cookies "$cookies" "$url_ebay_won" "$f_ebay_won->{file}"] );
         $p_ebay_won->start();
     }
 
@@ -213,9 +192,7 @@ sub get_ebay_data {
         # Update selling
         unlink $f_ebay_selling->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_selling->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_selling" "$f_ebay_selling->{file}"]
-        );
+        $p_ebay_selling->set( qq[get_url -cookies "$cookies" "$url_ebay_selling" "$f_ebay_selling->{file}"] );
         $p_ebay_selling->start();
     }
 
@@ -224,9 +201,7 @@ sub get_ebay_data {
         # Update sold
         unlink $f_ebay_sold->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_sold->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_sold" "$f_ebay_sold->{file}"]
-        );
+        $p_ebay_sold->set( qq[get_url -cookies "$cookies" "$url_ebay_sold" "$f_ebay_sold->{file}"] );
         $p_ebay_sold->start();
     }
 
@@ -235,9 +210,7 @@ sub get_ebay_data {
         # Update unsold
         unlink $f_ebay_unsold->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_unsold->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_unsold" "$f_ebay_unsold->{file}"]
-        );
+        $p_ebay_unsold->set( qq[get_url -cookies "$cookies" "$url_ebay_unsold" "$f_ebay_unsold->{file}"] );
         $p_ebay_unsold->start();
     }
 
@@ -246,9 +219,7 @@ sub get_ebay_data {
         # Update not won
         unlink $f_ebay_lost->name;
         my $cookies = &cookies_generate($ebay_cookies);
-        $p_ebay_lost->set(
-            qq[get_url -cookies "$cookies" "$url_ebay_lost" "$f_ebay_lost->{file}"]
-        );
+        $p_ebay_lost->set( qq[get_url -cookies "$cookies" "$url_ebay_lost" "$f_ebay_lost->{file}"] );
         $p_ebay_lost->start();
     }
 }
@@ -275,16 +246,13 @@ ($$$$)
         run_voice_cmd 'Check eBay';
         return 'NOT LOGGED IN';
     }
-    elsif ( $line =~
-        /<a href="http:\/\/cgi\.ebay\.com\/ws\/[^"]+&amp;item=(\d+)&amp;[^"]+">([^<]+)<\/a>/
-      )
-    {
+    elsif ( $line =~ /<a href="http:\/\/cgi\.ebay\.com\/ws\/[^"]+&amp;item=(\d+)&amp;[^"]+">([^<]+)<\/a>/ ) {
+
         # watching/bidding/selling/unsold/(lost?) page: item number and title
         # won/sold page: item title
         if ( ( $type eq 'won' ) or ( $type eq 'sold' ) ) {
             unless ( $lastitem == $1 ) {
-                &report_ebay_error(
-                    "Parse Error: Item $1 does not match $lastitem");
+                &report_ebay_error("Parse Error: Item $1 does not match $lastitem");
             }
         }
         else {
@@ -293,29 +261,24 @@ ($$$$)
         $hashref->{$lastitem}{'title'} = &html_decode($2);
         print_log "eBay: $type item $lastitem ($hashref->{$lastitem}{'title'})";
     }
-    elsif ( $line =~
-        /<a href="http:\/\/feedback\.ebay\.com\/[^"]+&amp;item=(\d+)&amp;[^"]+"><strong>([^<]+)<\/strong><\/a>/
-      )
-    {
+    elsif ( $line =~ /<a href="http:\/\/feedback\.ebay\.com\/[^"]+&amp;item=(\d+)&amp;[^"]+"><strong>([^<]+)<\/strong><\/a>/ ) {
+
         # Won page: item number and seller
         # Sold page: item number and buyer
         $lastitem = $1;
         if ( $type eq 'won' ) {
             $hashref->{$lastitem}{'seller'} = &html_decode($2);
-            print_log
-              "eBay: Seller for item $lastitem is $hashref->{$lastitem}{'seller'}"
+            print_log "eBay: Seller for item $lastitem is $hashref->{$lastitem}{'seller'}"
               if $main::Debug{ebay};
         }
         elsif ( $type eq 'sold' ) {
             $hashref->{$lastitem}{'buyer'} = &html_decode($2);
-            print_log
-              "eBay: Buyer for item $lastitem is $hashref->{$lastitem}{'buyer'}"
+            print_log "eBay: Buyer for item $lastitem is $hashref->{$lastitem}{'buyer'}"
               if $main::Debug{ebay};
         }
     }
-    elsif ( $line =~
-        /^<td align="right" class="([^"]+)" nowrap="true">(\$\d+\.\d+)</ )
-    {
+    elsif ( $line =~ /^<td align="right" class="([^"]+)" nowrap="true">(\$\d+\.\d+)</ ) {
+
         # watching/bidding/selling page: price and status
         # Class is 'normal' if you have not bid yet
         # Class is 'failed' if you have bid and are losing
@@ -360,11 +323,8 @@ ($$$$)
         # watching page: # of bids
         # selling page: # of bids (first) and number of questions
         # won/sold page: quantity won
-        if (
-               ( $type eq 'watching' )
-            or
-            ( ( $type eq 'selling' ) and ( not $hashref->{$lastitem}{'bids'} ) )
-          )
+        if (   ( $type eq 'watching' )
+            or ( ( $type eq 'selling' ) and ( not $hashref->{$lastitem}{'bids'} ) ) )
         {
             $hashref->{$lastitem}{'bids'} = $1;
             print_log "eBay: Number of bids for item $lastitem is $1"
@@ -381,10 +341,8 @@ ($$$$)
               if $main::Debug{ebay};
         }
     }
-    elsif ( $line =~
-        /<a href="http:\/\/feedback\.ebay\.com\/[^"]+&amp;item=(\d+)&amp;[^"]+">([^<]+)<\/a>/
-      )
-    {
+    elsif ( $line =~ /<a href="http:\/\/feedback\.ebay\.com\/[^"]+&amp;item=(\d+)&amp;[^"]+">([^<]+)<\/a>/ ) {
+
         # watching page: seller id
         # selling page: high bidder id
         unless ( $lastitem == $1 ) {
@@ -392,14 +350,12 @@ ($$$$)
         }
         if ( $type eq 'watching' ) {
             $hashref->{$lastitem}{'seller'} = &html_decode($2);
-            print_log
-              "eBay: Seller for item $lastitem is $hashref->{$lastitem}{'seller'}"
+            print_log "eBay: Seller for item $lastitem is $hashref->{$lastitem}{'seller'}"
               if $main::Debug{ebay};
         }
         elsif ( $type eq 'selling' ) {
             $hashref->{$lastitem}{'high_bidder'} = &html_decode($2);
-            print_log
-              "eBay: High bidder for item $lastitem is $hashref->{$lastitem}{'high_bidder'}"
+            print_log "eBay: High bidder for item $lastitem is $hashref->{$lastitem}{'high_bidder'}"
               if $main::Debug{ebay};
         }
     }
@@ -431,14 +387,11 @@ ($$$$)
         if ( $ends =~ /^\s*(\d+)m\s*/ ) {
             $hashref->{$lastitem}{'mins_left'} = $1;
         }
-        print_log
-          "eBay: Days left for item $lastitem is $hashref->{$lastitem}{'days_left'}"
+        print_log "eBay: Days left for item $lastitem is $hashref->{$lastitem}{'days_left'}"
           if $main::Debug{ebay};
-        print_log
-          "eBay: Hours left for item $lastitem is $hashref->{$lastitem}{'hours_left'}"
+        print_log "eBay: Hours left for item $lastitem is $hashref->{$lastitem}{'hours_left'}"
           if $main::Debug{ebay};
-        print_log
-          "eBay: Minutes left for item $lastitem is $hashref->{$lastitem}{'mins_left'}"
+        print_log "eBay: Minutes left for item $lastitem is $hashref->{$lastitem}{'mins_left'}"
           if $main::Debug{ebay};
         $hashref->{$lastitem}{'end_time'} =
           $Time +
@@ -577,18 +530,14 @@ ($$$)
     foreach my $item ( keys %ebay_end_times ) {
         if ( $ebay_end_times{$item} and $ebay_end_times{$item}{'end_time'} ) {
             my $ends_in = $ebay_end_times{$item}{'end_time'} - $Time;
-            print_log
-              "eBay: checking item $ebay_end_times{$item}{'title'}, $ends_in, $less_than"
+            print_log "eBay: checking item $ebay_end_times{$item}{'title'}, $ends_in, $less_than"
               if $main::Debug{ebay};
             if ( ( $ends_in > 0 ) and ( $ends_in < $less_than ) ) {
                 print_log
                   "eBay: checking item $ebay_end_times{$item}{'title'}, $ebay_end_times{$item}{'last_reported'}, $frequency"
                   if $main::Debug{ebay};
-                if (
-                    not $ebay_end_times{$item}{'last_reported'}
-                    or ( ( $Time - $ebay_end_times{$item}{'last_reported'} ) >=
-                        $frequency )
-                  )
+                if ( not $ebay_end_times{$item}{'last_reported'}
+                    or ( ( $Time - $ebay_end_times{$item}{'last_reported'} ) >= $frequency ) )
                 {
                     speak(
                         rooms      => 'all',
@@ -597,9 +546,7 @@ ($$$)
                           "e-Bay Notice: item '$ebay_end_times{$item}{'title'}' that you are $ebay_end_times{$item}{'activity'} ends in "
                           . &speak_time($ends_in)
                     );
-                    print_log
-                      "eBay item $item ($ebay_end_times{$item}{'title'}) ends in "
-                      . &speak_time($ends_in);
+                    print_log "eBay item $item ($ebay_end_times{$item}{'title'}) ends in " . &speak_time($ends_in);
                     $ebay_end_times{$item}{'last_reported'} = $Time;
                 }
             }
@@ -643,8 +590,7 @@ ($$$)
     %ebay_watching = ();
     $ebay_watching{'populated'} = 1;
     foreach ( $f_ebay_watching->read_all() ) {
-        $lastitem =
-          &parse_ebay_html_line( $lastitem, \%ebay_watching, $_, 'watching' );
+        $lastitem = &parse_ebay_html_line( $lastitem, \%ebay_watching, $_, 'watching' );
         if ( $lastitem eq 'NOT LOGGED IN' ) {
             %ebay_watching = ();
             last;
@@ -658,15 +604,12 @@ ($$$)
         # 'shipping' will be undefined if fixed shipping cost was not specified for item
         foreach ( 'title', 'status', 'price', 'bids', 'seller', 'end_time' ) {
             unless ( defined( $ebay_watching{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         &check_end_time( $item, \%ebay_watching, 'watching' );
         if ( $last_ebay_watching{'populated'} and $last_ebay_watching{$item} ) {
-            if ( $last_ebay_watching{$item}{'price'} ne
-                $ebay_watching{$item}{'price'} )
-            {
+            if ( $last_ebay_watching{$item}{'price'} ne $ebay_watching{$item}{'price'} ) {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
@@ -682,11 +625,9 @@ ($$$)
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
-                    text =>
-                      "e-Bay Notice: Auction for item '$ebay_watching{$item}{'title'}' has ended"
+                    text       => "e-Bay Notice: Auction for item '$ebay_watching{$item}{'title'}' has ended"
                 );
-                print_log
-                  "The auction of eBay item $item ($ebay_watching{$item}{'title'}) has ended";
+                print_log "The auction of eBay item $item ($ebay_watching{$item}{'title'}) has ended";
             }
         }
         elsif ( $last_ebay_watching{'populated'}
@@ -696,11 +637,9 @@ ($$$)
             speak(
                 rooms      => 'all',
                 importance => 'notice',
-                text =>
-                  "e-Bay Notice: I am now watching item '$ebay_watching{$item}{'title'}'"
+                text       => "e-Bay Notice: I am now watching item '$ebay_watching{$item}{'title'}'"
             );
-            print_log
-              "I am now watching eBay item $item ($ebay_watching{$item}{'title'})";
+            print_log "I am now watching eBay item $item ($ebay_watching{$item}{'title'})";
         }
     }
     print_log "eBay: You are watching $count items.";
@@ -714,8 +653,7 @@ ($$$)
     %ebay_bidding = ();
     $ebay_bidding{'populated'} = 1;
     foreach ( $f_ebay_bidding->read_all() ) {
-        $lastitem =
-          &parse_ebay_html_line( $lastitem, \%ebay_bidding, $_, 'bidding' );
+        $lastitem = &parse_ebay_html_line( $lastitem, \%ebay_bidding, $_, 'bidding' );
         if ( $lastitem eq 'NOT LOGGED IN' ) {
             %ebay_bidding = ();
             last;
@@ -729,26 +667,21 @@ ($$$)
         # 'shipping' will be undefined if fixed shipping cost was not specified for item
         foreach ( 'title', 'status', 'price', 'maxbid', 'end_time' ) {
             unless ( defined( $ebay_bidding{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         if ( $last_ebay_bidding{$item}{'status'} eq 'success' ) {
             &check_end_time( $item, \%ebay_bidding, 'winning' );
         }
         if ( $last_ebay_bidding{'populated'} and $last_ebay_bidding{$item} ) {
-            if ( $last_ebay_bidding{$item}{'status'} ne
-                $ebay_bidding{$item}{'status'} )
-            {
+            if ( $last_ebay_bidding{$item}{'status'} ne $ebay_bidding{$item}{'status'} ) {
                 if ( $last_ebay_bidding{$item}{'status'} eq 'success' ) {
                     speak(
                         rooms      => 'all',
                         importance => 'important',
-                        text =>
-                          "e-Bay Notice: You are no longer winning item '$ebay_bidding{$item}{'title'}'"
+                        text       => "e-Bay Notice: You are no longer winning item '$ebay_bidding{$item}{'title'}'"
                     );
-                    print_log
-                      "You are no longer winning eBay item $item ($ebay_bidding{$item}{'title'})";
+                    print_log "You are no longer winning eBay item $item ($ebay_bidding{$item}{'title'})";
                 }
             }
         }
@@ -760,21 +693,17 @@ ($$$)
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
-                    text =>
-                      "e-Bay Notice: You have bid on item '$ebay_bidding{$item}{'title'}' and you are winning"
+                    text       => "e-Bay Notice: You have bid on item '$ebay_bidding{$item}{'title'}' and you are winning"
                 );
-                print_log
-                  "You have bid on eBay item $item ($ebay_bidding{$item}{'title'}) and you are winning";
+                print_log "You have bid on eBay item $item ($ebay_bidding{$item}{'title'}) and you are winning";
             }
             else {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
-                    text =>
-                      "e-Bay Notice: You have bid on item '$ebay_bidding{$item}{'title'}' and you are not winning"
+                    text       => "e-Bay Notice: You have bid on item '$ebay_bidding{$item}{'title'}' and you are not winning"
                 );
-                print_log
-                  "You have bid on eBay item $item ($ebay_bidding{$item}{'title'}) and you are not winning";
+                print_log "You have bid on eBay item $item ($ebay_bidding{$item}{'title'}) and you are not winning";
             }
         }
     }
@@ -789,8 +718,7 @@ ($$$)
     %ebay_selling = ();
     $ebay_selling{'populated'} = 1;
     foreach ( $f_ebay_selling->read_all() ) {
-        $lastitem =
-          &parse_ebay_html_line( $lastitem, \%ebay_selling, $_, 'selling' );
+        $lastitem = &parse_ebay_html_line( $lastitem, \%ebay_selling, $_, 'selling' );
         if ( $lastitem eq 'NOT LOGGED IN' ) {
             %ebay_selling = ();
             last;
@@ -800,21 +728,14 @@ ($$$)
     foreach my $item ( keys %ebay_selling ) {
         next if $item eq 'populated';
         $count++;
-        foreach (
-            'title',       'status',   'price',     'bids',
-            'high_bidder', 'watchers', 'questions', 'end_time'
-          )
-        {
+        foreach ( 'title', 'status', 'price', 'bids', 'high_bidder', 'watchers', 'questions', 'end_time' ) {
             unless ( defined( $ebay_selling{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         &check_end_time( $item, \%ebay_selling, 'selling' );
         if ( $last_ebay_selling{'populated'} and $last_ebay_selling{$item} ) {
-            if ( $last_ebay_selling{$item}{'price'} ne
-                $ebay_selling{$item}{'price'} )
-            {
+            if ( $last_ebay_selling{$item}{'price'} ne $ebay_selling{$item}{'price'} ) {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
@@ -824,9 +745,7 @@ ($$$)
                 print_log
                   "The price of eBay item $item ($ebay_selling{$item}{'title'}) has changed to $ebay_selling{$item}{'price'} (high bidder is $ebay_selling{$item}{'high_bidder'})";
             }
-            if ( $last_ebay_selling{$item}{'watchers'} <
-                $ebay_selling{$item}{'watchers'} )
-            {
+            if ( $last_ebay_selling{$item}{'watchers'} < $ebay_selling{$item}{'watchers'} ) {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
@@ -836,9 +755,7 @@ ($$$)
                 print_log
                   "There are now $ebay_selling{$item}{'watchers'} people watching eBay item $item ($ebay_selling{$item}{'title'})";
             }
-            if ( $last_ebay_selling{$item}{'questions'} <
-                $ebay_selling{$item}{'questions'} )
-            {
+            if ( $last_ebay_selling{$item}{'questions'} < $ebay_selling{$item}{'questions'} ) {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
@@ -848,18 +765,14 @@ ($$$)
                 print_log
                   "There are new questions about eBay item $item ($ebay_selling{$item}{'title'}) ($ebay_selling{$item}{'questions'} pending)";
             }
-            if ( $last_ebay_selling{$item}{'status'} ne
-                $ebay_selling{$item}{'status'} )
-            {
+            if ( $last_ebay_selling{$item}{'status'} ne $ebay_selling{$item}{'status'} ) {
                 if ( $ebay_selling{$item}{'status'} eq 'success' ) {
                     speak(
                         rooms      => 'all',
                         importance => 'important',
-                        text =>
-                          "e-Bay Notice: item '$ebay_selling{$item}{'title'}' is now going to sell"
+                        text       => "e-Bay Notice: item '$ebay_selling{$item}{'title'}' is now going to sell"
                     );
-                    print_log
-                      "eBay item $item ($ebay_selling{$item}{'title'}) is now going to sell";
+                    print_log "eBay item $item ($ebay_selling{$item}{'title'}) is now going to sell";
                 }
             }
         }
@@ -870,11 +783,9 @@ ($$$)
             speak(
                 rooms      => 'all',
                 importance => 'notice',
-                text =>
-                  "e-Bay Notice: You are now selling item '$ebay_selling{$item}{'title'}'"
+                text       => "e-Bay Notice: You are now selling item '$ebay_selling{$item}{'title'}'"
             );
-            print_log
-              "You are now selling eBay item $item ($ebay_selling{$item}{'title'})";
+            print_log "You are now selling eBay item $item ($ebay_selling{$item}{'title'})";
         }
     }
     print_log "eBay: You are selling $count items.";
@@ -898,30 +809,20 @@ ($$$)
     foreach my $item ( keys %ebay_won ) {
         next if $item eq 'populated';
         $count++;
-        foreach (
-            'seller', 'quantity', 'sale_price',
-            'title',  'paid',     'feedback_left',
-            'feedback_received'
-          )
-        {
+        foreach ( 'seller', 'quantity', 'sale_price', 'title', 'paid', 'feedback_left', 'feedback_received' ) {
             unless ( defined( $ebay_won{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         if ( $last_ebay_won{'populated'} and $last_ebay_won{$item} ) {
-            if ( $last_ebay_won{$item}{'feedback_received'} ne
-                $ebay_won{$item}{'feedback_received'} )
-            {
+            if ( $last_ebay_won{$item}{'feedback_received'} ne $ebay_won{$item}{'feedback_received'} ) {
                 if ( $ebay_won{$item}{'feedback_received'} eq 'Positive' ) {
                     speak(
                         rooms      => 'all',
                         importance => 'notice',
-                        text =>
-                          "e-Bay Notice: You have received positive feedback for item '$ebay_won{$item}{'title'}'"
+                        text       => "e-Bay Notice: You have received positive feedback for item '$ebay_won{$item}{'title'}'"
                     );
-                    print_log
-                      "You have received positive feedback for eBay item $item ($ebay_won{$item}{'title'})";
+                    print_log "You have received positive feedback for eBay item $item ($ebay_won{$item}{'title'})";
                 }
                 else {
                     speak(
@@ -941,11 +842,9 @@ ($$$)
             speak(
                 rooms      => 'all',
                 importance => 'important',
-                text =>
-                  "e-Bay Notice: You won item '$ebay_won{$item}{'title'}' for $ebay_won{$item}{'sale_price'}"
+                text       => "e-Bay Notice: You won item '$ebay_won{$item}{'title'}' for $ebay_won{$item}{'sale_price'}"
             );
-            print_log
-              "You won eBay item $item ($ebay_won{$item}{'title'}) for $ebay_won{$item}{'sale_price'}";
+            print_log "You won eBay item $item ($ebay_won{$item}{'title'}) for $ebay_won{$item}{'sale_price'}";
         }
     }
     print_log "eBay: You have won $count items.";
@@ -970,14 +869,12 @@ ($$$)
         next if $item eq 'populated';
         $count++;
         foreach (
-            'buyer',             'quantity',           'sale_price',
-            'title',             'paid',               'feedback_left',
-            'feedback_received', 'completed_checkout', 'shipped'
+            'buyer',         'quantity',          'sale_price',         'title', 'paid',
+            'feedback_left', 'feedback_received', 'completed_checkout', 'shipped'
           )
         {
             unless ( defined( $ebay_sold{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         if ( $last_ebay_sold{'populated'} and $last_ebay_sold{$item} ) {
@@ -996,25 +893,19 @@ ($$$)
                     speak(
                         rooms      => 'all',
                         importance => 'notice',
-                        text =>
-                          "e-Bay Notice: The buyer has paid for item '$ebay_sold{$item}{'title'}'"
+                        text       => "e-Bay Notice: The buyer has paid for item '$ebay_sold{$item}{'title'}'"
                     );
-                    print_log
-                      "The buyer has paid for eBay item $item ($ebay_sold{$item}{'title'})";
+                    print_log "The buyer has paid for eBay item $item ($ebay_sold{$item}{'title'})";
                 }
             }
-            if ( $last_ebay_sold{$item}{'feedback_received'} ne
-                $ebay_sold{$item}{'feedback_received'} )
-            {
+            if ( $last_ebay_sold{$item}{'feedback_received'} ne $ebay_sold{$item}{'feedback_received'} ) {
                 if ( $ebay_sold{$item}{'feedback_received'} eq 'Positive' ) {
                     speak(
                         rooms      => 'all',
                         importance => 'notice',
-                        text =>
-                          "e-Bay Notice: You have received positive feedback for item '$ebay_sold{$item}{'title'}'"
+                        text       => "e-Bay Notice: You have received positive feedback for item '$ebay_sold{$item}{'title'}'"
                     );
-                    print_log
-                      "You have received positive feedback for eBay item $item ($ebay_sold{$item}{'title'})";
+                    print_log "You have received positive feedback for eBay item $item ($ebay_sold{$item}{'title'})";
                 }
                 else {
                     speak(
@@ -1027,14 +918,11 @@ ($$$)
                       "Warning, you have received $ebay_sold{$item}{'feedback_received'} feedback for eBay item $item ($ebay_sold{$item}{'title'})";
                 }
             }
-            if ( $last_ebay_sold{$item}{'completed_checkout'} !=
-                $ebay_sold{$item}{'completed_checkout'} )
-            {
+            if ( $last_ebay_sold{$item}{'completed_checkout'} != $ebay_sold{$item}{'completed_checkout'} ) {
                 speak(
                     rooms      => 'all',
                     importance => 'notice',
-                    text =>
-                      "e-Bay Notice: The buyer has completed checkout for item '$ebay_sold{$item}{'title'}'"
+                    text       => "e-Bay Notice: The buyer has completed checkout for item '$ebay_sold{$item}{'title'}'"
                 );
                 print_log
                   "The buyer has completed checkout for eBay item $item ($ebay_sold{$item}{'title'}) is pending and needs to be accepted or denied";
@@ -1064,8 +952,7 @@ ($$$)
     %ebay_unsold = ();
     $ebay_unsold{'populated'} = 1;
     foreach ( $f_ebay_unsold->read_all() ) {
-        $lastitem =
-          &parse_ebay_html_line( $lastitem, \%ebay_unsold, $_, 'unsold' );
+        $lastitem = &parse_ebay_html_line( $lastitem, \%ebay_unsold, $_, 'unsold' );
         if ( $lastitem eq 'NOT LOGGED IN' ) {
             %ebay_unsold = ();
             last;
@@ -1077,8 +964,7 @@ ($$$)
         $count++;
         foreach ('title') {
             unless ( defined( $ebay_unsold{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         if ( $last_ebay_unsold{'populated'} and not $last_ebay_unsold{$item} ) {
@@ -1087,11 +973,9 @@ ($$$)
             speak(
                 rooms      => 'all',
                 importance => 'notice',
-                text =>
-                  "e-Bay Notice: You did not sell item '$ebay_unsold{$item}{'title'}'"
+                text       => "e-Bay Notice: You did not sell item '$ebay_unsold{$item}{'title'}'"
             );
-            print_log
-              "You did not sell eBay item $item ($ebay_unsold{$item}{'title'})";
+            print_log "You did not sell eBay item $item ($ebay_unsold{$item}{'title'})";
         }
     }
     print_log "eBay: You have not sold $count items.";
@@ -1117,8 +1001,7 @@ ($$$)
         $count++;
         foreach ('title') {
             unless ( defined( $ebay_lost{$item}{$_} ) ) {
-                &report_ebay_error(
-                    "Parse error for item $item, value '$_' not found!");
+                &report_ebay_error("Parse error for item $item, value '$_' not found!");
             }
         }
         if ( $last_ebay_lost{'populated'} and not $last_ebay_lost{$item} ) {
@@ -1127,11 +1010,9 @@ ($$$)
             speak(
                 rooms      => 'all',
                 importance => 'important',
-                text =>
-                  "e-Bay Notice: You did not win item '$ebay_lost{$item}{'title'}'"
+                text       => "e-Bay Notice: You did not win item '$ebay_lost{$item}{'title'}'"
             );
-            print_log
-              "You did not win eBay item $item ($ebay_lost{$item}{'title'})";
+            print_log "You did not win eBay item $item ($ebay_lost{$item}{'title'})";
         }
     }
     print_log "eBay: You have not won $count items.";
@@ -1149,8 +1030,7 @@ ($$$)
                 text =>
                   "e-Bay Feedback Reminder: You have received feedback for item '$ebay_sold{$item}{'title'}' but have not left any yourself"
             );
-            print_log
-              "You have received feedback for eBay item $item ($ebay_sold{$item}{'title'}) but have not left any yourself";
+            print_log "You have received feedback for eBay item $item ($ebay_sold{$item}{'title'}) but have not left any yourself";
         }
     }
     foreach my $item ( keys %ebay_won ) {
@@ -1164,8 +1044,7 @@ ($$$)
                 text =>
                   "e-Bay Feedback Reminder: You have received feedback for item '$ebay_won{$item}{'title'}' but have not left any yourself"
             );
-            print_log
-              "You have received feedback for eBay item $item ($ebay_won{$item}{'title'}) but have not left any yourself";
+            print_log "You have received feedback for eBay item $item ($ebay_won{$item}{'title'}) but have not left any yourself";
         }
     }
 }
diff --git a/code/common/eliza_server.pl b/code/common/eliza_server.pl
index 87afda67b..51a0459fd 100644
--- a/code/common/eliza_server.pl
+++ b/code/common/eliza_server.pl
@@ -32,8 +32,7 @@
 my ($eliza);
 undef $eliza if $eliza and state_changed $eliza_rule;
 
-$f_eliza_deep_thoughts =
-  new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
+$f_eliza_deep_thoughts = new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
 
 if ( defined( $state = state_now $eliza_data) ) {
     my $msg = $state;
@@ -85,8 +84,7 @@
       requestor   => $name;
 
     #    speak app => 'chatbot',  compression => $wavcomp, text => $msg;
-    logit( "$config_parms{data_dir}/logs/eliza_server.$Year.log",
-        "domain=$name text=$msg" );
+    logit( "$config_parms{data_dir}/logs/eliza_server.$Year.log", "domain=$name text=$msg" );
 }
 
 if ( my ( $name, $name_short ) = net_domain_name_done 'eliza_server' ) {
diff --git a/code/common/email_marketplace_sales.pl b/code/common/email_marketplace_sales.pl
index aeccd8e5d..c37f5d7bb 100644
--- a/code/common/email_marketplace_sales.pl
+++ b/code/common/email_marketplace_sales.pl
@@ -13,9 +13,8 @@
 
 $cash_register       = new Generic_Item;
 $v_email_marketplace = new Voice_Cmd 'Process email sales';
-$v_email_sales = new Voice_Cmd 'How many sales [today,this week,this month]';
-$v_email_questions =
-  new Voice_Cmd 'How many questions [today,this week,this month]';
+$v_email_sales       = new Voice_Cmd 'How many sales [today,this week,this month]';
+$v_email_questions   = new Voice_Cmd 'How many questions [today,this week,this month]';
 my $daily_sales       = 0;
 my $daily_questions   = 0;
 my $weekly_sales      = 0;
@@ -74,8 +73,7 @@
     my $total_questions = 0;
     for my $line ( file_read $get_email_scan_file) {
         print "marketplace: mail =$line\n" if $Debug{email};
-        my ( $msg, $from, $to, $subject, $body ) =
-          $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+        my ( $msg, $from, $to, $subject, $body ) = $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
 
         my $message = '';
 
@@ -102,9 +100,7 @@
               if $Debug{email};
             $total_sales++;
         }
-        elsif (
-            $subject =~ /^ *Alibris Purchase Notification # (\d+-\d+) - (.*)/ )
-        {
+        elsif ( $subject =~ /^ *Alibris Purchase Notification # (\d+-\d+) - (.*)/ ) {
             $message = "$2 just sold on Alibris.";
             set $cash_register $2;
             print "marketplace: Found Alibris email: $subject\n"
@@ -117,10 +113,8 @@
             print "marketplace: Found Half email: $subject\n" if $Debug{email};
             $total_sales++;
         }
-        elsif (
-               $subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i
-            or $subject =~
-            /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i )
+        elsif ($subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i
+            or $subject =~ /^ *Sold -- ship now! \(\d+ listings\/(\d+) items\)/i )
         {
             $message = "$1 item(s) just sold on Amazon.";
             set $cash_register "$1 Amazon item(s)";
@@ -146,70 +140,52 @@
               if $Debug{email};
             $total_questions++;
         }
-        elsif ( $subject =~
-            /^ *Please send me total amount for eBay item #(\d+), (.*)/i )
-        {
+        elsif ( $subject =~ /^ *Please send me total amount for eBay item #(\d+), (.*)/i ) {
             $message = "Customer would like an invoice for $2.";
-            print
-              "marketplace: Found eBay request for invoice email: $subject\n"
+            print "marketplace: Found eBay request for invoice email: $subject\n"
               if $Debug{email};
             $total_questions++;
         }
         elsif ( $subject =~ /^ *Re: Order information from Amazon seller/i ) {
             $message = "Customer replied to Amazon communique.";
-            print
-              "marketplace: Found Amazon customer reply email: $subject from $from\n"
+            print "marketplace: Found Amazon customer reply email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
-        elsif ( $subject =~
-            /^ *Product details inquiry from Amazon customer (.*)/i )
-        {
+        elsif ( $subject =~ /^ *Product details inquiry from Amazon customer (.*)/i ) {
             $message = "$1 wants to know more about an Amazon listing...";
-            print
-              "marketplace: Found Amazon customer inquiry email: $subject from $from\n"
+            print "marketplace: Found Amazon customer inquiry email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
         elsif ( $subject =~ /^ *RE: Your Amazon Marketplace Purchase/i ) {
             $message = "$1 has a complaint about their purchase...";
-            print
-              "marketplace: Found Amazon customer complaint email: $subject from $from\n"
+            print "marketplace: Found Amazon customer complaint email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
         elsif ( $subject =~ /^ *Product Details/i ) {
             $message = "$1 wants to know more about an amazon listing...";
-            print
-              "marketplace: Found Amazon customer inquiry email: $subject from $from\n"
+            print "marketplace: Found Amazon customer inquiry email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
-        elsif ( $subject =~
-            /^ *Question\/Comment regarding Half.com Transaction #: (\d+)/i )
-        {
-            $message =
-              "Customer wants to know more about a Half.com transaction...";
-            print
-              "marketplace: Found Half.com order inquiry email: $subject from $from\n"
+        elsif ( $subject =~ /^ *Question\/Comment regarding Half.com Transaction #: (\d+)/i ) {
+            $message = "Customer wants to know more about a Half.com transaction...";
+            print "marketplace: Found Half.com order inquiry email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
-        elsif ( $subject =~
-            /^ *Re: Question\/Comment regarding Half.com Transaction #: (\d+)/i
-          )
-        {
+        elsif ( $subject =~ /^ *Re: Question\/Comment regarding Half.com Transaction #: (\d+)/i ) {
             $message = "Half.com customer replied to your answer.";
-            print
-              "marketplace: Found Half.com answer reply email: $subject from $from\n"
+            print "marketplace: Found Half.com answer reply email: $subject from $from\n"
               if $Debug{email};
             $total_questions++;
         }
 
         # *** Need to un-associate the chime from this app (pass explicitly if $total_sales)
 
-        my $chime =
-          ( $total_sales == 0 ) ? 'sound_nature/*.wav' : 'cash_register';
+        my $chime = ( $total_sales == 0 ) ? 'sound_nature/*.wav' : 'cash_register';
 
         speak "app=cashier chime=$chime $message" if ($message);
     }
@@ -221,8 +197,7 @@
         $monthly_sales   += $total_sales;
         speak
           "app=cashier no_chime=1 $total_sales new sale(s). That's $daily_sales on the day, $weekly_sales for the week and $monthly_sales this month.";
-        speak
-          "app=cashier no_chime=1 $daily_questions questions received today."
+        speak "app=cashier no_chime=1 $daily_questions questions received today."
           if $daily_questions;
         &persist_sales();
     }
diff --git a/code/common/email_motion.pl b/code/common/email_motion.pl
index 4b773566c..5dc87f555 100644
--- a/code/common/email_motion.pl
+++ b/code/common/email_motion.pl
@@ -16,8 +16,7 @@
     my @msgs;
     for my $line ( file_read $get_email_scan_file) {
         print "email_motion: mail =$line\n" if $Debug{email};
-        my ( $msg, $from, $to, $subject, $body ) =
-          $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+        my ( $msg, $from, $to, $subject, $body ) = $line =~ /Msg: (\d+) From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
         if ( $subject =~ /^ *Motion\:? /i ) {
             print "email_motion: Found mail: $subject\n" if $Debug{email};
             push @msgs, $msg;
@@ -27,8 +26,7 @@
     # Read in picture emails in the background
     if (@msgs) {
         print_log "Reading email_motion msgs @msgs";
-        set $p_email_motion
-          qq[read_email -account bruce -msgnum "@msgs" -file "$config_parms{data_dir}/email_motion.txt"];
+        set $p_email_motion qq[read_email -account bruce -msgnum "@msgs" -file "$config_parms{data_dir}/email_motion.txt"];
         start $p_email_motion;
     }
 }
@@ -44,11 +42,10 @@ sub process_email_images {
         my $r = shift @data;
         $camera = $1 if $r =~ /^ *Subject\: Motion\: (\S+)/;
         next
-          unless $r =~ /^ *Content-Disposition/
-          ;    # Assume this is the last record before the data
+          unless $r =~ /^ *Content-Disposition/;    # Assume this is the last record before the data
         print " - reading data for $r\n" if $Debug{email};
         shift @data;
-        shift @data;    # Assume 2 blank blank header lines
+        shift @data;                                # Assume 2 blank blank header lines
         my $data;
         while (@data) {
             $r = shift @data;
@@ -61,8 +58,7 @@ sub process_email_images {
         my $file = "$config_parms{data_dir}/web/motion/$member";
         print " - writing to $file\n" if $Debug{email};
         file_write $file, MIME::Base64::decode($data);
-        copy "$config_parms{data_dir}/web/motion/latest1.jpg",
-          "$config_parms{data_dir}/web/motion/latest2.jpg";
+        copy "$config_parms{data_dir}/web/motion/latest1.jpg", "$config_parms{data_dir}/web/motion/latest2.jpg";
         copy $file, "$config_parms{data_dir}/web/motion/latest1.jpg";
     }
 }
diff --git a/code/common/event_sounds.pl b/code/common/event_sounds.pl
index 7c2fa37cc..475812eb6 100644
--- a/code/common/event_sounds.pl
+++ b/code/common/event_sounds.pl
@@ -19,8 +19,7 @@
         or $Reload )
   )
 {
-    &print_log(
-        "Reading event sounds data from $config_parms{event_sounds_file}");
+    &print_log("Reading event sounds data from $config_parms{event_sounds_file}");
 
     open( SOUNDSDATA, $config_parms{event_sounds_file} );
     while (<SOUNDSDATA>) {
diff --git a/code/common/froggyrita.pl b/code/common/froggyrita.pl
index 76739bdad..ca1c2e069 100644
--- a/code/common/froggyrita.pl
+++ b/code/common/froggyrita.pl
@@ -5,11 +5,10 @@
 
 my $command_waiting;    #noloop
 
-$Froggy = new FroggyRita;
-$v_froggy_indoor_temperature =
-  new Voice_Cmd( '[What is] the indoor temperature', 0 );
-$v_froggy_indoor_humidity = new Voice_Cmd( '[What is] the indoor humidity', 0 );
-$v_froggy_indoor_check    = new Voice_Cmd( 'Check indoor conditions',       0 );
+$Froggy                      = new FroggyRita;
+$v_froggy_indoor_temperature = new Voice_Cmd( '[What is] the indoor temperature', 0 );
+$v_froggy_indoor_humidity    = new Voice_Cmd( '[What is] the indoor humidity', 0 );
+$v_froggy_indoor_check       = new Voice_Cmd( 'Check indoor conditions', 0 );
 
 if ( said $v_froggy_indoor_check) {
     respond "app=frog Checking indoor conditions...";
@@ -20,12 +19,10 @@
 if ( said $v_froggy_indoor_temperature) {
 
     if ( defined $Weather{TempIndoor} ) {
-        respond
-          "app=frog It is $Weather{TempIndoor} degrees fahrenheit indoors.";
+        respond "app=frog It is $Weather{TempIndoor} degrees fahrenheit indoors.";
     }
     else {
-        respond
-          "app=frog I don't know the temperature at the moment. Try again in a few minutes...";
+        respond "app=frog I don't know the temperature at the moment. Try again in a few minutes...";
     }
 
 }
@@ -35,8 +32,7 @@
         respond "app=frog It is " . $Froggy->humidity() . "% indoors.";
     }
     else {
-        respond
-          "app=frog I do not know at the moment. Try again in a few minutes...";
+        respond "app=frog I do not know at the moment. Try again in a few minutes...";
     }
 
 }
@@ -52,17 +48,14 @@
 
     if ( $command_waiting and $state ne 'status' ) {
         if ( defined $temperature ) {
-            $command_waiting->respond(
-                    'app=frog connected=0 Indoor temperature is '
+            $command_waiting->respond( 'app=frog connected=0 Indoor temperature is '
                   . $temperature
                   . ' degrees fahrenheit. Humidity is '
                   . $Froggy->humidity()
                   . '%' );
         }
         else {
-            $command_waiting->respond(
-                'app=frog connected=0 I do not know at the moment. Try again in a few minutes...'
-            );
+            $command_waiting->respond( 'app=frog connected=0 I do not know at the moment. Try again in a few minutes...' );
 
         }
         $command_waiting = undef;
@@ -78,8 +71,5 @@ sub get_froggy_status {
 # trigger
 
 if ($Reload) {
-    &trigger_set(
-        "new_minute 5", "&get_froggy_status()",
-        'NoExpire',     'get frog status'
-    ) unless &trigger_get('get frog status');
+    &trigger_set( "new_minute 5", "&get_froggy_status()", 'NoExpire', 'get frog status' ) unless &trigger_get('get frog status');
 }
diff --git a/code/common/games_bingo.pl b/code/common/games_bingo.pl
index 6d8f3aee9..4f4d702bc 100644
--- a/code/common/games_bingo.pl
+++ b/code/common/games_bingo.pl
@@ -8,13 +8,10 @@
 $v_bingo_control = new Voice_Cmd '[Start,Pause,Resume,Status,] Bingo';
 $v_bingo_time    = new Voice_Cmd 'Set bingo time to [2,5,10,15,20]';
 
-use vars qw(@bingo_card $bingo_count)
-  ;    # *** Is this really the best way to persist?
+use vars qw(@bingo_card $bingo_count);    # *** Is this really the best way to persist?
 
 if ( state_now $v_bingo_time) {
-    respond("app=bingo Bingo timer set to "
-          . $v_bingo_time->{state}
-          . " seconds." );
+    respond( "app=bingo Bingo timer set to " . $v_bingo_time->{state} . " seconds." );
     $config_parms{bingo_time} = $state;
 }
 
diff --git a/code/common/goofy.pl b/code/common/goofy.pl
index bdf66ccd2..5f8fd7d11 100644
--- a/code/common/goofy.pl
+++ b/code/common/goofy.pl
@@ -17,12 +17,9 @@
 
 # *** Remarks have spelling errors (and aren't particularly amusing.)
 
-$f_personal_remark_good =
-  new File_Item("$config_parms{data_dir}/remarks/personal_good.txt");
-$f_personal_remark_bad =
-  new File_Item("$config_parms{data_dir}/remarks/personal_bad.txt");
-$f_april_fools =
-  new File_Item("$config_parms{data_dir}/remarks/april_fools.txt");
+$f_personal_remark_good = new File_Item("$config_parms{data_dir}/remarks/personal_good.txt");
+$f_personal_remark_bad  = new File_Item("$config_parms{data_dir}/remarks/personal_bad.txt");
+$f_april_fools          = new File_Item("$config_parms{data_dir}/remarks/april_fools.txt");
 
 # Create trigger to play the annoying South Park sounds (needs updating)
 
@@ -30,8 +27,7 @@
     &trigger_set(
         "time_random('* 18-22 * * 1-5', 240) or time_random('*  8-22 * * 0,6', 240)",
         "run_voice_cmd('Play a fun sound file')",
-        'NoExpire',
-        'play fun sound'
+        'NoExpire', 'play fun sound'
     ) unless &trigger_get('play fun sound');
 }
 
@@ -49,11 +45,9 @@ sub uninstall_goofy {
 ) if said $v_why_here;
 
 $v_go_away->respond("I would go away if I could.") if said $v_go_away;
-$v_personal_remark_good->respond(
-    "app=goofy " . read_next $f_personal_remark_good)
+$v_personal_remark_good->respond( "app=goofy " . read_next $f_personal_remark_good)
   if said $v_personal_remark_good;
-$v_personal_remark_bad->respond(
-    "app=goofy image=frown " . read_next $f_personal_remark_bad)
+$v_personal_remark_bad->respond( "app=goofy image=frown " . read_next $f_personal_remark_bad)
   if said $v_personal_remark_bad;
 
 # One a day random wav file (triggered)
diff --git a/code/common/headercontroller.pl b/code/common/headercontroller.pl
index 0bbc1faa8..a5a700208 100644
--- a/code/common/headercontroller.pl
+++ b/code/common/headercontroller.pl
@@ -30,8 +30,7 @@
         unlink "$config_parms{data_dir}/headerallow.tab";
     }
     find( \&GenerateHeaderFiles, "$codedhtmlrootdir" );    #Need PGM ROOT!
-    file_write( "$config_parms{data_dir}/headerallow.tab", $TmpData ) &
-      main::speak "Header control file generation is complete";
+    file_write( "$config_parms{data_dir}/headerallow.tab", $TmpData ) & main::speak "Header control file generation is complete";
 }
 
 sub Search_Header_Allow {
@@ -62,8 +61,8 @@ sub Search_Header_Allow {
                     $AllowHeaderPassage = 1;
 
                 }
-                elsif ( ( $Authorized =~ /guest/i ) and ( $guest =~ /True/i ) )
-                {
+                elsif ( ( $Authorized =~ /guest/i ) and ( $guest =~ /True/i ) ) {
+
                     #print_log "Allowing Passage";
                     $AllowHeaderPassage = 1;
 
@@ -81,8 +80,7 @@ sub Search_Header_Allow {
     if (    ( $AllowHeaderPassage eq "" )
         and ( $config_parms{Use_Header_Control} = 1 ) )
     {
-        print_log
-          "Could not find -$Header_name- in control file.$AllowHeaderPassage";
+        print_log "Could not find -$Header_name- in control file.$AllowHeaderPassage";
     }
     if ( $AllowHeaderPassage == 1 ) {
 
diff --git a/code/common/hello_print.pl b/code/common/hello_print.pl
index dd19a973a..eab0c700f 100644
--- a/code/common/hello_print.pl
+++ b/code/common/hello_print.pl
@@ -7,7 +7,6 @@
 if ( new_second 30 ) {
     my $uptime_pgm      = &time_diff( $Time_Startup_time, time );
     my $uptime_computer = &time_diff( $Time_Boot_time,    $Time );
-    print_log
-      "Hi, I was started $uptime_pgm ago. The computer was booted $uptime_computer ago.";
+    print_log "Hi, I was started $uptime_pgm ago. The computer was booted $uptime_computer ago.";
 }
 
diff --git a/code/common/holiday_ical.pl b/code/common/holiday_ical.pl
index 54f4b1e23..4db15bf82 100755
--- a/code/common/holiday_ical.pl
+++ b/code/common/holiday_ical.pl
@@ -25,8 +25,7 @@
 
 $p_holical = new Process_Item();
 
-$v_generate_holidays =
-  new Voice_Cmd('Generate holiday information for [1,2,3,4] year(s)');
+$v_generate_holidays = new Voice_Cmd('Generate holiday information for [1,2,3,4] year(s)');
 $v_generate_holidays->set_info('Generate ical compatible holiday information');
 $v_generate_holidays->set_authority('anyone');
 my $holiday_output_filename = $config_parms{holiday_ical_filename};
@@ -46,9 +45,7 @@
     $years = "0" if !$years;
 
     if ( -e $config_parms{holiday_definition_file} ) {
-        $p_holical->set(
-            "holical -y +$years $options -f $holiday_output_filename $config_parms{holiday_definition_file} "
-        );
+        $p_holical->set( "holical -y +$years $options -f $holiday_output_filename $config_parms{holiday_definition_file} " );
         start $p_holical;
     }
     else {
diff --git a/code/common/iButton.pl b/code/common/iButton.pl
index a7b039f0e..594818ce6 100644
--- a/code/common/iButton.pl
+++ b/code/common/iButton.pl
@@ -28,12 +28,10 @@
 =cut
 
 $v_iButton_connect = new Voice_Cmd "[Connect,Disconnect] to the iButton bus";
-$v_iButton_connect->set_info(
-    'Use this to free up the serial port or test the iButton start/stop calls');
+$v_iButton_connect->set_info('Use this to free up the serial port or test the iButton start/stop calls');
 
 $v_iButton_list = new Voice_Cmd "List all the iButton buttons";
-$v_iButton_list->set_info(
-    'Lists the family and ID codes of all the buttons on the bus');
+$v_iButton_list->set_info('Lists the family and ID codes of all the buttons on the bus');
 $v_iButton_list->set_authority('anyone');
 
 if ( said $v_iButton_connect) {
@@ -43,8 +41,7 @@
         $v_iButton_connect->respond('app=error iButton bus is not configured.');
     }
     else {
-        $v_iButton_connect->respond(
-            "app=ibutton $state" . 'ing to iButton bus...' );
+        $v_iButton_connect->respond( "app=ibutton $state" . 'ing to iButton bus...' );
 
         if ( $state eq 'Connect' ) {
             print_log "&iButton::connect($config_parms{iButton_serial_port})";
@@ -62,8 +59,7 @@
     my $results = &iButton::scan_report();
     $v_iButton_list->respond( "List of iButtons:\n" . $results ) if $results;
     if ( $config_parms{iButton_2_serial_port} ) {
-        $results =
-          &iButton::scan_report( undef, $config_parms{iButton_2_serial_port} );
+        $results = &iButton::scan_report( undef, $config_parms{iButton_2_serial_port} );
         $v_iButton_list->respond( "List of iButtons:\n" . $results )
           if $results;
     }
diff --git a/code/common/ia7_phonelogs.pl b/code/common/ia7_phonelogs.pl
index 54a246965..0cf0df57e 100644
--- a/code/common/ia7_phonelogs.pl
+++ b/code/common/ia7_phonelogs.pl
@@ -62,13 +62,12 @@ sub _get_data {
     for my $r (@calls) {
         $count++;
         next if ( $count < $start );
-        my ( $time, $num, $name, $line, $type ) =
-          $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
+        my ( $time, $num, $name, $line, $type ) = $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
         ( $time, $num, $name ) = $r =~ /(.+\d+:\d+:\d+) (\S+) (.+)/
           unless $name;
         my $display_name = $name;
-        $display_name =~ s/_/ /g;   # remove underscores to make it print pretty
-            #print "db: [$table] $count, $time, $num,$display_name\n";
+        $display_name =~ s/_/ /g;    # remove underscores to make it print pretty
+                                     #print "db: [$table] $count, $time, $num,$display_name\n";
         next unless $num;
 
         my $type_no = 3;
@@ -95,8 +94,7 @@ sub _new_call {
 
     #print "db: time=$time number=$number name=$name line=$line type=$type\n";
     #print "db:table=$json_table, data=[" . join(";", @data) . "]\n";
-    &json_table_insert_data_row( $json_table, 0, [@data] ) &
-      json_table_push($json_table);
+    &json_table_insert_data_row( $json_table, 0, [@data] ) & json_table_push($json_table);
 }
 
 sub get_phone_inbound_data {
diff --git a/code/common/ical.pl b/code/common/ical.pl
index 81bb019dc..aaf2892d2 100644
--- a/code/common/ical.pl
+++ b/code/common/ical.pl
@@ -79,11 +79,8 @@ sub readCal {
 # it was read ?
 if (
     $New_Minute
-    and (
-        not $calendar
-        or DateTime::compare( DateTime->from_epoch( epoch => $st->mtime ),
-            $calendar->{readAt} ) > 0
-    )
+    and ( not $calendar
+        or DateTime::compare( DateTime->from_epoch( epoch => $st->mtime ), $calendar->{readAt} ) > 0 )
   )
 {
     print_log "Need to reload calendar !";
@@ -113,12 +110,7 @@ sub readCal {
         my $wanted_state = OFF;
 
         my $spanSet = DateTime::SpanSet->from_spans( spans => $spans );
-        if (
-            $spanSet->contains(
-                DateTime->now( time_zone => $config_parms{dt_time_zone} )
-            )
-          )
-        {
+        if ( $spanSet->contains( DateTime->now( time_zone => $config_parms{dt_time_zone} ) ) ) {
             $wanted_state = ON;
         }
         if ($wanted_state) {
diff --git a/code/common/idle_items.pl b/code/common/idle_items.pl
index fb46bc81f..bef48450a 100644
--- a/code/common/idle_items.pl
+++ b/code/common/idle_items.pl
@@ -2,8 +2,7 @@
 
 #@ Lists time idle for various types of items.  User configurable "other" option allows reporting on other items.
 
-$_vc_display_item_status =
-  new Voice_Cmd 'Show Idle Time [RF,Analog Sensor,Other]';
+$_vc_display_item_status = new Voice_Cmd 'Show Idle Time [RF,Analog Sensor,Other]';
 
 if ( defined( $state = said $_vc_display_item_status) ) {
     if ( $state eq 'RF' ) {
@@ -20,8 +19,7 @@
             &display_idle_item_status($idle_items_other);
         }
         else {
-            print
-              "You must first define idle_items_other in your ini parms.  Separate multiple item class names with a comma.\n";
+            print "You must first define idle_items_other in your ini parms.  Separate multiple item class names with a comma.\n";
         }
     }
 }
@@ -30,8 +28,7 @@ sub display_idle_item_status {
     my ($idle_types) = @_;
     my $output = "\n($idle_types) items and corresponding idle time";
     $output .= "\n------------------------------------------------------------";
-    $output .=
-      "\n  * warn - some items may report time since restart/reload\n\n";
+    $output .= "\n  * warn - some items may report time since restart/reload\n\n";
     my @idle_items = &main::get_idle_item_data($idle_types);
     foreach my $idle_item_ptr (@idle_items) {
         if ($idle_item_ptr) {
@@ -81,12 +78,9 @@ sub web_idle_status {
             $name =~ s/\$//g;
             my $type = $item_data{class};
             $html_data{$type} =
-              "<tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left' colspan=\"3\">"
-              . $type
-              . "</th></tr>"
+              "<tr id='resultrow' bgcolor='#9999CC' class='wvtheader'><th align='left' colspan=\"3\">" . $type . "</th></tr>"
               unless ( defined $html_data{$type} );
-            $html_data{$type} .=
-              "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
+            $html_data{$type} .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
             $html_data{$type} .= "<td nowrap>$name</td>";
             $html_data{$type} .= "<td ";
 
@@ -124,8 +118,7 @@ sub web_idle_status {
         $html .= $html_hdr . $html_output;
     }
     else {
-        $html .=
-          &html_header("Error, no data to display for type: $idle_types!");
+        $html .= &html_header("Error, no data to display for type: $idle_types!");
     }
 
     $html .= "</body>";
diff --git a/code/common/internet_connect_check.pl b/code/common/internet_connect_check.pl
index 8618bf733..97a1260a1 100644
--- a/code/common/internet_connect_check.pl
+++ b/code/common/internet_connect_check.pl
@@ -17,8 +17,7 @@
 $ping_test->set_output($ping_test_results);
 $v_ping_test = new Voice_Cmd 'Ping test [on,off,run]';
 $v_ping_test->set_info(
-    "Run a ping test to see if there is an internet connection. Set to 'On' to run it periodically.  'Run' runs it once."
-);
+    "Run a ping test to see if there is an internet connection. Set to 'On' to run it periodically.  'Run' runs it once." );
 
 #&tk_radiobutton('Ping Test', \$Save{ping_test_flag}, [1,0], ['On', 'Off']);
 
@@ -66,19 +65,14 @@ sub ping_test {
         if (    $Save{ping_test_results} eq 'down'
             and $Save{ping_test_count} >= 3 )
         {
-            my $time_diff = time_diff $Save{ping_test_time}, $Time, 'minute',
-              'numeric';
-            logit "$config_parms{data_dir}/logs/internet_down.log",
-              "Net up.  Was $Save{ping_test_results}.  Downtime: $time_diff";
+            my $time_diff = time_diff $Save{ping_test_time}, $Time, 'minute', 'numeric';
+            logit "$config_parms{data_dir}/logs/internet_down.log", "Net up.  Was $Save{ping_test_results}.  Downtime: $time_diff";
             $time_diff = time_diff $Save{ping_test_time}, $Time, 'minute';
 
             #           play file => 'timer', mode => 'unmute'; # Set in event_sounds.pl
-            $v_ping_test->respond(
-                "app=network The internet connection is back up after $time_diff"
-            );
+            $v_ping_test->respond( "app=network The internet connection is back up after $time_diff" );
             display
-              text =>
-              "The internet connection is back up  (was $Save{ping_test_results}).  Time=$time_diff",
+              text        => "The internet connection is back up  (was $Save{ping_test_results}).  Time=$time_diff",
               time        => 0,
               window_name => 'Internet Connect Check',
               append      => 'bottom';
@@ -94,8 +88,7 @@ sub ping_test {
             $Save{ping_test_time}    = $Time;
         }
         elsif ( ++$Save{ping_test_count} == 3 ) {
-            $v_ping_test->respond(
-                "app=network Internet connection just went down.");
+            $v_ping_test->respond("app=network Internet connection just went down.");
             display
               text        => 'The internet connection is down',
               time        => 0,
diff --git a/code/common/internet_dialup.pl b/code/common/internet_dialup.pl
index 8711805a1..b45f611d5 100644
--- a/code/common/internet_dialup.pl
+++ b/code/common/internet_dialup.pl
@@ -6,9 +6,7 @@
 $net_connect       = new Generic_Item;
 
 $v_logon_to_net = new Voice_Cmd('[Log onto,dial] the net');
-$v_logon_to_net->set_info(
-    "Connect to the net using rasdial entry $config_parms{net_connect_entry} (windows only)"
-);
+$v_logon_to_net->set_info( "Connect to the net using rasdial entry $config_parms{net_connect_entry} (windows only)" );
 
 #set_icon $v_logon_to_net 'logon';
 if ( said $v_logon_to_net) {
@@ -25,8 +23,7 @@
         if ( !defined $config_parms{net_connect_entry}
             and $config_parms{net_connect_entry} )
         {    #name and password optional
-            $v_logon_to_net->respond(
-                "app=error Dial-up networking is not configured.");
+            $v_logon_to_net->respond("app=error Dial-up networking is not configured.");
         }
         else {
             $v_logon_to_net->respond("app=network Dialing the internet");
@@ -43,7 +40,7 @@
 if ( said $v_logoff_net) {
     if (net_connect_check) {
         if ( &ras_disconnect() ) {
-            set $net_connect 'disconnected', $v_logoff_net;  # *** same as above
+            set $net_connect 'disconnected', $v_logoff_net;    # *** same as above
             $v_logoff_net->respond("app=network Logged off the Internet.");
         }
         else {
diff --git a/code/common/internet_earthquakes.pl b/code/common/internet_earthquakes.pl
index e736ee9da..aa7a85ddc 100644
--- a/code/common/internet_earthquakes.pl
+++ b/code/common/internet_earthquakes.pl
@@ -131,56 +131,36 @@
 if ( $state eq 'Get' ) {
     if (&net_connect_check) {
         if ( !$p_earthquakes->done() ) {
-            $v_earthquakes->respond(
-                "app=earthquakes Can not get earthquakes. Get earthquakes is already running..."
-            );
+            $v_earthquakes->respond( "app=earthquakes Can not get earthquakes. Get earthquakes is already running..." );
         }
         else {
             start $p_earthquakes;
-            $v_earthquakes->respond(
-                "app=earthquakes Checking for recent earthquakes...");
+            $v_earthquakes->respond("app=earthquakes Checking for recent earthquakes...");
         }
     }
 }
 elsif ( $state eq 'Clear' ) {
     if ( !$p_earthquakes->done() ) {
-        $v_earthquakes->respond(
-            "app=earthquakes Can not clear earthquakes. Get earthquakes is running..."
-        );
+        $v_earthquakes->respond( "app=earthquakes Can not clear earthquakes. Get earthquakes is running..." );
     }
     else {
-        $v_earthquakes->respond(
-            "app=earthquakes Clearing recent earthquakes ...");
+        $v_earthquakes->respond("app=earthquakes Clearing recent earthquakes ...");
         unlink $f_earthquakes_dbm;
         delete $Save{quakes};    #Delete the old save var if it exists
     }
 }
 elsif ( $state eq 'Read' ) {
-    if (
-        $speech = earthquake_read(
-            'all',             $f_earthquakes_dbm,
-            $Earthquake_Count, $Earthquake_Unit_Name
-        )
-      )
-    {
+    if ( $speech = earthquake_read( 'all', $f_earthquakes_dbm, $Earthquake_Count, $Earthquake_Unit_Name ) ) {
         $v_earthquakes->respond("app=earthquakes $speech");
     }
     else {
-        $v_earthquakes->respond(
-            'app=earthquakes No recent earthquakes to report.');
+        $v_earthquakes->respond('app=earthquakes No recent earthquakes to report.');
     }
 }
 
 if ( done_now $p_earthquakes) {
-    if (
-        $speech = earthquake_read(
-            'new',             $f_earthquakes_dbm,
-            $Earthquake_Count, $Earthquake_Unit_Name
-        )
-      )
-    {
-        $v_earthquakes->respond(
-            "app=earthquakes connected=0 important=1 $speech");
+    if ( $speech = earthquake_read( 'new', $f_earthquakes_dbm, $Earthquake_Count, $Earthquake_Unit_Name ) ) {
+        $v_earthquakes->respond("app=earthquakes connected=0 important=1 $speech");
     }
 }
 
@@ -214,9 +194,7 @@ sub earthquake_read {
 
     my $key;
     my $count = 0;
-    print_log( "internet_earthquakes: Found "
-          . scalar(@keysSpeak)
-          . " quakes to speak" )
+    print_log( "internet_earthquakes: Found " . scalar(@keysSpeak) . " quakes to speak" )
       if $Debug{earthquakes};
     foreach $key (@keysSpeak) {
         @dbmEvent = split( $;, $DBM{$key} );
@@ -257,8 +235,7 @@ sub calc_earthquake_age {
     # print ("UTC:" . $qtimeUTC . "\n");
 
     #Split it - these are now local time, not UTC
-    my ( $qseco, $qminu, $qhour, $qdate, $qmnth, $qyear ) =
-      localtime($qtimeUTC);
+    my ( $qseco, $qminu, $qhour, $qdate, $qmnth, $qyear ) = localtime($qtimeUTC);
     $qmnth += 1;
 
     #Merge it again - this is now local time, not UTC
@@ -268,11 +245,7 @@ sub calc_earthquake_age {
 
 # lets allow the user to control via triggers
 # noloop=start
-&trigger_set(
-    '$New_Hour and net_connect_check',
-    "run_voice_cmd 'Get recent earthquakes'",
-    'NoExpire',
-    'get earthquakes'
-) unless &trigger_get('get earthquakes');
+&trigger_set( '$New_Hour and net_connect_check', "run_voice_cmd 'Get recent earthquakes'", 'NoExpire', 'get earthquakes' )
+  unless &trigger_get('get earthquakes');
 
 # noloop=stop
diff --git a/code/common/internet_earthquakes_cal.pl b/code/common/internet_earthquakes_cal.pl
index cffd6b75a..5445cfacb 100644
--- a/code/common/internet_earthquakes_cal.pl
+++ b/code/common/internet_earthquakes_cal.pl
@@ -69,21 +69,16 @@
     $Earthquake_Count = $config_parms{Earthquake_Count};
 }
 
-$f_earthquakes_cal_html =
-  new File_Item("$config_parms{data_dir}/web/earthquakes_cal.html");
-$f_earthquakes_cal_gif =
-  new File_Item("$config_parms{data_dir}/web/earthquakes_cal.gif");
+$f_earthquakes_cal_html = new File_Item("$config_parms{data_dir}/web/earthquakes_cal.html");
+$f_earthquakes_cal_gif  = new File_Item("$config_parms{data_dir}/web/earthquakes_cal.gif");
 
 my $image;
 $p_earthquakes_image_cal = new Process_Item;
-$p_earthquakes_cal       = new Process_Item(
-    "get_url http://quake.wr.usgs.gov/recenteqs/Quakes/quakes0.htm "
-      . $f_earthquakes_cal_html->name );
-
-$v_earthquakes_cal =
-  new Voice_Cmd('[Get,Show,Read,Clear] recent California earthquakes');
-$v_earthquakes_cal->set_info(
-    'Display recent California earthquake information');
+$p_earthquakes_cal =
+  new Process_Item( "get_url http://quake.wr.usgs.gov/recenteqs/Quakes/quakes0.htm " . $f_earthquakes_cal_html->name );
+
+$v_earthquakes_cal = new Voice_Cmd('[Get,Show,Read,Clear] recent California earthquakes');
+$v_earthquakes_cal->set_info('Display recent California earthquake information');
 $v_earthquakes_cal->set_authority('anyone');
 
 $state = said $v_earthquakes_cal;
@@ -142,15 +137,14 @@
         $Save{quakes_cal} = $new_quakes . $Save{quakes_cal};
 
         #   $Save{quakes_cal} =~ s/^(([^\t]*\t){1,1000}).*/$1/;
-        $Save{quakes_cal} =~ s/^(([^\t]*\t){1,15}).*/$1/;  # Save last 15 quakes
+        $Save{quakes_cal} =~ s/^(([^\t]*\t){1,15}).*/$1/;    # Save last 15 quakes
         $image = '';
         foreach ( split /\t/, $new_quakes ) {
             $quake = $_;
             last unless $num < $Earthquake_Count;
             $num += speak_quake_cal($quake);
         }
-        set $p_earthquakes_image_cal "get_url $image "
-          . $f_earthquakes_cal_gif->name;
+        set $p_earthquakes_image_cal "get_url $image " . $f_earthquakes_cal_gif->name;
         start $p_earthquakes_image_cal if $image;
     }
 }
@@ -167,27 +161,17 @@ sub calc_distance_cal {
     $lon1 /= $c;
     $lon2 /= $c;
     $d = 2 * Math::Trig::asin(
-        sqrt(
-            ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 +
-              cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2
-        )
-    );
+        sqrt( ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 + cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2 ) );
 
     return $d * ( .5 * 7915.6 );    # convert to miles and return
 }
 
 sub calc_age_cal {
     my $time = shift;
-    my ( $qyear, $qmnth, $qdate, $qhour, $qminu, $qseco ) =
-      $time =~ m!(\S+)/(\S+)/(\S+)\s+(\S+):(\S+):(\S+)!;
-    my $qtime =
-      timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear - 1900 );
-    my $midnight = timelocal( 0, 0, 0, $Mday, $Month - 1, $Year - 1900 );
-    my $diff = (
-        time - timelocal(
-            $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear - 1900
-        )
-    );
+    my ( $qyear, $qmnth, $qdate, $qhour, $qminu, $qseco ) = $time =~ m!(\S+)/(\S+)/(\S+)\s+(\S+):(\S+):(\S+)!;
+    my $qtime    = timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear - 1900 );
+    my $midnight = timelocal( 0,      0,      0,      $Mday,  $Month - 1, $Year - 1900 );
+    my $diff = ( time - timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear - 1900 ) );
 
     return int( $diff / 60 ) . " minutes ago " if ( $diff < 60 * 120 );
     return int( $diff / ( 60 * 60 ) ) . " hours ago " if ( $qtime > $midnight );
@@ -204,30 +188,18 @@ sub calc_age_cal {
 sub speak_quake_cal {
 
     #map 1.3  2001/05/12 20:09:30 33.995N 116.818W 18.3    9 km ( 5 mi) NNW of Cabazon, CA
-    if (
-        my (
-            $qmagn, $qdate, $qtime, $qlatd, $qnoso,
-            $qlong, $qeawe, $qdept, $qloca
-        )
-        = $_ =~
-        m!map\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+).+km.+mi.+[NSEW]+\s+of\s+(.+)!i
-      )
+    if ( my ( $qmagn, $qdate, $qtime, $qlatd, $qnoso, $qlong, $qeawe, $qdept, $qloca ) =
+        $_ =~ m!map\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+).+km.+mi.+[NSEW]+\s+of\s+(.+)!i )
     {
         $qlatd *= -1 if ( $qnoso eq "S" );
         $qlong *= -1 if ( $qeawe eq "W" );
-        my $distance = sprintf "%d",
-          calc_distance_cal( $config_parms{latitude}, $config_parms{longitude},
-            $qlatd, $qlong ) + .5;
+        my $distance = sprintf "%d", calc_distance_cal( $config_parms{latitude}, $config_parms{longitude}, $qlatd, $qlong ) + .5;
         for ( keys %Magnitude_thresholds ) {
             if ( $distance <= $_ and $qmagn >= $Magnitude_thresholds{$_} ) {
-                $image =
-                    'http://quake.wr.usgs.gov/recenteqs/Maps/'
-                  . round( -$qlong ) . '-'
-                  . round($qlatd) . '.gif';
+                $image = 'http://quake.wr.usgs.gov/recenteqs/Maps/' . round( -$qlong ) . '-' . round($qlatd) . '.gif';
                 $qloca =~ s/, CA$/ California/;
                 $qloca =~ s/, NV$/ Nevada/;
-                speak &calc_age_cal("$qdate $qtime")
-                  . "a magnitude $qmagn earthquake occurred $distance miles away near $qloca";
+                speak &calc_age_cal("$qdate $qtime") . "a magnitude $qmagn earthquake occurred $distance miles away near $qloca";
                 return 1;
             }
         }
diff --git a/code/common/internet_im.pl b/code/common/internet_im.pl
index 73ae91305..9204b5cc0 100644
--- a/code/common/internet_im.pl
+++ b/code/common/internet_im.pl
@@ -58,8 +58,7 @@
 =cut
 
 $v_im_test = new Voice_Cmd 'Send [AOL,ICQ,MSN,jabber] test message';
-$v_im_test->set_info(
-    'Send a test message to the default AOL, ICQ, MSN, or jabber address');
+$v_im_test->set_info('Send a test message to the default AOL, ICQ, MSN, or jabber address');
 
 if ( $state = said $v_im_test) {
     my $msg = "MisterHouse has been up for $Tk_objects{label_uptime_cpu}";
@@ -69,8 +68,7 @@
 }
 
 $v_im_signon = new Voice_Cmd 'Connect to [AOL,ICQ,MSN,jabber]';
-$v_im_signon->set_info(
-    'Disconnect, then re-Connect to the specified im servers');
+$v_im_signon->set_info('Disconnect, then re-Connect to the specified im servers');
 if ( $state = said $v_im_signon) {
     if ( $state eq 'AOL' and $oscar::aim_connected ) {
         &net_im_signoff($state);
@@ -91,11 +89,9 @@
 }
 
 $v_im_logdata1 = new Voice_Cmd 'Start sending log data to [AOL,ICQ,MSN,jabber]';
-$v_im_logdata1->set_info(
-    'Start sending print log entries and speech to the default IM user');
+$v_im_logdata1->set_info('Start sending print log entries and speech to the default IM user');
 $v_im_logdata2 = new Voice_Cmd 'Stop sending log data to [AOL,ICQ,MSN,jabber]';
-$v_im_logdata2->set_info(
-    'Stop sending print log entries and speech to the default IM user');
+$v_im_logdata2->set_info('Stop sending print log entries and speech to the default IM user');
 
 $log_to_im_list{"$state default"} = 'all' if $state = said $v_im_logdata1;
 delete $log_to_im_list{"$state default"} if $state = said $v_im_logdata2;
@@ -176,15 +172,13 @@ sub im_message {
         return;
     }
 
-    print
-      "IM: RUN a=$authority,$im_data{password_allow}{$from} from=$from text=$text\n"
+    print "IM: RUN a=$authority,$im_data{password_allow}{$from} from=$from text=$text\n"
       if $main::Debug{im};
     return if $text =~ /^i\'m away/i;
     return if $text =~ /^Sorry, I ran out for a bit/i;
     return if $text =~ /^I am currently away from the computer/i;
     return
-      if $from =~ /AOL System Msg/i
-      ;    # Fix for AOL: bot to bot infinite loop - stops replies to AOL's bot.
+      if $from =~ /AOL System Msg/i;    # Fix for AOL: bot to bot infinite loop - stops replies to AOL's bot.
 
     my ($im_sessionless_from) = $from =~ m/^(.*@.*\/.*)\w{8}$/;
 
@@ -193,17 +187,14 @@ sub im_message {
         if ( $im_data{password_allow}{$from} ) {
 
             # *** What about the three different levels?
-            $msg =
-              "You have $im_data{password_allow}{$from} access, so there is no need to login!";
+            $msg = "You have $im_data{password_allow}{$from} access, so there is no need to login!";
         }
         else {
             if ( my $user = password_check $2) {
                 run_after_delay 120, "&im_logoff('$pgm', '$from')";
                 $im_data{password_allow_temp}{$from} = $user;
-                $msg =
-                  "$user login accepted. You will be logged out in 2 minutes.";
-                $msg .=
-                  "\nRun set_password to create a password.  Global authorization enabled until then"
+                $msg = "$user login accepted. You will be logged out in 2 minutes.";
+                $msg .= "\nRun set_password to create a password.  Global authorization enabled until then"
                   unless -e $config_parms{password_file};
             }
             else {
@@ -236,8 +227,7 @@ sub im_message {
                 push @cmds2, $cmd;
             }
             else {
-                $cmd =~ s/^[^:]+: //
-                  ; #Trim the category ("Other: ", etc) from the front of the command
+                $cmd =~ s/^[^:]+: //;    #Trim the category ("Other: ", etc) from the front of the command
                 $cmd =~ s/\s*$//;
                 my ($ref) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
                 $authority = $ref->get_authority if $ref;
@@ -246,8 +236,7 @@ sub im_message {
                   or lc $authority eq 'anyone';
             }
         }
-        $msg =
-          "Found " . scalar(@cmds2) . " commands that matched \"$search\":\n  ";
+        $msg = "Found " . scalar(@cmds2) . " commands that matched \"$search\":\n  ";
         $msg .= join( "\n  ", @cmds2 );
     }
     elsif ( $text =~ /^help/ ) {
@@ -257,12 +246,10 @@ sub im_message {
         $msg .= "  speak:  xyz  => speaks text xyz\n";
         $msg .= "  display:  xyz  => speaks text xyz\n";
         $msg .= "  set: xyz state => set object xyz to state\n";
-        $msg .=
-          "  log: xyz  => xyz is a filter of what to log. (print, speak, play, speak|play, all, and stop)\n"
+        $msg .= "  log: xyz  => xyz is a filter of what to log. (print, speak, play, speak|play, all, and stop)\n"
           if ( $im_data{password_allow}{$from}
             or $im_data{password_allow_temp}{$from} );
-        $msg .=
-          "  var: abc xyz => abc is a variable, hash or reference, xyz element in hash or hash reference to show\n";
+        $msg .= "  var: abc xyz => abc is a variable, hash or reference, xyz element in hash or hash reference to show\n";
         $msg .= "  logon: xyz  => logon with password xyz\n";
         $msg .=
           "  send sname:  xyz  => sname is a Screenname to send a message to, and xyz is the text to send. Can only send using current IM program\n"
@@ -293,8 +280,7 @@ sub im_message {
                         $msg = "\\$$$var = ${${$var}}";
                     }
                     else {
-                        $msg =
-                          "Error, \$$var is not a scalar reference, it is a $refType reference.  I need a second parameter";
+                        $msg = "Error, \$$var is not a scalar reference, it is a $refType reference.  I need a second parameter";
                     }
                 }
             }
@@ -302,8 +288,7 @@ sub im_message {
                 if ( $refType eq '' ) {    # this is a simple hash
                     $msg = '$' . $var . '{' . $key . '} = ' . ${$var}{$key};
                 }
-                else
-                {    # this is a reference, assuming a hash or object reference
+                else {                     # this is a reference, assuming a hash or object reference
                     $msg = '$' . $var . '->{' . $key . '} = ' . ${$var}->{$key};
                 }
             }
@@ -337,9 +322,7 @@ sub im_message {
             my @command = split( / /, $cmdstring );
 
             # check each of the following object classes for matching object name
-            for my $objectclass ( 'X10_Item', 'X10_Appliance', 'Serial_Item',
-                'Group' )
-            {
+            for my $objectclass ( 'X10_Item', 'X10_Appliance', 'Serial_Item', 'Group' ) {
                 for my $name ( &list_objects_by_type($objectclass) ) {
 
                     # compare lowercase to make case-insensitive
@@ -356,8 +339,7 @@ sub im_message {
                                 # so do it!
                                 $flag = 1;
                                 set $object $command[1];
-                                $msg =
-                                  $command[0] . " set to " . $command[1] . "\n";
+                                $msg = $command[0] . " set to " . $command[1] . "\n";
 
                                 # break out since we're done
                                 last;
@@ -366,10 +348,7 @@ sub im_message {
                         if ( !$flag ) {
 
                             # oops...invalid state requested, let them know
-                            $msg =
-                                $command[1]
-                              . " is not a valid state for "
-                              . $command[0] . "\n";
+                            $msg = $command[1] . " is not a valid state for " . $command[0] . "\n";
 
                             # set the flag so we'll stop searching because
                             # we already matched the object name
@@ -395,9 +374,7 @@ sub im_message {
             $cmdstring =~ s/\s+$//;
 
             # check each of the following object classes for matching object name
-            for my $objectclass ( 'X10_Item', 'X10_Appliance', 'Serial_Item',
-                'Group' )
-            {
+            for my $objectclass ( 'X10_Item', 'X10_Appliance', 'Serial_Item', 'Group' ) {
                 for my $name ( &list_objects_by_type($objectclass) ) {
 
                     # compare lowercase to make case-insensitive
@@ -430,19 +407,11 @@ sub im_message {
 
         # *** Need to convert unmatched command to a find...
         # RespondTarget is deprecated, use set_by to respond to the correct program/user
-        elsif (
-            &process_external_command(
-                $text, 1,
-                "im [$pgm,$from]",
-                "im pgm=$pgm to=$from"
-            )
-          )
-        {
+        elsif ( &process_external_command( $text, 1, "im [$pgm,$from]", "im pgm=$pgm to=$from" ) ) {
         }
         else {
 
-            use vars '$eliza_rule'
-              ;    # in case eliza_server common code module is not loaded
+            use vars '$eliza_rule';    # in case eliza_server common code module is not loaded
 
             my $rule;
 
@@ -452,10 +421,8 @@ sub im_message {
                 $rule = $eliza_rule->{state};
             }
 
-            if ( $rule and $rule ne 'none' )
-            {      # allow short-circuit of chatbot via config parm or widget
-                my $eliza = new Chatbot::Eliza "Eliza",
-                  "../data/eliza/$rule.txt";
+            if ( $rule and $rule ne 'none' ) {    # allow short-circuit of chatbot via config parm or widget
+                my $eliza = new Chatbot::Eliza "Eliza", "../data/eliza/$rule.txt";
                 $msg = $eliza->transform($text);
             }
             else {
diff --git a/code/common/internet_irc.pl b/code/common/internet_irc.pl
index 41834679a..0917893e8 100644
--- a/code/common/internet_irc.pl
+++ b/code/common/internet_irc.pl
@@ -146,8 +146,7 @@
     $irc_ops->add_global_handler( 'join',   \&irc_on_join );
     $irc_ops->add_global_handler( 'part',   \&irc_on_part );
     $irc_ops->add_global_handler( 'quit',   \&irc_on_part );
-    $irc_ops->add_global_handler( [ 251, 252, 253, 254, 302, 255 ],
-        \&irc_on_init );
+    $irc_ops->add_global_handler( [ 251, 252, 253, 254, 302, 255 ], \&irc_on_init );
     $irc_ops->add_global_handler( 'disconnect', \&irc_on_disconnect );
     $irc_ops->add_global_handler( 376,          \&irc_on_connect );
     $irc_ops->add_global_handler( 433,          \&irc_on_nick_taken );
@@ -170,19 +169,13 @@
             $cline =~ /irc_connection(\d+)/;
             $handle = $1;
             print "CLINE $handle: $cline\n" if $main::Debug{irc};
-            my ( $server, $port, $nick, $channels, $irc_name, $user_name,
-                $passwd );
-            if ( $config_parms{$cline} =~
-                /(\S+):(\d*):(\S+):(\S+):(\S+):(\S+):(\S*)/ )
-            {
-                (
-                    $server, $port, $nick, $channels, $irc_name, $user_name,
-                    $passwd
-                ) = ( $1, $2, $3, $4, $5, $6, $7 );
+            my ( $server, $port, $nick, $channels, $irc_name, $user_name, $passwd );
+            if ( $config_parms{$cline} =~ /(\S+):(\d*):(\S+):(\S+):(\S+):(\S+):(\S*)/ ) {
+                ( $server, $port, $nick, $channels, $irc_name, $user_name, $passwd ) = ( $1, $2, $3, $4, $5, $6, $7 );
                 $irc_data{connections}{$handle}{server} = $server;
-                $ref         = $irc_data{connections}{$handle};
-                $ref->{port} = $port;
-                $ref->{nick} = $nick;
+                $ref                                    = $irc_data{connections}{$handle};
+                $ref->{port}                            = $port;
+                $ref->{nick}                            = $nick;
                 foreach ( split( /,/, $channels ) ) {
                     print "CHANNEL: $_\n";
                     $ref->{channels}{$_}{start} = 1;
@@ -195,14 +188,13 @@
                 $ref->{auths} = '.*';    # no auth
                 $ref->{queue} = [];
 
-                $ref->{max_bytes} = 2560;    # optimised for hybrid6 ircd
-                $ref->{window}    = 10;      # hybrid6
+                $ref->{max_bytes}   = 2560;                                          # optimised for hybrid6 ircd
+                $ref->{window}      = 10;                                            # hybrid6
                 $ref->{float}       = $ref->{max_bytes};
-                $ref->{line_length} = 511;                 # hybrid6
-                $ref->{last_time} = $ref->{first_time} = $ref->{since} = time();
-                $ref->{last_sent} = 0;
-                print
-                  "$handle: $server, $port, $nick, $irc_name, $user_name, $passwd\n"
+                $ref->{line_length} = 511;                                           # hybrid6
+                $ref->{last_time}   = $ref->{first_time} = $ref->{since} = time();
+                $ref->{last_sent}   = 0;
+                print "$handle: $server, $port, $nick, $irc_name, $user_name, $passwd\n"
                   if $main::Debug{irc};
             }
         }
@@ -233,7 +225,7 @@
                     $ref->{max_bytes}   = $max_bytes   ? $max_bytes   : 2560;
                     $ref->{line_length} = $line_length ? $line_length : 511;
                     $ref->{window}      = $window      ? $window      : 10;
-                    $ref->{float} = $ref->{max_bytes};
+                    $ref->{float}       = $ref->{max_bytes};
                     print "$handle: $config_parms{$bline}\n"
                       if $main::Debug{irc};
                 }
@@ -285,8 +277,7 @@ sub irc_disconnect {
 
     foreach $handle ( keys( %{ $irc_data{connections} } ) ) {
         if ( defined( $irc_data{connections}{$handle}{conn} ) ) {
-            $irc_data{connections}{$handle}
-              {quit}++;    # flag the disconnect handler to abort
+            $irc_data{connections}{$handle}{quit}++;    # flag the disconnect handler to abort
             $irc_data{connections}{$handle}{conn}->quit($irc_quit_msg);
         }
     }
@@ -304,9 +295,7 @@ sub irc_log {
     foreach $handle ( keys( %{ $irc_data{connections} } ) ) {
 
         # for each connection, generate channel log msgs
-        foreach $channel (
-            keys( %{ $irc_data{connections}{$handle}{channels} } ) )
-        {
+        foreach $channel ( keys( %{ $irc_data{connections}{$handle}{channels} } ) ) {
             $mask = $irc_data{connections}{$handle}{channels}{$channel}{publog};
             next unless defined($mask);
             next unless ( $mask eq 'all' or $log_source =~ /$mask/ );
@@ -314,8 +303,7 @@ sub irc_log {
         }
 
         # then do private log msgs
-        foreach $user ( keys( %{ $irc_data{connections}{$handle}{userlog} } ) )
-        {
+        foreach $user ( keys( %{ $irc_data{connections}{$handle}{userlog} } ) ) {
             $mask = $irc_data{connections}{$handle}{userlog}{$user};
             next unless defined($mask);
             next unless ( $mask eq 'all' or $log_source =~ /$mask/ );
@@ -378,8 +366,7 @@ sub irc_on_public {
     print "on_public: <$nick><$from> $arg\n" if $main::Debug{irc};
 
     if ( $arg =~ /^$mynick[:,]\s*(.*)/ ) {    #were we addressed?
-        if ( irc_check_auth( $handle, $from ) )
-        {    # only hear channel msgs from authenticated users
+        if ( irc_check_auth( $handle, $from ) ) {    # only hear channel msgs from authenticated users
             $cmd = $1;
             print "addressed by $nick -> $cmd\n" if $main::Debug{irc};
 
@@ -395,8 +382,7 @@ sub irc_on_join {
     my $channel = ( $event->to )[0];
     my ( $nick, $mynick ) = ( $event->nick, $self->nick );
 
-    printf "on_join: *** %s (%s) has joined channel %s\n",
-      $event->nick, $event->userhost, $channel
+    printf "on_join: *** %s (%s) has joined channel %s\n", $event->nick, $event->userhost, $channel
       if $main::Debug{irc};
 
     if ( $nick eq $mynick ) {    # it's about me
@@ -406,8 +392,7 @@ sub irc_on_join {
         }
         else {
             # bogus. maybe a nick collision
-            print
-              "on_join: got told I joined $channel, but I'm not on that channel!\n"
+            print "on_join: got told I joined $channel, but I'm not on that channel!\n"
               if $main::Debug{irc};
         }
     }
@@ -424,19 +409,13 @@ sub irc_on_part {
       if $main::Debug{irc};
 
     if ( $nick eq $mynick ) {    # it's about me
-        if (
-            defined(
-                $irc_data{connections}{$handle}{channels}{$channel}{joined}
-            )
-          )
-        {
+        if ( defined( $irc_data{connections}{$handle}{channels}{$channel}{joined} ) ) {
             delete $irc_data{connections}{$handle}{channels}{$channel}{joined};
             print "on_part: left $channel\n" if $main::Debug{irc};
         }
         else {
             # bogus. maybe a nick collision
-            print
-              "on_join: got told I left $channel, but I'm not on that channel!\n"
+            print "on_join: got told I left $channel, but I'm not on that channel!\n"
               if $main::Debug{irc};
         }
     }
@@ -447,8 +426,7 @@ sub irc_on_disconnect {
     my ( $self, $event ) = @_;
     my $handle = find_handle($self);
 
-    print_log "Disconnected from ", $event->from(), " (",
-      ( $event->args() )[0], ")\n";
+    print_log "Disconnected from ", $event->from(), " (", ( $event->args() )[0], ")\n";
 
     if ( defined($handle) ) {
         if ( defined( $irc_data{connections}{$handle}{quit} ) ) {
@@ -488,8 +466,7 @@ sub irc_on_connect {    # actually on endmotd
         #my $channel=$irc_data{connections}{$handle}{channel};
         my $channel;
 
-        foreach $channel ( keys %{ $irc_data{connections}{$handle}{channels} } )
-        {
+        foreach $channel ( keys %{ $irc_data{connections}{$handle}{channels} } ) {
             if ( $irc_data{connections}{$handle}{channels}{$channel}{start} ) {
                 print_log "on_connect: Joining $channel...\n";
                 $self->join($channel);
@@ -559,35 +536,32 @@ sub irc_interpret {
             if ( $cmd eq 'quit' ) {    #### QUIT ####
                 irc_cmd_quit( $obj, $nick, $from, $handle );
             }
-            elsif ( $cmd =~ /^log(?:$|\s+(.*))/ )
-            {                          #### LOG #### logging via privmsg
+            elsif ( $cmd =~ /^log(?:$|\s+(.*))/ ) {    #### LOG #### logging via privmsg
                 irc_cmd_log( $obj, $nick, $from, $handle, $1 );
             }
-            elsif ( $cmd =~ /^publog(?:$|\s+(\S*)\s*(.*))/ )
-            {                          #### PUBLOG #### logging via channel msg
+            elsif ( $cmd =~ /^publog(?:$|\s+(\S*)\s*(.*))/ ) {    #### PUBLOG #### logging via channel msg
                 irc_cmd_publog( $obj, $nick, $from, $handle, $1, $2 );
             }
-            elsif ( $cmd eq 'links' ) {    #### LINKS ####
+            elsif ( $cmd eq 'links' ) {                           #### LINKS ####
                 irc_cmd_links( $obj, $nick, $from, $handle );
             }
-            elsif ( $cmd eq 'test' ) {     #### TEST ####
+            elsif ( $cmd eq 'test' ) {                            #### TEST ####
                 irc_cmd_test( $obj, $nick, $from, $handle );
             }
-            elsif ( $cmd =~ /^join\s+(\S+)/ ) {    #### JOIN ####
+            elsif ( $cmd =~ /^join\s+(\S+)/ ) {                   #### JOIN ####
                 irc_cmd_join( $obj, $nick, $from, $handle, $1 );
             }
-            elsif ( $cmd =~ /^part\s+(\S+)/ ) {    #### PART ####
+            elsif ( $cmd =~ /^part\s+(\S+)/ ) {                   #### PART ####
                 irc_cmd_part( $obj, $nick, $from, $handle, $1 );
             }
-            elsif ( $cmd eq 'list' ) {             #### LIST ####
+            elsif ( $cmd eq 'list' ) {                            #### LIST ####
                 irc_cmd_list( $obj, $nick, $from, $handle );
             }
-            elsif ( $cmd =~ /^find\s+(.+)/ ) {     #### FIND ####
+            elsif ( $cmd =~ /^find\s+(.+)/ ) {                    #### FIND ####
                 irc_cmd_find( $obj, $nick, $from, $handle, $1 );
             }
             else {
-                &process_external_command( $cmd, 0, '',
-                    "irc handle=$handle target=$nick" );
+                &process_external_command( $cmd, 0, '', "irc handle=$handle target=$nick" );
             }
         }    # end authorised
     }
@@ -607,8 +581,7 @@ sub irc_cmd_login {
 sub irc_cmd_quit {
     my ( $obj, $nick, $from, $handle ) = @_;
 
-    $irc_data{connections}{$handle}
-      {quit}++;    # flag the disconnect handler to abort
+    $irc_data{connections}{$handle}{quit}++;    # flag the disconnect handler to abort
     $obj->quit($irc_quit_msg);
 }
 
@@ -632,8 +605,7 @@ sub irc_cmd_publog {
     if ( ( $channel ne '' ) && ( $mask ne '' ) ) {    # publog channel mask
         if ( defined( $irc_data{connections}{$handle}{channels}{$channel} ) ) {
             $irc_data{connections}{$handle}{channels}{$channel}{publog} = $mask;
-            queue_msg( $handle, $nick,
-                "channel logging for $channel set to '$mask'\n" );
+            queue_msg( $handle, $nick, "channel logging for $channel set to '$mask'\n" );
         }
         else {
             queue_msg( $handle, $nick, "I'm not on channel $channel\n" );
@@ -658,12 +630,10 @@ sub irc_cmd_publog {
 
         if ( $channel ne '' ) {
             $irc_data{connections}{$handle}{channels}{$channel}{publog} = $mask;
-            queue_msg( $handle, $nick,
-                "channel logging for  $channel set to '$mask'\n" );
+            queue_msg( $handle, $nick, "channel logging for  $channel set to '$mask'\n" );
         }
         else {
-            queue_msg( $handle, $nick,
-                "I don't know which channel you're referring to\n" );
+            queue_msg( $handle, $nick, "I don't know which channel you're referring to\n" );
         }
     }
     else {    # publog
@@ -676,13 +646,11 @@ sub irc_cmd_publog {
                 $mask =
                   $irc_data{connections}{$handle}{channels}{$channel}{publog};
                 $mask = ( defined($mask) ) ? $mask : 'none';
-                queue_msg( $handle, $nick,
-                    "channel logging for $channel set to '$mask'\n" );
+                queue_msg( $handle, $nick, "channel logging for $channel set to '$mask'\n" );
             }
         }
         else {
-            queue_msg( $handle, $nick,
-                "I'm not currently logging to any channels\n" );
+            queue_msg( $handle, $nick, "I'm not currently logging to any channels\n" );
         }
     }
 }
@@ -705,14 +673,10 @@ sub irc_cmd_links {
             $handle, $ref->{server}, $ref->{port} ? ":$ref->{port}" : "",
             $ref->{nick}, $ref->{username}
         );
-        $text .= "      channels: "
-          . join( ', ', sort keys( %{ $ref->{channels} } ) ) . "\n";
-        $text .= "      admins: "
-          . join( ', ', sort keys( %{ $ref->{authenticated} } ) ) . "\n";
-        $text .=
-          "      buffer: $ref->{float} / $ref->{max_bytes} bytes used , $ref->{line_length} cpl, penalty $penalty\n";
-        $text .= sprintf( "      $qsize entr%s in queue\n",
-            $qsize == 1 ? "y" : "ies" );
+        $text .= "      channels: " . join( ', ', sort keys( %{ $ref->{channels} } ) ) . "\n";
+        $text .= "      admins: " . join( ', ', sort keys( %{ $ref->{authenticated} } ) ) . "\n";
+        $text .= "      buffer: $ref->{float} / $ref->{max_bytes} bytes used , $ref->{line_length} cpl, penalty $penalty\n";
+        $text .= sprintf( "      $qsize entr%s in queue\n", $qsize == 1 ? "y" : "ies" );
         queue_msg( $handle, $nick, $text );
     }
 }
@@ -725,9 +689,7 @@ sub irc_cmd_test {
 sub irc_cmd_join {
     my ( $obj, $nick, $from, $handle, $channel ) = @_;
 
-    if (
-        defined( $irc_data{connections}{$handle}{channels}{$channel}{joined} ) )
-    {
+    if ( defined( $irc_data{connections}{$handle}{channels}{$channel}{joined} ) ) {
         queue_msg( $handle, $nick, "I'm already on $channel\n" );
     }
     else {
@@ -739,9 +701,7 @@ sub irc_cmd_join {
 sub irc_cmd_part {
     my ( $obj, $nick, $from, $handle, $channel ) = @_;
 
-    if (
-        defined( $irc_data{connections}{$handle}{channels}{$channel}{joined} ) )
-    {
+    if ( defined( $irc_data{connections}{$handle}{channels}{$channel}{joined} ) ) {
         queue_msg( $handle, $nick, "Leaving $channel...\n" );
         $obj->part($channel);
     }
@@ -757,8 +717,7 @@ sub irc_cmd_list {
     @cmds = &Voice_Cmd::voice_items();
 
     for $cmd (@cmds) {
-        $cmd =~ s/^[^:]+: //
-          ;    #Trim the category ("Other: ", etc) from the front of the command
+        $cmd =~ s/^[^:]+: //;    #Trim the category ("Other: ", etc) from the front of the command
         $cmd =~ s/\s*$//;
         my ($ref) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
         my $authority = $ref->get_authority if $ref;
@@ -769,8 +728,7 @@ sub irc_cmd_list {
           or $authority eq '';
     }
 
-    $cmd = sprintf( "Found %d command%s\n",
-        scalar(@cmds2), scalar(@cmds2) == 1 ? "" : "s" );
+    $cmd = sprintf( "Found %d command%s\n", scalar(@cmds2), scalar(@cmds2) == 1 ? "" : "s" );
     queue_msg( $handle, $nick, $cmd );
     queue_msg( $handle, $nick, join( ', ', @cmds2 ) );
 }
@@ -785,8 +743,7 @@ sub irc_cmd_find {
     @cmds = &list_voice_cmds_match($search);
 
     for $cmd (@cmds) {
-        $cmd =~ s/^[^:]+: //
-          ;    #Trim the category ("Other: ", etc) from the front of the command
+        $cmd =~ s/^[^:]+: //;    #Trim the category ("Other: ", etc) from the front of the command
         $cmd =~ s/\s*$//;
         my ($ref) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
         my $authority = $ref->get_authority if $ref;
@@ -796,8 +753,7 @@ sub irc_cmd_find {
           or $authority eq '';
     }
 
-    $cmd = sprintf( "Found %d command%s\n",
-        scalar(@cmds2), scalar(@cmds2) == 1 ? "" : "s" );
+    $cmd = sprintf( "Found %d command%s\n", scalar(@cmds2), scalar(@cmds2) == 1 ? "" : "s" );
     queue_msg( $handle, $nick, $cmd );
     for $cmd (@cmds2) {
         queue_msg( $handle, $nick, "    $cmd\n" );
@@ -855,8 +811,7 @@ sub irc_authenticate {
                     if ( $user eq $mhuser ) {
                         $irc_data{connections}{$handle}{authenticated}{$from} =
                           2;
-                        print_log
-                          "authenticated $from as $mhuser with password $pwd\n";
+                        print_log "authenticated $from as $mhuser with password $pwd\n";
                         return 1;
                     }
                 }
@@ -920,9 +875,8 @@ sub poll_queue {
 
             #printf "penalty: %d buffer ;%d\n", $connref->{since} - $connref->{last_time}, $connref->{float} if $main::Debug{irc};
 
-            if (
-                $connref->{since} - $connref->{last_time} < $connref->{window} )
-            {
+            if ( $connref->{since} - $connref->{last_time} < $connref->{window} ) {
+
                 # we're not penalised
                 $connref->{float} += $connref->{last_sent};
                 $connref->{last_sent} = 0;
@@ -930,9 +884,8 @@ sub poll_queue {
                 my $len =
                   length( $msgref->{msg} ) +
                   length( $msgref->{target} ) +
-                  length("privmsg") + 12;  # 12 byte overhead in IRC::Connection
-                my $to_send =
-                  $len > $connref->{float} ? 0 : $len;   # only send whole lines
+                  length("privmsg") + 12;    # 12 byte overhead in IRC::Connection
+                my $to_send = $len > $connref->{float} ? 0 : $len;    # only send whole lines
 
                 if ($to_send) {
                     my $msg = shift @{$qref};
@@ -946,8 +899,7 @@ sub poll_queue {
 
                     $connref->{last_sent} = $to_send;
                     $connref->{float} -= $to_send;
-                    $connref->{since} +=
-                      ( 2 + $to_send / 120 );    # hybrid6 magic formula
+                    $connref->{since} += ( 2 + $to_send / 120 );    # hybrid6 magic formula
                 }
                 else {
                     # buffer full
diff --git a/code/common/internet_iridium.pl b/code/common/internet_iridium.pl
index 7df48fa1b..70f55d6a5 100644
--- a/code/common/internet_iridium.pl
+++ b/code/common/internet_iridium.pl
@@ -21,16 +21,13 @@
 =cut
 
 $v_iridium_check = new Voice_Cmd '[Get,List,Browse] iridium flares';
-$v_iridium_check->set_info(
-    'Lists times and locations flares from iridium satellites');
+$v_iridium_check->set_info('Lists times and locations flares from iridium satellites');
 
 # Create trigger
 
 if ($Reload) {
-    &trigger_set(
-        '$New_Week', "run_voice_cmd('Get iridium flares')",
-        'NoExpire',  'get iridium info'
-    ) unless &trigger_get('get iridium info');
+    &trigger_set( '$New_Week', "run_voice_cmd('Get iridium flares')", 'NoExpire', 'get iridium info' )
+      unless &trigger_get('get iridium info');
 }
 
 sub uninstall_internet_iridium {
@@ -45,20 +42,17 @@ sub uninstall_internet_iridium {
     "http://www.heavens-above.com/iridium.asp?"
   . "lat=$config_parms{latitude}&lng=$config_parms{longitude}&alt=0&TZ=UCT&Dur=7&"
   . "loc=$config_parms{city}";
-$p_iridium_check =
-  new Process_Item qq[get_url "$iridium_check_u" "$iridium_check_f"];
+$p_iridium_check = new Process_Item qq[get_url "$iridium_check_u" "$iridium_check_f"];
 
 sub respond_iridium {
     my $connected = shift;
     my $display   = &list_iridium();
     if ($display) {
-        $v_iridium_check->respond(
-            "app=iridium connected=$connected Listing iridium data.");
+        $v_iridium_check->respond("app=iridium connected=$connected Listing iridium data.");
         display $display, 0, 'Iridium list', 'fixed';
     }
     else {
-        $v_iridium_check->respond(
-            "app=iridium connected=$connected Nothing to report.");
+        $v_iridium_check->respond("app=iridium connected=$connected Nothing to report.");
     }
 }
 
@@ -108,14 +102,13 @@ sub list_iridium {
                 : "$a[1]/$a[0] $a[2]"
               ) +
               3600 * $config_parms{time_zone};
-            $time += 3600 if (localtime)[8];  # Adjust for daylight savings time
+            $time += 3600 if (localtime)[8];    # Adjust for daylight savings time
             ($time_sec) =
               time_date_stamp( 6, $time ) . ' ' . time_date_stamp( 16, $time );
             ( $time, $sec ) = time_date_stamp( 9, $time );
-            $display .= sprintf "%s, mag=%2d, alt=%3d, azimuth=%3d, %s %s\n",
-              $time_sec, @a[ 3, 4, 5, 9, 10 ];
+            $display .= sprintf "%s, mag=%2d, alt=%3d, azimuth=%3d, %s %s\n", $time_sec, @a[ 3, 4, 5, 9, 10 ];
 
-            next unless $a[4] > 20;    # We can not see them if they are too low
+            next unless $a[4] > 20;             # We can not see them if they are too low
 
             # Create a seperate code file with a time_now for each event
             print MYCODE<<eof;
@@ -154,8 +147,7 @@ sub list_iridium {
         &respond_iridium(1);
     }
     else {
-        $v_iridium_check->respond(
-            "app=iridium $state2" . ' iridium report...' );
+        $v_iridium_check->respond( "app=iridium $state2" . ' iridium report...' );
     }
 
 }
diff --git a/code/common/internet_mail.pl b/code/common/internet_mail.pl
index c41c37f3f..106316322 100644
--- a/code/common/internet_mail.pl
+++ b/code/common/internet_mail.pl
@@ -25,8 +25,7 @@
 # Example on how to send an email command
 # - This string can be in either the subject or the body of the email
 #      Subject line is:  command:x y z  code:xyz
-$v_send_email_test =
-  new Voice_Cmd('Send test e mail [1,2,3,4,5,6,7,8,9,10,11,12]');
+$v_send_email_test = new Voice_Cmd('Send test e mail [1,2,3,4,5,6,7,8,9,10,11,12]');
 $v_send_email_test->set_info('Send commands to test remote email commands');
 
 $v_cell_phone_test = new Voice_Cmd 'Send test e mail to the cell phone';
@@ -39,9 +38,7 @@
 
 # List or read unread email
 $v_unread_email = new Voice_Cmd('[List,Read] unread e mail');
-$v_unread_email->set_info(
-    'Summarize unread email headers and optionally call Outlook to read the mail'
-);
+$v_unread_email->set_info( 'Summarize unread email headers and optionally call Outlook to read the mail' );
 
 my $get_email_scan_file      = "$config_parms{data_dir}/get_email.scan";
 my $get_email_timeout_cycles = 0;
@@ -72,17 +69,14 @@
 
         # Send a command in the subject
         &net_mail_send(
-            subject => "command:What time is it  code:"
-              . $config_parms{net_mail_command_code},
-            text => "I have been running for "
-              . &time_diff( $Time_Startup_time, time )
+            subject => "command:What time is it  code:" . $config_parms{net_mail_command_code},
+            text    => "I have been running for " . &time_diff( $Time_Startup_time, time )
         ) if $state == 2;
 
         # Send a command in the body
         &net_mail_send(
             subject => "test command in body of text",
-            text    => "command:get this weeks new dvds  \ncode:"
-              . $config_parms{net_mail_command_code}
+            text    => "command:get this weeks new dvds  \ncode:" . $config_parms{net_mail_command_code}
         ) if $state == 3;
 
         # Send attachements of different types
@@ -121,9 +115,7 @@
         ) if $state == 9;
 
         # Test a request file via email
-        &net_mail_send(
-            subject => "command:request $config_parms{caller_id_file}  code:"
-              . $config_parms{net_mail_command_code} )
+        &net_mail_send( subject => "command:request $config_parms{caller_id_file}  code:" . $config_parms{net_mail_command_code} )
           if $state == 10;
 
         &net_mail_send(
@@ -137,9 +129,7 @@
         $v_send_email_test->respond("app=email Test message has been sent.");
     }
     else {
-        $v_send_email_test->respond(
-            "app=email I am not logged on to the internet, so can't send mail."
-        );
+        $v_send_email_test->respond( "app=email I am not logged on to the internet, so can't send mail." );
     }
 }
 
@@ -177,17 +167,14 @@
     }
     else {
         if ( $get_email_timeout_cycles == $get_email_timeout_current ) {
-            print_log
-              "Internet_mail: Timeout expired getting email, killing process.";
+            print_log "Internet_mail: Timeout expired getting email, killing process.";
             $get_email_timeout_current = 0;
             start $p_get_email;
         }
         else {
             $get_email_timeout_current++;
-            my $cycles_left =
-              $get_email_timeout_cycles - $get_email_timeout_current;
-            print_log "Internet_mail: Request to check mail but process still"
-              . " running. $cycles_left scan intervals remain";
+            my $cycles_left = $get_email_timeout_cycles - $get_email_timeout_current;
+            print_log "Internet_mail: Request to check mail but process still" . " running. $cycles_left scan intervals remain";
         }
     }
 }
@@ -231,13 +218,7 @@
 
         # *** Look up path in registry!  This is clearly Windows-only too...
 
-        if (
-            my $window = &sendkeys_find_window(
-                'Outlook',
-                'C:\Program Files\Microsoft Office\Office\OUTLOOK.EXE'
-            )
-          )
-        {
+        if ( my $window = &sendkeys_find_window( 'Outlook', 'C:\Program Files\Microsoft Office\Office\OUTLOOK.EXE' ) ) {
             my $keys = '\\alt\\te\\ret\\';    # For Outlook
             &SendKeys( $window, $keys, 1, 500 );
         }
@@ -266,11 +247,8 @@ sub scan_subjects {
     my ($file) = @_;
     return unless -e $file;
     for my $line ( file_read $file) {
-        my ( $from, $to, $subject_body ) =
-          $line =~ /From: *(.+) To: *(.+) Subject: *(.*)/;
-        if ( my ( $command, $code ) =
-            $subject_body =~ /command:(.+?)\s+code:(\S+)/i )
-        {
+        my ( $from, $to, $subject_body ) = $line =~ /From: *(.+) To: *(.+) Subject: *(.*)/;
+        if ( my ( $command, $code ) = $subject_body =~ /command:(.+?)\s+code:(\S+)/i ) {
             my $results;
             if (    $config_parms{net_mail_command_code}
                 and $config_parms{net_mail_command_code} eq $code )
@@ -296,8 +274,7 @@ sub scan_subjects {
                     # The mh respond_email function will mail back the results
                     if (
                         &process_external_command(
-                            $command,
-                            1,
+                            $command, 1,
                             "email [$from]",
                             "email to='$from' subject='Results for: $command'"
                         )
@@ -316,8 +293,7 @@ sub scan_subjects {
                 speak "An unauthorized email command received: $command";
                 $results = "Command not authorized: $command code:$code";
             }
-            logit( "$config_parms{data_dir}/logs/email_command.log",
-                "From:$from  " . $results );
+            logit( "$config_parms{data_dir}/logs/email_command.log", "From:$from  " . $results );
             &net_mail_send( to => $from, subject => $results );
         }
     }
@@ -355,15 +331,13 @@ sub open_email_message_window {
     $parms{text}        = "Dear,";
     $parms{window_name} = "message";
     $parms{buttons}     = 2;
-    $parms{help} = 'Enter a message to send to the default email account.';
+    $parms{help}        = 'Enter a message to send to the default email account.';
     my $w_window = &load_child_window(%parms);
 
     if ( defined $w_window ) {
         unless ( $w_window->{activated} ) {
-            $w_window->{MW}{top_frame}->Label( -text => 'Re:' )
-              ->pack(qw/-side left/);
-            $w_window->{re} = $w_window->{MW}{top_frame}->Entry()
-              ->pack(qw/-expand yes -fill both -side left/);
+            $w_window->{MW}{top_frame}->Label( -text => 'Re:' )->pack(qw/-side left/);
+            $w_window->{re} = $w_window->{MW}{top_frame}->Entry()->pack(qw/-expand yes -fill both -side left/);
             $w_window->activate();
             $w_window->{re}->focus();
         }
diff --git a/code/common/internet_slashdot.pl b/code/common/internet_slashdot.pl
index cb66582e3..58086f69c 100644
--- a/code/common/internet_slashdot.pl
+++ b/code/common/internet_slashdot.pl
@@ -4,12 +4,9 @@
 #@ also automatically gets this information each day.
 
 my $slashdot_news = "$config_parms{data_dir}/web/slashdot_news";
-$p_slashdot_news = new Process_Item
-  "get_url http://slashdot.org/slashdot.xml $slashdot_news.xml";
-$v_slashdot_news =
-  new Voice_Cmd '[Get,Show,Display,Read,Parse] the slashdot news';
-$v_slashdot_news->set_info(
-    'Summarize recent news from the great geek new site slashdot.org');
+$p_slashdot_news = new Process_Item "get_url http://slashdot.org/slashdot.xml $slashdot_news.xml";
+$v_slashdot_news = new Voice_Cmd '[Get,Show,Display,Read,Parse] the slashdot news';
+$v_slashdot_news->set_info('Summarize recent news from the great geek new site slashdot.org');
 $v_slashdot_news->set_authority('anyone');
 
 $state = said $v_slashdot_news;
diff --git a/code/common/internet_starshine.pl b/code/common/internet_starshine.pl
index afa33d9ba..d43564615 100644
--- a/code/common/internet_starshine.pl
+++ b/code/common/internet_starshine.pl
@@ -25,16 +25,13 @@
 =cut
 
 $v_starshine_check = new Voice_Cmd '[Get,List,Browse] starshine flares';
-$v_starshine_check->set_info(
-    'Lists times and locations of visible starshine 3 satellite passes');
+$v_starshine_check->set_info('Lists times and locations of visible starshine 3 satellite passes');
 
 # Create trigger
 
 if ($Reload) {
-    &trigger_set(
-        '$New_Week', "run_voice_cmd('Get starshine flares')",
-        'NoExpire',  'get starshine info'
-    ) unless &trigger_get('get starshine info');
+    &trigger_set( '$New_Week', "run_voice_cmd('Get starshine flares')", 'NoExpire', 'get starshine info' )
+      unless &trigger_get('get starshine info');
 }
 
 sub uninstall_internet_starshine {
@@ -47,20 +44,17 @@ sub uninstall_internet_starshine {
 my $f_starshine_check = "$config_parms{data_dir}/web/starshine.html";
 my $starshine_check_u = "http://www.heavens-above.com/PassSummary.asp?"
   . "lat=$config_parms{latitude}&lng=$config_parms{longitude}&alt=0&TZ=UCT&satid=26929";
-$p_starshine_check =
-  new Process_Item qq[get_url "$starshine_check_u" "$f_starshine_check"];
+$p_starshine_check = new Process_Item qq[get_url "$starshine_check_u" "$f_starshine_check"];
 
 sub respond_starshine {
     my $connected = shift;
     my $display   = &list_starshine();
     if ($display) {
-        $v_starshine_check->respond(
-            "app=starshine connected=$connected Listing starshine data.");
+        $v_starshine_check->respond("app=starshine connected=$connected Listing starshine data.");
         display $display, 0, 'Starshine list', 'fixed';
     }
     else {
-        $v_starshine_check->respond(
-            "app=starshine connected=$connected Nothing to report.");
+        $v_starshine_check->respond("app=starshine connected=$connected Nothing to report.");
     }
 }
 
@@ -77,21 +71,18 @@ sub list_starshine {
 
     open( MYCODE, ">$starshine_check_e" )
       or print_log "Error in writing to $starshine_check_e";
-    print MYCODE
-      "\n#@ Auto-generated from code/common/internet_starshine.pl\n\n";
+    print MYCODE "\n#@ Auto-generated from code/common/internet_starshine.pl\n\n";
     for ( split "\n", $text ) {
         if (/^\d{2}\s\S{3}\s/) {
             my @a = split;
-            $time = my_str2time("$a[1]/$a[0] $a[3]") +
-              3600 * $config_parms{time_zone};
-            $time += 3600 if (localtime)[8];  # Adjust for daylight savings time
+            $time = my_str2time("$a[1]/$a[0] $a[3]") + 3600 * $config_parms{time_zone};
+            $time += 3600 if (localtime)[8];    # Adjust for daylight savings time
             ($time_sec) =
               time_date_stamp( 6, $time ) . ' ' . time_date_stamp( 16, $time );
             ( $time, $sec ) = time_date_stamp( 9, $time );
-            $display .= sprintf "%s, alt=%3d, azimuth=%s\n", $time_sec,
-              @a[ 4, 5 ];
+            $display .= sprintf "%s, alt=%3d, azimuth=%s\n", $time_sec, @a[ 4, 5 ];
 
-            next unless $a[4] > 20;    # We can not see them if they are too low
+            next unless $a[4] > 20;             # We can not see them if they are too low
 
             # Create a seperate code file with a time_now for each event
             print MYCODE<<eof;
@@ -109,7 +100,7 @@ sub list_starshine {
     close MYCODE;
     return $display;
 
-    do_user_file $starshine_check_e; # This will enable the code file written above (MYCODE)
+    do_user_file $starshine_check_e;    # This will enable the code file written above (MYCODE)
 }
 
 if ( said $v_starshine_check) {
@@ -123,8 +114,7 @@ sub list_starshine {
         &respond_starshine(1);
     }
     else {
-        $v_starshine_check->respond(
-            "app=starshine $state2" . 'ing starshine report...' );
+        $v_starshine_check->respond( "app=starshine $state2" . 'ing starshine report...' );
     }
 }
 
diff --git a/code/common/internet_time.pl b/code/common/internet_time.pl
index cdb0bcbd2..19ca2e42a 100644
--- a/code/common/internet_time.pl
+++ b/code/common/internet_time.pl
@@ -5,11 +5,9 @@
 
 # Check clock against an internet atomic clock
 $v_set_clock = new Voice_Cmd('Set the clock via the internet');
-$v_set_clock->set_info(
-    'Use an Internet connected atomic clock to set your pc clock time');
+$v_set_clock->set_info('Use an Internet connected atomic clock to set your pc clock time');
 $v_set_clock->set_icon('time');
-$p_set_clock =
-  new Process_Item "set_clock -log $config_parms{data_dir}/logs/set_clock.log";
+$p_set_clock = new Process_Item "set_clock -log $config_parms{data_dir}/logs/set_clock.log";
 
 if (   said $v_set_clock
     or time_cron '7 6 * * * ' )
diff --git a/code/common/internet_top10.pl b/code/common/internet_top10.pl
index b4f9f2fdc..366e86a2f 100644
--- a/code/common/internet_top10.pl
+++ b/code/common/internet_top10.pl
@@ -10,8 +10,7 @@
 
 #noloop=stop
 
-$p_top10_list = new Process_Item(
-    "get_url http://www.cbs.com/latenight/lateshow/top_ten/ $f_top10_html");
+$p_top10_list = new Process_Item("get_url http://www.cbs.com/latenight/lateshow/top_ten/ $f_top10_html");
 
 # *** Split these up for security (allow anyone to read)
 
@@ -28,14 +27,11 @@
 
     if ( $state eq 'Get' or $state eq 'Check' ) {
         if (&net_connect_check) {
-            $v_top10_list->respond(
-                "app=top10 Retrieving Top 10 list from the Internet...");
+            $v_top10_list->respond("app=top10 Retrieving Top 10 list from the Internet...");
             start $p_top10_list;
         }
         else {
-            $v_top10_list->respond(
-                "app=top10 Cannot retrieve Top 10 list while disconnected from the Internet."
-            );
+            $v_top10_list->respond( "app=top10 Cannot retrieve Top 10 list while disconnected from the Internet." );
         }
     }
 
@@ -89,8 +85,7 @@
         &trigger_set(
             "state_now \$net_connect eq 'connected'",
             "run_voice_cmd 'Get the Top 10 List'",
-            'NoExpire',
-            'get top 10 list'
+            'NoExpire', 'get top 10 list'
         ) unless &trigger_get('get top 10 list');
     }
     else {
diff --git a/code/common/internet_weather.pl b/code/common/internet_weather.pl
index 96c58d9af..050f574a1 100644
--- a/code/common/internet_weather.pl
+++ b/code/common/internet_weather.pl
@@ -19,48 +19,37 @@
 
 #noloop=start
 # Get both the current weather data and forecast from the Internet
-$v_get_internet_weather_data =
-  new Voice_Cmd('[Get,Check,Mail,SMS] Internet weather data');
+$v_get_internet_weather_data = new Voice_Cmd('[Get,Check,Mail,SMS] Internet weather data');
 $v_get_internet_weather_data->set_info(
-    "Retrieves weather conditions and forecasts for $config_parms{city}, $config_parms{state}, $config_parms{zone}"
-);
+    "Retrieves weather conditions and forecasts for $config_parms{city}, $config_parms{state}, $config_parms{zone}" );
 
 # Get the current weather data from the Internet
-$v_get_internet_weather_conditions =
-  new Voice_Cmd('Get the Internet weather conditions');
+$v_get_internet_weather_conditions = new Voice_Cmd('Get the Internet weather conditions');
 $v_get_internet_weather_conditions->set_info(
-    "Retrieves current weather conditions for $config_parms{city}, $config_parms{state}, $config_parms{zone}"
-);
+    "Retrieves current weather conditions for $config_parms{city}, $config_parms{state}, $config_parms{zone}" );
 
 # Get the weather forecast from the Internet
-$v_get_internet_weather_forecast =
-  new Voice_Cmd('Get the Internet weather forecast');
+$v_get_internet_weather_forecast = new Voice_Cmd('Get the Internet weather forecast');
 $v_get_internet_weather_forecast->set_info(
-    "Retrieves weather forecasts for $config_parms{city}, $config_parms{state}, $config_parms{zone}"
-);
+    "Retrieves weather forecasts for $config_parms{city}, $config_parms{state}, $config_parms{zone}" );
 
-$v_show_internet_weather_forecast =
-  new Voice_Cmd( '[Read Internet,What is the] weather forecast', 0 );
-$v_show_internet_weather_forecast->set_info(
-    'Read previously downloaded weather forecast');
+$v_show_internet_weather_forecast = new Voice_Cmd( '[Read Internet,What is the] weather forecast', 0 );
+$v_show_internet_weather_forecast->set_info('Read previously downloaded weather forecast');
 $v_show_internet_weather_forecast->set_authority('anyone');
 
-$v_show_internet_weather_conditions =
-  new Voice_Cmd( '[Read Internet,What are the] weather conditions', 0 );
-$v_show_internet_weather_conditions->set_info(
-    'Read previously downloaded weather conditions');
+$v_show_internet_weather_conditions = new Voice_Cmd( '[Read Internet,What are the] weather conditions', 0 );
+$v_show_internet_weather_conditions->set_info('Read previously downloaded weather conditions');
 $v_show_internet_weather_forecast->set_authority('anyone');
 
 # These files get set by the get_weather program
 
-my $weather_forecast_path = "$config_parms{data_dir}/web/weather_forecast.txt";
-my $weather_conditions_path =
-  "$config_parms{data_dir}/web/weather_conditions.txt";
+my $weather_forecast_path   = "$config_parms{data_dir}/web/weather_forecast.txt";
+my $weather_conditions_path = "$config_parms{data_dir}/web/weather_conditions.txt";
 $f_weather_conditions = new File_Item($weather_conditions_path);
 $f_weather_forecast   = new File_Item($weather_forecast_path);
 my $city = $config_parms{city};
-$city = $config_parms{nws_city} if defined $config_parms{nws_city};
-$p_weather_data = new Process_Item;
+$city                 = $config_parms{nws_city} if defined $config_parms{nws_city};
+$p_weather_data       = new Process_Item;
 $p_weather_conditions = new Process_Item;
 $p_weather_forecast   = new Process_Item;
 
@@ -79,18 +68,13 @@ sub normalize_conditions {
 
 if ( said $v_get_internet_weather_data) {
     if (&net_connect_check) {
-        set $p_weather_data
-          qq|get_weather -state $config_parms{state} -city "$city" -zone "$config_parms{zone}"|;
+        set $p_weather_data qq|get_weather -state $config_parms{state} -city "$city" -zone "$config_parms{zone}"|;
         start $p_weather_data;
-        $v_get_internet_weather_data->respond(
-            "app=weather Weather data requested for $city, $config_parms{state}"
-              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' )
-        );
+        $v_get_internet_weather_data->respond( "app=weather Weather data requested for $city, $config_parms{state}"
+              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' ) );
     }
     else {
-        $v_get_internet_weather_data->respond(
-            "app=weather You must be connected to the Internet get weather data"
-        );
+        $v_get_internet_weather_data->respond( "app=weather You must be connected to the Internet get weather data" );
     }
 }
 
@@ -99,15 +83,11 @@ sub normalize_conditions {
         set $p_weather_conditions
           qq|get_weather -state $config_parms{state} -city "$city" -zone "$config_parms{zone}" -data conditions|;
         start $p_weather_conditions;
-        $v_get_internet_weather_conditions->respond(
-            "app=weather Weather conditions requested for $city, $config_parms{state}"
-              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' )
-        );
+        $v_get_internet_weather_conditions->respond( "app=weather Weather conditions requested for $city, $config_parms{state}"
+              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' ) );
     }
     else {
-        $v_get_internet_weather_conditions->respond(
-            "app=weather You must be connected to the Internet get weather data"
-        );
+        $v_get_internet_weather_conditions->respond( "app=weather You must be connected to the Internet get weather data" );
     }
 }
 
@@ -116,15 +96,11 @@ sub normalize_conditions {
         set $p_weather_forecast
           qq|get_weather -state $config_parms{state} -city "$city" -zone "$config_parms{zone}" -data forecast|;
         start $p_weather_forecast;
-        $v_get_internet_weather_forecast->respond(
-            "app=weather Weather forecast requested for $city, $config_parms{state}"
-              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' )
-        );
+        $v_get_internet_weather_forecast->respond( "app=weather Weather forecast requested for $city, $config_parms{state}"
+              . ( ( $config_parms{zone} ) ? " Zone $config_parms{zone}" : '' ) );
     }
     else {
-        $v_get_internet_weather_forecast->respond(
-            "app=weather You must be connected to the Internet get weather data"
-        );
+        $v_get_internet_weather_forecast->respond( "app=weather You must be connected to the Internet get weather data" );
     }
 }
 
@@ -150,8 +126,7 @@ sub normalize_conditions {
 }
 
 if ( done_now $p_weather_forecast) {
-    $v_get_internet_weather_forecast->respond(
-        'app=weather connected=0 Weather forecast retrieved.');
+    $v_get_internet_weather_forecast->respond('app=weather connected=0 Weather forecast retrieved.');
 }
 
 if ( done_now $p_weather_data or done_now $p_weather_conditions) {
@@ -166,8 +141,7 @@ sub normalize_conditions {
     $conditions = read_all $f_weather_conditions;
 
     if ( $conditions =~ /No data available/ ) {
-        $v_get_internet_weather_data->respond(
-            "Weather conditions are unavailable at this time.");
+        $v_get_internet_weather_data->respond("Weather conditions are unavailable at this time.");
     }
     else {
         # hash used to locally store weather conditions before selectively
@@ -178,9 +152,8 @@ sub normalize_conditions {
 
         $w{TempOutdoor} = $1 if $conditions =~ /(-?\d+) degrees/i;
         if ( $conditions =~ /(\d+)\%/ ) {
-            $w{HumidOutdoor} = $1;
-            $w{HumidOutdoorMeasured} =
-              1;    # tell Weather_Common that we directly measured humidity
+            $w{HumidOutdoor}         = $1;
+            $w{HumidOutdoorMeasured} = 1;    # tell Weather_Common that we directly measured humidity
         }
         $w{BaromSea}   = $1 if $conditions =~ /([\d\.]+) in./;
         $w{BaromDelta} = $1 if $conditions =~ /(rising|falling|steady)/;
@@ -202,8 +175,7 @@ sub normalize_conditions {
         $w{WindGustSpeed} = $1
           if $conditions =~ /gusts\s+up\s+to\s+(\d+)\s+mph/;
         $w{DewOutdoor} =
-          &Weather_Common::convert_humidity_to_dewpoint( $w{HumidOutdoor},
-            convert_f2c( $w{TempOutdoor} ) )
+          &Weather_Common::convert_humidity_to_dewpoint( $w{HumidOutdoor}, convert_f2c( $w{TempOutdoor} ) )
           ;    # DewOutdoor is in Celsius at this point
 
         # Who needs a sun sensor?
@@ -214,18 +186,12 @@ sub normalize_conditions {
         $w{IsSnowing} = 0;
         #########################################
 
-        if ( $conditions =~
-            /conditions were (foggy|light rain|heavy rain|light snow|heavy snow)/i
-          )
-        {
+        if ( $conditions =~ /conditions were (foggy|light rain|heavy rain|light snow|heavy snow)/i ) {
             $w{Conditions} = lc($1);
             $w{IsRaining}  = ( $Weather{Conditions} =~ /rain/i );
             $w{IsSnowing}  = ( $Weather{Conditions} =~ /snow/i );
         }
-        if ( $conditions =~
-            /conditions were (clear|cloudy|partly cloudy|mostly cloudy|sunny|mostly sunny|partly sunny)/
-          )
-        {
+        if ( $conditions =~ /conditions were (clear|cloudy|partly cloudy|mostly cloudy|sunny|mostly sunny|partly sunny)/ ) {
             $w{Clouds} = lc($1);
         }
 
@@ -267,17 +233,14 @@ sub normalize_conditions {
             }
         }
 
-        &Weather_Common::populate_internet_weather( \%w,
-            $config_parms{weather_internet_elements_noaa} );
+        &Weather_Common::populate_internet_weather( \%w, $config_parms{weather_internet_elements_noaa} );
         &Weather_Common::weather_updated;
     }
     if ( done_now $p_weather_data) {
-        $v_get_internet_weather_data->respond(
-            'app=weather connected=0 Weather data retrieved.');
+        $v_get_internet_weather_data->respond('app=weather connected=0 Weather data retrieved.');
     }
     else {
-        $v_get_internet_weather_conditions->respond(
-            'app=weather connected=0 Weather conditions retrieved.');
+        $v_get_internet_weather_conditions->respond('app=weather connected=0 Weather conditions retrieved.');
     }
 }
 
@@ -299,8 +262,7 @@ sub normalize_conditions {
     }
     elsif ( $v_get_internet_weather_data->{state} eq 'Mail' ) {
         my $to = $config_parms{weather_sendto} || '';
-        $v_get_internet_weather_data->respond(
-            "connected=0 app=weather image=mail Sending Internet weather data to "
+        $v_get_internet_weather_data->respond( "connected=0 app=weather image=mail Sending Internet weather data to "
               . ( ($to) ? $to : $config_parms{net_mail_send_account} )
               . '.' );
         &net_mail_send(
@@ -318,8 +280,7 @@ sub normalize_conditions {
         my $to = $config_parms{cell_phone};
         if ($to) {
             $v_get_internet_weather_data->respond(
-                "connected=0 app=weather image=mail Sending Internet weather data to mobile phone."
-            );
+                "connected=0 app=weather image=mail Sending Internet weather data to mobile phone." );
             &net_mail_send(
                 subject => "Internet weather conditions",
                 to      => $to,
@@ -332,8 +293,7 @@ sub normalize_conditions {
             );
         }
         else {
-            $v_get_internet_weather_data->respond(
-                "connected=0 app=error Mobile phone email address not found!");
+            $v_get_internet_weather_data->respond("connected=0 app=error Mobile phone email address not found!");
         }
     }
 }
diff --git a/code/common/internet_weather_noaa.pl b/code/common/internet_weather_noaa.pl
index 9a4fca799..02bc52f37 100644
--- a/code/common/internet_weather_noaa.pl
+++ b/code/common/internet_weather_noaa.pl
@@ -41,12 +41,8 @@
 
 # Create trigger
 if ($Reload) {
-    &trigger_set(
-        "time_cron '15 * * * *'",
-        "run_voice_cmd('Get XML weather data')",
-        'NoExpire',
-        'get xml weather'
-    ) unless &trigger_get('get xml weather');
+    &trigger_set( "time_cron '15 * * * *'", "run_voice_cmd('Get XML weather data')", 'NoExpire', 'get xml weather' )
+      unless &trigger_get('get xml weather');
 }
 
 if ( said $v_get_xml_weather) {
@@ -54,19 +50,14 @@
         $v_get_xml_weather->respond("app=weather Retrieving XML weather...");
         #
         # read XML file
-        $NWSdata = $xml->XMLin(
-            get(
-                "http://www.weather.gov/data/current_obs/" . $station . ".xml"
-            )
-        );
+        $NWSdata = $xml->XMLin( get( "http://www.weather.gov/data/current_obs/" . $station . ".xml" ) );
 
         # hash used to temporarily store weather info before selective load into %Weather
         my %w = ();
 
         $w{TempOutdoor}  = NA_to_zero( $NWSdata->{temp_f} );
         $w{HumidOutdoor} = NA_to_zero( $NWSdata->{relative_humidity} );
-        $w{HumidOutdoorMeasured} =
-          1;    # tell Weather_Common that we directly measured humidity
+        $w{HumidOutdoorMeasured} = 1;    # tell Weather_Common that we directly measured humidity
         $w{WindAvgDir}   = convert_wind_dir_text_to_num( $NWSdata->{wind_dir} );
         $w{WindAvgSpeed} = NA_to_zero( $NWSdata->{wind_mph} );
 
@@ -85,16 +76,12 @@
             }
         }
 
-        &print_log( "weather_xml: finished retrieving weather for station "
-              . $station );
-        $v_get_xml_weather->respond( 'app=weather connected=0 Weather data for '
-              . $NWSdata->{location}
-              . ' retrieved.' );
+        &print_log( "weather_xml: finished retrieving weather for station " . $station );
+        $v_get_xml_weather->respond( 'app=weather connected=0 Weather data for ' . $NWSdata->{location} . ' retrieved.' );
 
     }
     else {
-        $v_get_xml_weather->respond(
-            "I must be connected to the Internet to get weather data.");
+        $v_get_xml_weather->respond("I must be connected to the Internet to get weather data.");
     }
 }
 
diff --git a/code/common/menu.pl b/code/common/menu.pl
index 9c13e348c..c88efae71 100644
--- a/code/common/menu.pl
+++ b/code/common/menu.pl
@@ -49,8 +49,7 @@
     }
 
     # Set default menus, based on ip addresses
-    set_menu_default( 'main', 'Top', 'default' )
-      ;    # Default to top of main for unknown ip address
+    set_menu_default( 'main', 'Top', 'default' );    # Default to top of main for unknown ip address
 
     #   set_menu_default('main', 'Top|Main|Rooms|Living Room',   '127.0.0.1');
     #   set_menu_default('main', 'Main|Rooms|Living Room', '192.168.0.81');
@@ -61,8 +60,7 @@
 if ( $Http{loop} == $Loop_Count ) {
     if ( $Http{request} =~ /menu_wml/ ) {
         play 'wap';    # Defined in event_sounds.pl
-        my $msg =
-          "WAP call from $Http{'User-Agent'}, $Http{'x-up-subno'} $Http{request}";
+        my $msg = "WAP call from $Http{'User-Agent'}, $Http{'x-up-subno'} $Http{request}";
 
         #       display $msg, 0;        # See if this can be used for security
         logit "$config_parms{data_dir}/logs/menu_wml.$Year_Month_Now.log", $msg;
@@ -71,7 +69,6 @@
         play 'tell_me';    # Defined in event_sounds.pl
         my $msg = "Tellme call: $Http{request}";
         print_log $msg;
-        logit "$config_parms{data_dir}/logs/menu_vxml.$Year_Month_Now.log",
-          $msg;
+        logit "$config_parms{data_dir}/logs/menu_vxml.$Year_Month_Now.log", $msg;
     }
 }
diff --git a/code/common/mh_control.pl b/code/common/mh_control.pl
index 6591d4762..384979942 100644
--- a/code/common/mh_control.pl
+++ b/code/common/mh_control.pl
@@ -51,28 +51,25 @@ ()
     @ARGV = ( -user => $state );
     print_log "Setting $state password with: @ARGV";
     do "set_password";
-    &password_read;    # Re-read new password data
+    &password_read;                                            # Re-read new password data
 }
 
 # Display program and system uptime
 $v_uptime = new Voice_Cmd( "What is your up time", 0 );
-$v_uptime->set_info(
-    'Check how long the comuter and MisterHouse have been running');
+$v_uptime->set_info('Check how long the comuter and MisterHouse have been running');
 $v_uptime->set_authority('anyone');
-$v_uptime->tie_event('&handle_uptime_state()');    # noloop
+$v_uptime->tie_event('&handle_uptime_state()');                # noloop
 
 sub handle_uptime_state() {
     my $uptime_pgm      = &time_diff( $Time_Startup_time, time );
     my $uptime_computer = &time_diff( $Time_Boot_time,    $Time );
-    respond("I was started $uptime_pgm ago. "
-          . "The computer was booted $uptime_computer ago." );
+    respond( "I was started $uptime_pgm ago. " . "The computer was booted $uptime_computer ago." );
 }
 
 # Control and monitor the http server
 $v_http_control = new Voice_Cmd '[Open,Close,Restart,Check] the http server';
 $v_http_control->tie_event('&handle_http_control_state()');    # noloop
-$http_monitor = new Socket_Item( undef, undef,
-    "$config_parms{http_server}:$config_parms{http_port}" );
+$http_monitor = new Socket_Item( undef, undef, "$config_parms{http_server}:$config_parms{http_port}" );
 
 sub handle_http_control_state() {
     my $state = state $v_http_control;
@@ -85,8 +82,7 @@ ()
     # Check the http port, so we can restart it if down.
     if ( $state eq 'Check' ) {
         unless ( start $http_monitor) {
-            my $msg = "The http server $config_parms{http_server}:"
-              . "$config_parms{http_port} is down.  Restarting";
+            my $msg = "The http server $config_parms{http_server}:" . "$config_parms{http_port} is down.  Restarting";
             print_log $msg;
             display
               text        => "$Time_Date: $msg\n",
@@ -107,8 +103,7 @@ ()
 
 # Restart MisterHouse
 $v_restart_mh = new Voice_Cmd '[Restart,Exit] Mister House';
-$v_restart_mh->set_info( 'Restarts/Exits Misterhouse.  This will only work if '
-      . 'you start with mh/bin/mhl' )
+$v_restart_mh->set_info( 'Restarts/Exits Misterhouse.  This will only work if ' . 'you start with mh/bin/mhl' )
   if !$OS_win;
 $v_restart_mh->set_info('Restarts/Exits Misterhouse.') if $OS_win;
 $v_restart_mh->tie_event('&restart_mh($state)');    # noloop
@@ -159,8 +154,7 @@ ()
         my $machine = $ENV{COMPUTERNAME};
         respond "The computer $machine will reboot in 1 minute.";
         my $reboot = ( $state eq 'Reboot' ) ? 1 : 0;
-        Win32::InitiateSystemShutdown( $machine, 'Rebooting in 1 minute',
-            60, 1, $reboot );
+        Win32::InitiateSystemShutdown( $machine, 'Rebooting in 1 minute', 60, 1, $reboot );
     }
     elsif ( $Info{OS_name} eq 'XP' ) {
         my $machine = $ENV{COMPUTERNAME};
@@ -234,8 +228,7 @@ ()
 
 # Toggle selected debug options
 $v_debug_toggle = new Voice_Cmd "Toggle debug for [$debug_str]";
-$v_debug_toggle->set_info(
-    'Toggles what kind of debugging information is logged');
+$v_debug_toggle->set_info('Toggles what kind of debugging information is logged');
 $v_debug_toggle->tie_event('&handle_debug_toggle_state()');    # noloop
 
 sub handle_debug_toggle_state() {
@@ -265,8 +258,7 @@ ()
         $v_show_debug->respond('There are no active debug flags');
     }
     else {
-        $v_show_debug->respond(
-            'The currently active debug flags are ' . $config_parms{debug} );
+        $v_show_debug->respond( 'The currently active debug flags are ' . $config_parms{debug} );
     }
 }
 
@@ -281,8 +273,7 @@ sub update_config_parms_debug {
 
 # Set the house mode
 $v_mode = new Voice_Cmd("Put house in [normal,mute,offline] mode");
-$v_mode->set_info( 'mute mode disables all speech and sound.  '
-      . 'offline disables all serial control' );
+$v_mode->set_info( 'mute mode disables all speech and sound.  ' . 'offline disables all serial control' );
 $v_mode->tie_event('&handle_mode_state()');    # noloop
 
 sub handle_mode_state() {
@@ -315,16 +306,16 @@ ()
 # Allow tk and web users to search the user code for strings
 # Set from web menu mh/web/ia5/house/search.shtml
 $search_code_string = new Generic_Item;
-$search_code_string->set_icon('mh.jpg');                                # noloop
-$search_code_string->tie_event('&handle_search_code_string_state()');   # noloop
+$search_code_string->set_icon('mh.jpg');                                 # noloop
+$search_code_string->tie_event('&handle_search_code_string_state()');    # noloop
 
 sub handle_search_code_string_state() {
     my $state = state $search_code_string;
     print "Searching for code $state\n";
     my ( $results, $count, %files );
     $count = 0;
-    $state =~ s/ /.+/;    # Let 'reload code' match 'reload xyz code'
-                          # quotemeta function?
+    $state =~ s/ /.+/;                                                   # Let 'reload code' match 'reload xyz code'
+                                                                         # quotemeta function?
     $state =~ s/\//\\\//g;
     $state =~ s/\\/\\\\/g;
     $state =~ s/\(/\\\(/g;
@@ -374,24 +365,21 @@ ()
 
 # Create a list by X10 Addresses
 $v_list_x10_items = new Voice_Cmd 'List {X 10,X10} items', 0;
-$v_list_x10_items->set_info(
-    'Generates a report fo all X10 items, sorted by device code');
+$v_list_x10_items->set_info('Generates a report fo all X10 items, sorted by device code');
 $v_list_x10_items->tie_event('&handle_list_x10_items_state()');    # noloop
 
 sub handle_list_x10_items_state() {
     print_log "Listing X10 items";
-    my @object_list = (
-        &list_objects_by_type('X10_Item'),
-        &list_objects_by_type('X10_Appliance'),
-        &list_objects_by_type('X10_Garage_Door')
-    );
+    my @object_list =
+      ( &list_objects_by_type('X10_Item'), &list_objects_by_type('X10_Appliance'), &list_objects_by_type('X10_Garage_Door') );
     my @objects = map { &get_object_by_name($_) } @object_list;
     my $results;
     for my $object ( sort { $a->{x10_id} cmp $b->{x10_id} } @objects ) {
         $results .= sprintf(
             "Address:%-2s  File:%-15s  Object:%-30s State:%s\n",
-            substr( $object->{x10_id}, 1 ), $object->{filename},
-            $object->{object_name}, $object->{state}
+            substr( $object->{x10_id}, 1 ),
+            $object->{filename}, $object->{object_name},
+            $object->{state}
         );
     }
 
@@ -407,9 +395,8 @@ ()
 
 # Create a list by Serial States
 $v_list_serial_items = new Voice_Cmd 'List serial items';
-$v_list_serial_items->set_info(
-    'Generates a report of all Serial_Items, sorted by serial state');
-$v_list_serial_items->tie_event('&handle_list_serial_items_state()');   # noloop
+$v_list_serial_items->set_info('Generates a report of all Serial_Items, sorted by serial state');
+$v_list_serial_items->tie_event('&handle_list_serial_items_state()');    # noloop
 
 sub handle_list_serial_items_state() {
     print_log "Listing serial items";
@@ -449,9 +436,8 @@ ()
 
 # Find a list of debug options code for $Debug{xyz}
 $v_list_debug_options = new Voice_Cmd 'List debug options';
-$v_list_debug_options->set_info( 'Generates a list of the various -debug '
-      . 'options you can use to get debug errata' );
-$v_list_debug_options->tie_event('&handle_list_debug_options_state()'); # noloop
+$v_list_debug_options->set_info( 'Generates a list of the various -debug ' . 'options you can use to get debug errata' );
+$v_list_debug_options->tie_event('&handle_list_debug_options_state()');    # noloop
 
 sub handle_list_debug_options_state() {
     my ( %debug_options, $debug_string, $prev_index );
@@ -549,28 +535,25 @@ sub serial_match_log {
 $x10_backlog_timer = new Timer;
 if ($ControlX10::CM11::BACKLOG) {
     print "X10:scheduling backlog\n";
-    set $x10_backlog_timer 1,
-      "process_serial_data('X$ControlX10::CM11::BACKLOG',1,undef)";
+    set $x10_backlog_timer 1, "process_serial_data('X$ControlX10::CM11::BACKLOG',1,undef)";
     $ControlX10::CM11::BACKLOG = "";
 }
 
 # Repeat last spoken
-$v_repeat_last_spoken =
-  new Voice_Cmd '{Repeat your last message, What did you say}', '';
-$v_repeat_last_spoken->tie_event('&handle_repeat_last_spoken_state()'); # noloop
+$v_repeat_last_spoken = new Voice_Cmd '{Repeat your last message, What did you say}', '';
+$v_repeat_last_spoken->tie_event('&handle_repeat_last_spoken_state()');    # noloop
 
 sub handle_repeat_last_spoken_state() {
     ( $temp = $Speak_Log[0] ) =~ s/^.+?: //s;
-    $temp =~ s/^I said //s;    # In case we run this more than once in a row
+    $temp =~ s/^I said //s;                                                # In case we run this more than once in a row
     $temp = lcfirst($temp);
     respond "I said $temp";
 }
 
 # Clear the web cache directory
 $v_clear_cache = new Voice_Cmd 'Clear the web cache directory', '';
-$v_clear_cache->set_info(
-    'Delete all the auto-generated .jpg files in html_alias_cache directory');
-$v_clear_cache->tie_event('&handle_clear_cache_state()');    # noloop
+$v_clear_cache->set_info('Delete all the auto-generated .jpg files in html_alias_cache directory');
+$v_clear_cache->tie_event('&handle_clear_cache_state()');                  # noloop
 
 sub handle_clear_cache_state() {
     my $cmd = ($OS_win) ? 'del' : 'rm';
@@ -584,8 +567,7 @@ ()
 
 # Archive old logs
 if ($New_Month) {
-    print_log
-      "Archiving old print/speak logs: $config_parms{data_dir}/logs/print.log.old";
+    print_log "Archiving old print/speak logs: $config_parms{data_dir}/logs/print.log.old";
     file_backup "$config_parms{data_dir}/logs/print.log.old", 'force';
     file_backup "$config_parms{data_dir}/logs/speak.log.old", 'force';
     file_backup "$config_parms{data_dir}/logs/error.log.old", 'force';
@@ -630,8 +612,7 @@ ()
 
 # Undo the last action
 $v_undo_last_change = new Voice_Cmd 'Undo the last action';
-$v_undo_last_change->set_info(
-    'Changes the most recently changed item back to its previous state');
+$v_undo_last_change->set_info('Changes the most recently changed item back to its previous state');
 $v_undo_last_change->tie_event('&handle_undo_last_change_state()');    # noloop
 
 sub handle_undo_last_change_state() {
@@ -673,10 +654,9 @@ ()
 
 sub handle_mode_sleeping_state() {
     my $state = state $mode_sleeping;
-    $Save{sleeping_parents} =
-      ( $state eq 'parents' or $state eq 'all' ) ? 1 : 0;
-    $Save{sleeping_kids} = ( $state eq 'kids' or $state eq 'all' ) ? 1 : 0;
-    $state = ucfirst($state);
+    $Save{sleeping_parents} = ( $state eq 'parents' or $state eq 'all' ) ? 1 : 0;
+    $Save{sleeping_kids}    = ( $state eq 'kids'    or $state eq 'all' ) ? 1 : 0;
+    $state                  = ucfirst($state);
     $mode_sleeping->respond("mode=unmuted app=control $state are sleeping.");
 }
 
@@ -687,11 +667,7 @@ ()
 $v_update_docs->set_icon('mh.jpg');                   # noloop
 
 # noloop=start
-&trigger_set(
-    "time_cron('5 4 * * *')",
-    "run_voice_cmd 'Update the Documentation'",
-    'NoExpire',
-    'update the documentation'
-) unless &trigger_get('update the documentation');
+&trigger_set( "time_cron('5 4 * * *')", "run_voice_cmd 'Update the Documentation'", 'NoExpire', 'update the documentation' )
+  unless &trigger_get('update the documentation');
 
 # noloop=stop
diff --git a/code/common/mh_release.pl b/code/common/mh_release.pl
index 2fbb496eb..38b253de1 100644
--- a/code/common/mh_release.pl
+++ b/code/common/mh_release.pl
@@ -20,7 +20,7 @@
 =cut
 
 use JSON::PP ()
-  ; # Do not import any functions as it could conflict with the JSON imported functions from other locations in the code
+  ;    # Do not import any functions as it could conflict with the JSON imported functions from other locations in the code
 
 # noloop=start
 my $mhdl_url  = "https://api.github.com/repos/hollie/misterhouse/tags";
@@ -70,9 +70,7 @@ sub calc_age {
     return
         "$weeks week"
       . ( ( $weeks == 1 ) ? '' : 's' )
-      . (
-        ( !$days ) ? '' : ( " and $days day" . ( ( $days == 1 ) ? '' : 's' ) ) )
-      . " ago";
+      . ( ( !$days ) ? '' : ( " and $days day" . ( ( $days == 1 ) ? '' : 's' ) ) ) . " ago";
 }
 
 if ( said $v_version) {
@@ -87,15 +85,12 @@ sub calc_age {
         and ( $maj !~ m/^develop-ref/ )
       )
     {
-        respond(
-            "app=control I am version $version_str and $Save{mhdl_maj}.$Save{mhdl_min} was released "
+        respond("app=control I am version $version_str and $Save{mhdl_maj}.$Save{mhdl_min} was released "
               . &calc_age( $Save{mhdl_date} )
               . '.' );
     }
     elsif ( $maj =~ m/^develop-ref/ ) {
-        respond(
-            "app=control You are running the development branch, it has no version releases."
-        );
+        respond( "app=control You are running the development branch, it has no version releases." );
     }
     else {
         respond("app=control I am version $version_str.");
@@ -112,8 +107,7 @@ sub calc_age {
         start $p_mhdl_page;
     }
     else {
-        $msg =
-          "app=control Unable to check version while disconnected from the Internet";
+        $msg = "app=control Unable to check version while disconnected from the Internet";
     }
 
     $v_mhdl_page->respond("app=control $msg");
@@ -123,7 +117,7 @@ sub calc_age {
     my @html = file_read($mhdl_file);
     print_log("Download page retrieved");
     my $json = JSON::PP::decode_json(@html)
-      ; # Use the PP version of the call as otherwise this function fails at least on OS X 10.9.4 with Perl 5.18.2
+      ;    # Use the PP version of the call as otherwise this function fails at least on OS X 10.9.4 with Perl 5.18.2
     my ( $mhdl_date_url, $maj, $min );
     foreach ( @{$json} ) {
         next unless $_->{name} =~ m/^v(\d+)\.(\d+)/;
@@ -138,13 +132,11 @@ sub calc_age {
     if (&net_connect_check) {
         $msg = 'Checking version date...';
         print_log("Retrieving download date page");
-        set $p_mhdl_date_page
-          "get_url -quiet \"$mhdl_date_url\" \"$mhdl_date_file\"";
+        set $p_mhdl_date_page "get_url -quiet \"$mhdl_date_url\" \"$mhdl_date_file\"";
         start $p_mhdl_date_page;
     }
     else {
-        $msg =
-          "app=control Unable to check version date while disconnected from the Internet";
+        $msg = "app=control Unable to check version date while disconnected from the Internet";
     }
     respond("app=control $msg");
 }
@@ -159,8 +151,7 @@ sub calc_age {
         if (
             (
                    ( $Save{mhdl_maj} > $maj )
-                or
-                ( ( $Save{mhdl_maj} == $maj ) and ( $Save{mhdl_min} > $min ) )
+                or ( ( $Save{mhdl_maj} == $maj ) and ( $Save{mhdl_min} > $min ) )
             )
             and ( $maj !~ m/^develop-ref/ )
           )
@@ -170,9 +161,7 @@ sub calc_age {
                   . &calc_age( $Save{mhdl_date} . '.' ) );
         }
         elsif ( $maj =~ m/^develop-ref/ ) {
-            respond(
-                "connected=0 app=control You are running the development branch, it has no version releases."
-            );
+            respond( "connected=0 app=control You are running the development branch, it has no version releases." );
         }
         else {
             # Voice command is only code to start this process, so check its set_by
@@ -188,8 +177,7 @@ sub calc_age {
         &trigger_set(
             "state_now \$net_connect eq 'connected'",
             "run_voice_cmd 'Check Misterhouse version'",
-            'NoExpire',
-            'get MH version'
+            'NoExpire', 'get MH version'
         ) unless &trigger_get('get MH version');
     }
     else {
diff --git a/code/common/mh_sound.pl b/code/common/mh_sound.pl
index e50d0293e..b61a566b6 100644
--- a/code/common/mh_sound.pl
+++ b/code/common/mh_sound.pl
@@ -80,8 +80,7 @@ sub put_volume_back {
     my $wav_did_it = shift;
     if ($wav_did_it) {
         if ( !$is_speaking_flag ) {
-            set $mh_speakers OFF
-              ;    # don't turn speakers off if talking (WAV likely a chime)
+            set $mh_speakers OFF;    # don't turn speakers off if talking (WAV likely a chime)
         }
     }
     else {
@@ -95,9 +94,7 @@ sub put_volume_back {
     if ( defined $config_parms{volume_wav_default_volume}
         and ( $Voice_Text::VTxt_version ne 'msv5' or $wav_did_it ) )
     {
-        print_log(
-            "Putting wav volume back to $config_parms{volume_wav_default_volume}"
-        );
+        print_log( "Putting wav volume back to $config_parms{volume_wav_default_volume}" );
         &set_volume_wav( $config_parms{volume_wav_default_volume} );
 
         if ($volume_master_changed) {
@@ -130,12 +127,10 @@ sub put_volume_back {
 }
 
 $test_volume = new Voice_Cmd 'Test volume at [5,20,60,100]';
-$test_volume->tie_event(
-    '$test_volume->respond("volume=$state Testing volume at $state%")');
+$test_volume->tie_event('$test_volume->respond("volume=$state Testing volume at $state%")');
 
 # Currently, this only works with the MS Voice TTS
-$test_speak_mode = new Voice_Cmd
-  'Set speech to [stop,pause,resume,rewind,fastforward,fast,normal,slow,-5,5]';
+$test_speak_mode = new Voice_Cmd 'Set speech to [stop,pause,resume,rewind,fastforward,fast,normal,slow,-5,5]';
 $test_speak_mode->tie_event('speak mode => $state');
 
 # Currently, this only works with the MS Voice TTS
@@ -202,11 +197,9 @@ sub set_volume_pre_hook {
     print_log "FUNCTION: set_volume_pre_hook";
     return
       if $is_speaking
-      and $Voice_Text::VTxt_version ne
-      'msv5';    # Speaking volume wins over play volume (unless using MSv5!)
+      and $Voice_Text::VTxt_version ne 'msv5';    # Speaking volume wins over play volume (unless using MSv5!)
     return
-      unless $Info{Volume_Control}
-      ;          # Verify we have a volume control module installed
+      unless $Info{Volume_Control};               # Verify we have a volume control module installed
     my %parms = @_;
 
     # msv5 changes volume with xml tags in lib/Voice_Text.pm
@@ -234,8 +227,7 @@ sub set_volume_pre_hook {
 
     # Set a timer since we can not detect when a wav file is done
     if ( $parms{time} ) {
-        set $mh_speakers_timer $parms{time},
-          '&put_volume_back(1)';     # flag to say WAV did it!
+        set $mh_speakers_timer $parms{time}, '&put_volume_back(1)';    # flag to say WAV did it!
     }
 
     if ( $parms{time}
@@ -278,8 +270,6 @@ sub sound_pre_play {
 
 # Allow for restarting of TTS engine
 $restart_tts = new Voice_Cmd 'Restart the TTS engine';
-$restart_tts->set_info(
-    'This will restart the voice Text To Speech engine, in case it died for some reason'
-);
+$restart_tts->set_info( 'This will restart the voice Text To Speech engine, in case it died for some reason' );
 
 &Voice_Text::init if said $restart_tts;
diff --git a/code/common/mhmedia_xine.pl b/code/common/mhmedia_xine.pl
index 204af099e..eb706f769 100644
--- a/code/common/mhmedia_xine.pl
+++ b/code/common/mhmedia_xine.pl
@@ -48,18 +48,16 @@
 #my $mediaState = "";
 # noloop=stop
 
-my $mediahost = $config_parms{media_server_host_port}
-  ;    #@ the server (localhost)  and port (6789) for the player
+my $mediahost = $config_parms{media_server_host_port};    #@ the server (localhost)  and port (6789) for the player
 $mediahost = "localhost:6789" unless $mediahost;
 
-my $mediaPlaylist = $config_parms{media_server_playlist}
-  ;    #@full path to the palylist including the name
+my $mediaPlaylist = $config_parms{media_server_playlist};    #@full path to the palylist including the name
 $mediaPlaylist = "/root/.xine/playlist.tox" unless $mediaPlaylist;
 
-my $mediaUser = $config_parms{media_server_user};    #optional login information
+my $mediaUser = $config_parms{media_server_user};            #optional login information
 my $mediaPass = $config_parms{media_server_pass};
 my $mediapath = ""
-  unless $config_parms{media_file_path};    #used in mhmedia_list web function
+  unless $config_parms{media_file_path};                     #used in mhmedia_list web function
 
 $mediacmd = new Socket_Item( undef, undef, $mediahost, 'media', 'tcp' );
 
@@ -108,8 +106,7 @@
   . "Panel,Play DVD,Load Playlist,Playlist,track,"
   . "FastForward,Rewind,Slow,Fullscreen";
 
-$v_mhmedia_control_cmd =
-  new Voice_Cmd( "Set the house media player to [" . $cmdlist . "]" );
+$v_mhmedia_control_cmd = new Voice_Cmd( "Set the house media player to [" . $cmdlist . "]" );
 my $state;
 
 if ( $Reload or $Startup ) {
@@ -301,8 +298,7 @@ sub mhmedia_return {
 
             #if we want to authenticate here is where we do it
             if ( $config_parms{media_server_user} ) {
-                set $mediacmd
-                  "identify $config_parms{media_server_user}:$config_parms{media_server_pass}";
+                set $mediacmd "identify $config_parms{media_server_user}:$config_parms{media_server_pass}";
             }
             $mediaMode = '';
         }
@@ -540,9 +536,9 @@ sub mhmedia_get_playlist_pos {
         print "return $state \n";
         my ( $cmd2, $val ) = split( /\s+ /, $state );    # break ths line up
         my ( $ptr,  $cmd ) = split( /\s+/,  $val );
-        if ( $cmd2 eq "*>" ) {    # look current for the marker
-             # cmd-is the filename, val-fn ,ptr-list number, cmd2- current selection
-            $rtn = $ptr;    # return the pointer for the current selection
+        if ( $cmd2 eq "*>" ) {                           # look current for the marker
+                                                         # cmd-is the filename, val-fn ,ptr-list number, cmd2- current selection
+            $rtn = $ptr;                                 # return the pointer for the current selection
         }
     }
     return ($rtn);
@@ -552,7 +548,7 @@ sub mhmedia_get_playlist_pos {
 sub mhmedia_set_playlist_pos {
     my $cntr = &mhmedia_get_playlist_length();
     set $mediacmd 'playlist show';
-    select undef, undef, undef, .050;    # # Wait a while
+    select undef, undef, undef, .050;                    # # Wait a while
     my $rtn = 'No Playlist Title available';
     my $pos = 0;
     for ( $pos = 0, $pos < $cntr + 1, $pos++ ) {
diff --git a/code/common/mhmms_services.pl b/code/common/mhmms_services.pl
index 56eeeafe9..db0d8bdc3 100644
--- a/code/common/mhmms_services.pl
+++ b/code/common/mhmms_services.pl
@@ -46,8 +46,7 @@ sub mhmms_get_remote_list {
     my $mediapath = $config_parms{media_file_path};
     $mediapath = "" unless $config_parms{media_file_path};
 
-    my $mediadata =
-      new Socket_Item( undef, undef, $mediahost, 'mediadata', 'tcp' );
+    my $mediadata = new Socket_Item( undef, undef, $mediahost, 'mediadata', 'tcp' );
 
     start $mediadata ;    # open socket
                           # send data out
@@ -59,8 +58,8 @@ sub mhmms_get_remote_list {
         #select undef, undef, undef, .050; 	# Wait a while if needed
         $data = said_next $mediadata;    # get a string
         $pos  = $pos + 1;                # becuse we like counting entries
-             # print "mhmms-list:$data\n";		# and seeind data sometimes
-             #check to see if were done or the server is dead etc...
+                                         # print "mhmms-list:$data\n";		# and seeind data sometimes
+                                         #check to see if were done or the server is dead etc...
         last if ( $data eq "DONE" or $data eq '' or $data eq "\r\n" );
 
         #collect data into an aray
@@ -191,8 +190,7 @@ sub mhmms_ret_types {
     #my @dirs = shift;
     #my @files = shift;
 
-    my @search_types =
-      qw( asf avi mov mp3 mp4 mpeg mpg ogg rma vob wav wma wmv );
+    my @search_types = qw( asf avi mov mp3 mp4 mpeg mpg ogg rma vob wav wma wmv );
 
     #print "Sorting ...$search_this\n";
     #   print "\n files @$files \n dirs @$dirs \n retn @$retn";
diff --git a/code/common/mhsend_server.pl b/code/common/mhsend_server.pl
index 343377bc7..33641cfcb 100644
--- a/code/common/mhsend_server.pl
+++ b/code/common/mhsend_server.pl
@@ -24,8 +24,7 @@
     my ( $name, $name_short );
 
     #   my ($name, $name_short) = net_domain_name('server_data');
-    print_log
-      "Received server_data data: name=$name: action=$action arg=$action_arg"
+    print_log "Received server_data data: name=$name: action=$action arg=$action_arg"
       unless $config_parms{no_log} =~ /mhsend_server/;
 
     # Read header and optional password (until blank record)
@@ -71,8 +70,7 @@
 
         #       print_msg "mhsend: $msg";
         $response = "Data was displayed for $action_arg seconds";
-        logit( "$config_parms{data_dir}/mhsend/display.log", $msg )
-          ;    # Also logit
+        logit( "$config_parms{data_dir}/mhsend/display.log", $msg );    # Also logit
     }
     elsif ( $action eq 'state' ) {
         my $state = eval "state $msg";
@@ -85,8 +83,7 @@
         }
         else {
             display( $msg, 120, "Internet Message from $name" );
-            $response =
-              "Data was too long ... it was displayed instead of being spoken";
+            $response = "Data was too long ... it was displayed instead of being spoken";
         }
     }
     elsif ( $action eq 'run' ) {
@@ -95,8 +92,7 @@
         #       if (&run_voice_cmd($msg)) {
         #       my $respond = "object_set name=mhsend_server";
         my $respond = "mhsend name=mhsend_server ";
-        $respond .=
-          "proxyip=" . $Socket_Ports{'server_mhsend'}{client_ip_address};
+        $respond .= "proxyip=" . $Socket_Ports{'server_mhsend'}{client_ip_address};
         if ( &process_external_command( $msg, 0, 'mhsend', $respond ) ) {
             $response = "Command was run: $msg";
         }
diff --git a/code/common/monitor_actiontec_mi424wr.pl b/code/common/monitor_actiontec_mi424wr.pl
index f728a7b80..41e6b4dd4 100755
--- a/code/common/monitor_actiontec_mi424wr.pl
+++ b/code/common/monitor_actiontec_mi424wr.pl
@@ -37,8 +37,7 @@
     mkdir "$config_parms{data_dir}/rrd/"
       unless -d "$config_parms{data_dir}/rrd/";
     &create_actiontec_rrd($Time) unless -e $RRD;
-    $Included_HTML{'Internet'} .=
-      qq(<h3>Actiontec Throughput<p><img src='sub;?graph_actiontec_rrd()'><p>\n\n\n);
+    $Included_HTML{'Internet'} .= qq(<h3>Actiontec Throughput<p><img src='sub;?graph_actiontec_rrd()'><p>\n\n\n);
     $actiontec_host = $config_parms{'actiontec_host'}
       if $config_parms{'actiontec_host'};
     $actiontec_url = "http://$actiontec_host";
@@ -56,11 +55,7 @@
 
 if ( said $v_read_actiontec) {
     my $state = $v_read_actiontec->{state};
-    my $text =
-        "Internet download bit rate: "
-      . $Save{actiontec_rx}
-      . " Mbps  upload: "
-      . $Save{actiontec_tx} . " Mbps";
+    my $text  = "Internet download bit rate: " . $Save{actiontec_rx} . " Mbps  upload: " . $Save{actiontec_tx} . " Mbps";
     $v_read_actiontec->respond("app=network $text");
 }
 
@@ -68,9 +63,8 @@
 if ( done_now $p_get_actiontec) {
     my $html      = file_read $f_actiontec;
     my $post_data = "bla=foo";
-    my %hidden =
-      $html =~ m|\<INPUT type=HIDDEN name=\"([^\"]*)\" value=\"([^\"]*)\">|g;
-    my ($url) = $html =~ m|f.action=\"(/cache/\d+/index.cgi)\"|;
+    my %hidden    = $html =~ m|\<INPUT type=HIDDEN name=\"([^\"]*)\" value=\"([^\"]*)\">|g;
+    my ($url)     = $html =~ m|f.action=\"(/cache/\d+/index.cgi)\"|;
 
     if ( $stage eq 'authen' ) {
         $stage = 'get_main';
@@ -79,17 +73,14 @@
         if ( $html =~ m|$hidden{mimic_button_field}| ) {
             $hidden{user_name} = $actiontec_username;
             $hidden{"passwordmask_$hidden{session_id}"} = $actiontec_password;
-            $hidden{md5_pass} =
-              Digest::MD5::md5_hex( $hidden{"passwordmask_$hidden{session_id}"}
-                  . $hidden{auth_key} );
-            $hidden{passwd1} = "                    ";
+            $hidden{md5_pass} = Digest::MD5::md5_hex( $hidden{"passwordmask_$hidden{session_id}"} . $hidden{auth_key} );
+            $hidden{passwd1}  = "                    ";
             foreach my $key ( keys %hidden ) {
                 $hidden{$key} = &escape( $hidden{$key} );
                 $post_data .= "&$key=$hidden{$key}" if defined $hidden{$key};
             }
             print_log "actiontec post data: $post_data" if $debug;
-            set $p_get_actiontec
-              qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
+            set $p_get_actiontec qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
             $p_get_actiontec->start;
         }
         else {
@@ -108,8 +99,7 @@
                 $post_data .= "&$key=$hidden{$key}" if defined $hidden{$key};
             }
             print_log "actiontec post data: $post_data" if $debug;
-            set $p_get_actiontec
-              qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
+            set $p_get_actiontec qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
             $p_get_actiontec->start;
         }
         else {
@@ -128,8 +118,7 @@
                 $post_data .= "&$key=$hidden{$key}" if defined $hidden{$key};
             }
             print_log "actiontec post data: $post_data" if $debug;
-            set $p_get_actiontec
-              qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
+            set $p_get_actiontec qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
             $p_get_actiontec->start;
         }
         else {
@@ -148,8 +137,7 @@
                 $post_data .= "&$key=$hidden{$key}" if defined $hidden{$key};
             }
             print_log "actiontec post data: $post_data" if $debug;
-            set $p_get_actiontec
-              qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
+            set $p_get_actiontec qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
             $p_get_actiontec->start;
         }
         else {
@@ -168,8 +156,7 @@
                 $post_data .= "&$key=$hidden{$key}" if defined $hidden{$key};
             }
             print_log "actiontec post data: $post_data" if $debug;
-            set $p_get_actiontec
-              qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
+            set $p_get_actiontec qq|get_url $quiet -post "$post_data" $actiontec_url$url $f_actiontec|;
             $p_get_actiontec->start;
         }
         else {
@@ -186,12 +173,8 @@
         $Save{actiontec_tx} = $cell[0][0] / 1000;
 
         if ( $Save{actiontec_rx} and $Save{actiontec_tx} ) {
-            &update_actiontec_rrd( $Time, $Save{actiontec_rx},
-                $Save{actiontec_tx} );
-            print_log "Internet download bit rate: "
-              . $Save{actiontec_rx}
-              . " Mbps  upload: "
-              . $Save{actiontec_tx} . " Mbps"
+            &update_actiontec_rrd( $Time, $Save{actiontec_rx}, $Save{actiontec_tx} );
+            print_log "Internet download bit rate: " . $Save{actiontec_rx} . " Mbps  upload: " . $Save{actiontec_tx} . " Mbps"
               if $debug;
         }
         else {
@@ -228,38 +211,36 @@ sub create_actiontec_rrd {
 
     RRDs::create $RRD,
       '-b', $_[0], '-s', 60,
-      "DS:rxmbps:GAUGE:300:U:U",
-      "DS:txmbps:GAUGE:300:U:U",
-      'RRA:AVERAGE:0.5:1:801',    # details for 6 hours (agregate 1 minute)
+      "DS:rxmbps:GAUGE:300:U:U", "DS:txmbps:GAUGE:300:U:U", 'RRA:AVERAGE:0.5:1:801',    # details for 6 hours (agregate 1 minute)
 
-      'RRA:MIN:0.5:2:801',        # 1 day (agregate 2 minutes)
+      'RRA:MIN:0.5:2:801',                                                              # 1 day (agregate 2 minutes)
       'RRA:AVERAGE:0.5:2:801', 'RRA:MAX:0.5:2:801',
 
-      'RRA:MIN:0.5:5:641',        # 2 day (agregate 5 minutes)
+      'RRA:MIN:0.5:5:641',                                                              # 2 day (agregate 5 minutes)
       'RRA:AVERAGE:0.5:5:641', 'RRA:MAX:0.5:5:641',
 
-      'RRA:MIN:0.5:18:623',       # 1 week (agregate 18 minutes)
+      'RRA:MIN:0.5:18:623',                                                             # 1 week (agregate 18 minutes)
       'RRA:AVERAGE:0.5:18:623', 'RRA:MAX:0.5:18:623',
 
-      'RRA:MIN:0.5:35:618',       # 2 weeks (agregate 35 minutes)
+      'RRA:MIN:0.5:35:618',                                                             # 2 weeks (agregate 35 minutes)
       'RRA:AVERAGE:0.5:35:618', 'RRA:MAX:0.5:35:618',
 
-      'RRA:MIN:0.5:75:694',       # 1 month (agregate 1h15mn)
+      'RRA:MIN:0.5:75:694',                                                             # 1 month (agregate 1h15mn)
       'RRA:AVERAGE:0.5:75:694', 'RRA:MAX:0.5:75:694',
 
-      'RRA:MIN:0.5:150:694',      # 2 months (agregate 2h30mn)
+      'RRA:MIN:0.5:150:694',                                                            # 2 months (agregate 2h30mn)
       'RRA:AVERAGE:0.5:150:694', 'RRA:MAX:0.5:150:694',
 
-      'RRA:MIN:0.5:1080:268',     # 6 months (agregate 18 hours)
+      'RRA:MIN:0.5:1080:268',                                                           # 6 months (agregate 18 hours)
       'RRA:AVERAGE:0.5:1080:268', 'RRA:MAX:0.5:1080:268',
 
-      'RRA:MIN:0.5:2880:209',     # 12 months (agregate 2 days)
+      'RRA:MIN:0.5:2880:209',                                                           # 12 months (agregate 2 days)
       'RRA:AVERAGE:0.5:2880:209', 'RRA:MAX:0.5:2880:209',
 
-      'RRA:MIN:0.5:4320:279',     # 2 years (agregate 3 days)
+      'RRA:MIN:0.5:4320:279',                                                           # 2 years (agregate 3 days)
       'RRA:AVERAGE:0.5:4320:279', 'RRA:MAX:0.5:4320:279',
 
-      'RRA:MIN:0.5:8640:334',     # 5 years (agregate 6 days)
+      'RRA:MIN:0.5:8640:334',                                                           # 5 years (agregate 6 days)
       'RRA:AVERAGE:0.5:8640:334', 'RRA:MAX:0.5:8640:334';
 
     my $err = RRDs::error;
@@ -290,20 +271,13 @@ sub graph_actiontec_rrd {
 
     unlink "$config_parms{data_dir}/rrd/actiontec.png";
     my ( $graph, $x, $y ) = RRDs::graph(
-        "$config_parms{data_dir}/rrd/actiontec.png",
-        "--start=$ago",
-        "--end=$Time",
-        "--width=$width",
-        "--height=$height",
-        "--lower-limit=-$actiontec_upload_mbps",
-        "--upper-limit=$actiontec_download_mbps",
-        "--vertical-label=Mb/s",
-        "DEF:rxmbps=$RRD:rxmbps:AVERAGE",
-        "AREA:rxmbps#2000FF:In traffic",
-        "DEF:txmbps=$RRD:txmbps:AVERAGE",
-        "CDEF:itxmbps=txmbps,-1,*",
-        "AREA:itxmbps#AFAF00:Out traffic",
-        $thumb
+        "$config_parms{data_dir}/rrd/actiontec.png", "--start=$ago",
+        "--end=$Time",                               "--width=$width",
+        "--height=$height",                          "--lower-limit=-$actiontec_upload_mbps",
+        "--upper-limit=$actiontec_download_mbps",    "--vertical-label=Mb/s",
+        "DEF:rxmbps=$RRD:rxmbps:AVERAGE",            "AREA:rxmbps#2000FF:In traffic",
+        "DEF:txmbps=$RRD:txmbps:AVERAGE",            "CDEF:itxmbps=txmbps,-1,*",
+        "AREA:itxmbps#AFAF00:Out traffic",           $thumb
     );
     my $err = RRDs::error;
     print_log "actiontec graph error $err\n" if $err;
diff --git a/code/common/monitor_memory.pl b/code/common/monitor_memory.pl
index 705d7b1f0..5900f0ab5 100644
--- a/code/common/monitor_memory.pl
+++ b/code/common/monitor_memory.pl
@@ -28,12 +28,10 @@
         my $memory_time = round( $Time - $Info{memory_virtual_time} ) / 3600
           if $Info{memory_virtual_time};
         if ( $memory_diff > .5 ) {
-            my $time_startup = $Time_Uptime_Seconds / 3600;
-            my $memory_diff_rate = $memory_diff / $memory_time if $memory_time;
-            my $memory_diff_total =
-              ( $Info{memory_virtual} - $Info{memory_virtual_startup} ) /
-              $time_startup;
-            my $msg = sprintf "%5.1f hours:  %4.1f MB in %4.1f hours."
+            my $time_startup      = $Time_Uptime_Seconds / 3600;
+            my $memory_diff_rate  = $memory_diff / $memory_time if $memory_time;
+            my $memory_diff_total = ( $Info{memory_virtual} - $Info{memory_virtual_startup} ) / $time_startup;
+            my $msg               = sprintf "%5.1f hours:  %4.1f MB in %4.1f hours."
               . "  %5.1f -> %5.1f at %5.2f MB/hour.  Total: %5.2f MB/hour",
               $time_startup, $memory_diff, $memory_time,
               $Info{memory_virtual_prev}, $Info{memory_virtual},
@@ -50,15 +48,13 @@
 display font => 'fixed', text => $memory_leak_log if said $v_memory_leak_log;
 
 $v_memory_check = new Voice_Cmd '[Start,Stop] the memory leak checker';
-$v_memory_check->set_info( 'This will disable each code file for a while,'
-      . ' to determine which is causing a memory leak' );
+$v_memory_check->set_info( 'This will disable each code file for a while,' . ' to determine which is causing a memory leak' );
 $t_memory_check = new Timer;
 
 my ( @memory_leak_members, $memory_leak_index, $memory_leak_member );
 if ( 'Start' eq said $v_memory_check) {
     $v_memory_check->respond('app=memory Starting memory check...');
-    @memory_leak_members = grep !/(monitor_memory)|(tk_)/,
-      sort keys %Run_Members;
+    @memory_leak_members = grep !/(monitor_memory)|(tk_)/, sort keys %Run_Members;
     print "These members will be tested: @memory_leak_members\n"
       if $Debug{memory};
     $memory_leak_index = 0;
@@ -77,11 +73,9 @@
         print "Memory leak test: re-enabled $memory_leak_member\n"
           if $Debug{memory};
         $memory_leak_index++;
-        my $memory_diff =
-          round $Info{memory_virtual} - $Info{memory_virtual_test}, 2;
+        my $memory_diff = round $Info{memory_virtual} - $Info{memory_virtual_test}, 2;
         print "Memory leak amount: $memory_diff\n" if $Debug{memory};
-        logit "$config_parms{data_dir}/logs/monitor_memory.log",
-          "Leaked $memory_diff MB with $memory_leak_member disabled";
+        logit "$config_parms{data_dir}/logs/monitor_memory.log", "Leaked $memory_diff MB with $memory_leak_member disabled";
     }
     if ( $memory_leak_member = $memory_leak_members[$memory_leak_index] ) {
         $Run_Members{$memory_leak_member} = 0;
@@ -93,8 +87,7 @@
         $Info{memory_virtual_test} = $Info{memory_virtual};
     }
     else {
-        $v_memory_check->respond(
-            "app=memory connected=0 Memory leak test finished");
+        $v_memory_check->respond("app=memory connected=0 Memory leak test finished");
     }
 }
 
diff --git a/code/common/monitor_router.pl b/code/common/monitor_router.pl
index fa78b8143..94fe357ba 100644
--- a/code/common/monitor_router.pl
+++ b/code/common/monitor_router.pl
@@ -78,8 +78,7 @@
     if ( $config_parms{server_router_type} eq "netgear" ) {
 
         #Router data: <181>winter_router: IP[Src=168.191.93.23   Dst=192.168.0.5 TCP spo=02248  dpo=00080]}S05>R01nN>R02nF
-        ( $ip_src, $ip_dst, $proto, $port_in, $port_out ) =
-          $packet =~ /Src=(\S+) +Dst=(\S+) +(\S+) +spo=(\d+) +dpo=(\d+)/;
+        ( $ip_src, $ip_dst, $proto, $port_in, $port_out ) = $packet =~ /Src=(\S+) +Dst=(\S+) +(\S+) +spo=(\d+) +dpo=(\d+)/;
     }
 
     # Draytek
@@ -91,8 +90,8 @@
         # Outgoing:
         #local2:info Apr 29 22:12:42 zappa-router: Local User: 192.168.100.4:2428 -> 66.230.141.102:80 (TCP)Web
 
-        ( $dir, $ip_src, $port_in, $ip_dst, $port_out, $proto ) = $packet =~
-          /(Open port|Local User): (\S+):(\S+) -> (\S+):(\S+) \((\S+)\)/;
+        ( $dir, $ip_src, $port_in, $ip_dst, $port_out, $proto ) =
+          $packet =~ /(Open port|Local User): (\S+):(\S+) -> (\S+):(\S+) \((\S+)\)/;
     }
 
     # Linksys
@@ -100,8 +99,7 @@
 
         #Router data: 0� p?? .... +????Ps?? ?� +@out 192.168.0.2 8080 24.159.204.248 10325
         $proto = 'TCP';    # Linksys only does TCP :(
-        ( $dir, $ip_src, $port_in, $ip_dst, $port_out ) =
-          $packet =~ /\@(in|out) (\S+) (\S+) (\S+) (\S+)/;
+        ( $dir, $ip_src, $port_in, $ip_dst, $port_out ) = $packet =~ /\@(in|out) (\S+) (\S+) (\S+) (\S+)/;
     }
 
     print "Router: $proto $port_in \t-> $port_out\t$ip_src \t-> $ip_dst \n"
@@ -132,8 +130,7 @@
             #           my ($name, $name_short) = net_domain_name $ip_src;
             print_log "Web hit port=$port_out ip=$ip_src -> $ip_dst";
             play 'router_new';    # Defined in event_sounds.pl
-            net_domain_name_start 'router', $ip_src
-              ;   # Resolve from ip address to domain name ... in the background
+            net_domain_name_start 'router', $ip_src;    # Resolve from ip address to domain name ... in the background
         }
     }
 
@@ -152,11 +149,9 @@ sub check_router_times {
 }
 
 # Do not announce visits from these robots
-$config_parms{router_ignore_list} =
-  'inktomi netmind netwhistle northernlight singingfish googlebot avantgo inktomisearch'
+$config_parms{router_ignore_list} = 'inktomi netmind netwhistle northernlight singingfish googlebot avantgo inktomisearch'
   unless $config_parms{router_ignore_list};
-my %router_ignore_list = map { $_, 1 } split ' ',
-  $config_parms{router_ignore_list};
+my %router_ignore_list = map { $_, 1 } split ' ', $config_parms{router_ignore_list};
 
 # This is true when the background dns request finishes
 if ( my ( $name, $name_short ) = net_domain_name_done 'router' ) {
@@ -195,7 +190,7 @@ sub check_router_times {
 
     # Play a sound, louder for more hits
     my $volume = int 100 * $router_server_hits / 20;
-    play file => 'router_hit', volume => $volume;   # Defined in event_sounds.pl
+    play file => 'router_hit', volume => $volume;    # Defined in event_sounds.pl
     $router_server_hits = 0;
 }
 
@@ -204,8 +199,7 @@ sub check_router_times {
     my $router_overload = int 100 * $router_count / $router_loops;
 
     #   $router_count = sprintf '%4.1f', $router_count / 1000;
-    my $msg =
-      "Router had $router_count packets (${router_overload}% packets-per-pass) of traffic in the last hour";
+    my $msg = "Router had $router_count packets (${router_overload}% packets-per-pass) of traffic in the last hour";
     logit "$config_parms{data_dir}/logs/router.$Year_Month_Now.log", $msg;
     print_log $msg;
     $router_count = 0;
@@ -225,8 +219,7 @@ sub check_router_times {
     $Save{server_clients_hour} = 0;
 }
 elsif ( time_cron '1 20 * * *' ) {
-    speak
-      "app=router Notice, there were $Save{server_hits_day} web hits from $Save{server_clients_day} clients in the last day"
+    speak "app=router Notice, there were $Save{server_hits_day} web hits from $Save{server_clients_day} clients in the last day"
       if $Save{server_hits_day} > 5;
     $Save{server_hits_day}    = 0;
     $Save{server_clients_day} = 0;
@@ -235,20 +228,15 @@ sub check_router_times {
 # Allow for rebooting of various routers
 
 $v_router_reboot = new Voice_Cmd 'Reboot the router';
-$v_router_reboot->set_info(
-    'Sends commands to the router telnet port to walk the menus to reboot the router'
-);
-$router_client =
-  new Socket_Item( undef, undef, $config_parms{router_address} . ":23",
-    'router', 'tcp', 'raw' );
+$v_router_reboot->set_info( 'Sends commands to the router telnet port to walk the menus to reboot the router' );
+$router_client = new Socket_Item( undef, undef, $config_parms{router_address} . ":23", 'router', 'tcp', 'raw' );
 
 if ( said $v_router_reboot) {
     $v_router_reboot->respond('Rebooting the router...');
     if ( lc $config_parms{server_router_type} eq 'linksys' ) {
 
         # Press 'Apply' on the harmless Log menu.  Apply on any menu seems to restart the router
-        my $cmd =
-          qq[get_url "http://$config_parms{router_address}/Gozila.cgi?rLog=on&trapAddr3=255&Log=1" ];
+        my $cmd = qq[get_url "http://$config_parms{router_address}/Gozila.cgi?rLog=on&trapAddr3=255&Log=1" ];
         $cmd .= qq[-userid admin -password $config_parms{router_password}];
         run $cmd;
     }
diff --git a/code/common/monitor_router_lingo.pl b/code/common/monitor_router_lingo.pl
index 2de8aac1c..95bfd9525 100644
--- a/code/common/monitor_router_lingo.pl
+++ b/code/common/monitor_router_lingo.pl
@@ -32,28 +32,22 @@
 my $lingo_user = "user";
 my $lingo_pass = "ph3taswe";
 
-my $lingo_status_url =
-  "http://${lingo_user}:${lingo_pass}\@${lingo_ip}/LP_status.html";
-my $f_lingo_status_html =
-  "$config_parms{data_dir}/web/lingo_router_status.html";
+my $lingo_status_url    = "http://${lingo_user}:${lingo_pass}\@${lingo_ip}/LP_status.html";
+my $f_lingo_status_html = "$config_parms{data_dir}/web/lingo_router_status.html";
 
-my $lingo_reboot_url =
-  "http://${lingo_user}:${lingo_pass}\@${lingo_ip}/LP_reboot.html";
-my $f_lingo_reboot_html =
-  "$config_parms{data_dir}/web/lingo_router_reboot.html";
+my $lingo_reboot_url    = "http://${lingo_user}:${lingo_pass}\@${lingo_ip}/LP_reboot.html";
+my $f_lingo_reboot_html = "$config_parms{data_dir}/web/lingo_router_reboot.html";
 
 # noloop=stop
 
-$v_check_lingo_router = new Voice_Cmd('Check Lingo router');
-$p_check_lingo_router = new Process_Item(
-    "get_url -quiet \"$lingo_status_url\" \"$f_lingo_status_html\"");
-$p_reboot_lingo_router = new Process_Item(
-    "get_url -quiet \"$lingo_reboot_url\" \"$f_lingo_reboot_html\"");
+$v_check_lingo_router  = new Voice_Cmd('Check Lingo router');
+$p_check_lingo_router  = new Process_Item("get_url -quiet \"$lingo_status_url\" \"$f_lingo_status_html\"");
+$p_reboot_lingo_router = new Process_Item("get_url -quiet \"$lingo_reboot_url\" \"$f_lingo_reboot_html\"");
 
 # Run on the 3rd minute of every 5 minute block (or when requested by
 # the voice command)
-if ( ( $New_Minute and ( ( $Minute % 5 ) == 3 ) ) or said $v_check_lingo_router)
-{
+if ( ( $New_Minute and ( ( $Minute % 5 ) == 3 ) ) or said $v_check_lingo_router) {
+
     # Check for active internet connection
     # VoIP won't work without it regardless of the
     # state of the Lingo ATA
diff --git a/code/common/monitor_server.pl b/code/common/monitor_server.pl
index 8a6a9fea3..f4c0e9ecb 100644
--- a/code/common/monitor_server.pl
+++ b/code/common/monitor_server.pl
@@ -11,9 +11,7 @@
 my (%server_clients);
 
 $v_client_hits = new Voice_Cmd('Read the web server stats');
-$v_client_hits->set_info(
-    'Summarize how many people have visted the mh server in the last hour and day'
-);
+$v_client_hits->set_info( 'Summarize how many people have visted the mh server in the last hour and day' );
 
 if ( my $data = said $http_server) {
 
@@ -101,8 +99,7 @@
 sub hourly_web_hits {
     my $msg;
     if ( $Save{web_hits_hour} ) {
-        $msg =
-          "$Save{web_hits_hour} web hits from $Save{web_clients_hour} clients in the last hour.";
+        $msg = "$Save{web_hits_hour} web hits from $Save{web_clients_hour} clients in the last hour.";
     }
     else {
         $msg = "Nothing to report for the hour.";
@@ -124,8 +121,7 @@ sub hourly_web_hits {
 sub web_hits {
     my $msg;
     if ( $Save{web_hits_day} ) {
-        $msg =
-          "The MisterHouse server had $Save{web_hits_day} web hits from $Save{web_clients_day} clients since midnight.";
+        $msg = "The MisterHouse server had $Save{web_hits_day} web hits from $Save{web_clients_day} clients since midnight.";
     }
     else {
         $msg = "Nothing to report for today.";
diff --git a/code/common/monitor_versalink.pl b/code/common/monitor_versalink.pl
index 32871588d..6b801c1cc 100644
--- a/code/common/monitor_versalink.pl
+++ b/code/common/monitor_versalink.pl
@@ -25,8 +25,7 @@
     $versalink_url = "http://$versalink_host/atmstat.htm";
     set $p_get_versalink "get_url -quiet $versalink_url $f_versalink";
     &create_versalink_rrd($Time) unless -e $RRD;
-    $Included_HTML{'Internet'} .=
-      qq(<h3>Versalink Throughput<p><img src='sub;?graph_versalink_rrd()'><p>\n\n\n);
+    $Included_HTML{'Internet'} .= qq(<h3>Versalink Throughput<p><img src='sub;?graph_versalink_rrd()'><p>\n\n\n);
 }
 
 if (new_minute) {
@@ -90,10 +89,9 @@ sub create_versalink_rrd {
     RRDs::create $RRD,
       '-b', $_[0], '-s', 60,
       "DS:inbytes:COUNTER:300:U:U",
-      "DS:outbytes:COUNTER:300:U:U",
-      'RRA:AVERAGE:0.5:1:801',    # details for 6 hours (agregate 1 minute)
+      "DS:outbytes:COUNTER:300:U:U", 'RRA:AVERAGE:0.5:1:801',    # details for 6 hours (agregate 1 minute)
 
-      'RRA:MIN:0.5:2:801',        # 1 day (agregate 2 minutes)
+      'RRA:MIN:0.5:2:801',                                       # 1 day (agregate 2 minutes)
       'RRA:AVERAGE:0.5:2:801', 'RRA:MAX:0.5:2:801',;
 }
 
@@ -104,7 +102,7 @@ sub update_versalink_rrd {
     my ( $time, @data ) = @_;
 
     print "DATA INSERT : time = $time data = @data\n" if $debug;
-    RRDs::update $RRD, "$time:" . join ':', @data;    # add current data
+    RRDs::update $RRD, "$time:" . join ':', @data;               # add current data
 
     return if $err = RRDs::error and $err =~ /min.*one second step/;
     warn "$err\n" if $err;
@@ -117,16 +115,11 @@ sub graph_versalink_rrd {
     $seconds = 3600 unless $seconds;
     my $ago = $Time - $seconds;
     my ( $graph, $x, $y ) = RRDs::graph(
-        "$config_parms{data_dir}/versalink.png",
-        "--start=$ago",
-        "--end=$Time",
-        "--vertical-label=kb/s",
-        "DEF:inbytes=$RRD:inbytes:AVERAGE",
-        "CDEF:realinbytes=inbytes,8,*,1000,/",
-        "LINE1:realinbytes#FF0000:In traffic",
-        "DEF:outbytes=$RRD:outbytes:AVERAGE",
-        "CDEF:realoutbytes=outbytes,8,*,1000,/",
-        "LINE2:realoutbytes#00FF00:Out traffic",
+        "$config_parms{data_dir}/versalink.png", "--start=$ago",
+        "--end=$Time",                           "--vertical-label=kb/s",
+        "DEF:inbytes=$RRD:inbytes:AVERAGE",      "CDEF:realinbytes=inbytes,8,*,1000,/",
+        "LINE1:realinbytes#FF0000:In traffic",   "DEF:outbytes=$RRD:outbytes:AVERAGE",
+        "CDEF:realoutbytes=outbytes,8,*,1000,/", "LINE2:realoutbytes#00FF00:Out traffic",
     );
     return file_read "$config_parms{data_dir}/versalink.png";
 }
diff --git a/code/common/mp3.pl b/code/common/mp3.pl
index bc2dbacd4..3a65d637a 100644
--- a/code/common/mp3.pl
+++ b/code/common/mp3.pl
@@ -11,9 +11,7 @@
 
 # *** A good argument to rename this section to music (MP3 is hardly appropriate at this time.)
 $v_mp3_build_list = new Voice_Cmd '[Build,Load] the {mp3,m p 3} database', '';
-$v_mp3_build_list->set_info(
-    "Builds/loads an mp3 database for these directories: $config_parms{mp3_dir}"
-);
+$v_mp3_build_list->set_info( "Builds/loads an mp3 database for these directories: $config_parms{mp3_dir}" );
 
 $p_mp3_build_list = new Process_Item;
 
@@ -66,12 +64,10 @@
     undef $Tk_results{'MP3 Genre'};
     my ( $results1, $results2, $count1, $count2 ) =
       &mp3_search( quotemeta $Save{mp3_search}, quotemeta $Save{mp3_Genre} );
-    print_log
-      "$count2 out of $count1 songs for search=$Save{mp3_search}, genre=$Save{mp3_Genre}";
+    print_log "$count2 out of $count1 songs for search=$Save{mp3_search}, genre=$Save{mp3_Genre}";
     if ($results1) {
         speak "Found $count2 songs";
-        display "Found $count2 (out of $count1) songs\n" . $results1, 30,
-          'MP3 Search Results', 'fixed';
+        display "Found $count2 (out of $count1) songs\n" . $results1, 30, 'MP3 Search Results', 'fixed';
         my $file = "$config_parms{data_dir}/search.m3u";
         file_write $file, $results2;
         &mp3_queue($file);
@@ -123,8 +119,7 @@ sub mp3_search {
     foreach my $i (@results) {
         my $file = $files[$i];
         $results2 .= "$file\n";
-        $results1 .=
-          "Title: $titles[$i]   Album: $albums[$i]  Year: $years[$i]  Genre: $genres[$i]\n";
+        $results1 .= "Title: $titles[$i]   Album: $albums[$i]  Year: $years[$i]  Genre: $genres[$i]\n";
         $results1 .= "  - Artist: $artists[$i]  Comments:$comments[$i]\n";
         $results1 .= "  - File: $file\n\n";
     }
@@ -137,8 +132,7 @@ sub mp3_playlists {
     # Re-tie to the database, in case it has changed.
     eval 'untie %mp3_dbm';    # eval in cause db_file is not installed
     print_log "Tieing to music database: $mp3_file" if $Startup;
-    my $tie_code =
-      qq[tie %mp3_dbm, 'DB_File', "$mp3_file", O_RDWR|O_CREAT, 0666 or print_log "Error in tieing to $mp3_file"];
+    my $tie_code = qq[tie %mp3_dbm, 'DB_File', "$mp3_file", O_RDWR|O_CREAT, 0666 or print_log "Error in tieing to $mp3_file"];
     eval $tie_code;
     if ($@) {
         warn "Error in tieing to $mp3_file:\n  $@";
@@ -171,8 +165,7 @@ sub mp3_playlists {
     return $mp3names, %mp3files;
 }
 
-$v_mp3_playlist1 =
-  new Voice_Cmd("Set house mp3 player to playlist [$mp3names]");
+$v_mp3_playlist1 = new Voice_Cmd("Set house mp3 player to playlist [$mp3names]");
 
 #set_icon $v_mp3_playlist1 'playlist'; # ???
 
@@ -200,8 +193,7 @@ sub mp3_playlists {
         $mp3playing = ${ &mp3_get_playlist() }[$pos];
     }
     else {
-        $mp3playing = &mp3_get_curr_song()
-          ;    # Where is this function?  Does not appear to exist anywhere (!)
+        $mp3playing = &mp3_get_curr_song();    # Where is this function?  Does not appear to exist anywhere (!)
     }
     respond $mp3playing;
 }
@@ -219,8 +211,7 @@ sub set_tk_progress {
     $Tk_objects{mp3_progress}->configure( -value => $percent );
 }
 
-if ( !$config_parms{mp3_no_tkupdates} and new_second and &mp3_player_running() )
-{
+if ( !$config_parms{mp3_no_tkupdates} and new_second and &mp3_player_running() ) {
 
     if ( new_second 5 ) {
         $Save{mp3_mode} = &mp3_playing();
@@ -317,8 +308,7 @@ sub mp3_play_search_results {
 my $f_radio_stations = "$config_parms{data_dir}/web/radio_stations.html";
 $v_get_radio_stations = new Voice_Cmd 'Get internet radio station list';
 
-$p_get_radio_stations = new Process_Item
-  "get_url http://mindx.dyndns.org/kde/radio/live/entries.php $f_radio_stations";
+$p_get_radio_stations = new Process_Item "get_url http://mindx.dyndns.org/kde/radio/live/entries.php $f_radio_stations";
 
 if ( my $state = said $v_get_radio_stations) {
     unlink $f_radio_stations;
@@ -334,14 +324,11 @@ sub mp3_play_search_results {
 sub mp3_radio_stations {
     my ( $station, $url, $bandwidth, $style, @data );
     for my $html ( file_read $f_radio_stations, '' ) {
-        if ( $html =~ /^<tr.*<td>(.*)<\/td><td><a href="(.*)">.*<\/a><\/td>$/ )
-        {
+        if ( $html =~ /^<tr.*<td>(.*)<\/td><td><a href="(.*)">.*<\/a><\/td>$/ ) {
             $station = $1;
             $url     = $2;
         }
-        elsif ( ( $bandwidth, $style ) =
-            $html =~ /^<td>(.*)<\/td><td>(.*)<\/td><\/tr>$/ )
-        {
+        elsif ( ( $bandwidth, $style ) = $html =~ /^<td>(.*)<\/td><td>(.*)<\/td><\/tr>$/ ) {
             push @data, "$station$;$url$;$bandwidth$;$style";
         }
     }
diff --git a/code/common/mp3Rip_code.pl b/code/common/mp3Rip_code.pl
index 9e6c3cfdf..9cfe3ef63 100644
--- a/code/common/mp3Rip_code.pl
+++ b/code/common/mp3Rip_code.pl
@@ -170,80 +170,43 @@
 use File::Copy;
 
 my @id3_genres = (
-    'Blues',                  'Classic Rock',
-    'Country',                'Dance',
-    'Disco',                  'Funk',
-    'Grunge',                 'Hip-Hop',
-    'Jazz',                   'Metal',
-    'New Age',                'Oldies',
-    'Other',                  'Pop',
-    'R&B',                    'Rap',
-    'Reggae',                 'Rock',
-    'Techno',                 'Industrial',
-    'Alternative',            'Ska',
-    'Death Metal',            'Pranks',
-    'Soundtrack',             'Euro-Techno',
-    'Ambient',                'Trip-Hop',
-    'Vocal',                  'Jazz+Funk',
-    'Fusion',                 'Trance',
-    'Classical',              'Instrumental',
-    'Acid',                   'House',
-    'Game',                   'Sound Clip',
-    'Gospel',                 'Noise',
-    'Alt. Rock',              'Bass',
-    'Soul',                   'Punk',
-    'Space',                  'Meditative',
-    'Instrumental Pop',       'Instrumental Rock',
-    'Ethnic',                 'Gothic',
-    'Darkwave',               'Techno-Industrial',
-    'Electronic',             'Pop-Folk',
-    'Eurodance',              'Dream',
-    'Southern Rock',          'Comedy',
-    'Cult',                   'Gangsta Rap',
-    'Top 40',                 'Christian Rap',
-    'Pop/Funk',               'Jungle',
-    'Native American',        'Cabaret',
-    'New Wave',               'Psychedelic',
-    'Rave',                   'Showtunes',
-    'Trailer',                'Lo-Fi',
-    'Tribal',                 'Acid Punk',
-    'Acid Jazz',              'Polka',
-    'Retro',                  'Musical',
-    'Rock & Roll',            'Hard Rock',
-    'Folk',                   'Folk/Rock',
-    'National Folk',          'Swing',
-    'Fast-Fusion',            'Bebob',
-    'Latin',                  'Revival',
-    'Celtic',                 'Bluegrass',
-    'Avantgarde',             'Gothic Rock',
-    'Progressive Rock',       'Psychedelic Rock',
-    'Symphonic Rock',         'Slow Rock',
-    'Big Band',               'Chorus',
-    'Easy Listening',         'Acoustic',
-    'Humour',                 'Speech',
-    'Chanson',                'Opera',
-    'Chamber Music',          'Sonata',
-    'Symphony',               'Booty Bass',
-    'Primus',                 'Porn Groove',
-    'Satire',                 'Slow Jam',
-    'Club',                   'Tango',
-    'Samba',                  'Folklore',
-    'Ballad',                 'Power Ballad',
-    'Rhythmic Soul',          'Freestyle',
-    'Duet',                   'Punk Rock',
-    'Drum Solo',              'A Cappella',
-    'Euro-House',             'Dance Hall',
-    'Goa',                    'Drum & Bass',
-    'Club-House',             'Hardcore',
-    'Terror',                 'Indie',
-    'BritPop',                'Negerpunk',
-    'Polsk Punk',             'Beat',
-    'Christian Gangsta Rap',  'Heavy Metal',
-    'Black Metal',            'Crossover',
-    'Contemporary Christian', 'Christian Rock',
-    'Merengue',               'Salsa',
-    'Thrash Metal',           'Anime',
-    'JPop',                   'Synthpop'
+    'Blues',                  'Classic Rock',     'Country',          'Dance',
+    'Disco',                  'Funk',             'Grunge',           'Hip-Hop',
+    'Jazz',                   'Metal',            'New Age',          'Oldies',
+    'Other',                  'Pop',              'R&B',              'Rap',
+    'Reggae',                 'Rock',             'Techno',           'Industrial',
+    'Alternative',            'Ska',              'Death Metal',      'Pranks',
+    'Soundtrack',             'Euro-Techno',      'Ambient',          'Trip-Hop',
+    'Vocal',                  'Jazz+Funk',        'Fusion',           'Trance',
+    'Classical',              'Instrumental',     'Acid',             'House',
+    'Game',                   'Sound Clip',       'Gospel',           'Noise',
+    'Alt. Rock',              'Bass',             'Soul',             'Punk',
+    'Space',                  'Meditative',       'Instrumental Pop', 'Instrumental Rock',
+    'Ethnic',                 'Gothic',           'Darkwave',         'Techno-Industrial',
+    'Electronic',             'Pop-Folk',         'Eurodance',        'Dream',
+    'Southern Rock',          'Comedy',           'Cult',             'Gangsta Rap',
+    'Top 40',                 'Christian Rap',    'Pop/Funk',         'Jungle',
+    'Native American',        'Cabaret',          'New Wave',         'Psychedelic',
+    'Rave',                   'Showtunes',        'Trailer',          'Lo-Fi',
+    'Tribal',                 'Acid Punk',        'Acid Jazz',        'Polka',
+    'Retro',                  'Musical',          'Rock & Roll',      'Hard Rock',
+    'Folk',                   'Folk/Rock',        'National Folk',    'Swing',
+    'Fast-Fusion',            'Bebob',            'Latin',            'Revival',
+    'Celtic',                 'Bluegrass',        'Avantgarde',       'Gothic Rock',
+    'Progressive Rock',       'Psychedelic Rock', 'Symphonic Rock',   'Slow Rock',
+    'Big Band',               'Chorus',           'Easy Listening',   'Acoustic',
+    'Humour',                 'Speech',           'Chanson',          'Opera',
+    'Chamber Music',          'Sonata',           'Symphony',         'Booty Bass',
+    'Primus',                 'Porn Groove',      'Satire',           'Slow Jam',
+    'Club',                   'Tango',            'Samba',            'Folklore',
+    'Ballad',                 'Power Ballad',     'Rhythmic Soul',    'Freestyle',
+    'Duet',                   'Punk Rock',        'Drum Solo',        'A Cappella',
+    'Euro-House',             'Dance Hall',       'Goa',              'Drum & Bass',
+    'Club-House',             'Hardcore',         'Terror',           'Indie',
+    'BritPop',                'Negerpunk',        'Polsk Punk',       'Beat',
+    'Christian Gangsta Rap',  'Heavy Metal',      'Black Metal',      'Crossover',
+    'Contemporary Christian', 'Christian Rock',   'Merengue',         'Salsa',
+    'Thrash Metal',           'Anime',            'JPop',             'Synthpop'
 );
 
 my %cddb_to_id3 = (
@@ -260,22 +223,14 @@
     'soundtrack' => 'Soundtrack'
 );
 
-my ( $cddbp, @discs, @toc, @incomplete, $cd_drive_in_use, @recently_completed );
-my (
-    $cddbid,        $track_numbers, $track_lengths,
-    $track_offsets, $total_seconds, @data_tracks
-);
-my (
-    $get_cdinfo_process, %file_watchers, %rip_pids,
-    %ripper_data,        %incomplete_status
-);
+my ( $cddbp,  @discs,         @toc,           @incomplete,    $cd_drive_in_use, @recently_completed );
+my ( $cddbid, $track_numbers, $track_lengths, $track_offsets, $total_seconds,   @data_tracks );
+my ( $get_cdinfo_process, %file_watchers, %rip_pids, %ripper_data, %incomplete_status );
 
 if ($Reload) {
     $cd_drive_in_use    = 0;
-    $get_cdinfo_process = new Process_Item(
-        "$config_parms{mp3Rip_cdinfo} > $config_parms{mp3Rip_work_dir}/cd-info.curr"
-    );
-    $cddbp = new CDDB;
+    $get_cdinfo_process = new Process_Item( "$config_parms{mp3Rip_cdinfo} > $config_parms{mp3Rip_work_dir}/cd-info.curr" );
+    $cddbp              = new CDDB;
     print_log "mp3Rip: cddbids still being processed: $Save{'mp3Rip_pending'}"
       if $main::Debug{mp3Rip};
     foreach ( split( /\s+/, $Save{'mp3Rip_pending'} ) ) {
@@ -319,8 +274,7 @@ sub mp3Rip_attempt_reattach_and_restart {
 
 sub mp3Rip_remove_pending {
     my ($cddbid) = @_;
-    print_log
-      "mp3Rip($cddbid): Process no longer running (pending=$Save{'mp3Rip_pending'})"
+    print_log "mp3Rip($cddbid): Process no longer running (pending=$Save{'mp3Rip_pending'})"
       if $main::Debug{mp3Rip};
     $Save{'mp3Rip_pending'} =~ s/\s*$cddbid\s*/ /;
     $Save{'mp3Rip_pending'} =~ s/\s+$//;
@@ -361,31 +315,19 @@ sub mp3Rip_get_pending {
         $entry->[1] = $ripper_data{$_}->{'artist'};
         $entry->[2] = $ripper_data{$_}->{'album'};
         $entry->[3] = $ripper_data{$_}->{'current'};
-        $entry->[4] =
-          "$ripper_data{$_}->{'rip_done_count'} / $ripper_data{$_}->{'total_tracks'} Complete";
+        $entry->[4] = "$ripper_data{$_}->{'rip_done_count'} / $ripper_data{$_}->{'total_tracks'} Complete";
         if ( $ripper_data{$_}->{'total_length'} ) {
-            $entry->[5] = int(
-                (
-                    $ripper_data{$_}->{'rip_done_length'} /
-                      $ripper_data{$_}->{'total_length'}
-                ) * 100
-            );
+            $entry->[5] = int( ( $ripper_data{$_}->{'rip_done_length'} / $ripper_data{$_}->{'total_length'} ) * 100 );
             $entry->[5] .= '%';
         }
         if ( defined( $ripper_data{$_}->{'compress_done_count'} ) ) {
-            $entry->[6] =
-              "$ripper_data{$_}->{'compress_done_count'} / $ripper_data{$_}->{'total_tracks'} Complete";
+            $entry->[6] = "$ripper_data{$_}->{'compress_done_count'} / $ripper_data{$_}->{'total_tracks'} Complete";
         }
         else {
             $entry->[6] = 'Not Started';
         }
         if ( $ripper_data{$_}->{'total_length'} ) {
-            $entry->[7] = int(
-                (
-                    $ripper_data{$_}->{'compress_done_length'} /
-                      $ripper_data{$_}->{'total_length'}
-                ) * 100
-            );
+            $entry->[7] = int( ( $ripper_data{$_}->{'compress_done_length'} / $ripper_data{$_}->{'total_length'} ) * 100 );
             $entry->[7] .= '%';
         }
         if ( $ripper_data{$_}->{'rip_time'} ) {
@@ -515,17 +457,13 @@ sub mp3Rip_start_rip {
     unless ($cddbid) {
         return "No cddbid found!";
     }
-    print_log
-      "mp3Rip($cddbid): mp3Rip_start_rip(pending=$Save{'mp3Rip_pending'})"
+    print_log "mp3Rip($cddbid): mp3Rip_start_rip(pending=$Save{'mp3Rip_pending'})"
       if $main::Debug{mp3Rip};
     if ( $Save{'mp3Rip_pending'} =~ /$cddbid/ ) {
         return "There is already a rip in progress for $cddbid";
     }
-    unless (
-        open( MP3RIPDATA, ">$config_parms{mp3Rip_work_dir}/$cddbid.data" ) )
-    {
-        return
-          "Could not create file: $config_parms{mp3Rip_work_dir}/$cddbid.data";
+    unless ( open( MP3RIPDATA, ">$config_parms{mp3Rip_work_dir}/$cddbid.data" ) ) {
+        return "Could not create file: $config_parms{mp3Rip_work_dir}/$cddbid.data";
     }
     foreach (@_) {
         print MP3RIPDATA "$_\n";
@@ -538,8 +476,7 @@ sub mp3Rip_start_rip {
     print MP3RIPDATA "cdripper=$config_parms{mp3Rip_cdripper}\n";
     print MP3RIPDATA "mp3_encoder=$config_parms{mp3Rip_mp3_encoder}\n";
     if ( $config_parms{mp3Rip_disc_data_file} ) {
-        print MP3RIPDATA
-          "disc_data_file=$config_parms{mp3Rip_disc_data_file}\n";
+        print MP3RIPDATA "disc_data_file=$config_parms{mp3Rip_disc_data_file}\n";
     }
     close(MP3RIPDATA);
     unlink("$config_parms{mp3Rip_work_dir}/$cddbid.log");
@@ -720,10 +657,7 @@ ($)
     $name =~ s/(^|\s+)(.)/$1 . uc($2)/e;
 
     # Make sure the, of, a, an, from are not caps
-    while ( $name =~
-        s/\s+($config_parms{mp3Rip_first_letter_caps_ignore_list})\s+/' ' . lc($1) . ' '/e
-      )
-    {
+    while ( $name =~ s/\s+($config_parms{mp3Rip_first_letter_caps_ignore_list})\s+/' ' . lc($1) . ' '/e ) {
         1;
     }
 
@@ -763,13 +697,11 @@ sub mp3Rip_parse_cdinfo {
     }
     close CDINFO;
 
-    my @toc =
-      $cddbp->parse_cdinfo("$config_parms{mp3Rip_work_dir}/cd-info.curr");
+    my @toc = $cddbp->parse_cdinfo("$config_parms{mp3Rip_work_dir}/cd-info.curr");
     unless (@toc) {
         return ( undef, undef, undef );
     }
-    ( $cddbid, $track_numbers, $track_lengths, $track_offsets, $total_seconds )
-      = $cddbp->calculate_id(@toc);
+    ( $cddbid, $track_numbers, $track_lengths, $track_offsets, $total_seconds ) = $cddbp->calculate_id(@toc);
     unless ($cddbid) {
         return ( undef, undef, undef );
     }
@@ -814,8 +746,7 @@ sub mp3Rip_get_disc_details {
     $artist =~ s/ \/ .+$//;
     my $album = $disc_info->{dtitle};
     $album =~ s/^.+ \/ //;
-    return ( &mp3Rip_convert_genre_to_id3($genre),
-        $artist, $album, @{ $disc_info->{ttitles} } );
+    return ( &mp3Rip_convert_genre_to_id3($genre), $artist, $album, @{ $disc_info->{ttitles} } );
 }
 
 sub mp3Rip_read_key_from_data_file {
@@ -838,16 +769,12 @@ sub mp3Rip_clean {
     my $dir = &mp3Rip_read_key_from_data_file( $cddbid, 'dir' );
     unlink("$config_parms{mp3Rip_work_dir}/$cddbid.log");
     unlink("$config_parms{mp3Rip_work_dir}/$cddbid.pid");
-    unless (
-            $ripper_data{$cddbid}
+    unless ($ripper_data{$cddbid}
         and $ripper_data{$cddbid}->{'total_tracks'}
         and $ripper_data{$cddbid}->{'rip_done_count'}
-        and ( $ripper_data{$cddbid}->{'rip_done_count'} ==
-            $ripper_data{$cddbid}->{'total_tracks'} )
-      )
+        and ( $ripper_data{$cddbid}->{'rip_done_count'} == $ripper_data{$cddbid}->{'total_tracks'} ) )
     {
-        if ( opendir( MP3RIPWAVDIR, "$config_parms{mp3Rip_wav_dir}/$cddbid" ) )
-        {
+        if ( opendir( MP3RIPWAVDIR, "$config_parms{mp3Rip_wav_dir}/$cddbid" ) ) {
             while ( my $entry = readdir(MP3RIPWAVDIR) ) {
                 next if $entry =~ /^\./;
                 unlink "$config_parms{mp3Rip_wav_dir}/$cddbid/$entry";
@@ -879,9 +806,7 @@ sub mp3Rip_abort {
     unlink("$config_parms{mp3Rip_work_dir}/$cddbid.pid");
     if ( $rip_pids{$cddbid} ) {
         if ( -d "/proc/$rip_pids{$cddbid}" ) {
-            my $kill = new Process_Item(
-                "kill $rip_pids{$cddbid} ; sleep 5 ; kill -9 $rip_pids{$cddbid}"
-            );
+            my $kill = new Process_Item( "kill $rip_pids{$cddbid} ; sleep 5 ; kill -9 $rip_pids{$cddbid}" );
             $kill->start();
         }
     }
@@ -914,15 +839,13 @@ sub mp3Rip_remove_partial_entry {
 
 sub mp3Rip_make_pending {
     my ($cddbid) = @_;
-    print_log
-      "mp3Rip($cddbid): mp3Rip_make_pending(before=$Save{'mp3Rip_pending'})"
+    print_log "mp3Rip($cddbid): mp3Rip_make_pending(before=$Save{'mp3Rip_pending'})"
       if $main::Debug{mp3Rip};
     unless ( $Save{'mp3Rip_pending'} =~ /$cddbid/ ) {
         $Save{'mp3Rip_pending'} .= " $cddbid";
         $Save{'mp3Rip_pending'} =~ s/^\s+//;
     }
-    print_log
-      "mp3Rip($cddbid): mp3Rip_make_pending(after=$Save{'mp3Rip_pending'})"
+    print_log "mp3Rip($cddbid): mp3Rip_make_pending(after=$Save{'mp3Rip_pending'})"
       if $main::Debug{mp3Rip};
     &mp3Rip_remove_partial_entry($cddbid);
 }
@@ -934,9 +857,7 @@ sub mp3Rip_get_recently_completed {
 sub mp3Rip_rip_complete {
     my ($cddbid) = @_;
     $ripper_data{$cddbid}->{'current'} = 'Finished';
-    my $total_time =
-      &mp3Rip_format_time( $ripper_data{$cddbid}->{'rip_time'} +
-          $ripper_data{$cddbid}->{'compress_time'} );
+    my $total_time = &mp3Rip_format_time( $ripper_data{$cddbid}->{'rip_time'} + $ripper_data{$cddbid}->{'compress_time'} );
     my $log_entry =
       "$Time_Date: [$cddbid] Finished $ripper_data{$cddbid}->{'album'} by $ripper_data{$cddbid}->{'artist'} (Total Time: $total_time, $ripper_data{$cddbid}->{'total_tracks'} Tracks in $ripper_data{$cddbid}->{'dir'})";
     push @recently_completed, $log_entry;
@@ -951,14 +872,8 @@ sub mp3Rip_rip_complete {
     unlink("$config_parms{mp3Rip_work_dir}/$cddbid.pid");
     if ( $config_parms{mp3Rip_archive_dir} ) {
         mkdir("$config_parms{mp3Rip_archive_dir}");
-        move(
-            "$config_parms{mp3Rip_work_dir}/$cddbid.log",
-            "$config_parms{mp3Rip_archive_dir}/$cddbid.log"
-        );
-        move(
-            "$config_parms{mp3Rip_work_dir}/$cddbid.data",
-            "$config_parms{mp3Rip_archive_dir}/$cddbid.data"
-        );
+        move( "$config_parms{mp3Rip_work_dir}/$cddbid.log",  "$config_parms{mp3Rip_archive_dir}/$cddbid.log" );
+        move( "$config_parms{mp3Rip_work_dir}/$cddbid.data", "$config_parms{mp3Rip_archive_dir}/$cddbid.data" );
     }
     else {
         unlink("$config_parms{mp3Rip_work_dir}/$cddbid.log");
@@ -1045,9 +960,7 @@ sub mp3Rip_process_log_entry {
           "Ripping track $1 (" . &mp3Rip_format_time($2) . ')';
         $ripper_data{$cddbid}->{'current_length'} = $2;
     }
-    elsif (
-        $line =~ /^Compressing track (\d+) to .+ \(length: (\d+) seconds\)/ )
-    {
+    elsif ( $line =~ /^Compressing track (\d+) to .+ \(length: (\d+) seconds\)/ ) {
         $ripper_data{$cddbid}->{'current'} =
           "Compressing track $1 (" . &mp3Rip_format_time($2) . ')';
         $ripper_data{$cddbid}->{'compress_done_count'} = 0
@@ -1059,46 +972,29 @@ sub mp3Rip_process_log_entry {
         $ripper_data{$cddbid}->{'rip_done_length'} +=
           $ripper_data{$cddbid}->{'current_length'};
         $ripper_data{$cddbid}->{'rip_time'} += &mp3Rip_unformat_time($2);
-        if ( $ripper_data{$cddbid}->{'rip_done_count'} ==
-            $ripper_data{$cddbid}->{'total_tracks'} )
-        {
+        if ( $ripper_data{$cddbid}->{'rip_done_count'} == $ripper_data{$cddbid}->{'total_tracks'} ) {
             $ripper_data{$cddbid}->{'rip_predicted_remaining'} = 'Finished';
         }
         elsif ( $ripper_data{$cddbid}->{'rip_done_length'} ) {
-            $ripper_data{$cddbid}->{'rip_predicted_total'} = int(
-                $ripper_data{$cddbid}->{'total_length'} * (
-                    $ripper_data{$cddbid}->{'rip_time'} /
-                      $ripper_data{$cddbid}->{'rip_done_length'}
-                )
-            );
+            $ripper_data{$cddbid}->{'rip_predicted_total'} = int( $ripper_data{$cddbid}->{'total_length'} *
+                  ( $ripper_data{$cddbid}->{'rip_time'} / $ripper_data{$cddbid}->{'rip_done_length'} ) );
             $ripper_data{$cddbid}->{'rip_predicted_remaining'} =
-              $ripper_data{$cddbid}->{'rip_predicted_total'} -
-              $ripper_data{$cddbid}->{'rip_time'};
+              $ripper_data{$cddbid}->{'rip_predicted_total'} - $ripper_data{$cddbid}->{'rip_time'};
         }
     }
-    elsif (
-        $line =~ /^Done compressing track (\d+) to .+ \(compress time: (.+)\)/ )
-    {
+    elsif ( $line =~ /^Done compressing track (\d+) to .+ \(compress time: (.+)\)/ ) {
         $ripper_data{$cddbid}->{'compress_done_count'} = $1;
         $ripper_data{$cddbid}->{'compress_done_length'} +=
           $ripper_data{$cddbid}->{'current_length'};
         $ripper_data{$cddbid}->{'compress_time'} += &mp3Rip_unformat_time($2);
-        if ( $ripper_data{$cddbid}->{'compress_done_count'} ==
-            $ripper_data{$cddbid}->{'total_tracks'} )
-        {
-            $ripper_data{$cddbid}->{'compress_predicted_remaining'} =
-              'Finished';
+        if ( $ripper_data{$cddbid}->{'compress_done_count'} == $ripper_data{$cddbid}->{'total_tracks'} ) {
+            $ripper_data{$cddbid}->{'compress_predicted_remaining'} = 'Finished';
         }
         elsif ( $ripper_data{$cddbid}->{'compress_done_length'} ) {
-            $ripper_data{$cddbid}->{'compress_predicted_total'} = int(
-                $ripper_data{$cddbid}->{'total_length'} * (
-                    $ripper_data{$cddbid}->{'compress_time'} /
-                      $ripper_data{$cddbid}->{'compress_done_length'}
-                )
-            );
+            $ripper_data{$cddbid}->{'compress_predicted_total'} = int( $ripper_data{$cddbid}->{'total_length'} *
+                  ( $ripper_data{$cddbid}->{'compress_time'} / $ripper_data{$cddbid}->{'compress_done_length'} ) );
             $ripper_data{$cddbid}->{'compress_predicted_remaining'} =
-              $ripper_data{$cddbid}->{'compress_predicted_total'} -
-              $ripper_data{$cddbid}->{'compress_time'};
+              $ripper_data{$cddbid}->{'compress_predicted_total'} - $ripper_data{$cddbid}->{'compress_time'};
         }
     }
     elsif ( $line =~ s/^FATAL: // ) {
diff --git a/code/common/mp3_alsaplayer.pl b/code/common/mp3_alsaplayer.pl
index 7b04488db..b62909d5f 100644
--- a/code/common/mp3_alsaplayer.pl
+++ b/code/common/mp3_alsaplayer.pl
@@ -138,8 +138,7 @@ sub mp3_get_playlist_pos {
     return -1 unless ref $ref;
     foreach ( @{$ref} ) {
         $i++;
-        print_log
-          "Alsaplayer::mp3_get_playlist_pos(): Checking $currsong against $_";
+        print_log "Alsaplayer::mp3_get_playlist_pos(): Checking $currsong against $_";
         if ( $_ eq $player->get_path() ) {
             print_log "Alsaplayer::mp3_get_playlist_pos(): Returning $i";
             return $i;
diff --git a/code/common/mp3_dj.pl b/code/common/mp3_dj.pl
index 4a009b581..90bdbab6e 100644
--- a/code/common/mp3_dj.pl
+++ b/code/common/mp3_dj.pl
@@ -69,18 +69,15 @@ sub voice_over {
 
         if ($now_playing_formatted) {
             if ( not $trivia_question_asked ) {
-                my $f_trivia_question =
-                  new File_Item("$config_parms{data_dir}/trivia_question.txt");
-                my $trivia_question = read_all $f_trivia_question;
-                $speech = "Time for today's trivia question. $trivia_question";
+                my $f_trivia_question = new File_Item("$config_parms{data_dir}/trivia_question.txt");
+                my $trivia_question   = read_all $f_trivia_question;
+                $speech                = "Time for today's trivia question. $trivia_question";
                 $trivia_question_asked = 1;
             }
             elsif ( $trivia_question_asked and not $trivia_question_answered ) {
-                my $f_trivia_answer =
-                  new File_Item("$config_parms{data_dir}/trivia_answer.txt");
-                my $trivia_answer = read_all $f_trivia_answer;
-                $speech =
-                  "And now the answer to today's trivia question. $trivia_answer";
+                my $f_trivia_answer = new File_Item("$config_parms{data_dir}/trivia_answer.txt");
+                my $trivia_answer   = read_all $f_trivia_answer;
+                $speech                   = "And now the answer to today's trivia question. $trivia_answer";
                 $trivia_question_answered = 1;
             }
             elsif ( rand(10) > 7 ) {
@@ -101,12 +98,9 @@ sub voice_over {
                     if ( rand(10) > 4 and $speech ) {
                         $speech = " Hey, " . lcfirst($speech);
                     }
-                    $speech .=
-                      "The outdoor temperature is "
-                      . $Weather{TempOutdoor} . '. '
+                    $speech .= "The outdoor temperature is " . $Weather{TempOutdoor} . '. '
                       if ( defined $Weather{TempOutdoor} );
-                    $speech .=
-                      "Inside it is " . $Weather{TempIndoor} . " degrees. "
+                    $speech .= "Inside it is " . $Weather{TempIndoor} . " degrees. "
                       if ( $Weather{TempIndoor} );
                     $speech .= $Weather{chance_of_rain} . ' '
                       if ( $Weather{chance_of_rain} and rand(10) > 4 );
@@ -172,8 +166,7 @@ sub voice_over {
                     $forecast = $Weather{"Forecast $forecast_day"};
 
                     $speech = "How are you? It is $Time_Now";
-                    $speech .=
-                      " and time for the weather forecast. " . $forecast
+                    $speech .= " and time for the weather forecast. " . $forecast
                       if ( $forecast and rand(10) > 6 );
 
                 }
@@ -194,9 +187,7 @@ sub voice_over {
                 }
             }
 
-            &speak( "app=dj no_chime=1 voice=$voice "
-                  . ( ( defined $pitch ) ? " pitch=$pitch" : '' )
-                  . $speech );
+            &speak( "app=dj no_chime=1 voice=$voice " . ( ( defined $pitch ) ? " pitch=$pitch" : '' ) . $speech );
         }
     }
 }
@@ -236,8 +227,7 @@ sub dj {
 
         if ( $mptime - $mpelapse > 5 ) {
             $timer_voice_over->stop() unless inactive $timer_voice_over;
-            set $timer_voice_over $mptime - $mpelapse + 1,
-              "voice_over(" . '"' . "$last_track" . '")';
+            set $timer_voice_over $mptime - $mpelapse + 1, "voice_over(" . '"' . "$last_track" . '")';
         }
     }
 }
diff --git a/code/common/mp3_mpd.pl b/code/common/mp3_mpd.pl
index cc151d3fb..39bb0483d 100644
--- a/code/common/mp3_mpd.pl
+++ b/code/common/mp3_mpd.pl
@@ -65,10 +65,8 @@
 $v_mp3_control_cmd = new Voice_Cmd(
     "Set the house mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song,Volume Down,Volume Up,Shuffle On,Shuffle Off,Repeat On,Repeat Off,track]"
 );
-$v_mp3_vol_control = new Voice_Cmd(
-    "Set the house mp3 volume to [5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]"
-);
-$v_mpd_control = new Voice_Cmd("[Regenerate,Restart] MPD");
+$v_mp3_vol_control = new Voice_Cmd( "Set the house mp3 volume to [5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]" );
+$v_mpd_control     = new Voice_Cmd("[Regenerate,Restart] MPD");
 
 my $state;
 mp3_control($state)     if $state = said $v_mp3_control_cmd;
@@ -100,8 +98,7 @@ sub mpd_control {
             speak "M P D configuration file successfully generated";
         }
         else {
-            speak
-              "There was an error generating the configuration file for M P D";
+            speak "There was an error generating the configuration file for M P D";
         }
     }
 }
diff --git a/code/common/mp3_slimserver.pl b/code/common/mp3_slimserver.pl
index ef8999de4..ee6b5f1d1 100644
--- a/code/common/mp3_slimserver.pl
+++ b/code/common/mp3_slimserver.pl
@@ -72,8 +72,7 @@ sub mp3_play {
     print_log "Player IP address for playing slimserver " . $client_ip;
     print_log "mp3 play: $file";
     $file =~ s./.%2f.g;
-    my $url =
-      "http://$host/status.txt?p0=playlist&p1=load&p2=$file&player=$client_ip";
+    my $url = "http://$host/status.txt?p0=playlist&p1=load&p2=$file&player=$client_ip";
     get $url;
 }
 
@@ -86,8 +85,7 @@ sub mp3_queue {
     print_log "Player IP address queueing slimserver " . $client_ip;
     print_log "mp3 queue: $file";
     $file = &escape($file);
-    my $url =
-      "http://$host/status.txt?p0=playlist&p1=add&p2=$file&player=$client_ip";
+    my $url = "http://$host/status.txt?p0=playlist&p1=add&p2=$file&player=$client_ip";
     get $url;
 }
 
@@ -116,8 +114,7 @@ sub mp3_get_playlist_pos {
 }
 
 # noloop=start      This directive allows this code to be run on startup/reload
-my $mp3_states =
-  "Play,Stop,Pause,Next Song,Previous Song,Volume up, Volume down";
+my $mp3_states    = "Play,Stop,Pause,Next Song,Previous Song,Volume up, Volume down";
 my %slim_commands = (
     'play'          => 'play',
     'stop'          => 'stop',
@@ -127,8 +124,7 @@ sub mp3_get_playlist_pos {
     'volume up'     => 'volume_up',
     'volume down'   => 'volume_down'
 );
-$v_slimserver_control =
-  new Voice_Cmd("Set the house mp3 player to [$mp3_states]");
+$v_slimserver_control = new Voice_Cmd("Set the house mp3 player to [$mp3_states]");
 
 # noloop=stop
 
diff --git a/code/common/mp3_winamp.pl b/code/common/mp3_winamp.pl
index 8528ab37c..58596d3e0 100644
--- a/code/common/mp3_winamp.pl
+++ b/code/common/mp3_winamp.pl
@@ -40,8 +40,7 @@
 my $winamp_path;
 
 if ($OS_win) {    # Not really needed as this is a Windows-only module
-    $winamp_path =
-      $Registry->{'Classes/Applications/Winamp.exe/shell/open/command//'};
+    $winamp_path = $Registry->{'Classes/Applications/Winamp.exe/shell/open/command//'};
     $winamp_path = $1 if $winamp_path and $winamp_path =~ /"(.*?)"/;
     print "Found local Winamp: $winamp_path\n" if $Debug{winamp};
 }
@@ -50,8 +49,7 @@
 
 my ( %winamp_commands, $mp3_states );
 if ( $config_parms{mp3_program_control} eq 'wactrl' ) {
-    $mp3_states = "Play,Stop,Pause,Restart,Rewind,Forward,"
-      . "Next Song,Previous Song,Volume up,Volume down,ontop";
+    $mp3_states      = "Play,Stop,Pause,Restart,Rewind,Forward," . "Next Song,Previous Song,Volume up,Volume down,ontop";
     %winamp_commands = (
         'restart'       => 'start',
         'rewind'        => 'rew5s',
@@ -110,18 +108,14 @@ sub mp3_control {
     if (&is_httpq) {
         my $url = "http://$host:$config_parms{mp3_program_port}";
         if ( $command =~ /random song/i ) {
-            my $mp3_num_tracks =
-              get "$url/getlistlength?p=$config_parms{mp3_program_password}";
-            my $song          = int( rand($mp3_num_tracks) );
-            my $mp3_song_name = get
-              "$url/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$song";
+            my $mp3_num_tracks = get "$url/getlistlength?p=$config_parms{mp3_program_password}";
+            my $song           = int( rand($mp3_num_tracks) );
+            my $mp3_song_name  = get "$url/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$song";
             $mp3_song_name =~ s/[\n\r]//g;
             print "Now Playing $mp3_song_name\n" if $Debug{winamp};
             get "$url/stop?p=$config_parms{mp3_program_password}";
-            get
-              "$url/setplaylistpos?p=$config_parms{mp3_program_password}&a=$song";
-            $temp =
-              filter_cr get "$url/play?p=$config_parms{mp3_program_password}";
+            get "$url/setplaylistpos?p=$config_parms{mp3_program_password}&a=$song";
+            $temp = filter_cr get "$url/play?p=$config_parms{mp3_program_password}";
             return $temp;
         }
         elsif ( $command =~ /volume/i ) {
@@ -129,15 +123,13 @@ sub mp3_control {
 
             # 10 passes is about 20 percent
             for my $pass ( 1 .. 5 ) {
-                $temp .= filter_cr get
-                  "$url/$command?p=$config_parms{mp3_program_password}";
+                $temp .= filter_cr get "$url/$command?p=$config_parms{mp3_program_password}";
             }
             print "Winamp (httpq $host) set to $command: $temp\n"
               if $Debug{winamp};
         }
         elsif ( $command =~ /shuffle/i ) {
-            $temp .= filter_cr get
-              "$url/shuffle_status?p=$config_parms{mp3_program_password}";
+            $temp .= filter_cr get "$url/shuffle_status?p=$config_parms{mp3_program_password}";
             if ($temp) {
                 get "$url/shuffle?p=$config_parms{mp3_program_password}&a=0";
                 print "Winamp (httpq $host) Shuffle set OFF\n"
@@ -149,8 +141,7 @@ sub mp3_control {
             }
         }
         elsif ( $command =~ /repeat/i ) {
-            $temp .= filter_cr get
-              "$url/repeat_status?p=$config_parms{mp3_program_password}";
+            $temp .= filter_cr get "$url/repeat_status?p=$config_parms{mp3_program_password}";
             if ($temp) {
                 get "$url/repeat?p=$config_parms{mp3_program_password}&a=0";
                 print "Winamp (httpq $host) Repeat set OFF\n" if $Debug{winamp};
@@ -161,8 +152,7 @@ sub mp3_control {
             }
         }
         else {
-            $temp = filter_cr get
-              "$url/$command?p=$config_parms{mp3_program_password}";
+            $temp = filter_cr get "$url/$command?p=$config_parms{mp3_program_password}";
             print "Winamp (httpq $host) set to $command: $temp\n"
               if $Debug{winamp};
         }
@@ -198,14 +188,11 @@ sub mp3_play {
         #$file =~ s/\'/%27/g;
         #$file =~ s/\,/%2C/g;
         $file = &escape($file);
-        my $url = "http://$host:$config_parms{mp3_program_port}";
-        my $temp =
-          filter_cr get "$url/delete?p=$config_parms{mp3_program_password}";
-        print
-          "winamp debug $url/playfile?p=$config_parms{mp3_program_password}&a=$file\n"
+        my $url  = "http://$host:$config_parms{mp3_program_port}";
+        my $temp = filter_cr get "$url/delete?p=$config_parms{mp3_program_password}";
+        print "winamp debug $url/playfile?p=$config_parms{mp3_program_password}&a=$file\n"
           if $Debug{winamp};
-        $temp = filter_cr get
-          "$url/playfile?p=$config_parms{mp3_program_password}&a=$file";
+        $temp = filter_cr get "$url/playfile?p=$config_parms{mp3_program_password}&a=$file";
         $temp = filter_cr get "$url/play?p=$config_parms{mp3_program_password}";
         print "Winamp (httpq $host) song/list $file added: $temp\n"
           if $Debug{winamp};
@@ -236,13 +223,12 @@ sub mp3_queue {
         #$file =~ s/\,/%2C/g;
         $file = escape($file);
         my $url  = "http://$host:$config_parms{mp3_program_port}";
-        my $temp = filter_cr get
-          "$url/playfile?p=$config_parms{mp3_program_password}&a=$file";
+        my $temp = filter_cr get "$url/playfile?p=$config_parms{mp3_program_password}&a=$file";
         print "Winamp (httpq $host) song/list $file added: $temp\n"
           if $Debug{winamp};
     }
     else {
-        run qq["$config_parms{mp3_program}" /ADD "$file"]; ##/ # For gVim syntax
+        run qq["$config_parms{mp3_program}" /ADD "$file"];    ##/ # For gVim syntax
         print "mp3 queue: $file\n" if $Debug{winamp};
     }
 }
@@ -274,12 +260,10 @@ sub mp3_clear {
 sub mp3_get_playlist {
     my $host = shift || $mp3_host;
     return 0
-      unless &mp3_player_running($host)
-      ;    # Avoid frequent calls to a non-existant player ... get is too slow
+      unless &mp3_player_running($host);    # Avoid frequent calls to a non-existant player ... get is too slow
     if (&is_httpq) {
-        my $url =
-          "http://$host:$config_parms{mp3_program_port}/getplaylisttitle?p=$config_parms{mp3_program_password}";
-        my $mp3List = get $url;
+        my $url      = "http://$host:$config_parms{mp3_program_port}/getplaylisttitle?p=$config_parms{mp3_program_password}";
+        my $mp3List  = get $url;
         my @mp3Queue = split( "<br>", $mp3List );
         return \@mp3Queue;
     }
@@ -294,8 +278,7 @@ sub mp3_get_playlist {
 sub mp3_get_playlist_pos {
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        my $url =
-          "http://$host:$config_parms{mp3_program_port}/getlistpos?p=$config_parms{mp3_program_password}";
+        my $url = "http://$host:$config_parms{mp3_program_port}/getlistpos?p=$config_parms{mp3_program_password}";
         return get "$url";
     }
     else {
@@ -312,8 +295,7 @@ sub mp3_set_playlist_pos {
     return 0 if ( $pos eq '' );
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        my $url =
-          "http://$host:$config_parms{mp3_program_port}/setplaylistpos?p=$config_parms{mp3_program_password}&a=$pos";
+        my $url = "http://$host:$config_parms{mp3_program_port}/setplaylistpos?p=$config_parms{mp3_program_password}&a=$pos";
         print "Winamp URI:$url\n" if $Debug{winamp};
         return get "$url";
     }
@@ -341,8 +323,7 @@ sub mp3_playlist_delete {
     return 0 if ( $pos eq '' );
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        my $url =
-          "http://$host:$config_parms{mp3_program_port}/deletepos?p=$config_parms{mp3_program_password}&a=$pos";
+        my $url = "http://$host:$config_parms{mp3_program_port}/deletepos?p=$config_parms{mp3_program_password}&a=$pos";
         print "Winamp URI: $url\n" if $Debug{winamp};
         return get "$url";
     }
@@ -356,9 +337,8 @@ sub mp3_playlist_delete {
 sub mp3_get_playlist_files {
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        my $url =
-          "http://$host:$config_parms{mp3_program_port}/getplaylistfile?p=$config_parms{mp3_program_password}";
-        my $mp3List = get $url;
+        my $url      = "http://$host:$config_parms{mp3_program_port}/getplaylistfile?p=$config_parms{mp3_program_password}";
+        my $mp3List  = get $url;
         my @mp3Queue = split( "<br>", $mp3List );
         return \@mp3Queue;
     }
@@ -379,10 +359,8 @@ sub mp3_get_playlist_timestr {
 sub mp3_get_playlist_title {
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        my $cPos = get
-          "http://$host:$config_parms{mp3_program_port}/getlistpos?p=$config_parms{mp3_program_password}";
-        return get
-          "http://$host:$config_parms{mp3_program_port}/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$cPos";
+        my $cPos = get "http://$host:$config_parms{mp3_program_port}/getlistpos?p=$config_parms{mp3_program_password}";
+        return get "http://$host:$config_parms{mp3_program_port}/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$cPos";
     }
     else {
         # don't know how to do this
@@ -404,30 +382,25 @@ sub mp3_get_output_timestr {
     if (&is_httpq) {
 
         #		if ($type == 1 || $type =~ /Len/i) {
-        my $songPos = get
-          "http://$host:$config_parms{mp3_program_port}/getoutputtime?p=$config_parms{mp3_program_password}&a=0";
-        my $songLen = get
-          "http://$host:$config_parms{mp3_program_port}/getoutputtime?p=$config_parms{mp3_program_password}&a=1";
+        my $songPos = get "http://$host:$config_parms{mp3_program_port}/getoutputtime?p=$config_parms{mp3_program_password}&a=0";
+        my $songLen = get "http://$host:$config_parms{mp3_program_port}/getoutputtime?p=$config_parms{mp3_program_password}&a=1";
 
         # Format the info in a form consistant with xmms el:tm/to:tm
 
         my $tPos = $songPos / 1000;    #Posintion in miliseconds
         my $tLen = $songLen;           #Length of song in seconds
         if ($tLen) {
-            my $tPct = int( ( $tPos / $tLen ) * 100 );   # what ist the % played
+            my $tPct = int( ( $tPos / $tLen ) * 100 );    # what ist the % played
 
-            my $tMin = int( $tPos / 60 );    #Make outputs in mm:ss format
-            my $tSec = int( $tPos - ( $tMin * 60 ) )
-              ;    # we don't care about fractions of mins & secs
+            my $tMin = int( $tPos / 60 );                 #Make outputs in mm:ss format
+            my $tSec = int( $tPos - ( $tMin * 60 ) );     # we don't care about fractions of mins & secs
             if ( $tSec < 10 ) { $tSec = "0$tSec"; }
-            $songPos =
-              "$tMin:$tSec";   # this should be the elapsed time in MM:SS format
+            $songPos = "$tMin:$tSec";                     # this should be the elapsed time in MM:SS format
 
             $tMin = int( $tLen / 60 );
             $tSec = int( $tLen - ( $tMin * 60 ) );
             if ( $tSec < 10 ) { $tSec = "0$tSec"; }
-            $songLen =
-              "$tMin:$tSec";    # this should be the Total time in MM:SS format
+            $songLen = "$tMin:$tSec";                     # this should be the Total time in MM:SS format
 
             return "$songPos/$songLen ($tPct%)";
         }
@@ -448,8 +421,7 @@ sub mp3_get_output_timestr {
 sub mp3_get_playlist_length {
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        return get
-          "http://$host:$config_parms{mp3_program_port}/getlistlength?p=$config_parms{mp3_program_password}";
+        return get "http://$host:$config_parms{mp3_program_port}/getlistlength?p=$config_parms{mp3_program_password}";
     }
     else {
         # don't know how to do this
@@ -461,8 +433,7 @@ sub mp3_get_playlist_length {
 sub mp3_playing {
     my $host = shift || $mp3_host;
     if (&is_httpq) {
-        return get
-          "http://$host:$config_parms{mp3_program_port}/isplaying?p=$config_parms{mp3_program_password}";
+        return get "http://$host:$config_parms{mp3_program_port}/isplaying?p=$config_parms{mp3_program_password}";
     }
     else {
         # don't know how to do this
@@ -483,11 +454,9 @@ sub mp3_running {
         && ( $host eq 'localhost' )
         && done $p_winamp_house
         && !&sendkeys_find_window(
-            'Winamp ',
-            ( $config_parms{mp3_program} )
+            'Winamp ', ( $config_parms{mp3_program} )
             ? $config_parms{mp3_program}
-            : $winamp_path,
-            5000
+            : $winamp_path, 5000
         )
       )
     {
@@ -496,8 +465,7 @@ sub mp3_running {
         print_log "Starting WinAmp";
     }
     if (&is_httpq) {
-        return
-          "http://$host:$config_parms{mp3_program_port}/getversion?p=$config_parms{mp3_program_password}";
+        return "http://$host:$config_parms{mp3_program_port}/getversion?p=$config_parms{mp3_program_password}";
     }
     else {
         # don't know how to do this
@@ -521,8 +489,7 @@ sub mp3_radio_play {
     return 0 if ( $file eq '' );
     my $host = shift || $mp3_host;
     return 0
-      if $host ne 'localhost'
-      ;  # Can only launch URI's locally for some reason (httpq plugin problem?)
+      if $host ne 'localhost';    # Can only launch URI's locally for some reason (httpq plugin problem?)
     return 0 unless &mp3_running($host);
     $file =~ s/&&/&/g;
     run qq["$config_parms{mp3_program}" "$file"];
diff --git a/code/common/mythtv_osd.pl b/code/common/mythtv_osd.pl
index 1055f87e2..3afd5c60e 100644
--- a/code/common/mythtv_osd.pl
+++ b/code/common/mythtv_osd.pl
@@ -23,8 +23,7 @@
     &display_mythosd("This is a test notice !!");
 }
 
-$myth_osd = new Socket_Item( undef, undef, $config_parms{myth_notify_address},
-    'mythtv', 'udp' );
+$myth_osd = new Socket_Item( undef, undef, $config_parms{myth_notify_address}, 'mythtv', 'udp' );
 
 sub display_mythosd {
     my ($text) = @_;
diff --git a/code/common/news_ap_breaking.pl b/code/common/news_ap_breaking.pl
index 297c7c244..8f65a4a76 100644
--- a/code/common/news_ap_breaking.pl
+++ b/code/common/news_ap_breaking.pl
@@ -10,9 +10,7 @@
 my $f_ap_news      = "$config_parms{data_dir}/web/ap_breaking_news.txt";
 my $f_ap_news_html = "$config_parms{data_dir}/web/ap_breaking_news_pruned.html";
 my $f_ap_news_rss  = "$config_parms{data_dir}/web/ap_breaking_news.rss";
-$p_ap_news = new Process_Item(
-    qq!get_url "http://hosted.ap.org/lineups/TOPHEADS.rss?SITE=NHPOR&SECTION=HOME" $f_ap_news_rss!
-);
+$p_ap_news = new Process_Item( qq!get_url "http://hosted.ap.org/lineups/TOPHEADS.rss?SITE=NHPOR&SECTION=HOME" $f_ap_news_rss! );
 $v_ap_news = new Voice_Cmd('What is in the News');
 $v_ap_news->set_info('Responds with headline stories from the AP');
 $v_get_ap_news = new Voice_Cmd('[Get,Check,Mail,SMS] AP breaking news');
@@ -29,8 +27,7 @@ sub get_ap_news {
         start $p_ap_news;
     }
     else {
-        $response =
-          "Could not retrieve news from the AP (network connection is down.)";
+        $response = "Could not retrieve news from the AP (network connection is down.)";
     }
 
     $v_get_ap_news->respond("app=news $response");
@@ -68,11 +65,7 @@ sub get_ap_news {
         }
 
         $html .=
-            qq|<li><a href="|
-          . &recompose_uri( $item->{'link'} )
-          . qq|" title=$description>|
-          . $item->{'title'}
-          . qq|</a></li>|;
+          qq|<li><a href="| . &recompose_uri( $item->{'link'} ) . qq|" title=$description>| . $item->{'title'} . qq|</a></li>|;
 
     }
 
@@ -84,9 +77,8 @@ sub get_ap_news {
 
     if ( $v_get_ap_news->{state} eq 'Mail' ) {
         my $to = $config_parms{news_sendto} || "";
-        $v_get_ap_news->respond( "connected=0 image=mail Sending AP News to "
-              . ( ($to) ? $to : $config_parms{net_mail_send_account} )
-              . '.' );
+        $v_get_ap_news->respond(
+            "connected=0 image=mail Sending AP News to " . ( ($to) ? $to : $config_parms{net_mail_send_account} ) . '.' );
         &net_mail_send(
             subject => "Breaking news from the AP",
             to      => $to,
@@ -100,8 +92,7 @@ sub get_ap_news {
         # *** Check return value
         my $to = $config_parms{cell_phone};
         if ($to) {
-            $v_get_ap_news->respond(
-                "connected=0 image=mail Sending AP News to cell phone.");
+            $v_get_ap_news->respond("connected=0 image=mail Sending AP News to cell phone.");
             &net_mail_send(
                 subject => "Breaking news from the AP",
                 to      => $to,
@@ -110,16 +101,13 @@ sub get_ap_news {
             );
         }
         else {
-            $v_get_ap_news->respond(
-                "connected=0 app=error Mobile phone email address not found!");
+            $v_get_ap_news->respond("connected=0 app=error Mobile phone email address not found!");
         }
     }
-    elsif ( $v_get_ap_news->{state} ne 'Check' )
-    {    # get responds with story count
-        $v_get_ap_news->respond(
-            "connected=0 app=news AP news retrieved $i stories.");
+    elsif ( $v_get_ap_news->{state} ne 'Check' ) {    # get responds with story count
+        $v_get_ap_news->respond("connected=0 app=news AP news retrieved $i stories.");
     }
-    else {    # check responds with stories
+    else {                                            # check responds with stories
         $v_get_ap_news->respond("connected=0 app=news $text");
     }
 
@@ -133,12 +121,8 @@ sub get_ap_news {
 
 if ($Reload) {
     if ( $Run_Members{'internet_dialup'} ) {
-        &trigger_set(
-            "state_now \$net_connect eq 'connected'",
-            "run_voice_cmd 'Get AP Breaking News'",
-            'NoExpire',
-            'get AP news'
-        ) unless &trigger_get('get AP news');
+        &trigger_set( "state_now \$net_connect eq 'connected'", "run_voice_cmd 'Get AP Breaking News'", 'NoExpire', 'get AP news' )
+          unless &trigger_get('get AP news');
 
     }
     else {
diff --git a/code/common/news_email_breaking.pl b/code/common/news_email_breaking.pl
index a798a94e4..238f83004 100644
--- a/code/common/news_email_breaking.pl
+++ b/code/common/news_email_breaking.pl
@@ -8,8 +8,7 @@
 # get_email_scan_file and $p_get_email are created by internet_mail.pl
 if ( done_now $p_get_email and -e $get_email_scan_file ) {
     for my $line ( file_read $get_email_scan_file) {
-        my ( $from, $to, $subject, $body ) =
-          $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+        my ( $from, $to, $subject, $body ) = $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
         if ( $subject =~ /CNN breaking news/i or $subject =~ /News Alert/i ) {
 
             #           print "dbx1 s=$subject body=$body\nline=$line\n";
diff --git a/code/common/news_mquote_oftd.pl b/code/common/news_mquote_oftd.pl
index 4c24c99cf..0eba812eb 100644
--- a/code/common/news_mquote_oftd.pl
+++ b/code/common/news_mquote_oftd.pl
@@ -3,17 +3,14 @@
 #@ Gets motivational quotes for the day
 
 #noloop=start
-my $mquote_otd      = "$config_parms{data_dir}/web/mquote_otd.txt";
-my $mquote_otd_html = "$config_parms{data_dir}/web/mquote_otd.html";
-my $mquote_otd_html_pruned =
-  "$config_parms{data_dir}/web/mquote_otd_pruned.html";
+my $mquote_otd             = "$config_parms{data_dir}/web/mquote_otd.txt";
+my $mquote_otd_html        = "$config_parms{data_dir}/web/mquote_otd.html";
+my $mquote_otd_html_pruned = "$config_parms{data_dir}/web/mquote_otd_pruned.html";
 
 #noloop=stop
 
-$p_mquote_otd =
-  new Process_Item("get_url http://tqpage.com/mqotd.php3 $mquote_otd_html");
-$v_mquote_otd =
-  new Voice_Cmd('[Get,Read,Check] Motivational Quotes of the day');
+$p_mquote_otd = new Process_Item("get_url http://tqpage.com/mqotd.php3 $mquote_otd_html");
+$v_mquote_otd = new Voice_Cmd('[Get,Read,Check] Motivational Quotes of the day');
 $v_mquote_otd->set_authority('anyone');
 
 if ( 'Read' eq said $v_mquote_otd) {
@@ -23,8 +20,7 @@
 if ( ( said $v_mquote_otd eq 'Get' or said $v_mquote_otd eq 'Check' )
     and &net_connect_check )
 {
-    $v_mquote_otd->respond(
-        "app=motivation Retrieving motivational quotes from the Internet...");
+    $v_mquote_otd->respond("app=motivation Retrieving motivational quotes from the Internet...");
     start $p_mquote_otd;
 }
 
@@ -38,9 +34,8 @@
 
         while (m!/quote/([^"]*?)">([^<]*?)</a>!ig) {
             unless ( $2 =~ /<img/gi ) {
-                $text .= "$2\n\n";
-                $html_pruned .=
-                  "<li><a href=\"http://www.quotationspage.com/quote/$1\">$2</a></li>";
+                $text        .= "$2\n\n";
+                $html_pruned .= "<li><a href=\"http://www.quotationspage.com/quote/$1\">$2</a></li>";
             }
         }
     }
@@ -48,8 +43,7 @@
     file_write( $mquote_otd,             $text );
     file_write( $mquote_otd_html_pruned, $html_pruned );
     if ( $v_mquote_otd->{state} eq 'Get' ) {
-        $v_mquote_otd->respond(
-            'app=motivation connected=0 Motivational quotes retrieved.');
+        $v_mquote_otd->respond('app=motivation connected=0 Motivational quotes retrieved.');
     }
     else {
         $v_mquote_otd->respond('app=motivation connected=0 $text');
diff --git a/code/common/news_onthisday.pl b/code/common/news_onthisday.pl
index c64a1e7a7..2ed4a7afd 100644
--- a/code/common/news_onthisday.pl
+++ b/code/common/news_onthisday.pl
@@ -7,9 +7,7 @@
 my $f_onthisday_html  = "$config_parms{data_dir}/web/onthisday.html";
 my $f_onthisday_html2 = "$config_parms{data_dir}/web/onthisday_pruned.html";
 
-$p_onthisday = new Process_Item(
-    "get_url http://www.nytimes.com/learning/general/onthisday/index.html $f_onthisday_html"
-);
+$p_onthisday = new Process_Item( "get_url http://www.nytimes.com/learning/general/onthisday/index.html $f_onthisday_html" );
 $v_onthisday = new Voice_Cmd('[Get,Show,Check] on this day');
 $v_onthisday->set_info('Get or display the daily calendar facts');
 $v_onthisday->set_authority('anyone');
@@ -20,9 +18,7 @@
         start $p_onthisday;
     }
     else {
-        $v_onthisday->respond(
-            "Cannot retrieve daily calendar facts when disconnected from the Internet."
-        );
+        $v_onthisday->respond( "Cannot retrieve daily calendar facts when disconnected from the Internet." );
     }
 }
 
@@ -45,8 +41,7 @@
     $html =~ s|href="/|href="http://www.nytimes.com/|gi;
     $html =~ s|href="../|href="http://www.nytimes.com/learning/general/|gi;
     $html =~ s|src="/|src="http://www.nytimes.com/|gi;
-    $html =~
-      s|href="archive.html|href="http://www.nytimes.com/learning/general/onthisday/archive.html|gi;
+    $html =~ s|href="archive.html|href="http://www.nytimes.com/learning/general/onthisday/archive.html|gi;
 
     my $html2 = "<html><body><table>$date\n" . $html . "</table></body></html>";
 
@@ -73,16 +68,14 @@
         &trigger_set(
             "state_now \$net_connect eq 'connected'",
             "run_voice_cmd 'Get on this day'",
-            'NoExpire',
-            'get calendar facts'
+            'NoExpire', 'get calendar facts'
         ) unless &trigger_get('get calendar facts');
     }
     else {
         &trigger_set(
             "time_cron '30 6 * * *' and net_connect_check",
             "run_voice_cmd 'Get on this day'",
-            'NoExpire',
-            'get calendar facts'
+            'NoExpire', 'get calendar facts'
         ) unless &trigger_get('get calendar facts');
     }
 }
diff --git a/code/common/news_physics_web.pl b/code/common/news_physics_web.pl
index 7d587c069..8d8bc3aba 100644
--- a/code/common/news_physics_web.pl
+++ b/code/common/news_physics_web.pl
@@ -7,8 +7,7 @@
 my $f_physics_web      = "$config_parms{data_dir}/web/physics_web.txt";
 my $f_physics_web_html = "$config_parms{data_dir}/web/physics_web.html";
 
-$p_physics_web = new Process_Item(
-    "get_url http://physicsweb.org/archive/news $f_physics_web_html");
+$p_physics_web = new Process_Item("get_url http://physicsweb.org/archive/news $f_physics_web_html");
 $v_physics_web = new Voice_Cmd('[Get,Read] physics web');
 $v_physics_web->set_authority('anyone');
 
@@ -16,8 +15,7 @@
 
 if ( said $v_physics_web eq 'Get' ) {
     if (&net_connect_check) {
-        $v_physics_web->respond(
-            "Retrieving Physics Web News Stories from the Internet...");
+        $v_physics_web->respond("Retrieving Physics Web News Stories from the Internet...");
 
         # Use start instead of run so we can detect when it is done
         start $p_physics_web;
diff --git a/code/common/news_yahoo.pl b/code/common/news_yahoo.pl
index 9972aef71..61469926c 100644
--- a/code/common/news_yahoo.pl
+++ b/code/common/news_yahoo.pl
@@ -4,39 +4,30 @@
 #@ news from yahoo.com, then read or display it.
 
 #my $f_all_news_html = "$config_parms{data_dir}/web/all_news.html"; # *** Makes more sense
-my $f_all_news_html =
-  "$Pgm_Root/web/ia5/news/news.html";    # *** Why put this in IA5?
-my $f_Top_news = "$config_parms{data_dir}/web/Top_news.txt";
+my $f_all_news_html = "$Pgm_Root/web/ia5/news/news.html";           # *** Why put this in IA5?
+my $f_Top_news      = "$config_parms{data_dir}/web/Top_news.txt";
 
 my %news_files;
-$news_files{"US"}    = "$config_parms{data_dir}/web/US_news.txt";
-$news_files{"World"} = "$config_parms{data_dir}/web/World_news.txt";
-$news_files{"Entertainment"} =
-  "$config_parms{data_dir}/web/Entertainment_news.txt";
-$news_files{"Business"} = "$config_parms{data_dir}/web/Business_news.txt";
-$news_files{"Tech"}     = "$config_parms{data_dir}/web/Tech_news.txt";
-$news_files{"Science"}  = "$config_parms{data_dir}/web/Science_news.txt";
-$news_files{"Health"}   = "$config_parms{data_dir}/web/Health_news.txt";
-$news_files{"Sports"}   = "$config_parms{data_dir}/web/Sports_news.txt";
-
-$p_all_news =
-  new Process_Item("get_url http://dailynews.yahoo.com/fc $f_all_news_html");
+$news_files{"US"}            = "$config_parms{data_dir}/web/US_news.txt";
+$news_files{"World"}         = "$config_parms{data_dir}/web/World_news.txt";
+$news_files{"Entertainment"} = "$config_parms{data_dir}/web/Entertainment_news.txt";
+$news_files{"Business"}      = "$config_parms{data_dir}/web/Business_news.txt";
+$news_files{"Tech"}          = "$config_parms{data_dir}/web/Tech_news.txt";
+$news_files{"Science"}       = "$config_parms{data_dir}/web/Science_news.txt";
+$news_files{"Health"}        = "$config_parms{data_dir}/web/Health_news.txt";
+$news_files{"Sports"}        = "$config_parms{data_dir}/web/Sports_news.txt";
+
+$p_all_news = new Process_Item("get_url http://dailynews.yahoo.com/fc $f_all_news_html");
 $v_all_news = new Voice_Cmd('Get current news');
 $v_all_news->set_authority('anyone');
-$v_news = new Voice_Cmd(
-    'Tell me the [Top,U S,World,Entertainment,Business,Technology,Science,Health,Sports] news'
-);
+$v_news = new Voice_Cmd( 'Tell me the [Top,U S,World,Entertainment,Business,Technology,Science,Health,Sports] news' );
 $v_news->set_authority('anyone');
 
 # Create trigger
 
 if ($Reload) {
-    &trigger_set(
-        "time_cron('13 6,12,18 * * *')",
-        "run_voice_cmd('Get daily news')",
-        'NoExpire',
-        'get daily news'
-    ) unless &trigger_get('get daily news');
+    &trigger_set( "time_cron('13 6,12,18 * * *')", "run_voice_cmd('Get daily news')", 'NoExpire', 'get daily news' )
+      unless &trigger_get('get daily news');
 }
 
 # Events
@@ -63,8 +54,7 @@
         start $p_all_news;
     }
     else {
-        $v_all_news->respond(
-            'Cannot retrieve current news until connected to the Internet.');
+        $v_all_news->respond('Cannot retrieve current news until connected to the Internet.');
     }
 }
 
@@ -72,10 +62,7 @@
     my $text;
     $text = "Here is what is making news right now: \n";
     for ( file_read "$f_all_news_html" ) {
-        if (
-            m!<a href="http://story\.news\.yahoo\.com/fc\?cid=34&tmpl=fc&in=[\w&=]+">([ \w\.,'":\-]+)!
-          )
-        {
+        if ( m!<a href="http://story\.news\.yahoo\.com/fc\?cid=34&tmpl=fc&in=[\w&=]+">([ \w\.,'":\-]+)! ) {
             $text .= "$1.\n";
             $text =~ s! <td width="30%" align=right valign=middle>\n!!g;
         }
@@ -95,10 +82,7 @@
 
     my %news;
     while (<FN>) {
-        if (
-            m!<a href="http://story\.news\.yahoo\.com/fc\?cid=34&tmpl=fc&in=(\w+)&cat=[=&\w]+">!
-          )
-        {
+        if ( m!<a href="http://story\.news\.yahoo\.com/fc\?cid=34&tmpl=fc&in=(\w+)&cat=[=&\w]+">! ) {
             my $cat = $1;
             $text = <FN>;
             $text =~ s! <td width="30%" align="right" valign="middle">\n!!g;
diff --git a/code/common/nma_notification.pl b/code/common/nma_notification.pl
index 06d8686a6..9839d29e7 100644
--- a/code/common/nma_notification.pl
+++ b/code/common/nma_notification.pl
@@ -18,8 +18,7 @@
 
 # Notify the on startup / restart
 if ($Startup) {
-    print_log( "System Restarted, Notifying NMA -- using api key: ",
-        $nma_api_key );
+    print_log( "System Restarted, Notifying NMA -- using api key: ", $nma_api_key );
     nma_notify_b( "$nma_api_key", "Misterhouse has been restarted" );
 }
 
diff --git a/code/common/organizer.pl b/code/common/organizer.pl
index 2253e220d..a85fce242 100644
--- a/code/common/organizer.pl
+++ b/code/common/organizer.pl
@@ -146,8 +146,7 @@ sub is_active_tomorrow {
 sub is_active_on_day {
     my ( $self, $day ) = @_;
     my ($now_date) = $main::Time_Date =~ /(\S+)\s+\S+/;
-    my $comparetime =
-      &main::my_str2time( "$now_date 12:00 am + " . ( $day * 24 ) . ":00" );
+    my $comparetime = &main::my_str2time( "$now_date 12:00 am + " . ( $day * 24 ) . ":00" );
     foreach my $event ( @{ $$self{_events} } ) {
         my $eventtime = &main::my_str2time( $$event{startdt} );
         my $timediff  = $eventtime - $comparetime;
@@ -170,8 +169,7 @@ package main;
 $organizer_events   = new Organizer_Events('events');
 
 $organizer_check = new Voice_Cmd 'Check for new calendar events';
-$organizer_check->set_info(
-    'Creates MisterHouse events based on organizer calendar events');
+$organizer_check->set_info('Creates MisterHouse events based on organizer calendar events');
 
 $p_ical2vsdb = new Process_Item();
 
@@ -201,8 +199,7 @@ package main;
 
     #$p_ical2vsdb->set("ical2vsdb $_ical2db_config_path $_ical2db_output_dir $main::config_parms{date_format}");
 
-    &read_parm_hash( \%_organizer_emails,
-        $main::config_parms{organizer_email} );
+    &read_parm_hash( \%_organizer_emails, $main::config_parms{organizer_email} );
 
     # setup default announce times
     @_organizer_announce_day_times =
@@ -213,18 +210,12 @@ package main;
       if defined $main::config_parms{organizer_announce_priorday_times};
 
     #Check to see if calendar and organizer databases need upgrade
-    my @_upd_cal = (
-        'DATE',     'TIME',    'EVENT',    'CATEGORY',
-        'DETAILS',  'HOLIDAY', 'VACATION', 'SOURCE',
-        'REMINDER', 'ENDTIME', 'CONTROL'
-    );
+    my @_upd_cal =
+      ( 'DATE', 'TIME', 'EVENT', 'CATEGORY', 'DETAILS', 'HOLIDAY', 'VACATION', 'SOURCE', 'REMINDER', 'ENDTIME', 'CONTROL' );
     $calOk = &update_vsdb( 'Calendar', $_organizer_cal->name, @_upd_cal );
 
-    my @_upd_todo = (
-        'Complete',  'Description', 'DueDate', 'AssignedTo',
-        'Notes',     'SPEAK',       'SOURCE',  'REMINDER',
-        'STARTDATE', 'CATEGORY'
-    );
+    my @_upd_todo =
+      ( 'Complete', 'Description', 'DueDate', 'AssignedTo', 'Notes', 'SPEAK', 'SOURCE', 'REMINDER', 'STARTDATE', 'CATEGORY' );
     $todoOk = &update_vsdb( 'Todo', $_organizer_todo->name, @_upd_todo );
 
     #Auto generate i2v.cfg file from mh.ini entries
@@ -256,21 +247,15 @@ package main;
         }
 
         if ($data) {
-            $data =
-                "#\n# Autogenerated code at "
-              . $Date_Now . " "
-              . $Time_Now . "\n#\n"
-              . $data;
+            $data = "#\n# Autogenerated code at " . $Date_Now . " " . $Time_Now . "\n#\n" . $data;
             $data .= "\n#Options\n";
             $data .= "days_before\t" . $config_parms{ical_days_before} . "\n"
               if $config_parms{ical_days_before};
             $data .= "days_after\t" . $config_parms{ical_days_after} . "\n"
               if $config_parms{ical_days_after};
-            $data .=
-              "local_cache_dir\t" . $config_parms{ical_local_cache_dir} . "\n"
+            $data .= "local_cache_dir\t" . $config_parms{ical_local_cache_dir} . "\n"
               if $config_parms{ical_local_cache_dir};
-            $data .=
-              "\n#Required\nsleep_delay\t0\n\n#\n# Autogeneration complete.\n#\n"
+            $data .= "\n#Required\nsleep_delay\t0\n\n#\n# Autogeneration complete.\n#\n"
               if $data;
             &write_i2v($data);
         }
@@ -300,8 +285,7 @@ package main;
         }
         else {
             $v_get_ical_data->respond(
-                "iCal force unsuccessful.  Please check permissions on $config_parms{organizer_dir}/ical2vsdb.md5"
-            );
+                "iCal force unsuccessful.  Please check permissions on $config_parms{organizer_dir}/ical2vsdb.md5" );
         }
     }
     elsif ( said $v_get_ical_data eq "Purge" ) {
@@ -311,9 +295,7 @@ package main;
     }
 
     elsif ( -e $_ical2db_config_path ) {
-        $p_ical2vsdb->set(
-            "ical2vsdb $_ical2db_config_path $_ical2db_output_dir $main::config_parms{date_format}"
-        );
+        $p_ical2vsdb->set( "ical2vsdb $_ical2db_config_path $_ical2db_output_dir $main::config_parms{date_format}" );
         start $p_ical2vsdb;
     }
     else {
@@ -375,8 +357,7 @@ package main;
               : $data{endtime};
             $data{allday}  = ( $data{time} eq $data{endtime} ) ? 'Yes' : 'No';
             $data{notes}   = $objDB->FieldValue('DETAILS');
-            $data{startdt} = $data{date} . ' '
-              . ( ( $data{time} ) ? $data{time} : "12:00 am" );
+            $data{startdt} = $data{date} . ' ' . ( ( $data{time} ) ? $data{time} : "12:00 am" );
             $data{enddt} =
               $data{date} . ' '
               . (
@@ -413,15 +394,11 @@ package main;
 
             # protect against bad dates
             if ( $data{startdt} && !( &main::my_str2time( $data{startdt} ) ) ) {
-                &main::print_log(
-                    "Bad start time format: $data{startdt} encountered in calendar"
-                );
+                &main::print_log( "Bad start time format: $data{startdt} encountered in calendar" );
                 next;
             }
             if ( $data{enddt} && !( &main::my_str2time( $data{enddt} ) ) ) {
-                &main::print_log(
-                    "Bad end time format: $data{enddt} encountered in calendar"
-                );
+                &main::print_log( "Bad end time format: $data{enddt} encountered in calendar" );
                 next;
             }
             my $fh = *MYCODE;
@@ -467,10 +444,10 @@ package main;
             my $duedate  = $objDB->FieldValue('DueDate');
             my ( $date, $time ) = $duedate =~ /^(\S+)\s+(\S+\s+\S+)/;
             $date = $duedate unless $date;
-            $data{type}   = 'task';
-            $data{date}   = $date;
-            $data{time}   = $time;
-            $data{allday} = 'Yes' if $data{time} and $data{time} =~ /12:00 am/i;
+            $data{type}        = 'task';
+            $data{date}        = $date;
+            $data{time}        = $time;
+            $data{allday}      = 'Yes' if $data{time} and $data{time} =~ /12:00 am/i;
             $data{reminder}    = $objDB->FieldValue('REMINDER');
             $data{name}        = $objDB->FieldValue('AssignedTo');
             $data{description} = $objDB->FieldValue('Description');
@@ -488,19 +465,15 @@ package main;
               ? $data{date} . ' ' . $data{time}
               : $data{date} . ' 12:00 am';
             next
-              unless time_less_than("$evaldt + 23:59")
-              ;    # Skip past and invalid events
-                   # protect against bad dates
+              unless time_less_than("$evaldt + 23:59");    # Skip past and invalid events
+                                                           # protect against bad dates
 
             if ( $data{startdt} && !( &main::my_str2time( $data{startdt} ) ) ) {
-                &main::print_log(
-                    "Bad start time format: $data{startdt} encountered in tasks"
-                );
+                &main::print_log( "Bad start time format: $data{startdt} encountered in tasks" );
                 next;
             }
             if ( $data{enddt} && !( &main::my_str2time( $data{enddt} ) ) ) {
-                &main::print_log(
-                    "Bad end time format: $data{enddt} encountered in tasks");
+                &main::print_log("Bad end time format: $data{enddt} encountered in tasks");
                 next;
             }
             my $fh = *MYCODE;
@@ -533,13 +506,12 @@ sub get_speak_code {
                 $speak_code = "Calendar notice.  Today: $data{description}.";
             }
             else {
-                $speak_code =
-                  "Calendar notice.  In $data{reminder_diff} days: $data{description}.";
+                $speak_code = "Calendar notice.  In $data{reminder_diff} days: $data{description}.";
             }
         }
         elsif ( $data{reminder_diff} ) {
             $speak_code =
-              "Calendar Notice.  In $data{reminder_time} $data{reminder_units}"
+                "Calendar Notice.  In $data{reminder_time} $data{reminder_units}"
               . ( ( $data{reminder_time} > 1 ) ? 's' : '' )
               . ", $data{description}.";
         }
@@ -549,8 +521,7 @@ sub get_speak_code {
     }
     if ($speak_code) {
         $speak_code =~ s/'/\\'/g;
-        $speak_code =
-          "speak (\'app=organizer $speak_code\'); display (\'app=organizer $speak_code\');";
+        $speak_code = "speak (\'app=organizer $speak_code\'); display (\'app=organizer $speak_code\');";
     }
     return $speak_code;
 }
@@ -573,8 +544,7 @@ sub get_textmsg_code {
 
     #changed to new array reference
     for ( my $index = 1; $index <= $data{name_count}; $index++ ) {
-        $email .=
-          "net_mail_send to => '$_organizer_emails{lc $data{name}[$index]}', subject => q~$subject~, text => q~$notes~; ";
+        $email .= "net_mail_send to => '$_organizer_emails{lc $data{name}[$index]}', subject => q~$subject~, text => q~$notes~; ";
     }
     return $email;
 }
@@ -600,19 +570,17 @@ sub generate_code {
     {
         my $cmd = $data{description};
         $task_flag .= ":";
-        $cmd =~ s/$task_flag\s*//;  # trim of the prefix/identifier if it exists
+        $cmd =~ s/$task_flag\s*//;    # trim of the prefix/identifier if it exists
         my $vc = '';
         eval { $vc = &Voice_Cmd::voice_item_by_text("$cmd"); };
         if ($vc) {
             my $offcmd = $cmd;
             $offcmd =~ s/(\s+)on(\s*)/$1off$2/;
             if ( $data{startdt} ) {
-                print MYCODE
-                  "   if (time_now '$data{startdt}') { &main::run_voice_cmd('$cmd'); };\n";
+                print MYCODE "   if (time_now '$data{startdt}') { &main::run_voice_cmd('$cmd'); };\n";
             }
             if ( $data{enddt} and $offcmd ) {
-                print MYCODE
-                  "   if (time_now '$data{enddt}') { &main::run_voice_cmd('$offcmd'); };\n";
+                print MYCODE "   if (time_now '$data{enddt}') { &main::run_voice_cmd('$offcmd'); };\n";
             }
         }
         return;
@@ -632,15 +600,11 @@ sub generate_code {
         };
         if ($obj_state) {
             if ( ( $data{startdt} ) and ( $data{enddt} ) ) {
-                print MYCODE
-                  "if (time_now '$data{startdt}') { set \$$obj ON; }; #Control Event\n";
-                print MYCODE
-                  "if (time_now '$data{enddt}') { set \$$obj OFF; }; #Control Event\n";
+                print MYCODE "if (time_now '$data{startdt}') { set \$$obj ON; }; #Control Event\n";
+                print MYCODE "if (time_now '$data{enddt}') { set \$$obj OFF; }; #Control Event\n";
             }
             else {
-                &main::print_log(
-                    "Organizer: Warning, invalid times for event object $obj. Ignoring Event on $data{startdt}"
-                );
+                &main::print_log( "Organizer: Warning, invalid times for event object $obj. Ignoring Event on $data{startdt}" );
             }
         }
         else {
@@ -652,14 +616,11 @@ sub generate_code {
     }
 
     if ( $data{reminder}
-        and
-        !( time_greater_than( $data{time_date} ) or $data{reminder} eq 'none' )
-      )
+        and !( time_greater_than( $data{time_date} ) or $data{reminder} eq 'none' ) )
     {
         my @reminders = split( /,/, $data{reminder} );
         for my $reminder_info (@reminders) {
-            my ( $reminder_time, $reminder_code ) =
-              $reminder_info =~ /^(\d+)(\S)/;
+            my ( $reminder_time, $reminder_code ) = $reminder_info =~ /^(\d+)(\S)/;
             if ($reminder_time) {
                 my $reminder_diff  = '00:00';
                 my $reminder_units = 'minute';
@@ -676,8 +637,7 @@ sub generate_code {
                     if ( $reminder_time >= 60 ) {
                         my $hours   = $reminder_time / 60;
                         my $minutes = $reminder_time % 60;
-                        $reminder_diff = "$hours:"
-                          . ( ( $minutes >= 10 ) ? $minutes : "0$minutes" );
+                        $reminder_diff = "$hours:" . ( ( $minutes >= 10 ) ? $minutes : "0$minutes" );
                     }
                     else {
                         $reminder_diff = '00:'
@@ -691,23 +651,18 @@ sub generate_code {
                 $data{reminder_diff}  = $reminder_diff;
                 $data{reminder_time}  = $reminder_time;
                 $data{reminder_units} = $reminder_units;
-                print $fh
-                  "   if (time_now '$data{time_date} - $reminder_diff ') {"
-                  . &get_speak_code(%data) . "};\n";
+                print $fh "   if (time_now '$data{time_date} - $reminder_diff ') {" . &get_speak_code(%data) . "};\n";
             }
         }
     }
     if ( $data{type} =~ /task/i ) {
         if ( ($speak_tasks) and ( $data{speak} =~ /^y/i ) ) {
             if ( $data{time} and ( $data{time} !~ /12:00 am/i ) ) {
-                print MYCODE "   if (time_now '$data{date} $data{time}') {"
-                  . &get_speak_code(%data) . "};\n";
+                print MYCODE "   if (time_now '$data{date} $data{time}') {" . &get_speak_code(%data) . "};\n";
             }
             else {
                 foreach my $announce_time (@_organizer_announce_day_times) {
-                    print MYCODE
-                      "   if (time_now '$data{date}  $announce_time') {"
-                      . &get_speak_code(%data) . "};\n";
+                    print MYCODE "   if (time_now '$data{date}  $announce_time') {" . &get_speak_code(%data) . "};\n";
                 }
             }
         }
@@ -721,25 +676,21 @@ sub generate_code {
     }
     else {
         if ( $data{allday} !~ /^y/i ) {
-            $data{reminder_diff} = 0
-              ; # reset so that the get_speak_code doesn't think that this is an advance alarm
-            print $fh "   if (time_now '$data{time_date}') {"
-              . &get_speak_code(%data) . "};\n";
+            $data{reminder_diff} = 0;    # reset so that the get_speak_code doesn't think that this is an advance alarm
+            print $fh "   if (time_now '$data{time_date}') {" . &get_speak_code(%data) . "};\n";
         }
         else {
             $data{reminder_diff}  = 0;
             $data{reminder_units} = 'day';
             my $alert_date = &get_offset_date(%data);
             foreach my $announce_time (@_organizer_announce_day_times) {
-                print MYCODE "   if (time_now '$alert_date  $announce_time') {"
-                  . &get_speak_code(%data) . "};\n"
+                print MYCODE "   if (time_now '$alert_date  $announce_time') {" . &get_speak_code(%data) . "};\n"
                   if $announce_time;
             }
             $data{reminder_diff} = 1;
             my $alert_date = &get_offset_date(%data);
             foreach my $announce_time (@_organizer_announce_priorday_times) {
-                print MYCODE "   if (time_now '$alert_date  $announce_time') {"
-                  . &get_speak_code(%data) . "};\n"
+                print MYCODE "   if (time_now '$alert_date  $announce_time') {" . &get_speak_code(%data) . "};\n"
                   if $announce_time;
             }
 
@@ -754,8 +705,7 @@ sub generate_code {
                 $alert_date = &get_offset_date(%data);
 
                 #Changed to notify all organizer addresses
-                print $fh "   if (time_now '$alert_date 12 am') {"
-                  . &get_textmsg_code(%data) . "};\n";
+                print $fh "   if (time_now '$alert_date 12 am') {" . &get_textmsg_code(%data) . "};\n";
             }
         }
     }
@@ -766,8 +716,7 @@ sub get_offset_date {
     my (%data) = @_;
     my $hoursoffset =
       $data{reminder_diff} * ( ( $data{reminder_units} = 'day' ) ? 24 : 1 );
-    my @date =
-      localtime( &main::my_str2time("$data{time_date} - $hoursoffset:00") );
+    my @date  = localtime( &main::my_str2time("$data{time_date} - $hoursoffset:00") );
     my $month = $date[4] + 1;
     my $year  = $date[5] + 1900;
     my $offset_date =
@@ -787,10 +736,8 @@ sub update_vsdb {
     my $vsdb;
 
     if ( !-e $dbPath ) {
-        &main::print_log(
-            "Organizer (WARNING): $dbPath does not exist.  Now creating.");
-        push( @targetFields, 'ID' )
-          ;    # add the ID field in as it is not included in the schema names
+        &main::print_log("Organizer (WARNING): $dbPath does not exist.  Now creating.");
+        push( @targetFields, 'ID' );            # add the ID field in as it is not included in the schema names
         push( @targetFields, @schemaNames );    # order doesn't matter after ID
         $vsdb = new vsDB( file => $dbPath );
         $vsdb->Open();
@@ -808,9 +755,7 @@ sub update_vsdb {
             @schemaNames = @tmpFields;
         }
         if ( !($ID_found) ) {
-            &main::print_log(
-                "Organizer (WARNING): ID field not present in $dbPath.  Aborting continued use of $dbType."
-            );
+            &main::print_log( "Organizer (WARNING): ID field not present in $dbPath.  Aborting continued use of $dbType." );
             $vsdb->Close();
             return 0;
         }
@@ -820,8 +765,7 @@ sub update_vsdb {
     if (@targetFields) {
         &main::print_log("Organizer: Now upgrading $dbType database");
         foreach my $targetField (@targetFields) {
-            &main::print_log(
-                "Organizer: adding $targetField to the $dbType database");
+            &main::print_log("Organizer: adding $targetField to the $dbType database");
             $vsdb->AddNewField($targetField);
         }
         $vsdb->Commit();
@@ -831,9 +775,7 @@ sub update_vsdb {
         }
     }
     else {
-        &main::print_log(
-            "Organizer: $dbType matches target schema and does not require upgrading"
-        );
+        &main::print_log( "Organizer: $dbType matches target schema and does not require upgrading" );
     }
     $vsdb->Close();
     return 1;
diff --git a/code/common/outlook.pl b/code/common/outlook.pl
index 9b57047c2..624fa3d80 100644
--- a/code/common/outlook.pl
+++ b/code/common/outlook.pl
@@ -7,8 +7,7 @@
 my $outlook_file = "$Code_Dirs[0]/outlook_programing.pl";
 
 #p_outlook_read  = new Process_Item("outlook_read -version 98 -pl_file $outlook_file");
-$p_outlook_read =
-  new Process_Item("outlook_read             -pl_file $outlook_file");
+$p_outlook_read = new Process_Item("outlook_read             -pl_file $outlook_file");
 
 #f_outlook_data  = new File_Item 'c:\WIN98\Application data\Microsoft\Outlook\outlook.pst';
 $f_outlook_data = new File_Item $config_parms{outlook_file};
@@ -19,8 +18,7 @@
 # check this periodically, as it probably changes
 # often when people are messing around with email
 $v_outlook_read = new Voice_Cmd 'Check the Outlook calendar';
-$v_outlook_read->set_info(
-    'This will check create mh events to announce Outlook calendar entries');
+$v_outlook_read->set_info('This will check create mh events to announce Outlook calendar entries');
 if ( said $v_outlook_read or ( new_minute 15 and changed $f_outlook_data) ) {
     start $p_outlook_read;
     set_watch $f_outlook_data;    # Reset so changed function works
diff --git a/code/common/pa_control.pl b/code/common/pa_control.pl
index 74fd82ebd..5da4c54d5 100644
--- a/code/common/pa_control.pl
+++ b/code/common/pa_control.pl
@@ -61,8 +61,7 @@
 if ( said $v_pa_test) {
     my $state = $v_pa_test->{state};
     $v_pa_test->respond('app=pa Testing PA...');
-    speak
-      "nolog=1 rooms=all mode=unmuted volume=80 Hello. This is a PA system test.";
+    speak "nolog=1 rooms=all mode=unmuted volume=80 Hello. This is a PA system test.";
 
     #speak "nolog=1 rooms=downstairs mode=unmuted volume=100 Hi!";
 }
@@ -95,9 +94,7 @@ sub pa_parms_stub {
         my %pa_zones = $pactrl->get_pa_zones();
 
         if ( defined $pa_zones{audrey} && $pa_zones{audrey} ne '' ) {
-            print_log( "PA: audrey zone detected, hooking via web_hook. ("
-                  . $pa_zones{audrey}
-                  . ")" )
+            print_log( "PA: audrey zone detected, hooking via web_hook. (" . $pa_zones{audrey} . ")" )
               if $Debug{pa};
             push( @{ $parms->{web_hook} }, \&pa_web_hook );
         }
@@ -109,14 +106,11 @@ sub pa_parms_stub {
         #MH is already speaking, and other PA zones are already active. Delay speech.
         if ( $main::Debug{voice} ) {
             $parms->{clash_retry} = 0 unless $parms->{clash_retry};
-            &print_log(
-                "PA SPEECH CLASH($parms->{clash_retry}): Delaying speech call for "
-                  . $parms->{text}
-                  . "\n" )
+            &print_log( "PA SPEECH CLASH($parms->{clash_retry}): Delaying speech call for " . $parms->{text} . "\n" )
               unless $parms->{clash_retry} lt 1;
             $parms->{clash_retry}++;    #To track how many loops are made
         }
-        $parms->{nolog} = 1;    #To stop MH from logging the speech again
+        $parms->{nolog} = 1;            #To stop MH from logging the speech again
 
         my $parmstxt;
         my ( $pkey, $pval );
@@ -128,7 +122,7 @@ sub pa_parms_stub {
           if $main::Debug{voice} && $parms->{clash_retry} eq 0;
         &run_after_delay( $pa_clash_delay, "speak($parmstxt)" );
 
-        $parms->{no_speak} = 1;    #To stop MH from speaking this time around
+        $parms->{no_speak} = 1;         #To stop MH from speaking this time around
         return;
     }
     if ( $parms->{clash_retry} ) {
diff --git a/code/common/phone.pl b/code/common/phone.pl
index 60b093d37..f5df3f618 100644
--- a/code/common/phone.pl
+++ b/code/common/phone.pl
@@ -21,35 +21,28 @@ sub search_phone_calls {
     print_log "Searching for $string";
 
     # Search data logged from incoming caller id data.
-    my ( $count1, $count2, %results ) =
-      &dbm_search( "$config_parms{data_dir}/phone/callerid.dbm", $string );
+    my ( $count1, $count2, %results ) = &dbm_search( "$config_parms{data_dir}/phone/callerid.dbm", $string );
 
     # Also search in array created from mh.ini caller_id_file data
     while ( my ( $key, $value ) = each %Caller_ID::name_by_number ) {
         if ( $key =~ /$string/i or $value =~ /$string/i ) {
-            $value =
-              &dbm_read( "$config_parms{data_dir}/phone/callerid.dbm", $key )
-              ;    # Use dbm data for consistency
+            $value = &dbm_read( "$config_parms{data_dir}/phone/callerid.dbm", $key );    # Use dbm data for consistency
             $results{$key} = $value;
         }
     }
-    $count2 = keys %results;   # Reset count, in case Caller_ID search found any
+    $count2 = keys %results;    # Reset count, in case Caller_ID search found any
 
     my $results;
     if ($count2) {
         for ( sort keys %results ) {
-            my ( $cid_number, $cid_date, $cid_name ) =
-              $results{$_} =~ /(\S+) (.+) name=(.+)/;
+            my ( $cid_number, $cid_date, $cid_name ) = $results{$_} =~ /(\S+) (.+) name=(.+)/;
             $cid_name = $Caller_ID::name_by_number{$_}
               if $Caller_ID::name_by_number{$_};
-            $results .= sprintf( "%13s calls=%3s last=%26s %s\n",
-                $_, $cid_number, $cid_date, $cid_name );
+            $results .= sprintf( "%13s calls=%3s last=%26s %s\n", $_, $cid_number, $cid_date, $cid_name );
         }
 
         #       map {$results .= "   $_: $results{$_}\n\n"} sort keys %results;
-        $results =
-          "Results:  $count2 out of $count1 records matched $string\n\n"
-          . $results;
+        $results = "Results:  $count2 out of $count1 records matched $string\n\n" . $results;
     }
     else {
         $results = "\n      No match found\n";
@@ -59,8 +52,7 @@ sub search_phone_calls {
 
 # Show phone logs
 $v_phone_log_tk = new Voice_Cmd('Show the tk phone log');
-$v_phone_log_tk->set_info(
-    'Display a tk popup of all the incoming and outgoing phone calls');
+$v_phone_log_tk->set_info('Display a tk popup of all the incoming and outgoing phone calls');
 
 if ( said $v_phone_log_tk) {
     print "running display_callers\n";
diff --git a/code/common/phone_logs.pl b/code/common/phone_logs.pl
index c857dae8b..59196a06d 100644
--- a/code/common/phone_logs.pl
+++ b/code/common/phone_logs.pl
@@ -78,7 +78,7 @@ sub read_phone_logs2 {
         my @a = reverse <PLOG>;
         while ( $_ = shift @a ) {
 
-            tr/\x20-\x7e//cd; # Translate bad characters or else TK will mess up
+            tr/\x20-\x7e//cd;    # Translate bad characters or else TK will mess up
             s/\x2a//;
 
             #save A reference copy
@@ -92,19 +92,15 @@ sub read_phone_logs2 {
             #Mon 11/12/01 19:11:28  name=-UNKNOWN CALLER- data=###DATE11121911...NMBR...NAME-UNKNOWN CALLER-+++ line=W
 
             if ( $log_file =~ /callerid/ ) {
-                ( $time_date, $number, $name, $line, $type ) = $_ =~
-                  /(.+?) (1?\-?\d\d\d\-?\d\d\d\-?\d\d\d\d)\s+name=(.+)\s+line=(.+)\s+type=(.+)/;
                 ( $time_date, $number, $name, $line, $type ) =
-                  $_ =~ /(.+?) (\d{3,})\s+name=(.+)\s+line=(.+)\s+type=(.+)/
+                  $_ =~ /(.+?) (1?\-?\d\d\d\-?\d\d\d\-?\d\d\d\d)\s+name=(.+)\s+line=(.+)\s+type=(.+)/;
+                ( $time_date, $number, $name, $line, $type ) = $_ =~ /(.+?) (\d{3,})\s+name=(.+)\s+line=(.+)\s+type=(.+)/
                   unless $name;
-                ( $time_date, $number, $name ) =
-                  $_ =~ /(.+?) (\d\d\d\-?\d\d\d\-?\d\d\d\d) name=(.+)/
+                ( $time_date, $number, $name ) = $_ =~ /(.+?) (\d\d\d\-?\d\d\d\-?\d\d\d\d) name=(.+)/
                   unless $name;
-                ( $time_date, $number, $name ) =
-                  $_ =~ /(.+?) (\d\d\d\d\d\d\d\d\d\d)(\s\w+\s\w+\s\w+\s)/
+                ( $time_date, $number, $name ) = $_ =~ /(.+?) (\d\d\d\d\d\d\d\d\d\d)(\s\w+\s\w+\s\w+\s)/
                   unless $name;
-                ( $time_date, $number, $name ) =
-                  $_ =~ /(.+?) (\d\d\d\-?\d\d\d\d)/
+                ( $time_date, $number, $name ) = $_ =~ /(.+?) (\d\d\d\-?\d\d\d\d)/
                   unless $name;    # AC is optional
 
                 print_log "DB CID $time_date, $number, $name, $line, $type"
@@ -172,15 +168,13 @@ sub read_phone_logs2 {
                     $number =~ s/(\d\d\d)/$config_parms{local_area_code}-$1-/;
                 }
 
-                %callerid_by_number =
-                  dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
+                %callerid_by_number = dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
                   unless %callerid_by_number;
 
                 #               my $data = dbm_read("$config_parms{data_dir}/phone/callerid.dbm", $number);
                 my $data = $callerid_by_number{$number};
                 print_log "DB data= $data" if $Debug{phone};
-                my ( $calls, $time, $date, $name2 ) =
-                  $data =~ /^(\d+) +(.+), (.+) name=(.+)/
+                my ( $calls, $time, $date, $name2 ) = $data =~ /^(\d+) +(.+), (.+) name=(.+)/
                   if $data;
                 $name = $name2;
             }
@@ -194,17 +188,16 @@ sub read_phone_logs2 {
             my $name2 = $Caller_ID::name_by_number{$number};
             $name2 = $name unless $name2;
             $name2 = 'NA'  unless $name2;    # nothing to report from CID data
-               # Seems the data has lots-o-whitespace at the end and Sometimes embedded
-               #  so... strip the trailing and replace the embedded with _
-               #  this makes passing and parsing way easier (and keeps things aligned)
+                                             # Seems the data has lots-o-whitespace at the end and Sometimes embedded
+                                             #  so... strip the trailing and replace the embedded with _
+                                             #  this makes passing and parsing way easier (and keeps things aligned)
             $name2 =~ s/\s+$//;
             $name2 =~ s/ /_/g;
 
             #Break it up for the Extended records
             my ( $ph_time, $ph_num, $ph_name, $ph_ext, $ph_line, $ph_type );
             ( $ph_time, $ph_num, $ph_name, $ph_ext, $ph_line, $ph_type ) =
-              $refdata =~
-              /(.+?) O(\S+) name=(\S+) ext=(\S+) line=(\S+) type=(\S+)/;
+              $refdata =~ /(.+?) O(\S+) name=(\S+) ext=(\S+) line=(\S+) type=(\S+)/;
             print_log "REAL data $time_date, $number, $name2, $line, $type"
               if $Debug{phone};
             print_log "REF2 data $refdata" if $Debug{phone};
@@ -212,7 +205,7 @@ sub read_phone_logs2 {
             # Now do substitutions for teh extended format
             $type = $ph_type if $ph_type;    # detailed data is replaced here
             $type = 'out'
-              unless $type;    # Unless there isn't any then make a default
+              unless $type;                  # Unless there isn't any then make a default
 
             $line = $ph_line if $ph_line;
             $line = "1" unless $line;
@@ -221,7 +214,7 @@ sub read_phone_logs2 {
 
             $ph_name = "Not_Available" if ( $ph_ext eq "000" );
             $ph_name = $name2
-              unless $ph_name;    #and the name is really the elapsed time
+              unless $ph_name;                 #and the name is really the elapsed time
 
             #	my $num_len = length($number);
             #	if ( $num_len > 10 ) {
@@ -233,15 +226,13 @@ sub read_phone_logs2 {
             #		$number = substr($number,0,9);
             #	    }
             #	}
-            print_log
-              "split test  $time_date, $number, $name2, $ph_ext, $line, $type "
+            print_log "split test  $time_date, $number, $name2, $ph_ext, $line, $type "
               if $Debug{phone};
             print_log "split test  $time_date, $number, $name2"
               if $Debug{phone};
 
             push @calls,
-              sprintf(
-                "date=%20s number=%-12s name=%s line=%s type=%s dur=%8s ext=%s ",
+              sprintf( "date=%20s number=%-12s name=%s line=%s type=%s dur=%8s ext=%s ",
                 $time_date, $number, $name2, $line, $type, $ph_name, $ph_ext );
             last if ++$count2 > $count1;
 
diff --git a/code/common/phone_minutes.pl b/code/common/phone_minutes.pl
index c915f7e02..6bb3343c1 100644
--- a/code/common/phone_minutes.pl
+++ b/code/common/phone_minutes.pl
@@ -11,16 +11,14 @@
 $v_phone_minutes = new Voice_Cmd('[Check,Read,Show,Debug] phone minutes');
 $v_phone_minutes->set_info('Checks used and remaining cell phone minutes.');
 $v_tmobile_balance = new Voice_Cmd('[Read,Show] TMobile balance');
-$v_tmobile_balance->set_info(
-    'Reads or shows the current T-Mobile account balance');
+$v_tmobile_balance->set_info('Reads or shows the current T-Mobile account balance');
 
 run_voice_cmd 'Check phone minutes' if time_now '6 am';
 
 my $tmobile_flag;
 
 if ( $state = said $v_tmobile_balance) {
-    respond( ( ( $state eq 'Read' ) ? 'target=speak ' : '' )
-        . "Current T-Mobile account balance is $Save{TMobileBalance}" );
+    respond( ( ( $state eq 'Read' ) ? 'target=speak ' : '' ) . "Current T-Mobile account balance is $Save{TMobileBalance}" );
 }
 
 if ( $state = said $v_phone_minutes) {
@@ -28,8 +26,7 @@
         my $msg = "You have $Save{phone_minutes_left}";
         $msg .= " minutes" unless $Save{phone_minutes_left} =~ /\$/;
         $msg .= " left on your cellphone account.";
-        $msg .=
-          " $Save{phone_minutes_left_day} per day for the next $Save{phone_minutes_days} days"
+        $msg .= " $Save{phone_minutes_left_day} per day for the next $Save{phone_minutes_days} days"
           if $Save{phone_minutes_left_day};
         respond( ( ( $state eq 'Read' ) ? 'target=speak ' : '' ) . $msg );
     }
@@ -41,35 +38,28 @@
               qq[-post "txtMSISDN=$config_parms{cell_phone_username}&txtPassword=$config_parms{cell_phone_password}&__EVENTTARGET=signin" ];
             $cmd1 .=
               qq[-cookie_file_out "$config_parms{data_dir}/web/phone_minutes.cookies" -header "$config_parms{data_dir}/web/phone_minutes.headers" "$config_parms{data_dir}/web/phone_minutes1.html"];
-            $cmd2 =
-              qq[get_url "https://my.t-mobile.com/Default.aspx?rp.Logon=true" ];
+            $cmd2 = qq[get_url "https://my.t-mobile.com/Default.aspx?rp.Logon=true" ];
             $cmd2 .=
               qq[-cookie_file_in "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes2.html"];
             $tmobile_flag = 1;
         }
         elsif ( lc $config_parms{cell_phone_provider} eq 'cingular' ) {
-            my ( $ac, $pref, $num ) =
-              $config_parms{cell_phone_number} =~ /(\d\d\d)(\d\d\d)(\d\d\d\d)/;
-            my $post_data =
-              "CTNAreaCode=$ac&CTNPrefix=$pref&CTNNumber=$num&PASS=$config_parms{cell_phone_password}";
-            $post_data .=
-              "&event=forward&action=logIn&TF=N&NP=T&IDToken=$config_parms{cell_phone_number}";
-            $cmd1 =
-              qq[get_url "https://www.myaccount.cingular.com/DispatcherServlet" ];
+            my ( $ac, $pref, $num ) = $config_parms{cell_phone_number} =~ /(\d\d\d)(\d\d\d)(\d\d\d\d)/;
+            my $post_data = "CTNAreaCode=$ac&CTNPrefix=$pref&CTNNumber=$num&PASS=$config_parms{cell_phone_password}";
+            $post_data .= "&event=forward&action=logIn&TF=N&NP=T&IDToken=$config_parms{cell_phone_number}";
+            $cmd1 = qq[get_url "https://www.myaccount.cingular.com/DispatcherServlet" ];
             $cmd1 .= qq[-post "$post_data&name=/jsp/longTask.jsp" ];
             $cmd1 .=
               qq[-cookie_file_out "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes1.html" ];
 
             # Not sure why -post doesn't work here?
             #           $cmd2    = qq[get_url "https://www.myaccount.cingular.com/DispatcherServlet" -post "$post_data&name=/WAServletsLogin" ];
-            $cmd2 =
-              qq[get_url "https://www.myaccount.cingular.com/DispatcherServlet?$post_data&name=/WAServletsLogin" ];
+            $cmd2 = qq[get_url "https://www.myaccount.cingular.com/DispatcherServlet?$post_data&name=/WAServletsLogin" ];
             $cmd2 .=
               qq[-cookie_file_in "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes2.html"];
         }
         elsif ( lc $config_parms{cell_phone_provider} eq 'gophone' ) {
-            my $post_data =
-              "org.apache.struts.taglib.html.TOKEN=7a21a593735a8f718df04360f161225f";
+            my $post_data = "org.apache.struts.taglib.html.TOKEN=7a21a593735a8f718df04360f161225f";
             $post_data .= "&msisdn=$config_parms{cell_phone_number}";
             $post_data .= "&passcode=$config_parms{cell_phone_password}";
             $cmd1 = qq[get_url "https://www.paygonline.com/websc/Logon.do" ];
@@ -77,8 +67,7 @@
             $cmd1 .=
               qq[-cookie_file_out "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes1.html" ];
             print_log $cmd1;
-            $cmd2 =
-              qq[get_url "https://www.paygonline.com/websc/AccountDetails.do" ];
+            $cmd2 = qq[get_url "https://www.paygonline.com/websc/AccountDetails.do" ];
             $cmd2 .=
               qq[-cookie_file_in "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes2.html"];
         }
@@ -90,13 +79,11 @@
               qq[-post "min=$config_parms{cell_phone_number}&password=$config_parms{cell_phone_password}&action=doLogin&target=Login" ];
             $cmd1 .=
               qq[-cookie_file_out "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes1.html"];
-            $cmd2 =
-              qq[get_url "https://manage1.sprintpcs.com/Manage?target=MyCurrentUsage&action=current_usage" ];
+            $cmd2 = qq[get_url "https://manage1.sprintpcs.com/Manage?target=MyCurrentUsage&action=current_usage" ];
             $cmd2 .=
               qq[-cookie_file_in "$config_parms{data_dir}/web/phone_minutes.cookies" "$config_parms{data_dir}/web/phone_minutes2.html"];
         }
-        set $p_phone_minutes $cmd1,
-          $cmd2;    # Run login url, then usage report url
+        set $p_phone_minutes $cmd1, $cmd2;    # Run login url, then usage report url
         start $p_phone_minutes;
         print_log "Starting phone minutes check";
     }
@@ -108,8 +95,7 @@
 
     if ( lc $config_parms{cell_phone_provider} eq 'tmobile' ) {
         if ($tmobile_flag) {
-            my $html =
-              file_read "$config_parms{data_dir}/web/phone_minutes2.html";
+            my $html = file_read "$config_parms{data_dir}/web/phone_minutes2.html";
             if ( $html =~ /(\$\d\.\d\d)/ ) {
                 $Save{TMobileBalance} = $1;
                 print_log "T-Mobile balance:$1";
@@ -120,13 +106,10 @@
             start $p_phone_minutes;
         }
         else {
-            my $html =
-              file_read "$config_parms{data_dir}/web/phone_minutes2.html";
+            my $html = file_read "$config_parms{data_dir}/web/phone_minutes2.html";
             return unless $html;
 
-            my $te =
-              new HTML::TableExtract(
-                headers => [qw(Feature Included Used Remaining)] );
+            my $te = new HTML::TableExtract( headers => [qw(Feature Included Used Remaining)] );
             $te->parse($html);
 
             my @cell = $te->rows;
@@ -134,8 +117,7 @@
             $Save{phone_minutes_used} = round $cell[2][2];
             $Save{phone_minutes_left} = round $cell[2][3];
             $Save{phone_minutes_date} = $Time_Date;
-            print_log
-              "Phone minutes: plan=$Save{phone_minutes_plan} used=$Save{phone_minutes_used} left=$Save{phone_minutes_left}";
+            print_log "Phone minutes: plan=$Save{phone_minutes_plan} used=$Save{phone_minutes_used} left=$Save{phone_minutes_left}";
         }
     }
     elsif ( lc $config_parms{cell_phone_provider} eq 'gophone' ) {
@@ -145,12 +127,8 @@
         my @cell = $te->rows;
         $Save{phone_minutes_left}     = $cell[0][1];
         $Save{phone_minutes_date_end} = $cell[4][1];
-        $Save{phone_minutes_days}     = round(
-            ( str2time( $Save{phone_minutes_date_end} ) - time ) /
-              ( 24 * 3600 ),
-            1
-        );
-        $Save{phone_minutes_date} = $Time_Date;
+        $Save{phone_minutes_days}     = round( ( str2time( $Save{phone_minutes_date_end} ) - time ) / ( 24 * 3600 ), 1 );
+        $Save{phone_minutes_date}     = $Time_Date;
         print_log
           "Phone minutes: left=$Save{phone_minutes_left} date_end=$Save{phone_minutes_date_end} days=$Save{phone_minutes_days} per_day=$Save{phone_minutes_left_day}";
     }
@@ -163,8 +141,7 @@
         $Save{phone_minutes_used} = round $cell[1][1];
         $Save{phone_minutes_left} = $cell[1][0] - $cell[1][1];
         $Save{phone_minutes_date} = $Time_Date;
-        print_log
-          "Phone minutes: plan=$Save{phone_minutes_plan} used=$Save{phone_minutes_used} left=$Save{phone_minutes_left}";
+        print_log "Phone minutes: plan=$Save{phone_minutes_plan} used=$Save{phone_minutes_used} left=$Save{phone_minutes_left}";
     }
 
     # Example of Sprint's minutes remaining html data:
@@ -195,10 +172,6 @@
 # lets allow the user to control via triggers
 
 if ($Reload) {
-    &trigger_set(
-        "time_now '7 pm'",
-        "run_voice_cmd 'Read phone minutes'",
-        'NoExpire',
-        'Read phone minutes'
-    ) unless &trigger_get('Read phone minutes');
+    &trigger_set( "time_now '7 pm'", "run_voice_cmd 'Read phone minutes'", 'NoExpire', 'Read phone minutes' )
+      unless &trigger_get('Read phone minutes');
 }
diff --git a/code/common/phone_pcs_messaging.pl b/code/common/phone_pcs_messaging.pl
index e08a15abe..c80c1d47e 100644
--- a/code/common/phone_pcs_messaging.pl
+++ b/code/common/phone_pcs_messaging.pl
@@ -61,13 +61,12 @@ sub send_pcs_phone {
     }
     print "PCS: who=$parms{who}, msg=$parms{msg}" if $Debug{pcs};
     $addr = "$pcsnumber\@messaging.sprintpcs.com" if lc $pcsservice eq 'sprint';
-    $addr = "$pcsnumber\@vtext.com"            if lc $pcsservice eq 'verizon';
-    $addr = "$pcsnumber\@tmomail.net"          if lc $pcsservice eq 't-mobile';
-    $addr = "$pcsnumber\@mycingular.net"       if lc $pcsservice eq 'cingular';
-    $addr = "$pcsnumber\@messaging.nextel.com" if lc $pcsservice eq 'nextel';
+    $addr = "$pcsnumber\@vtext.com"               if lc $pcsservice eq 'verizon';
+    $addr = "$pcsnumber\@tmomail.net"             if lc $pcsservice eq 't-mobile';
+    $addr = "$pcsnumber\@mycingular.net"          if lc $pcsservice eq 'cingular';
+    $addr = "$pcsnumber\@messaging.nextel.com"    if lc $pcsservice eq 'nextel';
     if ( $addr eq '' ) {
-        print_log
-          "PCS ERROR: Service with name \"$pcsservice\" is not supported.";
+        print_log "PCS ERROR: Service with name \"$pcsservice\" is not supported.";
         return;
     }
 
diff --git a/code/common/phone_vcop.pl b/code/common/phone_vcop.pl
index d9227c534..d084834d6 100644
--- a/code/common/phone_vcop.pl
+++ b/code/common/phone_vcop.pl
@@ -54,8 +54,7 @@
 
 # noloop=stop
 
-$v_count_voicemails =
-  new Voice_Cmd("Count voice mail messages for [$vocp_users]");
+$v_count_voicemails = new Voice_Cmd("Count voice mail messages for [$vocp_users]");
 
 if ( my $user = said $v_count_voicemails) {
     my @mailboxes = split ',', $config_parms{vocp_mailboxes};
@@ -94,8 +93,7 @@ sub vocp_clearmsgs {
     my ( $user, $mailbox, $message ) = @_;
 
     #	return '' unless $Authorized eq 'admin' or $Authorized eq 'family';
-    return &html_header("Delete voicemail?")
-      . "<H2><A HREF=\"/SUB?vocp_deletemsgs($user,$mailbox,$message)\">Continue?</A></H2>";
+    return &html_header("Delete voicemail?") . "<H2><A HREF=\"/SUB?vocp_deletemsgs($user,$mailbox,$message)\">Continue?</A></H2>";
 }
 
 sub vocp_deletemsgs {
@@ -104,15 +102,11 @@ sub vocp_deletemsgs {
     my ( $user, $mailbox, $message ) = @_;
     print "deletemsgs: user:$user mbx:$mailbox message:$message\n"
       if $main::Debug{vocp};
-    my $file =
-        $config_parms{vocp_voicemail_dir} . "/"
-      . $mailbox . "-"
-      . $message . ".rmd";
+    my $file = $config_parms{vocp_voicemail_dir} . "/" . $mailbox . "-" . $message . ".rmd";
 
     my $xml = new XML::Simple;
 
-    my $flagfile =
-      $config_parms{vocp_voicemail_dir} . "/" . ".flag." . $mailbox;
+    my $flagfile = $config_parms{vocp_voicemail_dir} . "/" . ".flag." . $mailbox;
     print "checking for file $flagfile\n" if $main::Debug{vocp};
     if ( not -f $flagfile ) { die "can't find file" }
 
@@ -187,8 +181,7 @@ sub vocp_play_voicemail {
     system
       qq[$config_parms{vocp_bin_dir}/rmdtopvf $file | $config_parms{vocp_bin_dir}/pvftowav > $config_parms{html_dir}/ia5/phone/voicemail1.wav];
 
-    my $html .=
-      "\n<br><EMBED SRC='voicemail1.wav' VOLUME=20 WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n";
+    my $html .= "\n<br><EMBED SRC='voicemail1.wav' VOLUME=20 WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n";
     return $html;
 }
 
@@ -223,13 +216,11 @@ sub vocp_display_voicemail {
 
                 my $good_num = $number =~ /(\d\d\d)(\d\d\d)(\d+)/;
                 if ($good_num) {
-                    $number = $1 . '-' . $2 . "-" . $3;
-                    %callerid_by_number =
-                      dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
+                    $number             = $1 . '-' . $2 . "-" . $3;
+                    %callerid_by_number = dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
                       unless %callerid_by_number;
                     my $cid_data = $callerid_by_number{$number};
-                    ( $calls, $time2, $date, $name2 ) =
-                      $cid_data =~ /^(\d+) +(.+), (.+) name=(.+)/
+                    ( $calls, $time2, $date, $name2 ) = $cid_data =~ /^(\d+) +(.+), (.+) name=(.+)/
                       if $cid_data;
                     $name2 = "Not in Database" if $name2 eq '';
                 }
@@ -237,16 +228,14 @@ sub vocp_display_voicemail {
 
                 $num++;
 
-                $html_voicemail_data .=
-                  "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+                $html_voicemail_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
                 $html_voicemail_data .=
                   "<td nowrap>$time</td><td nowrap><a href=\"SUB?vocp_play_voicemail($user,$boxnum,$msgnum)\"><img src='/graphics/sound.gif' border=0 alt='Play message'></a><a href=\"/SUB?vocp_clearmsgs($user,$boxnum,$msgnum)\"><img src='/graphics/trash.gif' border=0 alt='Delete message'></a>&nbsp;$number</td><td nowrap>$name2</td><td nowrap>$duration</td></tr>";
 
             }
             $html_voicemail_hdr .= &html_header("$num Messages for $user ");
 
-            $html_voicemail_hdr .=
-              "<table width=100% cellspacing=2><tbody><font face=COURIER size=2>
+            $html_voicemail_hdr .= "<table width=100% cellspacing=2><tbody><font face=COURIER size=2>
 <tr id='resultrow' bgcolor='#9999CC' class='wvtheader'>
 <th align='left'>Time</th>
 <th align='left'>Number</th>
diff --git a/code/common/photo_index.pl b/code/common/photo_index.pl
index b83c61197..6a3639db8 100644
--- a/code/common/photo_index.pl
+++ b/code/common/photo_index.pl
@@ -34,13 +34,11 @@
 
 $v_photo_reindex = new Voice_Cmd 'Reindex the photo album [,name,date,random]';
 $v_photo_reindex->set_info(
-    "Re-creates a photo index for all the photos under $config_parms{photo_dirs} that match $config_parms{photo_filter}"
-);
+    "Re-creates a photo index for all the photos under $config_parms{photo_dirs} that match $config_parms{photo_filter}" );
 
 # Resize new photos using image_resize
 $v_photo_resize = new Voice_Cmd 'Resize new photo album pictures';
-$v_photo_resize->set_info(
-    "Re-sizes any new photos in the photo album directories");
+$v_photo_resize->set_info("Re-sizes any new photos in the photo album directories");
 $p_photo_resize = new Process_Item;
 
 my @subdirs;
@@ -49,9 +47,7 @@
 
 # Add form to Photos page
 # The include will take too long if there are lots of files/dirs, so use a link instead
-$Included_HTML{Photos} .=
-  '<br><a href="SUB;photo_html" target=control>Pick a photo subdirectory to index</a>'
-  . "\n";
+$Included_HTML{Photos} .= '<br><a href="SUB;photo_html" target=control>Pick a photo subdirectory to index</a>' . "\n";
 
 # Just a reference to $config_parms{photo_viewer} so it shows up in the code_select list
 
@@ -101,8 +97,7 @@ sub photo_dir {
     my ($realdir);
     ($realdir) = &http_get_local_file($dir);
     unless ($realdir) {
-        print_log
-          "can't find real directory associated with web directory $dir, skipping";
+        print_log "can't find real directory associated with web directory $dir, skipping";
         return;
     }
 
@@ -120,8 +115,7 @@ sub photo_dir {
     close DIR;
 }
 
-if ( my $string = quotemeta $Tk_results{'Photo Search'} )
-{    # *** This is very odd (?)
+if ( my $string = quotemeta $Tk_results{'Photo Search'} ) {    # *** This is very odd (?)
     undef $Tk_results{'Photo Search'};
     print_log "Searching for photos that match $string";
     my @match   = grep /$string/i, @photos;
@@ -140,21 +134,18 @@ sub photo_dir {
         my ( $realdir, $realdir2, $originals );
         ($realdir) = &http_get_local_file($webdir);
         unless ($realdir) {
-            print_log
-              "can't find real directory associated with web directory $webdir, skipping";
+            print_log "can't find real directory associated with web directory $webdir, skipping";
             next;
         }
         $originals = $bigs[$next];
         unless ( $originals or $config_parms{photo_prefix} ) {
-            print_log
-              "can't find webdir where your originals are located for $webdir, skipping";
+            print_log "can't find webdir where your originals are located for $webdir, skipping";
             next;
         }
         ($realdir2) = &http_get_local_file($originals);
         $realdir2 = "" if $realdir eq $realdir2;
         unless ( $realdir2 or $config_parms{photo_prefix} ) {
-            print_log
-              "can't find real directory associated with web directory $originals, skipping";
+            print_log "can't find real directory associated with web directory $originals, skipping";
             next;
         }
         $config_parms{photo_size} =~ m/(\d+)[x|X](\d+)/;
@@ -190,11 +181,8 @@ sub photo_html {
     my $html;
 
     # Create a form to pick which photo subdirectories to index
-    $html .=
-      '<table border><tr><form action="SET;referer" target=control><td>Pick which photo subdirectory to index'
-      . "\n";
-    $html .= &html_form_select( '$photo_subdir', 1, $selected, @subdirs )
-      . "</td></form></tr></table>\n";
+    $html .= '<table border><tr><form action="SET;referer" target=control><td>Pick which photo subdirectory to index' . "\n";
+    $html .= &html_form_select( '$photo_subdir', 1, $selected, @subdirs ) . "</td></form></tr></table>\n";
     return $html;
 }
 
diff --git a/code/common/pocketsphinx_control.pl b/code/common/pocketsphinx_control.pl
index f5b8b5b97..f53126694 100644
--- a/code/common/pocketsphinx_control.pl
+++ b/code/common/pocketsphinx_control.pl
@@ -79,19 +79,11 @@
 # noloop=stop
 
 # define some classes we need
-$v_pocketsphinx_reset = new Voice_Cmd("reset pocket sphinx language files");
-$v_pocketsphinx_awake = new Voice_Cmd(
-    $config_parms{pocketsphinx_awake_phrase},
-    $config_parms{pocketsphinx_awake_response}
-);
-$v_pocketsphinx_asleep = new Voice_Cmd(
-    $config_parms{pocketsphinx_asleep_phrase},
-    $config_parms{pocketsphinx_timeout_response}
-);
-$pocketsphinx_listener =
-  new PocketSphinx_Listener( "$config_parms{pocketsphinx_dev}",
-    $config_parms{pocketsphinx_rate} );
-$t_awake_timer = new Timer;
+$v_pocketsphinx_reset  = new Voice_Cmd("reset pocket sphinx language files");
+$v_pocketsphinx_awake  = new Voice_Cmd( $config_parms{pocketsphinx_awake_phrase}, $config_parms{pocketsphinx_awake_response} );
+$v_pocketsphinx_asleep = new Voice_Cmd( $config_parms{pocketsphinx_asleep_phrase}, $config_parms{pocketsphinx_timeout_response} );
+$pocketsphinx_listener = new PocketSphinx_Listener( "$config_parms{pocketsphinx_dev}", $config_parms{pocketsphinx_rate} );
+$t_awake_timer         = new Timer;
 
 # Set mode on startup and reload
 if ( $Startup or $Reload ) {
diff --git a/code/common/power_Xantrex.pl b/code/common/power_Xantrex.pl
index 6df72980e..149e7f1a8 100644
--- a/code/common/power_Xantrex.pl
+++ b/code/common/power_Xantrex.pl
@@ -85,10 +85,8 @@
             $ROM_XVer       = $3;
             $ROM_PVer       = $4;
             $ResponseParsed = 1;
-            print_log
-              "XanGT3.0 ROM Versions: B=$ROM_BVer, M=$ROM_MVer, X=$ROM_XVer, P=$ROM_PVer.";
-            speak
-              "XanGT3.0 ROM Versions: B=$ROM_BVer, M=$ROM_MVer, X=$ROM_XVer, P=$ROM_PVer.";
+            print_log "XanGT3.0 ROM Versions: B=$ROM_BVer, M=$ROM_MVer, X=$ROM_XVer, P=$ROM_PVer.";
+            speak "XanGT3.0 ROM Versions: B=$ROM_BVer, M=$ROM_MVer, X=$ROM_XVer, P=$ROM_PVer.";
         }
     }
 
@@ -98,10 +96,8 @@
             $idn_X_No       = $2;
             $idn_SerNo      = $3;
             $ResponseParsed = 1;
-            print_log
-              "XanGT3.0 IDs: Model=$idn_ModelNo, X=$idn_X_No, Serial=$idn_SerNo.";
-            speak
-              "XanGT3.0 IDs: Model=$idn_ModelNo, X=$idn_X_No, Serial=$idn_SerNo.";
+            print_log "XanGT3.0 IDs: Model=$idn_ModelNo, X=$idn_X_No, Serial=$idn_SerNo.";
+            speak "XanGT3.0 IDs: Model=$idn_ModelNo, X=$idn_X_No, Serial=$idn_SerNo.";
         }
     }
 
@@ -174,10 +170,8 @@
             $MEASIN_Current = $2;
             $MEASIN_Power   = $3;
             $ResponseParsed = 1;
-            print_log
-              "XanGT3.0 MEASIN voltage=$MEASIN_Voltage V, current=$MEASIN_Current A, power=$MEASIN_Power W.";
-            speak
-              "XanGT3.0 MEASIN voltage=$MEASIN_Voltage V, current=$MEASIN_Current A, power=$MEASIN_Power W.";
+            print_log "XanGT3.0 MEASIN voltage=$MEASIN_Voltage V, current=$MEASIN_Current A, power=$MEASIN_Power W.";
+            speak "XanGT3.0 MEASIN voltage=$MEASIN_Voltage V, current=$MEASIN_Current A, power=$MEASIN_Power W.";
         }
     }
 
@@ -201,24 +195,19 @@
             $MPPTSTAT_TD_param = $2;
             $MPPTSTAT_PL_param = $3;
             $ResponseParsed    = 1;
-            print_log
-              "XanGT3.0 MPPTSTAT (peak power) voltage=$MPPTSTAT_Voltage, TD=$MPPTSTAT_TD_param, PL=$MPPTSTAT_PL_param.";
-            speak
-              "XanGT3.0 MPPTSTAT (peak power) voltage=$MPPTSTAT_Voltage, TD=$MPPTSTAT_TD_param, PL=$MPPTSTAT_PL_param.";
+            print_log "XanGT3.0 MPPTSTAT (peak power) voltage=$MPPTSTAT_Voltage, TD=$MPPTSTAT_TD_param, PL=$MPPTSTAT_PL_param.";
+            speak "XanGT3.0 MPPTSTAT (peak power) voltage=$MPPTSTAT_Voltage, TD=$MPPTSTAT_TD_param, PL=$MPPTSTAT_PL_param.";
         }
     }
 
     if ( $command eq "POWSEQ" ) {
-        if ( $data =~ /^ST:([^ ]+) STS:([^ ]+ [^ ]+ [^ ]+ [^ ]+) FA:([^ ]+)$/ )
-        {
+        if ( $data =~ /^ST:([^ ]+) STS:([^ ]+ [^ ]+ [^ ]+ [^ ]+) FA:([^ ]+)$/ ) {
             $POWSEQ_ST_param  = $1;
             $POWSEQ_STS_param = $2;
             $POWSEQ_FA_param  = $3;
             $ResponseParsed   = 1;
-            print_log
-              "XanGT3.0 POWSEQ ST=$POWSEQ_ST_param, STS=$POWSEQ_STS_param, FA=$POWSEQ_FA_param.";
-            speak
-              "XanGT3.0 POWSEQ ST=$POWSEQ_ST_param, STS=$POWSEQ_STS_param, FA=$POWSEQ_FA_param.";
+            print_log "XanGT3.0 POWSEQ ST=$POWSEQ_ST_param, STS=$POWSEQ_STS_param, FA=$POWSEQ_FA_param.";
+            speak "XanGT3.0 POWSEQ ST=$POWSEQ_ST_param, STS=$POWSEQ_STS_param, FA=$POWSEQ_FA_param.";
         }
     }
 
@@ -237,8 +226,7 @@
             $ResponseParsed     = 1;
             print_log
               "XanGT3.0 unit power=$MEASENGY_UnitPower W, daily total=$MEASENGY_UnitTotal kWh, life=$MEASENGY_UnitLife kWh.";
-            speak
-              "XanGT3.0 unit power=$MEASENGY_UnitPower W, daily total=$MEASENGY_UnitTotal kWh, life=$MEASENGY_UnitLife kWh.";
+            speak "XanGT3.0 unit power=$MEASENGY_UnitPower W, daily total=$MEASENGY_UnitTotal kWh, life=$MEASENGY_UnitLife kWh.";
         }
     }
 
@@ -254,18 +242,14 @@
             $MEASTEMP_HeatsinkTemp_degC = $1;
             $MEASTEMP_HeatsinkTemp_degF = $2;
             $ResponseParsed             = 1;
-            print_log
-              "XanGT3.0 heatsink temp=$MEASTEMP_HeatsinkTemp_degF degF ($MEASTEMP_HeatsinkTemp_degC degC).";
-            speak
-              "XanGT3.0 heatsink temp=$MEASTEMP_HeatsinkTemp_degF degF ($MEASTEMP_HeatsinkTemp_degC degC).";
+            print_log "XanGT3.0 heatsink temp=$MEASTEMP_HeatsinkTemp_degF degF ($MEASTEMP_HeatsinkTemp_degC degC).";
+            speak "XanGT3.0 heatsink temp=$MEASTEMP_HeatsinkTemp_degF degF ($MEASTEMP_HeatsinkTemp_degC degC).";
         }
     }
 
     if ( $ResponseParsed != 1 ) {
-        print_log
-          "XanGT3.0 serial input parsing error: command=$command data=$data";
-        speak
-          "XanGT3.0 serial input parsing error: command=$command data=$data";
+        print_log "XanGT3.0 serial input parsing error: command=$command data=$data";
+        speak "XanGT3.0 serial input parsing error: command=$command data=$data";
     }
 }
 
diff --git a/code/common/proxy_client_server.pl b/code/common/proxy_client_server.pl
index e9b77dfaf..989c995ee 100644
--- a/code/common/proxy_client_server.pl
+++ b/code/common/proxy_client_server.pl
@@ -95,17 +95,11 @@
     bedroom    => 'bedroom'
 );
 
-$test_voice_proxy = new Voice_Cmd
-  'Test proxy speak to [all,livingroom,jim,sharon,kitchen,bedroom]';
-$test_voice_proxy->tie_event(
-    'speak "rooms=$state we are the borg,, you will be assimilated,, resistance is few tile"'
-);
+$test_voice_proxy = new Voice_Cmd 'Test proxy speak to [all,livingroom,jim,sharon,kitchen,bedroom]';
+$test_voice_proxy->tie_event( 'speak "rooms=$state we are the borg,, you will be assimilated,, resistance is few tile"' );
 
-$test_play_proxy = new Voice_Cmd
-  'Test proxy play to [all,livingroom,jim,sharon,kitchen,bedroom]';
-$test_play_proxy->tie_event(
-    'play (rooms=> "$state", time => 60, volume => 80, file => "chimes/west30.wav")'
-);
+$test_play_proxy = new Voice_Cmd 'Test proxy play to [all,livingroom,jim,sharon,kitchen,bedroom]';
+$test_play_proxy->tie_event( 'play (rooms=> "$state", time => 60, volume => 80, file => "chimes/west30.wav")' );
 
 #speak "room=office The time is $Time_Now" if new_second 15;
 
@@ -127,8 +121,7 @@ sub proxy_speak_play {
     @rooms = sort keys %proxy_by_room if lc $parms{rooms} =~ /all/;
     for my $room (@rooms) {
         next
-          unless my $address =
-          $proxy_by_room{$room} . ":" . $config_parms{server_proxy_port};
+          unless my $address = $proxy_by_room{$room} . ":" . $config_parms{server_proxy_port};
         next if ( $room eq $config_parms{speak_mh_room} );
         print "Sending speech to proxy room=$room address=$address\n"
           if $Debug{'proxy'};
@@ -170,8 +163,7 @@ sub proxy_speak_play {
 
 # Proxy Server Section
 
-$proxy_server =
-  new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" );
+$proxy_server = new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" );
 
 # Allow for proxy regstration to the main mh (optional)
 # If you want this, add these mh.ini parms: mh_proxyreg_port, mh_server, and proxy_name
@@ -184,8 +176,7 @@ sub proxy_speak_play {
         next unless my $address = $proxy_by_room{$room};
         next if ( $room eq $config_parms{speak_mh_room} );
         print "Connecting to server $address\n";
-        my $s_proxy_init = new Socket_Item( undef, undef,
-            $address . ":" . $config_parms{mh_proxyreg_port} );
+        my $s_proxy_init = new Socket_Item( undef, undef, $address . ":" . $config_parms{mh_proxyreg_port} );
         start $s_proxy_init;
         set $s_proxy_init
           "$config_parms{password},$config_parms{proxy_name},$config_parms{server_proxy_port},$config_parms{speak_mh_room}";
@@ -196,8 +187,7 @@ sub proxy_speak_play {
 if ( $state = said $proxy_server) {
     my ( $interface, $function, @data ) = split $;, $state;
     my $client = $Socket_Ports{'server_proxy'}{client_ip_address};
-    print
-      "client proxy data received from: client=$client function=$function data=@data.\n"
+    print "client proxy data received from: client=$client function=$function data=@data.\n"
       if $Debug{'proxy'};
 
     if ( $function eq 'send_serial_data' ) {
@@ -207,8 +197,7 @@ sub proxy_speak_play {
         &Serial_Item::send_x10_data( $interface, $data[0] );
     }
     elsif ( $function eq 'send_ir' ) {
-        &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object},
-            $data[0] );
+        &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object}, $data[0] );
     }
     elsif ( $function eq 'uirt2_send' ) {
         $main::Serial_Ports{UIRT2}{object}->write( pack 'C*', @data );
@@ -244,12 +233,10 @@ sub proxy_speak_play {
     elsif ( $function eq 'lynx10plc' ) {
         my $function2 = shift @data;
         if ( $function2 eq 'send_plc' ) {
-            &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object},
-                @data );
+            &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object}, @data );
         }
         elsif ( $function2 eq 'readDeviceInfo' ) {
-            &Lynx10PLC::readDeviceInfo( $main::Serial_Ports{Lynx10PLC}{object},
-                $data[0] );
+            &Lynx10PLC::readDeviceInfo( $main::Serial_Ports{Lynx10PLC}{object}, $data[0] );
         }
     }
 
@@ -266,10 +253,8 @@ sub proxy_serial_data {
     # if command came in from a proxy, don't send out as proxy
     print_log "proxy_serial_data: $proxy $interface" if $Debug{proxy};
     return if ($proxy);
-    set $proxy_server join( $;, 'serial', $data, $interface ),
-      'all';    # all writes out to all clients
-    print
-      "Proxy serial data sent to collective: interface=$interface data=$data.\n"
+    set $proxy_server join( $;, 'serial', $data, $interface ), 'all';    # all writes out to all clients
+    print "Proxy serial data sent to collective: interface=$interface data=$data.\n"
       if $Debug{proxy};
 }
 
diff --git a/code/common/reject_caller_list.pl b/code/common/reject_caller_list.pl
index 17486856d..4ad9ec21a 100644
--- a/code/common/reject_caller_list.pl
+++ b/code/common/reject_caller_list.pl
@@ -46,9 +46,7 @@ sub read_reject_call_list {
         $type  = 'general' unless $type;
 
         #	    print_log "Number;$number, Name;$name, Sound;$sound, Type;$type\n";
-        push @calls,
-          sprintf( "number=%-12s name=%s sound=%s type=%s",
-            $number, $name, $sound, $type );
+        push @calls, sprintf( "number=%-12s name=%s sound=%s type=%s", $number, $name, $sound, $type );
 
     }
     close MYFILE;
diff --git a/code/common/robot_esra.pl b/code/common/robot_esra.pl
index f51d97dbd..58d2aa02b 100644
--- a/code/common/robot_esra.pl
+++ b/code/common/robot_esra.pl
@@ -20,8 +20,7 @@
 
 my $robot_esra_states = '0,10,20,30,40,50,60,70,80,90,100';
 my @robot_esra_states = split ',', $robot_esra_states;
-my @robot_esra_servos =
-  qw ($robot_lids $robot_eyes $robot_lipt $robot_lipb $robot_neck);
+my @robot_esra_servos = qw ($robot_lids $robot_eyes $robot_lipt $robot_lipb $robot_neck);
 
 # Enable better web control by setting valid states
 set_states $robot_lids @robot_esra_states;
diff --git a/code/common/robot_robosapien.pl b/code/common/robot_robosapien.pl
index 04ec2bf0c..946d01081 100644
--- a/code/common/robot_robosapien.pl
+++ b/code/common/robot_robosapien.pl
@@ -123,9 +123,8 @@
 $robot_program->tie_items($robot);
 
 # Create sequence commands
-$robot_sequence1 = new Voice_Cmd
-  'Robot sequence [pickup,tilt,strike,arms,step,talk,all,random,stop]';
-$robot_timer1 = new Timer;
+$robot_sequence1 = new Voice_Cmd 'Robot sequence [pickup,tilt,strike,arms,step,talk,all,random,stop]';
+$robot_timer1    = new Timer;
 
 my @robot_sequence_cmds;
 if ( $state = said $robot_sequence1) {
@@ -143,27 +142,22 @@
             randomize_list @robot_sequence_cmds;
         }
         elsif ( $state eq 'pickup' ) {
-            @robot_sequence_cmds =
-              qw(RightHandPickUp LeftHandPickUp RightHandThrow LeftHandThrow Burp);
+            @robot_sequence_cmds = qw(RightHandPickUp LeftHandPickUp RightHandThrow LeftHandThrow Burp);
         }
         elsif ( $state eq 'tilt' ) {
-            @robot_sequence_cmds =
-              qw(TiltBodyRight LeanBackward TiltBodyLeft LeanForward Burp);
+            @robot_sequence_cmds = qw(TiltBodyRight LeanBackward TiltBodyLeft LeanForward Burp);
         }
         elsif ( $state eq 'strike' ) {
-            @robot_sequence_cmds =
-              qw(RightHandStrike1 LeftHandStrike1 RightHandStrike2
+            @robot_sequence_cmds = qw(RightHandStrike1 LeftHandStrike1 RightHandStrike2
               LeftHandStrike2 RightHandStrike3 LeftHandStrike3
               RightHandSweep  LeftHandSweep Burp);
         }
         elsif ( $state eq 'arms' ) {
-            @robot_sequence_cmds =
-              qw(RightArmDown LeftArmDown RightArmIn LeftArmIn
+            @robot_sequence_cmds = qw(RightArmDown LeftArmDown RightArmIn LeftArmIn
               RightArmOut LeftArmOut RightArmUp LeftArmUp Burp);
         }
         elsif ( $state eq 'step' ) {
-            @robot_sequence_cmds =
-              qw (ForwardStep BackwardStep RightTurnStep LeftTurnStep Burp );
+            @robot_sequence_cmds = qw (ForwardStep BackwardStep RightTurnStep LeftTurnStep Burp );
         }
         elsif ( $state eq 'talk' ) {
             @robot_sequence_cmds = qw (High5 Oops Roar TalkBack Whistle Burp);
@@ -185,9 +179,8 @@
     }
 }
 
-$robot_keepawake =
-  new Voice_Cmd 'Set robot to [keepawake, letsleep, WakeUp, Sleep]';
-$robot_timer2 = new Timer;
+$robot_keepawake = new Voice_Cmd 'Set robot to [keepawake, letsleep, WakeUp, Sleep]';
+$robot_timer2    = new Timer;
 
 if ( $state = said $robot_keepawake) {
     if ( $state eq 'keepawake' ) {
@@ -254,7 +247,7 @@ sub robot_speak_chime {
 
 if ( $New_Msecond_250 and $Misc{robosapien}{speaking_flag} ) {
     print '.';
-    if ( !&Voice_Text::is_speaking( $config_parms{robot_robosapien_speak_card} )
+    if (  !&Voice_Text::is_speaking( $config_parms{robot_robosapien_speak_card} )
         or $Misc{robosapien}{speaking_flag}++ > 120 )
     {
         print "*\n";
@@ -276,16 +269,14 @@ sub robot_speak_chime {
         speak 'app=robot no_animate=1 Time to dance!';
         set $robot_song "mplay32.exe  /play /close m:/sounds/ymca.mid";
         start $robot_song;
-        @robot_sequence_cmds =
-          qw(DanceDemo BackwardStep Burp BackwardStep High5 Demo2 BackwardStep);
+        @robot_sequence_cmds = qw(DanceDemo BackwardStep Burp BackwardStep High5 Demo2 BackwardStep);
         set $robot_timer1 2;
         set $robot_speak_timer 4;
     }
 }
 
 # Speak random fun words while danceing
-$robot_words =
-  new File_Item "$config_parms{data_dir}/remarks/list_fun_words.txt";
+$robot_words       = new File_Item "$config_parms{data_dir}/remarks/list_fun_words.txt";
 $robot_speak_timer = new Timer;
 if ( expired $robot_speak_timer) {
     speak
diff --git a/code/common/rss_subscriber.pl b/code/common/rss_subscriber.pl
index 7d5baca86..62f2f6d37 100644
--- a/code/common/rss_subscriber.pl
+++ b/code/common/rss_subscriber.pl
@@ -102,11 +102,9 @@ sub rss_file_process_all {
     foreach my $feed (@feeds) {
         $i++;
         my ( $link, $regex, $dir ) = split /\s+/, $feed;
-        &rss_file_process( $link, "$config_parms{data_dir}/rss_feed_$i.xml",
-            $regex, $dir );
+        &rss_file_process( $link, "$config_parms{data_dir}/rss_feed_$i.xml", $regex, $dir );
     }
-    $v_rss_file_feed->respond(
-        'app=syndicate connected=0 Feed processing completed.');
+    $v_rss_file_feed->respond('app=syndicate connected=0 Feed processing completed.');
 }
 
 sub rss_file_process {
@@ -164,15 +162,12 @@ sub rss_file_process {
                     print_log "$file already downloaded"
                       if $DBM{"$torrent_dir/$file"};
                     print_log "$file already queued"
-                      if grep { $_ eq "'$link' '$torrent_dir/$file'" }
-                      @rss_file_download_queue;
+                      if grep { $_ eq "'$link' '$torrent_dir/$file'" } @rss_file_download_queue;
                     unless ( $current_file eq "$torrent_dir/$file"
                         or $DBM{"$torrent_dir/$file"}
-                        or grep { $_ eq "'$link' '$torrent_dir/$file'" }
-                        @rss_file_download_queue )
+                        or grep { $_ eq "'$link' '$torrent_dir/$file'" } @rss_file_download_queue )
                     {
-                        push @rss_file_download_queue,
-                          "'$link' '$torrent_dir/$file'";
+                        push @rss_file_download_queue, "'$link' '$torrent_dir/$file'";
                         print_log "queued $file";
                     }
                     $link = "";
@@ -187,29 +182,23 @@ sub rss_file_process {
             if ( $title =~ /$regexp/xi and not &check_regexps_reject($title) ) {
 
                 # hack to fix isohunt's links
-                $link =~
-                  s|rss.isohunt.com/btDetails.php\?ihq=.*\&id=|isohunt.com/download.php?mode=bt&id=|;
+                $link =~ s|rss.isohunt.com/btDetails.php\?ihq=.*\&id=|isohunt.com/download.php?mode=bt&id=|;
                 $link =~ s|isohunt.com/torrent_details|isohunt.com/download|;
 
                 # hack to fix torrentportal's links
-                $link =~
-                  s|torrentportal.com/details/|torrentportal.com/download/|;
+                $link =~ s|torrentportal.com/details/|torrentportal.com/download/|;
 
                 # hack to fix torrentspy's links
-                $link =~
-                  s|torrentspy.com/torrent/(\d+)/.*|torrentspy.com/download.asp?id=$1|;
+                $link =~ s|torrentspy.com/torrent/(\d+)/.*|torrentspy.com/download.asp?id=$1|;
 
                 # hack to fix newtorrents' links
-                $link =~
-                  s|newtorrents.info/torrent/(\d+)/.*|newtorrents.info/down.php?id=$1|;
+                $link =~ s|newtorrents.info/torrent/(\d+)/.*|newtorrents.info/down.php?id=$1|;
 
                 # hack to fix seedler's links
-                $link =~
-                  s|seedler.org/en/html/info/|seedler.org/download.x?id=|;
+                $link =~ s|seedler.org/en/html/info/|seedler.org/download.x?id=|;
 
                 # hack to fix isohunt's links
-                $link =~
-                  s|isohunt.com/btDetails.php.*id=|isohunt.com/dl.php?id=|;
+                $link =~ s|isohunt.com/btDetails.php.*id=|isohunt.com/dl.php?id=|;
 
                 # hack to fix mininova's links
                 $link =~ s|mininova.org/tor/|mininova.org/get/|;
@@ -238,16 +227,13 @@ sub rss_file_process {
                 print_log "$file already downloaded"
                   if $DBM{"$torrent_dir/$file"};
                 print_log "$file already queued"
-                  if grep { $_ eq "'$link' '$torrent_dir/$file'" }
-                  @rss_file_download_queue;
+                  if grep { $_ eq "'$link' '$torrent_dir/$file'" } @rss_file_download_queue;
 
                 unless ( $current_file eq "$torrent_dir/$file"
                     or $DBM{"$torrent_dir/$file"}
-                    or grep { $_ eq "'$link' '$torrent_dir/$file'" }
-                    @rss_file_download_queue )
+                    or grep { $_ eq "'$link' '$torrent_dir/$file'" } @rss_file_download_queue )
                 {
-                    push @rss_file_download_queue,
-                      "'$link' '$torrent_dir/$file'";
+                    push @rss_file_download_queue, "'$link' '$torrent_dir/$file'";
                     print_log "queued $file";
                 }
             }
@@ -273,10 +259,7 @@ sub rss_update_html {
     foreach my $feed (@feeds) {
         $i++;
         my ( $link, $regex, $dir ) = split /\s+/, $feed;
-        $html .=
-          &rss_file_html_format( $link,
-            "$config_parms{data_dir}/rss_feed_$i.xml",
-            $regex, $dir );
+        $html .= &rss_file_html_format( $link, "$config_parms{data_dir}/rss_feed_$i.xml", $regex, $dir );
     }
     return $html;
 }
@@ -293,8 +276,7 @@ sub rss_file_html_format {
     my $first = file_head $xml, 3;
 
     unless ( $first =~ /\<\?xml/i or $first =~ /\<rss/i ) {
-        return
-          "RSS feed <a href=$url>$url</a> does not appear to be an XML file.<p>";
+        return "RSS feed <a href=$url>$url</a> does not appear to be an XML file.<p>";
     }
     my $tmp = file_read $xml;
     $tmp =~ s/\<\/item\>\<item\>/\<\/item\>\n\<item\>/gi;
@@ -357,10 +339,6 @@ sub rss_file_html_format {
 # lets allow the user to control via triggers
 
 if ($Reload) {
-    &trigger_set(
-        '$New_Hour and net_connect_check',
-        "run_voice_cmd 'Get RSS subscribed files'",
-        'NoExpire',
-        'get rss files'
-    ) unless &trigger_get('get rss files');
+    &trigger_set( '$New_Hour and net_connect_check', "run_voice_cmd 'Get RSS subscribed files'", 'NoExpire', 'get rss files' )
+      unless &trigger_get('get rss files');
 }
diff --git a/code/common/speak_chime.pl b/code/common/speak_chime.pl
index fa3d07b00..eb603bfdb 100644
--- a/code/common/speak_chime.pl
+++ b/code/common/speak_chime.pl
@@ -22,8 +22,7 @@ sub speak_chime {
 
     # Only chime on time-based events, not
     # interactive events like tk/web/email/IM/vr triggered
-    print
-      "db speak_chime respond=$Respond_Target app=$parms{app} t=$parms{text}\n"
+    print "db speak_chime respond=$Respond_Target app=$parms{app} t=$parms{text}\n"
       if $main::Debug{chime};
 
     if ( !$parms{force_chime} ) {
diff --git a/code/common/speak_insult.pl b/code/common/speak_insult.pl
index 4a8b0933c..ad5643526 100644
--- a/code/common/speak_insult.pl
+++ b/code/common/speak_insult.pl
@@ -8,21 +8,14 @@
 #@ You can see a video of this code allowing my 2 robots to insult each other
 #@ at <a href=http://misterhouse.net/public/robot/>misterhouse.net/public/robot/</a>.
 
-$f_insult = new File_Item(
-    &file_default(
-        $config_parms{speak_insult_file},
-        "$config_parms{data_dir}/remarks/insults1.txt"
-    )
-);
+$f_insult = new File_Item( &file_default( $config_parms{speak_insult_file}, "$config_parms{data_dir}/remarks/insults1.txt" ) );
 
 $v_insult1 = new Voice_Cmd('Speak an insult');
 $v_insult1->set_authority('anyone');
 
 $v_insult1->set_info('Speaks an insult');
 $v_insult2 = new Voice_Cmd '[Start,Stop] speaking insults';
-$v_insult2->set_info(
-    'Starts/stops a sequence of insults, optionally alternating between voices/cards'
-);
+$v_insult2->set_info( 'Starts/stops a sequence of insults, optionally alternating between voices/cards' );
 
 $Misc{insult}{flag} = 1 if said $v_insult2 eq 'Start';
 $Misc{insult}{flag} = 0 if said $v_insult2 eq 'Stop';
diff --git a/code/common/speak_voices.pl b/code/common/speak_voices.pl
index 847b61c02..9a46cb5bd 100644
--- a/code/common/speak_voices.pl
+++ b/code/common/speak_voices.pl
@@ -16,10 +16,8 @@
 
 $v_voices_speak_many = new Voice_Cmd 'Test speech with many voices [1,2,3]';
 
-$f_deep_thoughts =
-  new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
-$f_house_tagline =
-  new File_Item("$config_parms{data_dir}/remarks/1100tags.txt");
+$f_deep_thoughts = new File_Item("$config_parms{data_dir}/remarks/deep_thoughts.txt");
+$f_house_tagline = new File_Item("$config_parms{data_dir}/remarks/1100tags.txt");
 
 if ( said $v_voices_speak_many) {
     my $state = $v_voices_speak_many->{state};
diff --git a/code/common/speech_clash.pl b/code/common/speech_clash.pl
index 6b2f48410..b753c3f93 100644
--- a/code/common/speech_clash.pl
+++ b/code/common/speech_clash.pl
@@ -42,10 +42,7 @@ sub speak_clash_stub {
         if ( $main::Debug{voice} ) {
             $ref->{clash_retry} = 0 unless $ref->{clash_retry};
             $ref->{clash_retry}++;    #To track how many loops are made
-            &print_log(
-                "SPEECH_CLASH($ref->{clash_retry}): Delaying speech call for "
-                  . $ref->{text}
-                  . "\n" );
+            &print_log( "SPEECH_CLASH($ref->{clash_retry}): Delaying speech call for " . $ref->{text} . "\n" );
         }
         $ref->{nolog} = 1;            #To stop MH from logging the speech again
         delete( $ref->{web_hook} );
@@ -73,8 +70,7 @@ sub speak_clash_stub {
     }
 
     if ( $ref->{clash_retry} ) {
-        &print_log("SPEECH_CLASH: Resolved, continuing speech.")
-          ;                      # if $main::Debug{voice};
+        &print_log("SPEECH_CLASH: Resolved, continuing speech.");    # if $main::Debug{voice};
         $is_speaking      = 0;
         $is_speaking_flag = 0;
     }
diff --git a/code/common/stocks.pl b/code/common/stocks.pl
index 68da75293..2132db50a 100644
--- a/code/common/stocks.pl
+++ b/code/common/stocks.pl
@@ -16,33 +16,25 @@
 #&tk_label(\$Save{stock_data1});
 #&tk_label(\$Save{stock_data2});
 
-my @months = (
-    'January', 'Febuary', 'March',     'April',   'May',      'June',
-    'July',    'August',  'September', 'October', 'November', 'December'
-);
+my @months =
+  ( 'January', 'Febuary', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
 
 my @stock_symbols = split ' ', $config_parms{stocks};
 my %stocks;    # This is where the data will be stored
 
 # More info on how this magic url was derived can be found here:
 #    http://www.padz.net/~djpadz/YahooQuote/
-my $stock_url =
-  'http://download.finance.yahoo.com/d?f=snl1d1t1c1p2va2bapomwerr1dyj1x\&s='
-  . join( '%20', @stock_symbols );
+my $stock_url = 'http://download.finance.yahoo.com/d?f=snl1d1t1c1p2va2bapomwerr1dyj1x\&s=' . join( '%20', @stock_symbols );
 my @stock_keys = (
-    'SName',      'LName',        'Last',          'Date',
-    'Time',       'Change',       'PChange',       'Volume',
-    'Avg Volume', 'Bid',          'Ask',           'Prev Close',
-    'Open',       'Day Range',    '52-Week Range', 'EPS',
-    'P/E Ratio',  'Div Pay Date', 'Div/Share',     'Div Yield',
-    'Mkt Cap',    'Exchange'
+    'SName',     'LName',     'Last',          'Date', 'Time',      'Change',
+    'PChange',   'Volume',    'Avg Volume',    'Bid',  'Ask',       'Prev Close',
+    'Open',      'Day Range', '52-Week Range', 'EPS',  'P/E Ratio', 'Div Pay Date',
+    'Div/Share', 'Div Yield', 'Mkt Cap',       'Exchange'
 );
 
 #***Split these up for security (read is only anyone can do)
 $v_stock_quote = new Voice_Cmd '[Get,Read,Check,Mail,SMS] stock quotes', 0;
-$v_stock_quote->set_info(
-    "Gets stock market info from yahoo for these stocks: $config_parms{stocks}"
-);
+$v_stock_quote->set_info( "Gets stock market info from yahoo for these stocks: $config_parms{stocks}" );
 $v_stock_quote->set_authority('anyone');
 $f_stock_quote = new File_Item "$config_parms{data_dir}/web/stocks.html";
 $p_stock_quote = new Process_Item;
@@ -54,9 +46,7 @@
 }
 elsif ($state) {
     unless (&net_connect_check) {
-        $v_stock_quote->respond(
-            "app=stocks Cannot update stock information when disconnected from the Internet."
-        );
+        $v_stock_quote->respond( "app=stocks Cannot update stock information when disconnected from the Internet." );
         return;
     }
 
@@ -121,20 +111,15 @@
         map { $stocks{$stock}{ $stock_keys[ $i++ ] } = $_ } @data;
         $stocks{$stock}{PChange} =~ s/[-+%]//g;
 
-        $stocks{$stock}{Date} =~
-          s|\/\d{4}||;    # Drop the year ... should be obvious :)
+        $stocks{$stock}{Date} =~ s|\/\d{4}||;    # Drop the year ... should be obvious :)
 
-        $Save{stock_data1} =
-          "Quotes: $stocks{$stock}{Date} $stocks{$stock}{Time} "
+        $Save{stock_data1} = "Quotes: $stocks{$stock}{Date} $stocks{$stock}{Time} "
           unless $results;
         $Save{stock_data2} = 'Change:' unless $results;
         $Save{stock_data1} .=
           sprintf( "%s:%.2f ", $stocks{$stock}{SName}, $stocks{$stock}{Last} );
 
-        $Save{stock_data2} .= sprintf( "%s:%+.2f/%s ",
-            $stocks{$stock}{SName},
-            $stocks{$stock}{Change},
-            $stocks{$stock}{PChange} );
+        $Save{stock_data2} .= sprintf( "%s:%+.2f/%s ", $stocks{$stock}{SName}, $stocks{$stock}{Change}, $stocks{$stock}{PChange} );
 
         #Some stocks are below a dollar, modify the display for dollars and cents.
         if ( $stocks{$stock}{Last} < 1 ) {
@@ -158,20 +143,16 @@
                     $stocks{$stock}{'Speak Name'}
                   ? $stocks{$stock}{'Speak Name'}
                   : $stocks{$stock}{LName};
-                $Save{stock_alert} .= " has "
-                  . ( $stocks{$stock}{Change} < 0 ? "fallen" : "risen" );
-                $Save{stock_alert} .=
-                  " $stocks{$stock}{PChange} percent to $stocks{$stock}{Last}";
+                $Save{stock_alert} .= " has " . ( $stocks{$stock}{Change} < 0 ? "fallen" : "risen" );
+                $Save{stock_alert} .= " $stocks{$stock}{PChange} percent to $stocks{$stock}{Last}";
             }
         }
 
         #Modify the change to cents as it sounds better.
         $stocks{$stock}{Change} = ( $stocks{$stock}{Change} * 100 );
-        $stocks{$stock}{Change2} =
-          "down " . sprintf( "%2.f cents", $stocks{$stock}{Change} )
+        $stocks{$stock}{Change2} = "down " . sprintf( "%2.f cents", $stocks{$stock}{Change} )
           if $stocks{$stock}{Change} < 0;
-        $stocks{$stock}{Change2} =
-          "up " . sprintf( "%2.f cents", $stocks{$stock}{Change} )
+        $stocks{$stock}{Change2} = "up " . sprintf( "%2.f cents", $stocks{$stock}{Change} )
           if $stocks{$stock}{Change} > 0;
         $stocks{$stock}{Change2} = "unchanged " if $stocks{$stock}{Change} eq 0;
 
@@ -194,22 +175,19 @@
 
     }
     if ( $Save{stock_alert} ) {
-        $v_stock_quote->respond(
-            "app=stocks connected=0 important=1 $Save{stock_alert}");
+        $v_stock_quote->respond("app=stocks connected=0 important=1 $Save{stock_alert}");
     }
     $position = rindex( $download_date, "/" );
     $month = substr( $download_date, 0, $position );
     $day = substr( $download_date, $position + 1 );
-    $Save{stock_results} =
-      'On ' . $months[ $month - 1 ] . ' ' . $day . ",\n " . $results;
+    $Save{stock_results} = 'On ' . $months[ $month - 1 ] . ' ' . $day . ",\n " . $results;
 
     if ( $v_stock_quote->{state} eq 'Check' ) {
         $v_stock_quote->respond("app=stocks connected=0 $Save{stock_results}.");
     }
     elsif ( $v_stock_quote->{state} eq 'Mail' ) {
         my $to = $config_parms{stocks_sendto} || "";
-        $v_stock_quote->respond(
-                "app=stocks connected=0 image=mail Sending stock quotes to "
+        $v_stock_quote->respond( "app=stocks connected=0 image=mail Sending stock quotes to "
               . ( ($to) ? $to : $config_parms{net_mail_send_account} )
               . '.' );
         &net_mail_send(
@@ -221,8 +199,7 @@
     elsif ( $v_stock_quote->{state} eq 'SMS' ) {
         my $to = $config_parms{cell_phone};
         if ($to) {
-            $v_stock_quote->respond(
-                "connected=0 image=mail Sending stock quotes to cell phone.");
+            $v_stock_quote->respond("connected=0 image=mail Sending stock quotes to cell phone.");
 
             # *** Try to respond via email or SMS and warn if they return false
             &net_mail_send(
@@ -232,23 +209,18 @@
             );
         }
         else {
-            $v_stock_quote->respond(
-                "connected=0 app=error Mobile phone email address not found!");
+            $v_stock_quote->respond("connected=0 app=error Mobile phone email address not found!");
         }
 
     }
     else {
-        $v_stock_quote->respond(
-            "app=stocks connected=0 Stock quotes retrieved.");
+        $v_stock_quote->respond("app=stocks connected=0 Stock quotes retrieved.");
     }
 }
 
 if ($Reload) {
-    &trigger_set(
-        "time_cron '5 9-17 * * 1-5' and net_connect_check",
-        "run_voice_cmd 'Get stock quotes'",
-        'NoExpire', 'get stocks'
-    ) unless &trigger_get('get stocks');
+    &trigger_set( "time_cron '5 9-17 * * 1-5' and net_connect_check", "run_voice_cmd 'Get stock quotes'", 'NoExpire', 'get stocks' )
+      unless &trigger_get('get stocks');
 }
 
 # 07 Jul 14, Jared J. Fernandez
diff --git a/code/common/tattler.pl b/code/common/tattler.pl
index 58493ae33..fea3bc316 100644
--- a/code/common/tattler.pl
+++ b/code/common/tattler.pl
@@ -13,14 +13,12 @@
 if ( active_now $server_tattler) {
     $count = 0;
     print_log 'New tattler applet connection';
-    set $server_tattler
-      'Welcome to the MisterHouse tattler server.  You should get 3 taglines, one every 10 seconds.';
+    set $server_tattler 'Welcome to the MisterHouse tattler server.  You should get 3 taglines, one every 10 seconds.';
 }
 
 if ( active $server_tattler and new_second 10 ) {
     if ( $count++ >= 3 ) {
-        set $server_tattler
-          "Thanks for dropping bye.  Socket will now be closed.  Refresh the page to recycle.";
+        set $server_tattler "Thanks for dropping bye.  Socket will now be closed.  Refresh the page to recycle.";
         print_log "Tattler socket closed";
         stop $server_tattler;
     }
diff --git a/code/common/telnet.pl b/code/common/telnet.pl
index e8664a78e..48854f9c4 100644
--- a/code/common/telnet.pl
+++ b/code/common/telnet.pl
@@ -13,23 +13,20 @@
 
 # set the banners
 # noloop=start
-$config_parms{telnet_welcome_banner} =
-  "Welcome to Mister House Socket Port 1!  Type exit/quit/bye/ctrl-D to exit."
+$config_parms{telnet_welcome_banner} = "Welcome to Mister House Socket Port 1!  Type exit/quit/bye/ctrl-D to exit."
   unless $config_parms{telnet_welcome_banner};
-$config_parms{telnet_exit_banner} =
-  "Bye for now.  Y'all come back now, ya hear!"
+$config_parms{telnet_exit_banner} = "Bye for now.  Y'all come back now, ya hear!"
   unless $config_parms{telnet_exit_banner};
 
 # noloop=stop
 
 # Examples on how to read and write data to a tcp socket port
-$telnet_server = new Socket_Item( $config_parms{telnet_welcome_banner} . "\n\r",
-    'Welcome1', 'server_telnet' );
+$telnet_server = new Socket_Item( $config_parms{telnet_welcome_banner} . "\n\r", 'Welcome1', 'server_telnet' );
 $telnet_server->add( "Hi, thanks for dropping by!\n\r",          'hi' );
 $telnet_server->add( $config_parms{telnet_exit_banner} . "\n\r", 'bye' );
 $telnet_server->add( "\n\r",                                     'cr' );
 $telnet_server->add( "\rmh> ",                                   'prompt' );
-$telnet_server->add( "\rmh# ", 'prompt_admin' );
+$telnet_server->add( "\rmh# ",                                   'prompt_admin' );
 
 #$telnet_server ->add             ("\rmh $Time_Now> ", 'prompt');
 
@@ -54,8 +51,7 @@
             set $telnet_server 'Authorized by IP address match.';
         }
         else {
-            set $telnet_server
-              'Run set_password to create a password.  Global authorization enabled until then';
+            set $telnet_server 'Run set_password to create a password.  Global authorization enabled until then';
         }
         set $telnet_server 'cr';
         $telnet_flags{$client}{auth}      = $user;
@@ -64,8 +60,7 @@
     }
     else {
         print_log "Telnet: connection from $client_ip ($client)";
-        set $telnet_server
-          'Type "login" to authenticate. Type "help" for a quick list of options.';
+        set $telnet_server 'Type "login" to authenticate. Type "help" for a quick list of options.';
         set $telnet_server 'cr';
     }
     set $telnet_server 'cr';
@@ -152,17 +147,13 @@ sub telnet_log {
 
         if ( $telnet_flags{$client}{auth} eq 'set_password' ) {
             print_log "Telnet: password data: $telnet_flags{$client}{data}";
-            if ( my $user = password_check $telnet_flags{$client}{data},
-                'server_telnet' )
-            {
-                print_log
-                  "Telnet: session authorized for $user from $client_ip";
+            if ( my $user = password_check $telnet_flags{$client}{data}, 'server_telnet' ) {
+                print_log "Telnet: session authorized for $user from $client_ip";
                 $msg = "$user password accepted\r\n";
                 $telnet_flags{$client}{auth} = $user;
             }
             else {
-                print_log
-                  "Telnet: password bad: password=$telnet_flags{$client}{data}";
+                print_log "Telnet: password bad: password=$telnet_flags{$client}{data}";
                 $msg = "password bad\r\n";
                 $telnet_flags{$client}{auth} = 0;
             }
@@ -170,8 +161,7 @@ sub telnet_log {
         }
         elsif ( $telnet_flags{$client}{data} ne '' ) {
 
-            print_log
-              "Telnet: port data ($client): $telnet_flags{$client}{data}";
+            print_log "Telnet: port data ($client): $telnet_flags{$client}{data}";
 
             if ( $telnet_flags{$client}{data} =~ /^log[io]n/i ) {
                 $msg = "Enter Password: ";
@@ -183,31 +173,24 @@ sub telnet_log {
                 $msg .= "  logon       => logon with password\n\r"
                   if !$telnet_flags{$client}{auth}
                   && !&password_check( undef, 'server_telnet' );
-                $msg .=
-                  "  find:  xyz  => find and report commands that match xyz\n\r";
-                $msg .=
-                  "  log:   xyz  => xyz is a filter of what to log.  Can print, speak, play, speak|play, all, and stop\n\r";
+                $msg .= "  find:  xyz  => find and report commands that match xyz\n\r";
+                $msg .= "  log:   xyz  => xyz is a filter of what to log.  Can print, speak, play, speak|play, all, and stop\n\r";
                 $msg .= "  whoami:     => display currently logged in user\n\r";
-                $msg .=
-                  "  exit|bye:   => exit from admin or family mode, or close telnet connection\n\r";
+                $msg .= "  exit|bye:   => exit from admin or family mode, or close telnet connection\n\r";
                 $msg .= "  help|?:     => this help text\n\r";
-                $msg .=
-                  "  any valid MisterHouse voice command (e.g. What time is it)\n\r";
+                $msg .= "  any valid MisterHouse voice command (e.g. What time is it)\n\r";
             }
             elsif ( $telnet_flags{$client}{data} =~ /^find:(.+)/ ) {
                 my $search = $1;
-                $search =~ s/^\s*(.*?)\s*$/$1/
-                  ;    # remove any whitespace before and after the search term
+                $search =~ s/^\s*(.*?)\s*$/$1/;    # remove any whitespace before and after the search term
                 my @cmds = list_voice_cmds_match $search;
                 my @cmds2;
                 for my $cmd (@cmds) {
-                    if ( $telnet_flags{$client}{auth} )
-                    { #if access is given in mh.ini parms, then don't check authority
+                    if ( $telnet_flags{$client}{auth} ) {    #if access is given in mh.ini parms, then don't check authority
                         push @cmds2, $cmd;
                     }
                     else {
-                        $cmd =~ s/^[^:]+: //
-                          ; #Trim the category ("Other: ", etc) from the front of the command
+                        $cmd =~ s/^[^:]+: //;                #Trim the category ("Other: ", etc) from the front of the command
                         $cmd =~ s/\s*$//;
                         my ($ref) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
                         my $authority = $ref->get_authority if $ref;
@@ -216,10 +199,7 @@ sub telnet_log {
                           or lc $authority eq 'anyone';
                     }
                 }
-                $msg =
-                    "Found "
-                  . scalar(@cmds2)
-                  . " commands that matched \"$search\":\n\r  ";
+                $msg = "Found " . scalar(@cmds2) . " commands that matched \"$search\":\n\r  ";
                 $msg .= join( "\n\r  ", @cmds2 );
                 $msg .= "\n\r";
             }
@@ -247,9 +227,7 @@ sub telnet_log {
                 || lc( $telnet_flags{$client}{data} ) eq 'quit'
                 || $telnet_flags{$client}{data} eq "\x04" )
             {
-                if ( $telnet_flags{$client}{auth} eq
-                    $telnet_flags{$client}{auth_orig} )
-                {
+                if ( $telnet_flags{$client}{auth} eq $telnet_flags{$client}{auth_orig} ) {
                     set $telnet_server 'bye';
                     sleep 1;
                     stop $telnet_server;
@@ -257,20 +235,17 @@ sub telnet_log {
                 elsif ( $telnet_flags{$client}{auth} eq "admin" ) {
                     $telnet_flags{$client}{auth} =
                       $telnet_flags{$client}{auth_orig};
-                    print_log
-                      "Telnet: user from $client_ip has exited from admin back to $telnet_flags{$client}{auth}";
+                    print_log "Telnet: user from $client_ip has exited from admin back to $telnet_flags{$client}{auth}";
                 }
                 elsif ( $telnet_flags{$client}{auth} eq "family" ) {
                     $telnet_flags{$client}{auth} =
                       $telnet_flags{$client}{auth_orig};
-                    print_log
-                      "Telnet: user from $client_ip has exited from family back to $telnet_flags{$client}{auth}";
+                    print_log "Telnet: user from $client_ip has exited from family back to $telnet_flags{$client}{auth}";
                 }
             }
             else {
                 # This will allow us to type in any command
-                my ($ref) = &Voice_Cmd::voice_item_by_text(
-                    lc( $telnet_flags{$client}{data} ) );
+                my ($ref) = &Voice_Cmd::voice_item_by_text( lc( $telnet_flags{$client}{data} ) );
                 my $authority = $ref->get_authority if $ref;
 
                 #set $telnet_server "You said: '$telnet_flags{$client}{data}'\n\r";
@@ -280,27 +255,17 @@ sub telnet_log {
                     if (    $authority eq 'admin'
                         and $telnet_flags{$client}{auth} ne 'admin' )
                     {
-                        $msg =
-                          "Admin logon required for '$telnet_flags{$client}{data}'";
+                        $msg = "Admin logon required for '$telnet_flags{$client}{data}'";
                     }
-                    elsif (
-                        &process_external_command(
-                            $telnet_flags{$client}{data}, 0,
-                            "telnet [$client_ip]"
-                        )
-                      )
-                    {
+                    elsif ( &process_external_command( $telnet_flags{$client}{data}, 0, "telnet [$client_ip]" ) ) {
+
                         #                   elsif (&process_external_command($telnet_flags{$client}{data}, 0, 'telnet', $respond)) {
-                        $msg =
-                          "Command executed: \"$telnet_flags{$client}{data}\"\n\r";
-                        $response_loop_telnet = $Loop_Count +
-                          4; # Give us 4 passes to wait for any resulting speech
+                        $msg = "Command executed: \"$telnet_flags{$client}{data}\"\n\r";
+                        $response_loop_telnet = $Loop_Count + 4;    # Give us 4 passes to wait for any resulting speech
                     }
                     else {
-                        $msg =
-                          "Searching for cmd: $telnet_flags{$client}{data}.\n\r";
-                        set $search_command_string $telnet_flags{$client}{data},
-                          "telnet [$client_ip]";
+                        $msg = "Searching for cmd: $telnet_flags{$client}{data}.\n\r";
+                        set $search_command_string $telnet_flags{$client}{data}, "telnet [$client_ip]";
 
                         #                        set $search_command_string $telnet_flags{$client}{data}, 'telnet', $respond;
                     }
@@ -310,14 +275,10 @@ sub telnet_log {
                     #                    }
                 }
                 else {
-                    $msg =
-                      "Not authorized to run command: \"$telnet_flags{$client}{data}\"\n\r";
+                    $msg = "Not authorized to run command: \"$telnet_flags{$client}{data}\"\n\r";
                 }
             }
-            logit(
-                "$config_parms{data_dir}/logs/server_telnet.$Year_Month_Now.log",
-                "$client: $telnet_flags{$client}{data}"
-            );
+            logit( "$config_parms{data_dir}/logs/server_telnet.$Year_Month_Now.log", "$client: $telnet_flags{$client}{data}" );
         }
         set $telnet_server $msg if defined $msg;
         unless ( $telnet_flags{$client}{auth} eq 'set_password' ) {
@@ -340,8 +301,7 @@ sub telnet_log {
 # Example of how enable inputing random data from a telnet session
 # In your telnet, type:  set $wakeup_time_test '10 am'
 $wakeup_time_test = new Generic_Item;
-$wakeup_time_test->set_states(
-    qw(6:00am 6:20am 6:40am 7:00am 7:20am 7:40am 8:00am none));
+$wakeup_time_test->set_states(qw(6:00am 6:20am 6:40am 7:00am 7:20am 7:40am 8:00am none));
 
 speak "Your wake up time is set for $state"
   if $state = state_now $wakeup_time_test;
diff --git a/code/common/terminal_menu.pl b/code/common/terminal_menu.pl
index 77028540b..e1254d969 100644
--- a/code/common/terminal_menu.pl
+++ b/code/common/terminal_menu.pl
@@ -229,17 +229,14 @@
 my %connections = ();
 my $clientid    = 0;
 
-$terminalmenu_server =
-  new Socket_Item( undef, undef, 'server_terminalmenu', undef, undef, undef,
-    "\n" );
+$terminalmenu_server = new Socket_Item( undef, undef, 'server_terminalmenu', undef, undef, undef, "\n" );
 
 #############################################################################
 #############################################################################
 if ($Reload) {
     print_log "Reloading terminal menu\n";
 
-    menu_parse scalar file_read("$config_parms{code_dir}/terminalmenu.menu"),
-      'terminal-menu';
+    menu_parse scalar file_read("$config_parms{code_dir}/terminalmenu.menu"), 'terminal-menu';
 }
 
 #############################################################################
@@ -306,11 +303,9 @@ sub new_connection {
     my ($client) = @_;
 
     ++$clientid;
-    $connections{$client}{id} = $clientid;
-    $connections{$client}{terminal_menu} =
-      eval "new Terminal_Menu('terminal-menu');";
-    $connections{$client}{terminal_menu}
-      ->tie_event("send_to_client $clientid, \$state");
+    $connections{$client}{id}            = $clientid;
+    $connections{$client}{terminal_menu} = eval "new Terminal_Menu('terminal-menu');";
+    $connections{$client}{terminal_menu}->tie_event("send_to_client $clientid, \$state");
 }
 
 #############################################################################
diff --git a/code/common/test_speak.pl b/code/common/test_speak.pl
index 694497944..95e520015 100644
--- a/code/common/test_speak.pl
+++ b/code/common/test_speak.pl
@@ -9,8 +9,7 @@
 $test_speak1   = new Voice_Cmd 'Test speech with tagline';
 respond( read_next $house_tagline) if said $test_speak1;
 
-$test_speak2 = new Voice_Cmd
-  'Test speech with tagline to a file with [low,normal,high] compression';
+$test_speak2 = new Voice_Cmd 'Test speech with tagline to a file with [low,normal,high] compression';
 
 #peak to_file => "$config_parms{data_dir}/test_tts.wav", compression => 'high',
 if ( $state = said $test_speak2) {
@@ -24,10 +23,8 @@
     play "$config_parms{data_dir}/test_tts.wav";
 }
 
-$test_speak3 = new Voice_Cmd
-  'Test speech control of [start,stop,pause,resume,rewind,fastforward,fast,normal,slow,-6,-4,4,6,10]';
-$test_speak3->set_info(
-    'Reads the mh FAQ, allowing you to test the start,stop, ect speak options');
+$test_speak3 = new Voice_Cmd 'Test speech control of [start,stop,pause,resume,rewind,fastforward,fast,normal,slow,-6,-4,4,6,10]';
+$test_speak3->set_info('Reads the mh FAQ, allowing you to test the start,stop, ect speak options');
 
 if ( $state = state_now $test_speak3) {
     if ( $state eq 'start' ) {
@@ -43,8 +40,7 @@
 
 # Create a command search menu with all the Voice_Cmd words
 my $voice_name_list = join( ',', &Voice_Text::list_voices );    # noloop
-$test_speak4 =
-  new Voice_Cmd "Test speech with voice [$voice_name_list,random,next]";
+$test_speak4 = new Voice_Cmd "Test speech with voice [$voice_name_list,random,next]";
 $test_speak4->set_info('Speak a phrase with the chosen voice');
 speak "voice=$state Testing speech with voice $state"
   if $state = state_now $test_speak4;
@@ -77,23 +73,20 @@
   text  => "Attention $state room people.  Hi."
   if $state = said $test_speak9;
 
-$test_speak10 =
-  new Voice_Cmd "Test speech to room [living,bedroom,all] with a wav file";
+$test_speak10 = new Voice_Cmd "Test speech to room [living,bedroom,all] with a wav file";
 play
   rooms => $state,
   file  => "hello_from_bruce.wav",
   time  => 5
   if $state = said $test_speak10;
 
-$test_speak11 = new Voice_Cmd
-  "Test speech engine [festival,viavoice,vv_tts,flite,NaturalVoice]";
+$test_speak11 = new Voice_Cmd "Test speech engine [festival,viavoice,vv_tts,flite,NaturalVoice]";
 speak
   engine => $state,
   text   => "Speaking with speech engine $state"
   if $state = said $test_speak11;
 
-$test_voice12 = new Voice_Cmd
-  "Change speech engine to [festival,viavoice,vv_tts,flite,NaturalVoice]";
+$test_voice12 = new Voice_Cmd "Change speech engine to [festival,viavoice,vv_tts,flite,NaturalVoice]";
 if ( $state = said $test_voice12) {
     $config_parms{voice_text} = $state;
     speak "The default speech engine has been set to $state";
diff --git a/code/common/test_xap.pl b/code/common/test_xap.pl
index 80ec9c86c..88a2e197c 100644
--- a/code/common/test_xap.pl
+++ b/code/common/test_xap.pl
@@ -40,10 +40,8 @@
 # Note how $state is used to flag the field that state will correlate to.
 #
 $xpl_speak1_v = new Voice_Cmd 'Test speech to an xpl client [1,2]';
-$xpl_speak1 =
-  new xPL_Item( 'tonyt-tts.voice1', 'tts.basic' => { speech => '$state' } );
-$xpl_speak2 = new xPL_Item( 'tonyt-ttsagent.agent1',
-    'tts.basic' => { speech => '$state' } );
+$xpl_speak1   = new xPL_Item( 'tonyt-tts.voice1', 'tts.basic' => { speech => '$state' } );
+$xpl_speak2   = new xPL_Item( 'tonyt-ttsagent.agent1', 'tts.basic' => { speech => '$state' } );
 set $xpl_speak1 "xpl client says the time is $Time_Now"
   if state_now $xpl_speak1_v == 1;
 set $xpl_speak2 "Hi, I'm an agent.   Today is $Date_Now"
@@ -52,14 +50,10 @@
 #
 # Test X10 data. Note:  Not yet tested with any X10 clients yet
 #
-$outside_light_xap = new xAP_Item( 'xap-x10.request', '*',
-    'xap-x10.request' => { command => '$state', device => 'A1' } );
-$outside_light_xpl =
-  new xPL_Item( 'ACME-LAMP.outside', 'lamp.basic' => { action => '$state' } );
-$outside_light_xap->tie_event(
-    'print_log "xap says outside light was set to $state"');
-$outside_light_xpl->tie_event(
-    'print_log "xpl says outside light was set to $state"');
+$outside_light_xap = new xAP_Item( 'xap-x10.request', '*', 'xap-x10.request' => { command => '$state', device => 'A1' } );
+$outside_light_xpl = new xPL_Item( 'ACME-LAMP.outside', 'lamp.basic' => { action => '$state' } );
+$outside_light_xap->tie_event('print_log "xap says outside light was set to $state"');
+$outside_light_xpl->tie_event('print_log "xpl says outside light was set to $state"');
 
 #
 # Test a clock app.  Also print other fields, not just the state field.
@@ -81,8 +75,7 @@
 
     set $outside_light_xap TOGGLE if $state == 1;
 
-    &xAP::send( 'xAP', 'xap-x10.request',
-        'xap-x10.request' => { device => 'A1', command => 'on' } )
+    &xAP::send( 'xAP', 'xap-x10.request', 'xap-x10.request' => { device => 'A1', command => 'on' } )
       if $state == 2;
 
     set $clock_xap $Time_Now if $state == 3;
@@ -121,8 +114,7 @@
 
     set $outside_light_xpl TOGGLE if $state == 1;
 
-    &xAP::send( 'xPL', 'ACME-LAMP.LIVINGROOM',
-        'lamp.basic' => { action => 'on' } )
+    &xAP::send( 'xPL', 'ACME-LAMP.LIVINGROOM', 'lamp.basic' => { action => 'on' } )
       if $state == 2;
 
     &xAP::send( 'xPL', 'tonyt-rio.unit100', 'rio.basic' => { sel => 'skip' } )
@@ -152,7 +144,6 @@ sub xpl_speak {
       if $parms{volume};
 
     for my $room (@rooms) {
-        &xAP::send( 'xPL', "tonyt-tts.$room",
-            'tts.basic' => { speech => $parms{text} } );
+        &xAP::send( 'xPL', "tonyt-tts.$room", 'tts.basic' => { speech => $parms{text} } );
     }
 }
diff --git a/code/common/time_info.pl b/code/common/time_info.pl
index ab238f000..74eb05aa0 100644
--- a/code/common/time_info.pl
+++ b/code/common/time_info.pl
@@ -18,9 +18,7 @@
 # Sun
 
 $v_sun_set = new Voice_Cmd( 'When will the sun [set,rise]', 0 );
-$v_sun_set->set_info(
-    "Calculates sunrise and sunset for latitude=$config_parms{latitude}, longitude=$config_parms{longitude}"
-);
+$v_sun_set->set_info( "Calculates sunrise and sunset for latitude=$config_parms{latitude}, longitude=$config_parms{longitude}" );
 $v_sun_set->set_authority('anyone');
 $v_sun_set->tie_event("&announce_sun(\$state)");
 
@@ -29,9 +27,7 @@
 $v_moon_info1 = new Voice_Cmd "When is the next [new,full] moon",  0;
 $v_moon_info2 = new Voice_Cmd "When was the last [new,full] moon", 0;
 $v_moon_info3 = new Voice_Cmd "What is the phase of the moon",     0;
-$v_moon_info3->set_info(
-    'Phase will be: New, One-Quarter Waxing, Half Waxing, Three-Quarter Waxing, Full, and same for Waning'
-);
+$v_moon_info3->set_info( 'Phase will be: New, One-Quarter Waxing, Half Waxing, Three-Quarter Waxing, Full, and same for Waning' );
 $v_moon_info1->set_authority('anyone');
 $v_moon_info2->set_authority('anyone');
 $v_moon_info3->set_authority('anyone');
@@ -49,31 +45,22 @@
 
 if ($Reload) {
     my $command = 'time_now $Time_Sunset and $Moon{phase} =~ /^full/i';
-    &trigger_set( $command, "&announce_full_moon()", 'NoExpire',
-        'announce full moon' )
+    &trigger_set( $command, "&announce_full_moon()", 'NoExpire', 'announce full moon' )
       unless &trigger_get('announce full moon');
 
     $command = "time_cron '30 9,12,19 * * *' and " . '$Holiday';
-    &trigger_set( $command,
-        'speak "app=holiday force_chime=1 Today is $Holiday"',
-        'NoExpire', 'announce holiday' )
+    &trigger_set( $command, 'speak "app=holiday force_chime=1 Today is $Holiday"', 'NoExpire', 'announce holiday' )
       unless &trigger_get('announce holiday');
 
     $command = 'time_now $Time_Sunrise';
-    &trigger_set(
-        $command,
-        'speak "force_chime=1 app=sunrise Notice, the sun is now rising at $Time_Sunrise"',
-        'NoExpire',
-        'announce sunrise'
-    ) unless &trigger_get('announce sunrise');
+    &trigger_set( $command, 'speak "force_chime=1 app=sunrise Notice, the sun is now rising at $Time_Sunrise"',
+        'NoExpire', 'announce sunrise' )
+      unless &trigger_get('announce sunrise');
 
     $command = 'time_now $Time_Sunset';
-    &trigger_set(
-        $command,
-        'speak "force_chime=1 app=sunset Notice, the sun is now setting at $Time_Sunset"',
-        'NoExpire',
-        'announce sunset'
-    ) unless &trigger_get('announce sunset');
+    &trigger_set( $command, 'speak "force_chime=1 app=sunset Notice, the sun is now setting at $Time_Sunset"',
+        'NoExpire', 'announce sunset' )
+      unless &trigger_get('announce sunset');
 }
 
 # events (tied to voice commands)
@@ -100,28 +87,23 @@ sub announce_sun {
 }
 
 sub announce_moon {
-    $v_moon_info3->respond(
-        qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old]
-    );
+    $v_moon_info3->respond( qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old] );
 }
 
 sub announce_previous_moon {
     my $state = shift;
     my $days = &time_diff( $Moon{"time_${state}_prev"}, $Time );
-    $v_moon_info2->respond(
-        qq[The last $state moon was $days ago, on $Moon{"${state}_prev"}]);
+    $v_moon_info2->respond(qq[The last $state moon was $days ago, on $Moon{"${state}_prev"}]);
 }
 
 sub announce_next_moon {
     my $state = shift;
     my $days = &time_diff( $Moon{"time_$state"}, $Time );
-    $v_moon_info1->respond(
-        qq[The next $state moon is in $days, on $Moon{$state}]);
+    $v_moon_info1->respond(qq[The next $state moon is in $days, on $Moon{$state}]);
 }
 
 sub announce_full_moon {
-    speak "app=moon Notice, tonight is a full moon.  "
-      . ( read_next $f_full_moon);
+    speak "app=moon Notice, tonight is a full moon.  " . ( read_next $f_full_moon);
 }
 
 # Uninstall (must be called prior to removing this module from code_select.txt)
diff --git a/code/common/timers.pl b/code/common/timers.pl
index be50984f3..b3da941cf 100644
--- a/code/common/timers.pl
+++ b/code/common/timers.pl
@@ -59,15 +59,11 @@ sub expired_timer {
 }
 
 # Allow for limited voice command timers
-$v_minute_timer = new Voice_Cmd(
-    'Set a timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,25,30,45,60,90,120] minutes'
-);
-$v_minute_timer->set_info(
-    'Set a minute timer.  Time remaining will be periodically announced');
+$v_minute_timer = new Voice_Cmd( 'Set a timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,25,30,45,60,90,120] minutes' );
+$v_minute_timer->set_info('Set a minute timer.  Time remaining will be periodically announced');
 if ( said $v_minute_timer) {
     my $state = $v_minute_timer->{state};
-    $v_minute_timer->respond(
-        "app=timer A timer has been set for $state minutes.");
+    $v_minute_timer->respond("app=timer A timer has been set for $state minutes.");
     set $timer_time "$state minutes";
 
     #   set $timer_text 'minite';
@@ -91,13 +87,10 @@ sub expired_timer {
             $time_left /= 3600 if $timer->{unit} eq 'hour';
             $time_left = round $time_left, 1;
             if ( $timer->{text} ) {
-                speak "app=timer $timer->{text} in "
-                  . &plural( $time_left, $timer->{unit} );
+                speak "app=timer $timer->{text} in " . &plural( $time_left, $timer->{unit} );
             }
             else {
-                speak "app=timer "
-                  . &plural( $time_left, $timer->{unit} )
-                  . " left on the timer.";
+                speak "app=timer " . &plural( $time_left, $timer->{unit} ) . " left on the timer.";
             }
         }
     }
@@ -131,13 +124,10 @@ sub expired_timer {
         #       $time_left = int $time_left;
         if ( $timer_reminder_intervals{$time_left} ) {
             if ( $timer->{text} ) {
-                speak "app=timer pitch=$pitch $timer->{text} in "
-                  . &plural( $time_left, $timer->{unit} );
+                speak "app=timer pitch=$pitch $timer->{text} in " . &plural( $time_left, $timer->{unit} );
             }
             else {
-                speak "app=timer pitch=$pitch "
-                  . &plural( $time_left, $timer->{unit} )
-                  . " left on the timer.";
+                speak "app=timer pitch=$pitch " . &plural( $time_left, $timer->{unit} ) . " left on the timer.";
             }
         }
     }
diff --git a/code/common/tk_eye.pl b/code/common/tk_eye.pl
index 68786a55c..382962ba2 100644
--- a/code/common/tk_eye.pl
+++ b/code/common/tk_eye.pl
@@ -16,8 +16,7 @@
 
     # I get "couldn't recognize data in image file" errors with .jpg files.  .gifs should be faster anyway
     #   $Tk_objects{eye_photo}->configure(-file => "$Pgm_Path/images/eye/eye" . ($eye_pos + 1) . ".jpg");
-    $Tk_objects{eye_photo}->configure(
-        -file => "$Pgm_Path/images/eye/eye" . ( $eye_pos + 1 ) . ".gif" );
+    $Tk_objects{eye_photo}->configure( -file => "$Pgm_Path/images/eye/eye" . ( $eye_pos + 1 ) . ".gif" );
 
     #$Tk_objects{eye} = '      ';
     #substr($Tk_objects{eye}, $eye_pos, 1) = '=';
diff --git a/code/common/tk_frames.pl b/code/common/tk_frames.pl
index a7edc7a63..178e4f923 100644
--- a/code/common/tk_frames.pl
+++ b/code/common/tk_frames.pl
@@ -27,12 +27,9 @@
 
         $Tk_objects{grid} =
           $Tk_objects{ft}->Frame->pack(qw/-side right -anchor n/);
-        $Tk_objects{fb2} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
-        $Tk_objects{fb3} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
-        $Tk_objects{fb4} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{fb2} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{fb3} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{fb4} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
 
         # *** Put in to make window menu fonts sync with scheme change (doesn't seem to work)
 
@@ -48,8 +45,7 @@
     # This file changed, so re-create all frames
     else {
         file_change("$config_parms{code_dir_common}/tk_frames.pl")
-          if $Startup
-          ; # Set file change time stamp *** Why? display_alpha doesn't do this for bitmaps
+          if $Startup;    # Set file change time stamp *** Why? display_alpha doesn't do this for bitmaps
 
         $Invalidate_Window = 0;
 
@@ -64,14 +60,11 @@
         print "Creating Frames\n";
 
         # Create top and bottom frames
-        $Tk_objects{ft} = $MW->Frame->pack(qw/-side top -fill both -expand 1/);
-        $Tk_objects{fb} = $MW->Frame->pack(qw/-side top -fill both -expand 1/);
-        $Tk_objects{fb2} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
-        $Tk_objects{fb3} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
-        $Tk_objects{fb4} =
-          $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{ft}  = $MW->Frame->pack(qw/-side top -fill both -expand 1/);
+        $Tk_objects{fb}  = $MW->Frame->pack(qw/-side top -fill both -expand 1/);
+        $Tk_objects{fb2} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{fb3} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
+        $Tk_objects{fb4} = $MW->Frame->pack(qw/-side bottom -fill both -expand 1/);
 
         &configure_element( 'frame', \$Tk_objects{ft} );
         &configure_element( 'frame', \$Tk_objects{fb} );
@@ -116,8 +109,7 @@
             -scrollbars => 'se',
             -setgrid    => 'true'
         )->pack(qw/-side top -expand 1 -fill both/);
-        $Tk_objects{speak_window}->insert( '0.0', ( join "\n", @Speak_Log ) )
-          ;    # Seed with previous entries
+        $Tk_objects{speak_window}->insert( '0.0', ( join "\n", @Speak_Log ) );    # Seed with previous entries
 
         &configure_element( 'log', \$Tk_objects{speak_window} );
 
@@ -129,8 +121,7 @@
             -scrollbars => 'osoe',
             -setgrid    => 'true'
         )->pack(qw/-side top -expand 1 -fill both/);
-        $Tk_objects{log_window}->insert( '0.0', ( join "\n", @Print_Log ) )
-          ;    # Seed with previous entries
+        $Tk_objects{log_window}->insert( '0.0', ( join "\n", @Print_Log ) );      # Seed with previous entries
 
         &configure_element( 'log', \$Tk_objects{log_window} );
 
diff --git a/code/common/tk_photos.pl b/code/common/tk_photos.pl
index 41132a1e1..dea81762c 100644
--- a/code/common/tk_photos.pl
+++ b/code/common/tk_photos.pl
@@ -22,8 +22,7 @@
 my_use "Tk::JPEG";             # Optional, in case it is not installed
 my_use "Tk::CursorControl";    # Ditto
 
-$v_photo_slideshow =
-  new Voice_Cmd('[Start,Stop,Next,Previous] the photo slideshow');
+$v_photo_slideshow = new Voice_Cmd('[Start,Stop,Next,Previous] the photo slideshow');
 
 $t_photo_slideshow = new Timer;
 $p_photo_slideshow = new Process_Item;
@@ -48,27 +47,24 @@
             $MW = MainWindow->new;
             $MW->geometry('0x0+0+0');
         }
-        eval '$mw_cursor = $MW->CursorControl';   # Initialise the CursorControl
+        eval '$mw_cursor = $MW->CursorControl';    # Initialise the CursorControl
         $mw_photo = $MW->Toplevel( -bg => "black" );
         $mw_photo->overrideredirect(1);
         geometry $mw_photo $MW->screenwidth . "x" . $MW->screenheight . "+0+0";
 
-        $mw_photo->bind( "<q>",
-            sub { run_voice_cmd 'Stop the photo slideshow' } );    # *** !
+        $mw_photo->bind( "<q>", sub { run_voice_cmd 'Stop the photo slideshow' } );    # *** !
         $mw_photo->bind( "<n>", sub { &photo_change('next') } );
         $mw_photo->bind( "<p>", sub { &photo_change('previous') } );
-        eval
-          '$mw_cursor-> hide($mw_photo)'; # Hide the mouse cursor on this window
+        eval '$mw_cursor-> hide($mw_photo)';                                           # Hide the mouse cursor on this window
 
-        $mw_photo_label = $mw_photo->Label( -border => 0 )
-          ->pack( -anchor => 'center', -expand => 1 );
+        $mw_photo_label = $mw_photo->Label( -border => 0 )->pack( -anchor => 'center', -expand => 1 );
         &photo_change('next');
 
     }
     elsif ( $state eq 'Stop' ) {
         $v_photo_slideshow->respond('app=photos Stopping the slideshow...');
         eval '$mw_cursor-> show($mw_photo)';    # Show the cursor
-            #   $MW             -> destroy  if $MW and ! $config_parms{tk};
+                                                #   $MW             -> destroy  if $MW and ! $config_parms{tk};
         $mw_photo->destroy      if $mw_photo;
         $mw_photo_image->delete if $mw_photo_image;
         undef $mw_cursor;
@@ -105,8 +101,7 @@ sub photo_change {
     # Do it with a process, as it can take seconds
     if ( $config_parms{photo_resize} ) {
         my $size = $MW->screenwidth . "x" . $MW->screenheight;
-        set $p_photo_slideshow
-          qq|image_resize --size "$size" --file_in "$jpeg" --file_out "$photo_temp_file"|;
+        set $p_photo_slideshow qq|image_resize --size "$size" --file_in "$jpeg" --file_out "$photo_temp_file"|;
         start $p_photo_slideshow;
     }
 
diff --git a/code/common/tk_widgets.pl b/code/common/tk_widgets.pl
index 66d81f600..e95839cda 100644
--- a/code/common/tk_widgets.pl
+++ b/code/common/tk_widgets.pl
@@ -66,8 +66,7 @@
 
     # $search_code_string is defined in /code/common/mh_control.pl
 
-    &tk_entry( 'MP3 Search', \$Save{mp3_search}, 'MP3 Genre',
-        \$Save{mp3_Genre} )
+    &tk_entry( 'MP3 Search', \$Save{mp3_search}, 'MP3 Genre', \$Save{mp3_Genre} )
       if $Run_Members{mp3_playlist};
 
     #   &tk_entry('Phone Search', \$Save{phone_search}) if $Run_Members{phone};
diff --git a/code/common/trivia.pl b/code/common/trivia.pl
index 7079c59fb..ab1884867 100644
--- a/code/common/trivia.pl
+++ b/code/common/trivia.pl
@@ -8,9 +8,8 @@
 my $f_trivia_question = "$config_parms{data_dir}/trivia_question.txt";
 my $f_trivia_answer   = "$config_parms{data_dir}/trivia_answer.txt";
 
-$v_trivia_next = new Voice_Cmd(
-    'What is the [Current,next Science,next Entertainment,next Mixed,next Sports,next Random] trivia question'
-);
+$v_trivia_next =
+  new Voice_Cmd( 'What is the [Current,next Science,next Entertainment,next Mixed,next Sports,next Random] trivia question' );
 $v_trivia_answer = new Voice_Cmd('What is the trivia answer');
 
 $v_trivia_next->set_authority('anyone');
@@ -21,10 +20,7 @@
 # Create trigger
 
 if ($Reload) {
-    &trigger_set(
-        "time_cron '0 6 * * * '", "&trivia_next()",
-        'NoExpire',               'refresh trivia'
-    ) unless &trigger_get('refresh trivia');
+    &trigger_set( "time_cron '0 6 * * * '", "&trivia_next()", 'NoExpire', 'refresh trivia' ) unless &trigger_get('refresh trivia');
 }
 
 sub uninstall_trivia {
@@ -65,8 +61,7 @@ sub trivia_next {
     my $offset = 0 + 153 * ( $qn - 1 );
 
     open( INDATA, "$Pgm_Root/data/trivia/$cat.dat" )
-      or die
-      "Error, could not open trivia file $Pgm_Path/../data/$cat.dat:$!\n";
+      or die "Error, could not open trivia file $Pgm_Path/../data/$cat.dat:$!\n";
     open( QUESTION, ">$f_trivia_question" );
     open( ANSWER,   ">$f_trivia_answer" );
 
diff --git a/code/common/tv_btvwin32.pl b/code/common/tv_btvwin32.pl
index 84d16a866..02026d2c2 100644
--- a/code/common/tv_btvwin32.pl
+++ b/code/common/tv_btvwin32.pl
@@ -106,17 +106,14 @@ sub snapstream_import {
 
     # TODO: need some kind of error checking here, in case the file is empty or we're using the ini file
     my @keys;
-    @keys = file_read( $config_parms{favorite_tv_shows_file} )
-      ;        # read data into @keys for processing later
+    @keys = file_read( $config_parms{favorite_tv_shows_file} );    # read data into @keys for processing later
 
     # format date/time search key to match snapstream format (yyyymmddhhmm). 4/25/04 @ 17:00 = 200404251700
-    my $snapstreamdate =
-      sprintf( "%04d%02d%02d%02d%02d", 1900 + $year, $mon, $mday, $hour, $min );
+    my $snapstreamdate = sprintf( "%04d%02d%02d%02d%02d", 1900 + $year, $mon, $mday, $hour, $min );
 
     # debug - when in doubt, hardcode and test :)
     # $snapstreamdate = "200404290000" ;
-    print
-      "\n\nsearching local snapstream db for shows starting at $snapstreamdate...\n"
+    print "\n\nsearching local snapstream db for shows starting at $snapstreamdate...\n"
       if $Debug{snapstream};
 
     my $msg    = "";    # we pass this back to the page
@@ -161,9 +158,8 @@ sub snapstream_import {
     for my $key (@keys) {
         $count++;
         next
-          if ( $key =~ /\#/ or $key !~ /\w/ )
-          ;   # drop comments and crap that hasn't been filtered out of the file
-         # escape the quotes (viva Win32::ODBC! :)) - stuff like Punk'd would break it otherwise :)
+          if ( $key =~ /\#/ or $key !~ /\w/ );    # drop comments and crap that hasn't been filtered out of the file
+              # escape the quotes (viva Win32::ODBC! :)) - stuff like Punk'd would break it otherwise :)
         $key =~ s/\'/\'\'/g;
 
         # this is important for SQL syntax: add commas IF we're not at the end (last key) - otherwise we break real bad :)
@@ -198,9 +194,8 @@ sub snapstream_import {
 
         # parse the data from $HashRow()
         my ( $progtitle, $episodetitle, $channel, $callsign, $scheduled ) = (
-            $HashRow{'progtitle'}, $HashRow{'episodetitle'},
-            $HashRow{'tmschan'},   $HashRow{'stationcallsign'},
-            $HashRow{'rec_scheduled'}
+            $HashRow{'progtitle'},       $HashRow{'episodetitle'}, $HashRow{'tmschan'},
+            $HashRow{'stationcallsign'}, $HashRow{'rec_scheduled'}
         );
         $count = 0 unless $count;
 
@@ -264,9 +259,7 @@ sub snapstream_import {
     my $i = 0;
     foreach my $line (@data) {
         if ( my ( $title, $channel, $start, $end ) =
-            $line =~
-            /^\d+\.\s+(.+)\.\s+\S+\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./
-          )
+            $line =~ /^\d+\.\s+(.+)\.\s+\S+\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./ )
         {
             if ( $state eq 'favorites now' ) {
                 $data[$i] = "$title Channel $channel.\n";
diff --git a/code/common/tv_grid.pl b/code/common/tv_grid.pl
index 229844956..95275caf0 100644
--- a/code/common/tv_grid.pl
+++ b/code/common/tv_grid.pl
@@ -14,8 +14,7 @@
 
     # http://house:8080/SET?$tv_grid?channel_2_from_7:00_to_8:00
 
-    my ( $channel, $start, $stop, $date, $show_name ) =
-      $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
+    my ( $channel, $start, $stop, $date, $show_name ) = $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
 
     unless ($start) {
         my $msg = "Bad tv_grid time: $data";
@@ -24,8 +23,7 @@
         return;
     }
 
-    my $msg =
-      "Programing vcr for $show_name.  Channel $channel from $start to $stop on $date.";
+    my $msg = "Programing vcr for $show_name.  Channel $channel from $start to $stop on $date.";
     speak $msg;
     print_log $msg;
 
@@ -34,29 +32,22 @@
     #   my $vcr_set = ($main::{VCR}) ? 'set' : '# set';
     eval '$VCR';
     my $vcr_set = ($@) ? '# set' : 'set';
-    &trigger_set(
-        "time_now '$date $start - 00:02'",
-        "speak qq~app=tv \$Time_Now. VCR recording will be started in 2 minutes for $show_name on channel $channel~"
-    );
+    &trigger_set( "time_now '$date $start - 00:02'",
+        "speak qq~app=tv \$Time_Now. VCR recording will be started in 2 minutes for $show_name on channel $channel~" );
     &trigger_set(
         "time_now '$date $start'",
         "speak 'VCR recording started';\n"
           . "print_log qq~VCR recording on channel $channel for $show_name~;\n"
           . "$vcr_set \$VCR 'STOP,$channel,RECORD';\n"
     );
-    &trigger_set(
-        "time_now '$date $stop'",
-        "speak 'VCR recording stopped';\n" . "$vcr_set \$VCR '$channel,STOP';"
-    );
+    &trigger_set( "time_now '$date $stop'", "speak 'VCR recording stopped';\n" . "$vcr_set \$VCR '$channel,STOP';" );
 
 }
 
 # This is what downloads tv data.  This needs to be forked/detatched, as it can take a while
 $v_get_tv_grid_xmltv_data1 = new Voice_Cmd('[Get,reget] TV XML data for today');
 $v_get_tv_grid_xmltv_data2 = new Voice_Cmd('[Get,reget] all TV XML data');
-$v_get_tv_grid_xmltv_data1->set_info(
-    'Updates the TV database from XMLTV data.  Get will only reget if the data is old.'
-);
+$v_get_tv_grid_xmltv_data1->set_info( 'Updates the TV database from XMLTV data.  Get will only reget if the data is old.' );
 if (   $state = said $v_get_tv_grid_xmltv_data1
     or $state = said $v_get_tv_grid_xmltv_data2)
 {
@@ -65,12 +56,10 @@
 
     # Call with -db sat to use sat_* parms instead of tv_* parms
     # Use mh_run so we can find mh libs and/or compiled mh.exe/mhe
-    my $label =
-      ( $config_parms{tv_label} ) ? "-label $config_parms{tv_label}" : "";
+    my $label = ( $config_parms{tv_label} ) ? "-label $config_parms{tv_label}" : "";
 
     # my $pgm = "mh_run get_tv_grid_xmltv $label -preserveRaw -db tv $state -days $days";
-    my $pgm =
-      "mh_run get_tv_grid_xmltv -db tv -infile $config_parms{tv_xml} -days $days";
+    my $pgm = "mh_run get_tv_grid_xmltv -db tv -infile $config_parms{tv_xml} -days $days";
 
     # Allow data to be stored wherever the alias points to
     my $tvdir = &html_alias('tv');
@@ -79,16 +68,14 @@
     # If we have set the net_mail_send_account, send default web page via email
     my $tv_mail      = $config_parms{tv_mail};
     my $mail_account = $config_parms{net_mail_send_account};
-    my $mail_server =
-      $main::config_parms{"net_mail_${mail_account}_server_send"};
-    my $mail_to = $main::config_parms{"net_mail_${mail_account}_address"};
+    my $mail_server  = $main::config_parms{"net_mail_${mail_account}_server_send"};
+    my $mail_to      = $main::config_parms{"net_mail_${mail_account}_address"};
     if ( $mail_to and $mail_server and $tv_mail ) {
         if (&net_connect_check) {    # We only need to net_connect_check here
                                      # because this will work off-line
                                      # with the XML file local
             $pgm .= " -mail_to $mail_to -mail_server $mail_server ";
-            $pgm .=
-              " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
+            $pgm .= " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
         }
         else {
             speak "Sorry, you must be logged onto the net to send TV Mail";
diff --git a/code/common/tv_info.pl b/code/common/tv_info.pl
index 7ca4d9d46..504da838d 100644
--- a/code/common/tv_info.pl
+++ b/code/common/tv_info.pl
@@ -9,32 +9,16 @@
     qq[get_tv_info -times all -keys "$config_parms{favorite_tv_shows}" -keyfile $config_parms{favorite_tv_shows_file} -title_only -early_am 0+6 -outfile2 $config_parms{data_dir}/web/tv_info3.txt]
 );
 
-$v_tv_results = new Voice_Cmd( 'What are the tv search results', 0 );
-$v_tv_movies1 = new Voice_Cmd(
-    "What TV movies are on channel [$config_parms{favorite_tv_channels}] tonight",
-    0
-);
-$v_tv_movies2 =
-  new Voice_Cmd( 'What TV movies are on at [6pm,7pm,8pm,9pm] tonight', 0 );
-$v_tv_movies1->set_info(
-    'Looks for TV shows that are 2-3 hours in length from 6 to 10 pm, on channels:',
-    0
-);
-$v_tv_movies2->set_info(
-    'Looks for TV shows that are 2-3 hours in length on all channels, at time:',
-    0
-);
+$v_tv_results = new Voice_Cmd( 'What are the tv search results',                                              0 );
+$v_tv_movies1 = new Voice_Cmd( "What TV movies are on channel [$config_parms{favorite_tv_channels}] tonight", 0 );
+$v_tv_movies2 = new Voice_Cmd( 'What TV movies are on at [6pm,7pm,8pm,9pm] tonight',                          0 );
+$v_tv_movies1->set_info( 'Looks for TV shows that are 2-3 hours in length from 6 to 10 pm, on channels:', 0 );
+$v_tv_movies2->set_info( 'Looks for TV shows that are 2-3 hours in length on all channels, at time:',     0 );
 
-$v_tv_shows1 = new Voice_Cmd(
-    "What TV shows are on channel [$config_parms{favorite_tv_channels}] tonight"
-);
+$v_tv_shows1 = new Voice_Cmd( "What TV shows are on channel [$config_parms{favorite_tv_channels}] tonight" );
 $v_tv_shows2 = new Voice_Cmd('What TV shows of interest are on today');
-$v_tv_shows1->set_info(
-    "Lists all shows on from 6 to 10 pm tonight on channels:$config_parms{favorite_tv_channels}"
-);
-$v_tv_shows2->set_info(
-    "Checks to see if any of the following shows in $config_parms{favorite_tv_shows} are on today"
-);
+$v_tv_shows1->set_info( "Lists all shows on from 6 to 10 pm tonight on channels:$config_parms{favorite_tv_channels}" );
+$v_tv_shows2->set_info( "Checks to see if any of the following shows in $config_parms{favorite_tv_shows} are on today" );
 
 if ( my $state = said $v_tv_movies1) {
     $v_tv_movies1->respond("app=tv Searching for TV movies...");
@@ -63,7 +47,7 @@
     set_watch $f_tv_file "$state favorites today";
 }    # *** trigger
 elsif ( time_cron('47 * * * *') or $Reload )
-{ #Refresh favorite shows today at one after each hour (so as to prune ended shows from the Web page)
+{    #Refresh favorite shows today at one after each hour (so as to prune ended shows from the Web page)
     print_log "Searching for TV shows of interest on today";
 
     #run qq[get_tv_info -times all -keys "$config_parms{favorite_tv_shows}" -keyfile $config_parms{favorite_tv_shows_file} -title_only -early_am 0+6 -outfile2 $config_parms{data_dir}/web/tv_info3.txt];
@@ -79,10 +63,7 @@
         if ($show_count) {
             my $msg = "There";
             $msg .= ( $show_count > 1 ) ? " are " : " is ";
-            $msg .=
-              (     $show_count
-                  . ( ( $show_count == 1 ) ? ' show' : ' shows' )
-                  . ' of interest' );
+            $msg .= ( $show_count . ( ( $show_count == 1 ) ? ' show' : ' shows' ) . ' of interest' );
             $Save{tv_favorites} = "$msg on today.";
             print_log $Save{tv_favorites};
         }
@@ -110,8 +91,7 @@
 
 if ( $Tk_results{'TV Search'} or $Tk_results{'TV Dates'} ) {
     print_log "Searching TV programs...";
-    run
-      qq[get_tv_info -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
+    run qq[get_tv_info -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
     set_watch $f_tv_file;
     undef $Tk_results{'TV search'};
     undef $Tk_results{'TV dates'};
@@ -127,10 +107,7 @@
 
     if ( defined $show_count ) {
 
-        $summary =
-            "Found $show_count TV show"
-          . ( ( $show_count == 1 ) ? ''  : 's' )
-          . ( ($show_count)        ? ':' : '.' );
+        $summary = "Found $show_count TV show" . ( ( $show_count == 1 ) ? '' : 's' ) . ( ($show_count) ? ':' : '.' );
         my @data = read_all $f_tv_file;
         shift @data;    # Drop summary;
 
@@ -139,9 +116,7 @@
         foreach my $line (@data) {
 
             if ( my ( $title, $channel, $channel_number, $start, $end ) =
-                $line =~
-                /^\d+\.\s+(.+)\.\s+(\S+)\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./
-              )
+                $line =~ /^\d+\.\s+(.+)\.\s+(\S+)\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./ )
             {
                 if ($channel) {
                     $channel = "$channel ($channel_number)";
@@ -165,10 +140,7 @@
 
         my $msg = "There";
         $msg .= ( $show_count > 1 ) ? " are " : " is ";
-        $msg .=
-          (     $show_count
-              . ( ( $show_count == 1 ) ? ' show' : ' shows' )
-              . ' of interest' );
+        $msg .= ( $show_count . ( ( $show_count == 1 ) ? ' show' : ' shows' ) . ' of interest' );
         if ( $state =~ 'favorites today' ) {
             if ( $show_count > 0 ) {
                 respond "app=tv $msg on today.\n$list";
@@ -178,9 +150,7 @@
             }
         }
         elsif ( $state eq 'favorites now' ) {
-            speak "app=tv force_chime=1 Notice, "
-              . lcfirst($msg)
-              . " starting now.\n$list"
+            speak "app=tv force_chime=1 Notice, " . lcfirst($msg) . " starting now.\n$list"
               if $show_count > 0;
         }
         else {
diff --git a/code/common/viavoice_control.pl b/code/common/viavoice_control.pl
index 7914cfdf7..237fbbd8a 100644
--- a/code/common/viavoice_control.pl
+++ b/code/common/viavoice_control.pl
@@ -10,26 +10,14 @@
 $v_viavoice_hello->set_info('A dummy little test command');
 
 # Create the viavoice control phrases
-$v_viavoice_awake = new Voice_Cmd(
-    $config_parms{viavoice_awake_phrase},
-    $config_parms{viavoice_awake_response},
-    0, 'mh_activate'
-);
-$v_viavoice_asleep = new Voice_Cmd(
-    $config_parms{viavoice_asleep_phrase},
-    $config_parms{viavoice_asleep_response}
-);
-$v_viavoice_off = new Voice_Cmd( $config_parms{viavoice_off_phrase},
-    'you want the microphone off', 1 );
+$v_viavoice_awake = new Voice_Cmd( $config_parms{viavoice_awake_phrase}, $config_parms{viavoice_awake_response}, 0, 'mh_activate' );
+$v_viavoice_asleep = new Voice_Cmd( $config_parms{viavoice_asleep_phrase}, $config_parms{viavoice_asleep_response} );
+$v_viavoice_off = new Voice_Cmd( $config_parms{viavoice_off_phrase}, 'you want the microphone off', 1 );
 
 # Monitor the Tk button
 my ( $tk_vr_mode, $tk_vr_mode_prev );
 $tk_vr_mode = $tk_vr_mode_prev = $Save{vr_mode} if $Reload;
-&tk_radiobutton(
-    'VR Mode', \$tk_vr_mode,
-    [ 'awake', 'asleep', 'off' ],
-    [ 'Awake', 'Asleep', 'Off' ]
-);
+&tk_radiobutton( 'VR Mode', \$tk_vr_mode, [ 'awake', 'asleep', 'off' ], [ 'Awake', 'Asleep', 'Off' ] );
 
 #print "db $vr_mode_prev\n";
 if ( $tk_vr_mode_prev ne $tk_vr_mode ) {
@@ -117,8 +105,7 @@
 $voice_word_list = 'no words listed' unless $voice_word_list;
 $v_command_search = new Voice_Cmd( 'find a command', 'what words?' );
 print "db viavoice word list: $voice_word_list\n";
-$v_command_words =
-  new Voice_Cmd( "[$voice_word_list,do it]", '', 0, 'mh_words' );
+$v_command_words = new Voice_Cmd( "[$voice_word_list,do it]", '', 0, 'mh_words' );
 set_icon $v_command_words 'none';
 
 # noloop=stop
@@ -149,8 +136,7 @@
             }
         }
         speak $text;
-        display
-          join( "\n - ", "$count matching commands for $viavoice_cmd", @list );
+        display join( "\n - ", "$count matching commands for $viavoice_cmd", @list );
         &Voice_Cmd::disablevocab('mh_words');
         &Voice_Cmd::enablevocab('mh');
         $Save{vr_mode} = 'awake';
diff --git a/code/common/vocp_callerid.pl b/code/common/vocp_callerid.pl
index f48ed413c..8570fb40b 100644
--- a/code/common/vocp_callerid.pl
+++ b/code/common/vocp_callerid.pl
@@ -48,53 +48,40 @@
     $cnumber =~ s/\D//g;
 
     # Format raw 10 digit number to (XXX) XXX-XXXX for Callerid compatibility
-    my $fcnumber =
-        substr( $cnumber, 0, 3 ) . "-"
-      . substr( $cnumber, 3, 3 ) . "-"
-      . substr( $cnumber, 6, 4 );
+    my $fcnumber = substr( $cnumber, 0, 3 ) . "-" . substr( $cnumber, 3, 3 ) . "-" . substr( $cnumber, 6, 4 );
 
     if ( $ctype eq 'incoming call' ) {
 
         # Search the callerid.dbm file
         if ( ( $cname eq '0' ) or ( $cname eq 'O' ) ) {
-            my %callerid_by_number =
-              dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
+            my %callerid_by_number = dbm_read("$config_parms{data_dir}/phone/callerid.dbm")
               unless %callerid_by_number;
             my $cid_data = $callerid_by_number{$fcnumber};
-            my ( $cid_calls, $cid_time, $cid_date, $cid_name ) =
-              $cid_data =~ /^(\d+) +(.+), (.+) name=(.+)/
+            my ( $cid_calls, $cid_time, $cid_date, $cid_name ) = $cid_data =~ /^(\d+) +(.+), (.+) name=(.+)/
               if $cid_data;
             $cname = $cid_name;
             $cname = "Unknown" if $cname eq '';
         }
 
         my $callerid_data = $ctime . "," . $cnumber . "," . $cname;
-        &Caller_ID::read_areacode_list(
-            'local_area_code' => $config_parms{local_area_code} );
-        my ( $caller, $cid_number, $cid_name, $cid_time ) =
-          &Caller_ID::make_speakable( $callerid_data, 6 );
-        logit(
-            "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-            "$fcnumber name=$cname   line=Line 1" );
+        &Caller_ID::read_areacode_list( 'local_area_code' => $config_parms{local_area_code} );
+        my ( $caller, $cid_number, $cid_name, $cid_time ) = &Caller_ID::make_speakable( $callerid_data, 6 );
+        logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$fcnumber name=$cname   line=Line 1" );
 
         # Parse the caller-id.list format to check for group membership
-        my ( $cid2_name, $cid2_wav, $cid2_group, $cid2_from ) =
-          ( split /\t/, $caller );
+        my ( $cid2_name, $cid2_wav, $cid2_group, $cid2_from ) = ( split /\t/, $caller );
 
         # Reject the REJECT* Group. Should add code to hang up on the caller
         if ( $cid2_group =~ m/reject/i ) {
-            print_log
-              "Call Rejected at $cid_time from number: $cid_number name: $cid_name";
+            print_log "Call Rejected at $cid_time from number: $cid_number name: $cid_name";
             speak( rooms => "all", text => "Phone call from Rejected Number." );
         }
         else {
             $caller = $cid2_name . $cid2_from;
             $Save{last_caller} = $caller;
             speak( rooms => "all", text => "Phone call from $caller." );
-            print_log
-              "Call Recieved at $cid_time from number: $cid_number name: $cid_name";
-            logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-                $fcnumber, "$Time_Now $Date_Now $Year name=$cname" );
+            print_log "Call Recieved at $cid_time from number: $cid_number name: $cid_name";
+            logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $fcnumber, "$Time_Now $Date_Now $Year name=$cname" );
             run_voice_cmd 'Set All Audrey top light on'
               if ( !$vocp_alert_flag
                 and $config_parms{vocp_audrey}
@@ -106,13 +93,7 @@
 
         my $duration = vocp_duration( $cnumber, $uid );
         print_log "VOCP: Voicemail message for box $cnumber (length=$duration)";
-        if (
-            !(
-                    ( $config_parms{vocp_ignore_length} )
-                and ( $duration < $config_parms{vocp_ignore_length} )
-            )
-          )
-        {
+        if ( !( ( $config_parms{vocp_ignore_length} ) and ( $duration < $config_parms{vocp_ignore_length} ) ) ) {
             speak( rooms => "all", text => "Voicemail message left" );
             if ( $config_parms{vocp_audrey} ) {
                 print_log "VOCP: Alerting Audreys";
@@ -125,13 +106,8 @@
 
 #----------------------------------------------------------------------
 # Listen for Audrey Top light resets, and update flag based on that event
-if (
-    (
-           ( $state = said $v_audrey_top_led_off )
-        or ( $state = said $v_audrey_both_leds_off )
-    )
-    and $config_parms{vocp_audrey}
-  )
+if ( ( ( $state = said $v_audrey_top_led_off ) or ( $state = said $v_audrey_both_leds_off ) )
+    and $config_parms{vocp_audrey} )
 {
     print_log "VOCP Message flag reset";
     $vocp_alert_flag = 0;
@@ -145,46 +121,32 @@
 
     for ( file_read "$config_parms{data_dir}/organizer/contacts.tab" ) {
         my (
-            $ID,           $FirstName,      $LastName,     $Title,
-            $Company,      $WorkAddress1,   $WorkAddress2, $WorkCity,
-            $WorkState,    $WorkZip,        $HomeAddress1, $HomeAddress2,
-            $HomeCity,     $HomeState,      $HomeZip,      $WorkPhone,
-            $HomePhone,    $MobilePhone,    $Fax,          $Pager,
-            $PrimaryEmail, $SecondaryEmail, $WebSiteURL,   $Notes
+            $ID,           $FirstName, $LastName,     $Title,          $Company,      $WorkAddress1,
+            $WorkAddress2, $WorkCity,  $WorkState,    $WorkZip,        $HomeAddress1, $HomeAddress2,
+            $HomeCity,     $HomeState, $HomeZip,      $WorkPhone,      $HomePhone,    $MobilePhone,
+            $Fax,          $Pager,     $PrimaryEmail, $SecondaryEmail, $WebSiteURL,   $Notes
         ) = split( /\t/, $_ );
         $WorkPhone =~ s/\D//g;
         $HomePhone =~ s/\D//g;
         $MobilePhone =~ s/\D//g;
         if ( $WorkPhone and ( length($WorkPhone) == 10 ) ) {
             $records++;
-            my $tmp =
-                substr( $WorkPhone, 0, 3 ) . "-"
-              . substr( $WorkPhone, 3, 3 ) . "-"
-              . substr( $WorkPhone, 6, 4 );
+            my $tmp = substr( $WorkPhone, 0, 3 ) . "-" . substr( $WorkPhone, 3, 3 ) . "-" . substr( $WorkPhone, 6, 4 );
             logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-                $tmp,
-                "$Time_Now $Date_Now $Year name=$LastName $FirstName (Work)" );
+                $tmp, "$Time_Now $Date_Now $Year name=$LastName $FirstName (Work)" );
             print_log "Contacts.tab: $tmp = $FirstName $LastName (Work)";
         }
         if ( $HomePhone and ( length($HomePhone) == 10 ) ) {
             $records++;
-            my $tmp =
-                substr( $HomePhone, 0, 3 ) . "-"
-              . substr( $HomePhone, 3, 3 ) . "-"
-              . substr( $HomePhone, 6, 4 );
-            logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-                $tmp, "$Time_Now $Date_Now $Year name=$LastName $FirstName" );
+            my $tmp = substr( $HomePhone, 0, 3 ) . "-" . substr( $HomePhone, 3, 3 ) . "-" . substr( $HomePhone, 6, 4 );
+            logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $tmp, "$Time_Now $Date_Now $Year name=$LastName $FirstName" );
             print_log "Contacts.tab: $tmp = $FirstName $LastName";
         }
         if ( $MobilePhone and ( length($MobilePhone) == 10 ) ) {
             $records++;
-            my $tmp =
-                substr( $MobilePhone, 0, 3 ) . "-"
-              . substr( $MobilePhone, 3, 3 ) . "-"
-              . substr( $MobilePhone, 6, 4 );
+            my $tmp = substr( $MobilePhone, 0, 3 ) . "-" . substr( $MobilePhone, 3, 3 ) . "-" . substr( $MobilePhone, 6, 4 );
             logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-                $tmp,
-                "$Time_Now $Date_Now $Year name=$LastName $FirstName (Cell)" );
+                $tmp, "$Time_Now $Date_Now $Year name=$LastName $FirstName (Cell)" );
             print_log "Contacts.tab: $tmp = $FirstName $LastName (Cell)";
         }
     }
diff --git a/code/common/voice_server.pl b/code/common/voice_server.pl
index bda77605b..4b77eacd6 100644
--- a/code/common/voice_server.pl
+++ b/code/common/voice_server.pl
@@ -114,9 +114,7 @@ sub play_to_others_1 {
 my $authorized_2 = 0;
 my ( $password_2, $user_2, $data_2 );
 
-$voice_server_2 =
-  new Socket_Item( "Connected to MisterHouse Voice Server 2\r\n",
-    'Welcome', 'server_voice_2' );
+$voice_server_2 = new Socket_Item( "Connected to MisterHouse Voice Server 2\r\n", 'Welcome', 'server_voice_2' );
 $timer_disconnect_2 = new Timer;
 
 if ( ($Reload) && ( active $voice_server_2) ) {
@@ -182,9 +180,7 @@ sub play_to_others_2 {
 my $authorized_3 = 0;
 my ( $password_3, $user_3, $data_3 );
 
-$voice_server_3 =
-  new Socket_Item( "Connected to MisterHouse Voice Server 3\r\n",
-    'Welcome', 'server_voice_3' );
+$voice_server_3 = new Socket_Item( "Connected to MisterHouse Voice Server 3\r\n", 'Welcome', 'server_voice_3' );
 $timer_disconnect_3 = new Timer;
 
 if ( ($Reload) && ( active $voice_server_3) ) {
diff --git a/code/common/weather_chance_of_rain.pl b/code/common/weather_chance_of_rain.pl
index efac78f64..e26855a07 100644
--- a/code/common/weather_chance_of_rain.pl
+++ b/code/common/weather_chance_of_rain.pl
@@ -15,23 +15,18 @@
 # 12/07/2001 Created by David Norwood (dnorwood2@yahoo.com)
 # 12/28/2005 added back the "announce forecast" feature and made it a trigger
 
-$f_weather_forecast_chance_of_rain =
-  new File_Item "$config_parms{data_dir}/web/weather_forecast.txt";
+$f_weather_forecast_chance_of_rain = new File_Item "$config_parms{data_dir}/web/weather_forecast.txt";
 set_watch $f_weather_forecast_chance_of_rain if $Reload;
 
 $v_get_chance_of_rain = new Voice_Cmd 'Get the chance of rain or snow', 0;
-$v_get_chance_of_rain->set_info(
-    'Gets chance of rain or snow from the Internet');
+$v_get_chance_of_rain->set_info('Gets chance of rain or snow from the Internet');
 
-$v_chance_of_rain = new Voice_Cmd 'Read the forecasted chance of rain or snow',
-  0;
-$v_chance_of_rain->set_info(
-    'Reports on chance of rain or snow from the Internet');
+$v_chance_of_rain = new Voice_Cmd 'Read the forecasted chance of rain or snow', 0;
+$v_chance_of_rain->set_info('Reports on chance of rain or snow from the Internet');
 $v_chance_of_rain->set_authority('anyone');
 
 $v_chance_of_rain2 = new Voice_Cmd 'When will it [rain,snow]', 0;
-$v_chance_of_rain2->set_info(
-    'Reports on chance of rain or snow from the Internet');
+$v_chance_of_rain2->set_info('Reports on chance of rain or snow from the Internet');
 $v_chance_of_rain2->set_authority('anyone');
 
 if ( said $v_chance_of_rain or $state = said $v_chance_of_rain2) {
@@ -69,10 +64,7 @@
     set_watch $f_weather_forecast_chance_of_rain;
 
     my (%forecasts);
-    my @days = (
-        "Sunday",   "Monday", "Tuesday", "Wednesday",
-        "Thursday", "Friday", "Saturday"
-    );
+    my @days = ( "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" );
 
     if ( ( stat( $f_weather_forecast_chance_of_rain->name ) )[7] < 100 ) {
         $Weather{chance_of_rain} = undef;
@@ -116,20 +108,15 @@
     foreach my $day ( split /\|/, $Weather{"Forecast Days"} ) {
         my $chance = 0;
         $chance = 20
-          if $forecasts{$day} =~
-          /(slight|a) chance (of|for) *\S* *(rain|showers|snow|thunderstorms)/i;
+          if $forecasts{$day} =~ /(slight|a) chance (of|for) *\S* *(rain|showers|snow|thunderstorms)/i;
         $chance = 60
-          if $forecasts{$day} =~
-          /(rain|showers|snow|thunderstorms) (becoming )?likely/i;
+          if $forecasts{$day} =~ /(rain|showers|snow|thunderstorms) (becoming )?likely/i;
         $chance = $1
-          if $forecasts{$day} =~
-          /(\d+) percent chance (of|for) *\S* *(rain|showers|snow|thunderstorms)/i;
+          if $forecasts{$day} =~ /(\d+) percent chance (of|for) *\S* *(rain|showers|snow|thunderstorms)/i;
         $chance = $4
-          if $forecasts{$day} =~
-          /chance (of|for) *\S* *(rain|showers|snow|thunderstorms)( near)? (\d+) percent/i;
+          if $forecasts{$day} =~ /chance (of|for) *\S* *(rain|showers|snow|thunderstorms)( near)? (\d+) percent/i;
         $chance = $3
-          if $forecasts{$day} =~
-          /chance (of|for) *\S* *(rain|showers|snow|thunderstorms) increasing to (\d+) percent/i;
+          if $forecasts{$day} =~ /chance (of|for) *\S* *(rain|showers|snow|thunderstorms) increasing to (\d+) percent/i;
 
         #print "$day : $chance\n";
         $chance = 80 if $chance > 100;
@@ -155,10 +142,9 @@
         $Weather{chance_of_rain} = 'There is no rain or snow in the forecast.';
     }
     else {
-        $Weather{"ChanceOfRainPercent"} = undef;
-        $Weather{"ChanceOfSnowPercent"} = undef;
-        $Weather{ "ChanceOf" . ucfirst($current_precip) . "Percent" } =
-          $current_chance
+        $Weather{"ChanceOfRainPercent"}                               = undef;
+        $Weather{"ChanceOfSnowPercent"}                               = undef;
+        $Weather{ "ChanceOf" . ucfirst($current_precip) . "Percent" } = $current_chance
           if defined $current_chance;
 
         my $tomorrow = $days[ ( $Wday + 1 ) % 7 ];
@@ -168,8 +154,7 @@
         $text =~ s/a 8/an 8/g;
         $text =~ s/,([^,]+)$/ and$1/;
         $Weather{chance_of_rain} = $text;
-        $v_get_chance_of_rain->respond(
-            "app=rain Precipitation forecast prepared.")
+        $v_get_chance_of_rain->respond("app=rain Precipitation forecast prepared.")
           if said $v_get_chance_of_rain;
     }
 }
diff --git a/code/common/weather_iB_OWW_client.pl b/code/common/weather_iB_OWW_client.pl
index b8aee2961..c567ecd65 100644
--- a/code/common/weather_iB_OWW_client.pl
+++ b/code/common/weather_iB_OWW_client.pl
@@ -122,10 +122,7 @@
     "North West",
     "North North West"
 );
-my @directionshort = (
-    "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE",
-    "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"
-);
+my @directionshort = ( "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW" );
 
 set $ibws_v 'Start' if $Startup;
 
@@ -144,19 +141,17 @@
     # ----------------------------------------------------------------------------
     #                               ------ COLLECT and Sort the Data -------
     for ( my $i = 0; $i < 14; $i++ ) {    # ???????? -1 ???????????
-        print_log
-          "Processing data at $i which is $weather_vars[$i] value of $data[$i]"
+        print_log "Processing data at $i which is $weather_vars[$i] value of $data[$i]"
           if $Debug{oww};
         my $key = $weather_vars[$i];      # Get the Name of the data key
 
-        if ( $i < 3 ) {    # 0-TempOutdoor 1-TempOutdoorHigh 2-TempOutdoorLow
+        if ( $i < 3 ) {                   # 0-TempOutdoor 1-TempOutdoorHigh 2-TempOutdoorLow
             $Weather{$key} = $data[$i];
             $Weather{$key} = &main::convert_c2f( $data[$i] )
               if ( $main::config_parms{weather_uom_temp} eq 'F' );
         }
 
-        if ( ( $i >= 3 ) && ( $i <= 5 ) )
-        {                  # 3-WindSpeed 4-WindGustSpeed 5-WindSpeedHigh
+        if ( ( $i >= 3 ) && ( $i <= 5 ) ) {    # 3-WindSpeed 4-WindGustSpeed 5-WindSpeedHigh
             $Weather{$key} = $data[$i];                            # mps
             $Weather{$key} = &main::convert_mps2kph( $data[$i] )
               if ( $main::config_parms{weather_uom_wind} eq 'kph' );
@@ -164,33 +159,31 @@
               if ( $main::config_parms{weather_uom_wind} eq 'mph' );
         }
 
-        if ( ( $i == 6 ) || ( $i == 7 ) ) {    # 6-WindDir 7-WindAvgDir
+        if ( ( $i == 6 ) || ( $i == 7 ) ) {                        # 6-WindDir 7-WindAvgDir
             $Weather{$key} = $data[$i];
         }
 
-        if ( $i == 8 ) {                       # 8-RainRate
+        if ( $i == 8 ) {                                           # 8-RainRate
             $Weather{$key} = $data[$i];
             $Weather{$key} = &main::convert_in2mm( $data[$i] )
               if ( $main::config_parms{weather_uom_rainrate} eq 'mm/hr' );
         }
-        if ( ( $i >= 9 ) && ( $i <= 11 ) )
-        {    # 9-RainTotal 10-RainWeek 11-RainMonth
+        if ( ( $i >= 9 ) && ( $i <= 11 ) ) {                       # 9-RainTotal 10-RainWeek 11-RainMonth
             $Weather{$key} = $data[$i];
             $Weather{$key} = &main::convert_in2mm( $data[$i] )
               if ( $main::config_parms{weather_uom_rain} eq 'mm' );
         }
-        if ( $i == 12 ) {    # 12-Humidity
+        if ( $i == 12 ) {                                          # 12-Humidity
             $Weather{$key} = sprintf( "%.2f", $data[$i] );
         }
-        if ( $i == 13 ) {    # 13-Barometric Pressure
+        if ( $i == 13 ) {                                          # 13-Barometric Pressure
             $Weather{$key} = $data[$i];
             $Weather{$key} = &main::convert_mb2in( $data[$i] )
               if ( $main::config_parms{weather_uom_baro} eq 'in' );
         }
     }
-    $Weather{WindAvgDir} = ( $Weather{WindDir} * 22.5 ); #convert to rrd degrees
-    $Weather{WindGustDir} =
-      $Weather{WindAvgDir};    # Because rrd wants this and we dont have it
+    $Weather{WindAvgDir}  = ( $Weather{WindDir} * 22.5 );          #convert to rrd degrees
+    $Weather{WindGustDir} = $Weather{WindAvgDir};                  # Because rrd wants this and we dont have it
     foreach my $key (@weather_vars) {
         print_log "Weather:: key: $key data: $Weather{$key}" if $Debug{oww};
     }
diff --git a/code/common/weather_iB_OWW_txt_client.pl b/code/common/weather_iB_OWW_txt_client.pl
index d2bbbe27e..d5b4d592b 100644
--- a/code/common/weather_iB_OWW_txt_client.pl
+++ b/code/common/weather_iB_OWW_txt_client.pl
@@ -100,16 +100,13 @@
   unless defined $config_parms{owwserver_host_deadman_minutes};
 $config_parms{owwserver_host_txt_port} = "localhost:8891"
   unless defined $config_parms{owwserver_host_txt_port};
-$ibwstxt =
-  new Socket_Item( undef, undef, $config_parms{owwserver_host_txt_port},
-    'ibwstxt', 'tcp', 'raw' );
+$ibwstxt = new Socket_Item( undef, undef, $config_parms{owwserver_host_txt_port}, 'ibwstxt', 'tcp', 'raw' );
 
 # noloop=stop
 
 # Initialisation
 if ($Reload) {
-    $config_parms{temperature_sensor_keys} =
-      "outdoor => TempOutdoor, indoor => TempIndoor"
+    $config_parms{temperature_sensor_keys} = "outdoor => TempOutdoor, indoor => TempIndoor"
       unless defined $config_parms{temperature_sensor_keys};
 }
 
@@ -120,23 +117,19 @@
 my %temp_sensor_keys;
 
 # read keys preserve case
-&main::read_parm_hash( \%temp_sensor_keys,
-    $main::config_parms{temperature_sensor_keys}, 1 );
+&main::read_parm_hash( \%temp_sensor_keys, $main::config_parms{temperature_sensor_keys}, 1 );
 
 my %humidity_sensor_keys;
 
 # read keys preserve case
-&main::read_parm_hash( \%humidity_sensor_keys,
-    $main::config_parms{humidity_sensor_keys}, 1 );
+&main::read_parm_hash( \%humidity_sensor_keys, $main::config_parms{humidity_sensor_keys}, 1 );
 
 my %dewpoint_sensor_keys;
 
 # read keys preserve case
-&main::read_parm_hash( \%dewpoint_sensor_keys,
-    $main::config_parms{dewpoint_sensor_keys}, 1 );
+&main::read_parm_hash( \%dewpoint_sensor_keys, $main::config_parms{dewpoint_sensor_keys}, 1 );
 
-$ibwstxt_v =
-  new Voice_Cmd "[Start,Stop,Speak] the ibutton weather station text client";
+$ibwstxt_v = new Voice_Cmd "[Start,Stop,Speak] the ibutton weather station text client";
 $ibwstxt_v->set_info('Connects to the ibutton weather station server');
 
 my $freezing = new Weather_Item 'TempOutdoor', '<', 32;
@@ -199,8 +192,7 @@
                 }
                 $Weather{$name} = $data[ $i + 1 ];
                 $temp_unit = $data[ $i + 2 ];
-                print_log
-                  "Temperature at $key ( $name ) is $Weather{$name} $temp_unit"
+                print_log "Temperature at $key ( $name ) is $Weather{$name} $temp_unit"
                   if $debug;
                 $i += 2;
                 last PARSE;
@@ -274,8 +266,7 @@
                 # Direction <Desc> <degrees>> <vane_number>
                 s/\[//;
                 s/]//;
-                print_log
-                  "Wind is $data[$i+1] degrees $data[$i+2] vane $data[$i+3]"
+                print_log "Wind is $data[$i+1] degrees $data[$i+2] vane $data[$i+3]"
                   if $debug;
 
                 # could convert to longer names...
@@ -322,8 +313,7 @@
 
     # this is the standard short summary for the web interfaces
     $Weather{Summary_Short} = "$Weather{TempOutdoor} $temp_unit ";
-    $Weather{Wind} =
-      " $Weather{WindAvgSpeed}/$Weather{WindSpeedHigh} $direction";
+    $Weather{Wind}          = " $Weather{WindAvgSpeed}/$Weather{WindSpeedHigh} $direction";
 
 }
 
@@ -340,10 +330,7 @@
 
 # ----------------------------------------------------------------------------
 
-&tk_entry(
-    "temp",    \$Weather{TempOutdoor}, "Wind ", \$Weather{Wind},
-    "Wchill ", \$Weather{WindChill}
-);
+&tk_entry( "temp", \$Weather{TempOutdoor}, "Wind ", \$Weather{Wind}, "Wchill ", \$Weather{WindChill} );
 
 if ( $state = said $ibwstxt_v) {
     print_log "${state}ing the ibutton weather station client";
diff --git a/code/common/weather_metar.pl b/code/common/weather_metar.pl
index 6b34018c5..e92b7f312 100644
--- a/code/common/weather_metar.pl
+++ b/code/common/weather_metar.pl
@@ -35,14 +35,12 @@
       . $station;
 }
 else {
-    $url = "http://weather.noaa.gov/cgi-bin/mgetmetar.pl?Submit=SUBMIT&cccc="
-      . $station;
+    $url = "http://weather.noaa.gov/cgi-bin/mgetmetar.pl?Submit=SUBMIT&cccc=" . $station;
 }
 
 my $weather_metar_file = $config_parms{data_dir} . '/web/weather_metar.html';
 
-$p_weather_metar_page =
-  new Process_Item(qq{get_url -quiet "$url" "$weather_metar_file"});
+$p_weather_metar_page = new Process_Item(qq{get_url -quiet "$url" "$weather_metar_file"});
 
 $v_get_metar_weather = new Voice_Cmd('get metar weather');
 
@@ -52,15 +50,13 @@
     &trigger_set(
         '$New_Minute and $Minute == 5',
         '$p_weather_metar_page->start',
-        'NoExpire',
-        'Update weather information via METAR'
+        'NoExpire', 'Update weather information via METAR'
     ) unless &trigger_get('Update weather information via METAR');
 }
 
 if ( said $v_get_metar_weather) {
     start $p_weather_metar_page;
-    $v_get_metar_weather->respond(
-        'Updating weather information from latest METAR');
+    $v_get_metar_weather->respond('Updating weather information from latest METAR');
 }
 
 if ( done_now $p_weather_metar_page or $Reload ) {
@@ -81,10 +77,7 @@ sub process_metar {
 
     # apparenttemp is either windchill or humidex
 
-    while ( $html =~
-        m#((METAR) |(SPECI) )?$station \d{6}Z (AUTO )?(COR )?(CCA )?(\d{3}|VRB)\d{2}(G\d{2})?KT .+?\n#g
-      )
-    {
+    while ( $html =~ m#((METAR) |(SPECI) )?$station \d{6}Z (AUTO )?(COR )?(CCA )?(\d{3}|VRB)\d{2}(G\d{2})?KT .+?\n#g ) {
         $last_report = $&;
         chop $last_report;
         $weather = '';
@@ -100,19 +93,19 @@ sub process_metar {
         if ( $last_report =~ m#\s(M?\d{2})/(M?\d{2})\s# ) {
             ( $metar{TempOutdoor}, $metar{DewOutdoor} ) = ( $1, $2 );
         }
-        ;    # temperatures are in Celsius
+        ;                                                      # temperatures are in Celsius
         if ( $last_report =~ m#\sA(\d{4})\s# ) {
             $metar{BaromSea} = convert_in2mb( $1 / 100 );
         }
-        ;    # pressure in inches of mercury, converted to mb
+        ;                                                      # pressure in inches of mercury, converted to mb
         if ( $last_report =~ m#\sQ(\d{4})\s# ) { $metar{BaromSea} = $1; }
-        ;    # pressure in hPa (mb)
+        ;                                                      # pressure in hPa (mb)
         my $element;
         foreach $element ( split( / /, $last_report ) ) {
             if ( $element eq $station ) { next; }
-            ;    # don't decode station
+            ;                                                  # don't decode station
             if ( $element =~ m#^RMK# ) { last; }
-            ;    # end of current conditions
+            ;                                                  # end of current conditions
             if ( $element eq 'CAVOK' ) {
                 $weather .= 'ceiling and visibility OK';
             }
@@ -121,16 +114,16 @@ sub process_metar {
             }
             if ( $element eq 'METAR' or $element eq 'SPECI' ) { next; }
             if ( $element eq 'CCA' ) { next; }
-            ;    # correction
+            ;                                                  # correction
             if ( $element eq 'AUTO' ) { next; }
-            ;    # automated station
+            ;                                                  # automated station
             if ( $element =~ m#^FEW# ) { $clouds = 'few clouds'; }
             if ( $element =~ m#^SCT# ) { $clouds = 'scattered clouds'; }
             if ( $element =~ m#^BKN# ) { $clouds = 'broken clouds'; }
             if ( $element =~ m#^OVC# ) { $clouds = 'overcast'; }
 
             if ( $element =~ m#\d# ) { next; }
-            ;    # precipitation has no digits
+            ;                                                  # precipitation has no digits
             $element =~ /^\+/ && do { $weather .= 'heavy ' };
             $element =~ /^\-/ && do { $weather .= 'light ' };
             ($element) = $element =~ m#^[\+\-]?(.+)#;
@@ -141,7 +134,7 @@ sub process_metar {
                 if ( $1 eq 'DR' ) { $weather .= 'low drifting ' }
                 if ( $1 eq 'BL' ) { $weather .= 'blowing ' }
                 if ( $1 eq 'SH' ) { $weather .= 'showers ' }
-                ;    # could be snow or rain
+                ;                                              # could be snow or rain
                 if ( $1 eq 'TS' ) { $weather .= 'thunderstorm ' }
                 if ( $1 eq 'FZ' ) { $weather .= 'freezing ' }
                 if ( $1 eq 'DZ' ) { $weather .= 'drizzle ' }
@@ -190,9 +183,7 @@ sub process_metar {
     }
 
     if ( $last_report eq 'none' ) {    # didn't find a report
-        &print_log(
-            "weather_metar: couldn't find a valid METAR report.  Retrieved data can be found in ${weather_metar_file}."
-        );
+        &print_log( "weather_metar: couldn't find a valid METAR report.  Retrieved data can be found in ${weather_metar_file}." );
         return;
     }
 
@@ -228,20 +219,16 @@ sub process_metar {
     $metar{DewOutdoor} =~ s/^(-?)0/$1/;
 
     if ( $config_parms{weather_uom_temp} eq 'F' ) {
-        grep { $metar{$_} = convert_c2f( $metar{$_} ) }
-          qw(TempOutdoor DewOutdoor);
+        grep { $metar{$_} = convert_c2f( $metar{$_} ) } qw(TempOutdoor DewOutdoor);
     }
     if ( $config_parms{weather_uom_wind} eq 'mph' ) {
-        grep { $metar{$_} = convert_nm2mile( $metar{$_} ) }
-          qw(WindAvgSpeed WindGustSpeed);
+        grep { $metar{$_} = convert_nm2mile( $metar{$_} ) } qw(WindAvgSpeed WindGustSpeed);
     }
     if ( $config_parms{weather_uom_wind} eq 'm/s' ) {
-        grep { $metar{$_} = convert_knots2mps( $metar{$_} ) }
-          qw(WindAvgSpeed WindGustSpeed);
+        grep { $metar{$_} = convert_knots2mps( $metar{$_} ) } qw(WindAvgSpeed WindGustSpeed);
     }
     if ( $config_parms{weather_uom_wind} eq 'kph' ) {
-        grep { $metar{$_} = convert_nm2km( $metar{$_} ) }
-          qw(WindAvgSpeed WindGustSpeed);
+        grep { $metar{$_} = convert_nm2km( $metar{$_} ) } qw(WindAvgSpeed WindGustSpeed);
     }
 
     $metar{Barom} =
@@ -267,8 +254,7 @@ sub process_metar {
         }
     }
 
-    &Weather_Common::populate_internet_weather( \%metar,
-        $config_parms{weather_internet_elements_metar} );
+    &Weather_Common::populate_internet_weather( \%metar, $config_parms{weather_internet_elements_metar} );
     &Weather_Common::weather_updated;
 }
 
diff --git a/code/common/weather_monitor.pl b/code/common/weather_monitor.pl
index 42234ef2a..0b5bef32f 100644
--- a/code/common/weather_monitor.pl
+++ b/code/common/weather_monitor.pl
@@ -60,10 +60,8 @@
 
 if ( $config_parms{weather_uom_temp} eq 'C' ) {
     grep { $_ = convert_f2c($_) } (
-        $default_outdoor_comfort_min, $default_outdoor_comfort_max,
-        $default_heat_warning_point,  $default_cold_warning_point,
-        $default_temp_indoor_maximum, $default_temp_indoor_minimum,
-        $Weather{FreezePoint},        $Weather{FrostbitePoint}
+        $default_outdoor_comfort_min, $default_outdoor_comfort_max, $default_heat_warning_point, $default_cold_warning_point,
+        $default_temp_indoor_maximum, $default_temp_indoor_minimum, $Weather{FreezePoint},       $Weather{FrostbitePoint}
     );
 }
 
@@ -75,12 +73,10 @@
     grep { $_ = convert_mph2mps($_) } ($default_wind_gust_threshold);
 }
 
-$Weather{HeatWarningPoint} =
-  $config_parms{heat_warning_point};    # danger point for outdoor temp
+$Weather{HeatWarningPoint} = $config_parms{heat_warning_point};    # danger point for outdoor temp
 $Weather{HeatWarningPoint} = $default_heat_warning_point
   unless defined $Weather{HeatWarningPoint};
-$Weather{ColdWarningPoint} =
-  $config_parms{cold_warning_point};    # danger point for outdoor temp
+$Weather{ColdWarningPoint} = $config_parms{cold_warning_point};    # danger point for outdoor temp
 $Weather{ColdWarningPoint} = $default_cold_warning_point
   unless defined $Weather{ColdWarningPoint};
 
@@ -104,7 +100,7 @@
 my $weather_wind_gust_threshold = $config_parms{weather_wind_gust_threshold};
 $weather_wind_gust_threshold = $default_wind_gust_threshold
   unless $weather_wind_gust_threshold;
-my $weather_pollen_threshold = $config_parms{weather_pollen_threshold}; # noloop
+my $weather_pollen_threshold = $config_parms{weather_pollen_threshold};    # noloop
 $weather_pollen_threshold = $default_weather_pollen_threshold
   unless $weather_pollen_threshold;
 my $weather_temp_indoor_maximum = $config_parms{weather_temp_indoor_max};
@@ -120,27 +116,26 @@
 $weather_humid_indoor_minimum = $default_humid_indoor_minimum
   unless $weather_humid_indoor_minimum;
 
-$TempOutdoor  = new Weather_Item 'TempOutdoor';
-$TempOutdoorA = new Weather_Item 'TempOutdoorApparent';
-$TempIndoor   = new Weather_Item 'TempIndoor';
-$DewIndoor    = new Weather_Item 'DewIndoor';
-$DewOutoor    = new Weather_Item 'DewOutdoor';
-$HumidOutdoor = new Weather_Item 'HumidOutdoor';
-$HumidIndoor  = new Weather_Item 'HumidIndoor';
-$WindChill    = new Weather_Item 'WindChill';
-$WindGust     = new Weather_Item 'WindGustSpeed';
-$Windy        = new Weather_Item "WindGustSpeed > $weather_wind_gust_threshold";
-$WindGustDir  = new Weather_Item 'WindGustDir';
-$WindAvg      = new Weather_Item 'WindAvgSpeed';
-$WindAvgDir   = new Weather_Item 'WindAvgDir';
-$RainTotal    = new Weather_Item 'RainTotal';
-$RainRate     = new Weather_Item 'RainRate';
-$Barom        = new Weather_Item 'Barom';
-$Pollen       = new Weather_Item 'PollenCount';
-$Irritating   = new Weather_Item "Pollen > $weather_pollen_threshold";
-$Conditions   = new Weather_Item 'Conditions';
-$Warning =
-  new Weather_Item 'Warning'; # Set in chance of rain and by other weather items
+$TempOutdoor    = new Weather_Item 'TempOutdoor';
+$TempOutdoorA   = new Weather_Item 'TempOutdoorApparent';
+$TempIndoor     = new Weather_Item 'TempIndoor';
+$DewIndoor      = new Weather_Item 'DewIndoor';
+$DewOutoor      = new Weather_Item 'DewOutdoor';
+$HumidOutdoor   = new Weather_Item 'HumidOutdoor';
+$HumidIndoor    = new Weather_Item 'HumidIndoor';
+$WindChill      = new Weather_Item 'WindChill';
+$WindGust       = new Weather_Item 'WindGustSpeed';
+$Windy          = new Weather_Item "WindGustSpeed > $weather_wind_gust_threshold";
+$WindGustDir    = new Weather_Item 'WindGustDir';
+$WindAvg        = new Weather_Item 'WindAvgSpeed';
+$WindAvgDir     = new Weather_Item 'WindAvgDir';
+$RainTotal      = new Weather_Item 'RainTotal';
+$RainRate       = new Weather_Item 'RainRate';
+$Barom          = new Weather_Item 'Barom';
+$Pollen         = new Weather_Item 'PollenCount';
+$Irritating     = new Weather_Item "Pollen > $weather_pollen_threshold";
+$Conditions     = new Weather_Item 'Conditions';
+$Warning        = new Weather_Item 'Warning';                                     # Set in chance of rain and by other weather items
 $SunSensor      = new Weather_Item 'sun_sensor';
 $PressureChange = new Weather_Item 'BaromDelta';
 $ChanceOfRain   = new Weather_Item 'ChanceOfRainPercent';
@@ -148,15 +143,14 @@
 $Raining        = new Weather_Item 'IsRaining';
 $Snowing        = new Weather_Item 'IsSnowing';
 $FreezingRain   = new Weather_Item 'IsRaining and TempOutdoor < FreezePoint';
-$IceStorm       = new Weather_Item
-  'IsRaining and TempOutdoor < FreezePoint and WindGustSpeed > 15';
+$IceStorm       = new Weather_Item 'IsRaining and TempOutdoor < FreezePoint and WindGustSpeed > 15';
 $Freezing       = new Weather_Item 'TempOutdoor <= FreezePoint';
 $FreezingIndoor = new Weather_Item 'TempIndoor <= FreezePoint';
 $WindChill      = new Weather_Item 'WindChill';
 $DewOutdoor     = new Weather_Item 'DewOutdoor';
 $Dew            = new Weather_Item 'HumidOutdoor > 70';
-$Frost     = new Weather_Item 'HumidOutoor > 70 and TempOutdoor < FreezePoint';
-$Frostbite = new Weather_Item 'WindChill < FrostbitePoint';
+$Frost          = new Weather_Item 'HumidOutoor > 70 and TempOutdoor < FreezePoint';
+$Frostbite      = new Weather_Item 'WindChill < FrostbitePoint';
 
 # These Weather sensors actually report the current battery status of remote sensing units
 $BatIndoor  = new Weather_Item 'BatIndoor';
@@ -184,16 +178,12 @@
 # Examples.  Someone weather-oriented should come up with some real forecasting expressions...
 # Possibility: snowstorm (chance_of_snow, high humidity, high winds, under freezing, low pressure and falling)  Something like that.
 
-$Extreme = new Weather_Item
-  'TempOutdoorApparent > HeatWarningPoint or TempOutdoorApparent < ColdWarningPoint';
-$Comfortable = new Weather_Item
-  "TempOutdoorApparent >= $outdoor_comfort_min and TempOutdoorApparent <= $outdoor_comfort_max";
-$Uncomfortable = new Weather_Item
-  "TempOutdoorApparent < $outdoor_comfort_min or TempOutdoorApparent > $outdoor_comfort_max";
-$Intolerable = new Weather_Item
-  "TempOutdoorApparent > HeatWarningPoint and HumidOutdoor > 70 and Pollen > $weather_pollen_threshold";
-$Scorching =
-  new Weather_Item 'TempOutdoor > HeatWarningPoint and HumidOutdoor < 50';
+$Extreme       = new Weather_Item 'TempOutdoorApparent > HeatWarningPoint or TempOutdoorApparent < ColdWarningPoint';
+$Comfortable   = new Weather_Item "TempOutdoorApparent >= $outdoor_comfort_min and TempOutdoorApparent <= $outdoor_comfort_max";
+$Uncomfortable = new Weather_Item "TempOutdoorApparent < $outdoor_comfort_min or TempOutdoorApparent > $outdoor_comfort_max";
+$Intolerable =
+  new Weather_Item "TempOutdoorApparent > HeatWarningPoint and HumidOutdoor > 70 and Pollen > $weather_pollen_threshold";
+$Scorching = new Weather_Item 'TempOutdoor > HeatWarningPoint and HumidOutdoor < 50';
 
 $Dry  = new Weather_Item 'HumidOutdoor < 60';
 $Arid = new Weather_Item 'HumidOutdoor < 40';
@@ -204,8 +194,7 @@
 $Tornado  = new Weather_Item 'WindGustSpeed > 55';
 
 $SwimmingWeather = new Weather_Item 'WindGustSpeed < 10 and TempOutdoor > 80';
-$RunningWeather  = new Weather_Item
-  'TempOutdoor > 45 and TempOutdoor < 60 and WindGustSpeed < 10';
+$RunningWeather  = new Weather_Item 'TempOutdoor > 45 and TempOutdoor < 60 and WindGustSpeed < 10';
 
 #   rainstorm, snowstorm (chance_of_snow, high humidity, high winds, under freezing, low pressure and falling), portending
 
@@ -276,22 +265,16 @@ sub weather_monitor_create_tk_labels {
 }
 
 # Set up pointers to random weather comments
-$f_remark_on_humidity =
-  new File_Item("$config_parms{data_dir}/remarks/list_humid.txt");
-$f_remark_on_temp_below_0 =
-  new File_Item("$config_parms{data_dir}/remarks/list_temp_below_0.txt");
-$f_remark_on_temp_below_20 =
-  new File_Item("$config_parms{data_dir}/remarks/list_temp_below_20.txt");
+$f_remark_on_humidity      = new File_Item("$config_parms{data_dir}/remarks/list_humid.txt");
+$f_remark_on_temp_below_0  = new File_Item("$config_parms{data_dir}/remarks/list_temp_below_0.txt");
+$f_remark_on_temp_below_20 = new File_Item("$config_parms{data_dir}/remarks/list_temp_below_20.txt");
 
 $v_what_temp = new Voice_Cmd('What is the [,inside,outside] temperature');
-$v_what_temp->set_info(
-    'Returns the humidity, temperature, and windchill, as measured by our weather station'
-);
+$v_what_temp->set_info( 'Returns the humidity, temperature, and windchill, as measured by our weather station' );
 $v_what_temp->set_authority('anyone');
 
 if ( $state = said $v_what_temp) {
-    if ( defined $Weather{TempOutdoor} and $Weather{TempOutdoor} ne 'unknown' )
-    {
+    if ( defined $Weather{TempOutdoor} and $Weather{TempOutdoor} ne 'unknown' ) {
         my $temp      = round( $Weather{TempOutdoor} );
         my $apparent  = round( $Weather{TempOutdoorApparent} );
         my $temp_in   = round( $Weather{TempIndoor} );
@@ -316,12 +299,10 @@ sub weather_monitor_create_tk_labels {
             $remark = read_next $f_remark_on_humidity;
         }
         if ( defined $windchill ) {
-            if ( $windchill < $config_parms{weather_uom_temp} eq 'F' ? 0 : -17 )
-            {
+            if ( $windchill < $config_parms{weather_uom_temp} eq 'F' ? 0 : -17 ) {
                 $remark = read_next $f_remark_on_temp_below_0;
             }
-            if ( $windchill < $config_parms{weather_uom_temp} eq 'F' ? 20 : -6 )
-            {
+            if ( $windchill < $config_parms{weather_uom_temp} eq 'F' ? 20 : -6 ) {
                 $remark = read_next $f_remark_on_temp_below_20;
             }
         }
@@ -339,15 +320,13 @@ sub weather_monitor_create_tk_labels {
             $text = "It is $temp_out. $remark";
         }
         else {
-            $text =
-              "It is $temp_in degrees $humidity_in percent inside, $temp_out. $remark";
+            $text = "It is $temp_in degrees $humidity_in percent inside, $temp_out. $remark";
 
         }
         $v_what_temp->respond("app=weather $text");
     }
     else {
-        $v_what_temp->respond(
-            "app=weather Weather information is not available.");
+        $v_what_temp->respond("app=weather Weather information is not available.");
     }
 }
 
@@ -380,8 +359,7 @@ sub weather_monitor_create_tk_labels {
   new Voice_Cmd( 'How much rain have we had in the last '
       . '[hour,2 hours,6 hours,12 hours,day,2 days,3 days,4 days,5 days,6 days,week,2 weeks,3 weeks,month,'
       . '2 months,3 months,4 months,6 months]' );
-$v_what_rain->set_info(
-    'Rainfall, measured by our weather station and logged by mh');
+$v_what_rain->set_info('Rainfall, measured by our weather station and logged by mh');
 if ( my $period = said $v_what_rain) {
     undef $temp;
     my $days;
@@ -454,8 +432,7 @@ sub get_weather_record {
 if ( state $Windy) {
 
     # Wait for the gust to peak before announcing
-    print
-      "Wind gust: s1=$timer_wind_gust2->{speed}, s2=$Weather{WindGustSpeed}, t=$weather_wind_gust_threshold"
+    print "Wind gust: s1=$timer_wind_gust2->{speed}, s2=$Weather{WindGustSpeed}, t=$weather_wind_gust_threshold"
       if $Debug{weather};
     if ( $timer_wind_gust2->{speed} < $Weather{WindGustSpeed} ) {
         $timer_wind_gust2->{speed} = $Weather{WindGustSpeed};
@@ -470,9 +447,7 @@ sub get_weather_record {
     {
         $timer_wind_gust->{speed} = $speed;
         set $timer_wind_gust 20 * 60;
-        &speak(
-            "app=weather image=warning color=red Weather alert, the wind is gusting to $speed $wind_units"
-        );
+        &speak( "app=weather image=warning color=red Weather alert, the wind is gusting to $speed $wind_units" );
         $Weather{Warning} = "High winds gusting to $speed $wind_units";
     }
     $Save{WindGustMax} = $speed
diff --git a/code/common/weather_pollen.pl b/code/common/weather_pollen.pl
index 0729cbcf3..bff91d4d1 100644
--- a/code/common/weather_pollen.pl
+++ b/code/common/weather_pollen.pl
@@ -51,16 +51,13 @@
 
 $v_get_pollen_forecast = new Voice_Cmd('[Get,Check] pollen forecast');
 $v_get_pollen_forecast->set_info(
-    "Downloads and parses the pollen forecast data.  The 'check' option reads out the result after parsing is complete."
-);
+    "Downloads and parses the pollen forecast data.  The 'check' option reads out the result after parsing is complete." );
 
 $v_read_pollen_forecast = new Voice_Cmd('Read pollen forecast');
-$v_read_pollen_forecast->set_info(
-    "Reads out the previously fetched pollen forecast.");
+$v_read_pollen_forecast->set_info("Reads out the previously fetched pollen forecast.");
 
-$p_pollen_forecast = new Process_Item(
-    "get_url http://www.wunderground.com/DisplayPollen.asp?Zipcode=$config_parms{zip_code} $pollen_file"
-);
+$p_pollen_forecast =
+  new Process_Item( "get_url http://www.wunderground.com/DisplayPollen.asp?Zipcode=$config_parms{zip_code} $pollen_file" );
 
 &parse_pollen_forecast if ( ($Reload) && ( -e $pollen_file ) );
 
@@ -111,21 +108,19 @@ sub parse_pollen_forecast {
               . lc( $main::Weather{TodayPollenType} . "." ) );
     }
     else {
-        $v_get_pollen_forecast->respond(
-            "app=pollen Pollen forecast retrieved.");
+        $v_get_pollen_forecast->respond("app=pollen Pollen forecast retrieved.");
     }
 }
 
 if ( said $v_read_pollen_forecast) {
     if ( $Weather{TodayPollenCount} ) {
         $v_read_pollen_forecast->respond(
-            "app=pollen Today's pollen count is $main::Weather{TodayPollenCount}. The predominant pollens are from "
+                "app=pollen Today's pollen count is $main::Weather{TodayPollenCount}. The predominant pollens are from "
               . lc( $main::Weather{TodayPollenType} )
               . "." );
     }
     else {
-        $v_read_pollen_forecast->respond(
-            "app=pollen I do not know the pollen count at the moment.");
+        $v_read_pollen_forecast->respond("app=pollen I do not know the pollen count at the moment.");
     }
 }
 
@@ -136,8 +131,7 @@ sub parse_pollen_forecast {
         &trigger_set(
             "state_now \$net_connect eq 'connected'",
             "run_voice_cmd 'Get pollen forecast'",
-            'NoExpire',
-            'get pollen forecast'
+            'NoExpire', 'get pollen forecast'
         ) unless &trigger_get('get pollen forecast');
     }
     else {
diff --git a/code/common/weather_rrd_update.pl b/code/common/weather_rrd_update.pl
index 8c45a5fe1..f547752d9 100644
--- a/code/common/weather_rrd_update.pl
+++ b/code/common/weather_rrd_update.pl
@@ -186,13 +186,11 @@
 if ($Reread) {
     $config_parms{weather_graph_frequency} = 10
       unless $config_parms{weather_graph_frequency};
-    $config_parms{weather_data_rrd} =
-      "$config_parms{data_dir}/rrd/weather_data.rrd"
+    $config_parms{weather_data_rrd} = "$config_parms{data_dir}/rrd/weather_data.rrd"
       unless $config_parms{weather_data_rrd};
     $config_parms{weather_graph_dir} = "$config_parms{data_dir}/rrd"
       unless $config_parms{weather_graph_dir};
-    $config_parms{weather_graph_footer} =
-      'Last updated $Time_Date, Dominique Benoliel, www.domotix.net'
+    $config_parms{weather_graph_footer} = 'Last updated $Time_Date, Dominique Benoliel, www.domotix.net'
       unless $config_parms{weather_graph_footer};
     mkdir $config_parms{weather_graph_dir}
       unless -d $config_parms{weather_graph_dir};
@@ -205,8 +203,7 @@
       unless $config_parms{weather_graph_format};
 
     if ( $RRDs::VERSION >= 1.2 and lc( $config_parms{weather_graph_format} eq 'gif' ) ) {
-        &print_log(
-            "weather_rrd: WARNING, RRD version 1.2+ does not support GIFs");
+        &print_log("weather_rrd: WARNING, RRD version 1.2+ does not support GIFs");
     }
 
     &weather_rrd_rename_chill_to_apparent;
@@ -244,19 +241,14 @@ sub weather_rrd_rename_chill_to_apparent {
 # Update RRD database every 1 minute
 if ($New_Minute) {
     my (
-        $rrd_TempOutdoor,   $rrd_HumidOutdoor, $rrd_DewOutdoor,
-        $rrd_Barom,         $rrd_WindGustDir,  $rrd_WindAvgDir,
-        $rrd_WindGustSpeed, $rrd_WindAvgSpeed, $rrd_TempOutdoorApparent,
-        $rrd_RainRate,      $rrd_RainTotal,    $rrd_TempIndoor,
-        $rrd_HumidIndoor,   $rrd_DewIndoor,    $rrd_TempSpare1,
-        $rrd_HumidSpare1,   $rrd_DewSpare1,    $rrd_TempSpare2,
-        $rrd_HumidSpare2,   $rrd_DewSpare2,    $rrd_TempSpare3,
-        $rrd_HumidSpare3,   $rrd_DewSpare3,    $rrd_TempSpare4,
-        $rrd_HumidSpare4,   $rrd_TempSpare5,   $rrd_HumidSpare5,
-        $rrd_TempSpare6,    $rrd_HumidSpare6,  $rrd_TempSpare7,
-        $rrd_HumidSpare7,   $rrd_TempSpare8,   $rrd_HumidSpare8,
-        $rrd_TempSpare9,    $rrd_HumidSpare9,  $rrd_TempSpare10,
-        $rrd_HumidSpare10
+        $rrd_TempOutdoor, $rrd_HumidOutdoor,  $rrd_DewOutdoor,   $rrd_Barom,               $rrd_WindGustDir,
+        $rrd_WindAvgDir,  $rrd_WindGustSpeed, $rrd_WindAvgSpeed, $rrd_TempOutdoorApparent, $rrd_RainRate,
+        $rrd_RainTotal,   $rrd_TempIndoor,    $rrd_HumidIndoor,  $rrd_DewIndoor,           $rrd_TempSpare1,
+        $rrd_HumidSpare1, $rrd_DewSpare1,     $rrd_TempSpare2,   $rrd_HumidSpare2,         $rrd_DewSpare2,
+        $rrd_TempSpare3,  $rrd_HumidSpare3,   $rrd_DewSpare3,    $rrd_TempSpare4,          $rrd_HumidSpare4,
+        $rrd_TempSpare5,  $rrd_HumidSpare5,   $rrd_TempSpare6,   $rrd_HumidSpare6,         $rrd_TempSpare7,
+        $rrd_HumidSpare7, $rrd_TempSpare8,    $rrd_HumidSpare8,  $rrd_TempSpare9,          $rrd_HumidSpare9,
+        $rrd_TempSpare10, $rrd_HumidSpare10
     );
 
     foreach my $sensor (@rrd_sensors) {
@@ -283,15 +275,10 @@ sub weather_rrd_rename_chill_to_apparent {
 
     if ( $config_parms{weather_uom_temp} eq 'C' ) {
         grep { $_ = convert_c2f($_) unless $_ eq 'U' } (
-            $rrd_TempOutdoor, $rrd_TempIndoor,
-            $rrd_TempSpare1,  $rrd_TempSpare2,
-            $rrd_TempSpare3,  $rrd_TempSpare4,
-            $rrd_TempSpare5,  $rrd_TempSpare6,
-            $rrd_TempSpare7,  $rrd_TempSpare8,
-            $rrd_TempSpare9,  $rrd_TempSpare10,
-            $rrd_DewOutdoor,  $rrd_DewIndoor,
-            $rrd_DewSpare1,   $rrd_DewSpare2,
-            $rrd_DewSpare3,   $rrd_TempOutdoorApparent
+            $rrd_TempOutdoor, $rrd_TempIndoor,  $rrd_TempSpare1, $rrd_TempSpare2, $rrd_TempSpare3,
+            $rrd_TempSpare4,  $rrd_TempSpare5,  $rrd_TempSpare6, $rrd_TempSpare7, $rrd_TempSpare8,
+            $rrd_TempSpare9,  $rrd_TempSpare10, $rrd_DewOutdoor, $rrd_DewIndoor,  $rrd_DewSpare1,
+            $rrd_DewSpare2,   $rrd_DewSpare3,   $rrd_TempOutdoorApparent
         );
     }
 
@@ -300,13 +287,11 @@ sub weather_rrd_rename_chill_to_apparent {
     }
 
     if ( $config_parms{weather_uom_wind} eq 'kph' ) {
-        grep { $_ = convert_km2mile($_) unless $_ eq 'U' }
-          ( $rrd_WindGustSpeed, $rrd_WindAvgSpeed );
+        grep { $_ = convert_km2mile($_) unless $_ eq 'U' } ( $rrd_WindGustSpeed, $rrd_WindAvgSpeed );
     }
 
     if ( $config_parms{weather_uom_wind} eq 'm/s' ) {
-        grep { $_ = convert_mps2mph($_) unless $_ eq 'U' }
-          ( $rrd_WindGustSpeed, $rrd_WindAvgSpeed );
+        grep { $_ = convert_mps2mph($_) unless $_ eq 'U' } ( $rrd_WindGustSpeed, $rrd_WindAvgSpeed );
     }
 
     if ( $config_parms{weather_uom_rain} eq 'mm' ) {
@@ -318,19 +303,14 @@ sub weather_rrd_rename_chill_to_apparent {
     }
 
     @d = (
-        $rrd_TempOutdoor,   $rrd_HumidOutdoor, $rrd_DewOutdoor,
-        $rrd_Barom,         $rrd_WindGustDir,  $rrd_WindAvgDir,
-        $rrd_WindGustSpeed, $rrd_WindAvgSpeed, $rrd_TempOutdoorApparent,
-        $rrd_RainRate,      $rrd_RainTotal,    $rrd_TempIndoor,
-        $rrd_HumidIndoor,   $rrd_DewIndoor,    $rrd_TempSpare1,
-        $rrd_HumidSpare1,   $rrd_DewSpare1,    $rrd_TempSpare2,
-        $rrd_HumidSpare2,   $rrd_DewSpare2,    $rrd_TempSpare3,
-        $rrd_HumidSpare3,   $rrd_DewSpare3,    $rrd_TempSpare4,
-        $rrd_HumidSpare4,   $rrd_TempSpare5,   $rrd_HumidSpare5,
-        $rrd_TempSpare6,    $rrd_HumidSpare6,  $rrd_TempSpare7,
-        $rrd_HumidSpare7,   $rrd_TempSpare8,   $rrd_HumidSpare8,
-        $rrd_TempSpare9,    $rrd_HumidSpare9,  $rrd_TempSpare10,
-        $rrd_HumidSpare10
+        $rrd_TempOutdoor, $rrd_HumidOutdoor,  $rrd_DewOutdoor,   $rrd_Barom,               $rrd_WindGustDir,
+        $rrd_WindAvgDir,  $rrd_WindGustSpeed, $rrd_WindAvgSpeed, $rrd_TempOutdoorApparent, $rrd_RainRate,
+        $rrd_RainTotal,   $rrd_TempIndoor,    $rrd_HumidIndoor,  $rrd_DewIndoor,           $rrd_TempSpare1,
+        $rrd_HumidSpare1, $rrd_DewSpare1,     $rrd_TempSpare2,   $rrd_HumidSpare2,         $rrd_DewSpare2,
+        $rrd_TempSpare3,  $rrd_HumidSpare3,   $rrd_DewSpare3,    $rrd_TempSpare4,          $rrd_HumidSpare4,
+        $rrd_TempSpare5,  $rrd_HumidSpare5,   $rrd_TempSpare6,   $rrd_HumidSpare6,         $rrd_TempSpare7,
+        $rrd_HumidSpare7, $rrd_TempSpare8,    $rrd_HumidSpare8,  $rrd_TempSpare9,          $rrd_HumidSpare9,
+        $rrd_TempSpare10, $rrd_HumidSpare10
     );
 
     #print "@d\n";
@@ -345,8 +325,7 @@ sub weather_rrd_rename_chill_to_apparent {
 }
 
 # Create the graphs
-$p_weather_graph =
-  new Process_Item qq:weather_rrd_update_graphs "$rrdDataTransferFile":;
+$p_weather_graph     = new Process_Item qq:weather_rrd_update_graphs "$rrdDataTransferFile":;
 $tell_generate_graph = new Voice_Cmd "Generate weather graphs";
 
 if (   new_minute $config_parms{weather_graph_frequency}
@@ -368,8 +347,7 @@ sub update_graphs {
     }
 
     if ( !open( RRDDATATRANSFER, '>' . $rrdDataTransferFile ) ) {
-        &print_log(
-            "weather_rrd: can't open $rrdDataTransferFile for writing: $!");
+        &print_log("weather_rrd: can't open $rrdDataTransferFile for writing: $!");
         return;
     }
 
@@ -398,8 +376,8 @@ sub update_graphs {
 !;
 
     foreach my $key ( keys(%config_parms) ) {
-        next if $key !~ /^weather_rrd_color_(.*)/;   # we only want certain keys
-        next if $key =~ /_MHINTERNAL_/;              # not internal copies
+        next if $key !~ /^weather_rrd_color_(.*)/;    # we only want certain keys
+        next if $key =~ /_MHINTERNAL_/;               # not internal copies
         my $element = $1;
         my $color   = $config_parms{ "weather_rrd_color_" . $element };
         &print_log("weather_rrd: found element -$element- value is -$color-")
@@ -409,16 +387,14 @@ sub update_graphs {
     }
 
     foreach my $key ( keys(%config_parms) ) {
-        next if $key !~ /^weather_uom_(.*)/;         # we only want certain keys
-        next if $key =~ /_MHINTERNAL_/;              # not internal copies
+        next                                      if $key !~ /^weather_uom_(.*)/;    # we only want certain keys
+        next                                      if $key =~ /_MHINTERNAL_/;         # not internal copies
         &print_log("weather_rrd: found key $key") if $Debug{weather_graph};
-        print RRDDATATRANSFER
-          qq:\$weather_uom_$1="$config_parms{"weather_uom_".$1}";\n:;
+        print RRDDATATRANSFER qq:\$weather_uom_$1="$config_parms{"weather_uom_".$1}";\n:;
     }
 
     my %sensor_names;
-    &main::read_parm_hash( \%sensor_names,
-        $main::config_parms{weather_graph_sensor_names} );
+    &main::read_parm_hash( \%sensor_names, $main::config_parms{weather_graph_sensor_names} );
 
     foreach my $key ( keys(%sensor_names) ) {
         print RRDDATATRANSFER qq:\$sensor_names{$key}="$sensor_names{$key}";\n:;
@@ -426,7 +402,7 @@ sub update_graphs {
 
     close(RRDDATATRANSFER);
     &print_log("weather_rrd: updating weather graphs") if $Debug{weather_graph};
-    start $p_weather_graph; # We are now safe to do this in Windows as all of the processing is done in an external file
+    start $p_weather_graph;    # We are now safe to do this in Windows as all of the processing is done in an external file
 }
 
 #==============================================================================
@@ -635,19 +611,14 @@ sub update_csv {
             'Humidity module 10',
             "\n" );
 
-        &logit( "$config_parms{weather_data_csv}.$Year_Month_Now",
-            $row_header, 0 );
+        &logit( "$config_parms{weather_data_csv}.$Year_Month_Now", $row_header, 0 );
     }
     $row_data = join( ";",
-        $time,       $log_annee,   $log_mois, $log_jour, $log_heure,
-        $log_minute, $log_seconde, $data[0],  $data[1],  $data[2],
-        $data[3],    $data[4],     $data[5],  $data[6],  $data[7],
-        $data[8],    $data[9],     $data[10], $data[11], $data[12],
-        $data[13],   $data[14],    $data[15], $data[16], $data[17],
-        $data[18],   $data[19],    $data[20], $data[21], $data[22],
-        $data[23],   $data[24],    $data[25], $data[26], $data[27],
-        $data[28],   $data[29],    $data[30], $data[31], $data[32],
-        $data[33],   $data[34],    $data[35], $data[36], "\n" );
+        $time,     $log_annee, $log_mois, $log_jour, $log_heure, $log_minute, $log_seconde, $data[0],  $data[1],
+        $data[2],  $data[3],   $data[4],  $data[5],  $data[6],   $data[7],    $data[8],     $data[9],  $data[10],
+        $data[11], $data[12],  $data[13], $data[14], $data[15],  $data[16],   $data[17],    $data[18], $data[19],
+        $data[20], $data[21],  $data[22], $data[23], $data[24],  $data[25],   $data[26],    $data[27], $data[28],
+        $data[29], $data[30],  $data[31], $data[32], $data[33],  $data[34],   $data[35],    $data[36], "\n" );
 
     &logit( "$config_parms{weather_data_csv}.$Year_Month_Now", $row_data, 0 );
 }
@@ -659,8 +630,7 @@ sub analyze_rrd_rain {
       if $::Debug{weather_graph};
 
     my @hours = ( 1, 2, 6, 12, 18, 24, 48, 72, 168 );
-    my $resolution = 18 * 60
-      ; # using 18 minute datapoints - don't change this unless you know what you're doing
+    my $resolution = 18 * 60;    # using 18 minute datapoints - don't change this unless you know what you're doing
 
     # set default values
     foreach my $hour (@hours) {
@@ -669,17 +639,12 @@ sub analyze_rrd_rain {
 
     my $endtime = int( time / $resolution ) * $resolution;
 
-    my ( $start, $step, $names, $data ) = RRDs::fetch(
-        $RRD, 'AVERAGE', '-r', $resolution,
-        '-e', $endtime,  '-s', 'e-168hours'
-    );
+    my ( $start, $step, $names, $data ) = RRDs::fetch( $RRD, 'AVERAGE', '-r', $resolution, '-e', $endtime, '-s', 'e-168hours' );
 
     my $RRDerror = RRDs::error;
 
     if ($RRDerror) {
-        &print_log(
-            "weather_rrd_update: having trouble fetching data for rain: $RRDerror"
-        );
+        &print_log( "weather_rrd_update: having trouble fetching data for rain: $RRDerror" );
         return;
     }
 
@@ -753,33 +718,29 @@ sub analyze_rrd_rain {
         # if the total rain in the last period of time is lower than the
         # next larger period of time, then check the next period
         next
-          if ( $Weather{"RainLast${shorter}Hours"} <=
-            $Weather{"RainLast${longer}Hours"} );
+          if ( $Weather{"RainLast${shorter}Hours"} <= $Weather{"RainLast${longer}Hours"} );
 
         # a quirk in the data has caused a smaller period to have a larger
         # value than the next larger period
         # fix it by copying the smaller amount onto the larger amount
-        $Weather{"RainLast${shorter}Hours"} =
-          $Weather{"RainLast${longer}Hours"};
+        $Weather{"RainLast${shorter}Hours"} = $Weather{"RainLast${longer}Hours"};
     }
     &print_log('analyze_rrd_rain: complete') if $::Debug{weather_graph};
 }
 
 # Allow for sending graphs via email
 
-$weather_graph_email = new Voice_Cmd
-  'Email [tempout,tempin,windspeed,winddir,raintotal,rainrate,press,humout,humin] weather chart';
+$weather_graph_email = new Voice_Cmd 'Email [tempout,tempin,windspeed,winddir,raintotal,rainrate,press,humout,humin] weather chart';
 
 if ( $state = said $weather_graph_email) {
     print_log "Sending $state weather charts";
     my $html = &html_file( undef, '../web/bin/weather_graph.pl', $state );
     &net_mail_send(
         subject => "$state weather charts for $Date_Now",
-        baseref =>
-          "$config_parms{http_server}:$config_parms{http_port}/ia5/outside/",
-        to   => $config_parms{weather_graph_email},
-        text => $html,
-        mime => 'html'
+        baseref => "$config_parms{http_server}:$config_parms{http_port}/ia5/outside/",
+        to      => $config_parms{weather_graph_email},
+        text    => $html,
+        mime    => 'html'
     );
 
     #    &net_mail_send(subject => "Weather charts for $Date_Now",
@@ -792,9 +753,7 @@ sub uninstall_weather_rrd_update {
 }
 
 if ($Reload) {
-    &trigger_set(
-        'new_minute(10)', '&analyze_rrd_rain',
-        'NoExpire',       'update rain totals from RRD database'
-    ) unless &trigger_get('update rain totals from RRD database');
+    &trigger_set( 'new_minute(10)', '&analyze_rrd_rain', 'NoExpire', 'update rain totals from RRD database' )
+      unless &trigger_get('update rain totals from RRD database');
     &analyze_rrd_rain;
 }
diff --git a/code/common/weather_summary.pl b/code/common/weather_summary.pl
index f81da4725..1780271f6 100644
--- a/code/common/weather_summary.pl
+++ b/code/common/weather_summary.pl
@@ -26,7 +26,7 @@ sub weather_summary_update {
 ##
     #$Weather{Summary_Short}= sprintf("%3.1f/%3d/%3d %3d%% %3d%%", #orig
     $Weather{Summary_Short} = sprintf(
-        "%3.1f&#176in|%3d&#176out|%3d&#176wc|%3d%%RH in|%3d%%RH out",   # Mark's
+        "%3.1f&#176in|%3d&#176out|%3d&#176wc|%3d%%RH in|%3d%%RH out",    # Mark's
         $Weather{TempIndoor},
         $Weather{TempOutdoor},
         $Weather{WindChill},
@@ -36,7 +36,7 @@ sub weather_summary_update {
     $Weather{Wind} = " $Weather{WindAvgSpeed}/$Weather{WindGustSpeed} " .
 
       #&main::convert_direction($Weather{WindGustDir});# long i.e. 'north west'
-      convert_summary_direction( $Weather{WindGustDir} );    # short i.e. 'NW'
+      convert_summary_direction( $Weather{WindGustDir} );                # short i.e. 'NW'
 ## ^^^^^^^^^^^^^^^^^^^^^
 ## Using WindGustDir because there is no AVG wind direction in WMR-968
 ##
diff --git a/code/common/weather_tides.pl b/code/common/weather_tides.pl
index 81978e77f..2fd54f855 100644
--- a/code/common/weather_tides.pl
+++ b/code/common/weather_tides.pl
@@ -12,16 +12,13 @@
 my $f_tides   = "$config_parms{data_dir}/web/tides.html";
 $v_get_tides = new Voice_Cmd 'Get tide info';
 $v_get_tides->set_info('Get tide information from the Internet');
-$v_read_tides =
-  new Voice_Cmd 'When is the next [High Tide,Low Tide,Moonrise,Moonset]?';
-$v_read_tides->set_info(
-    'Show tide, moonrise and moonset information from the Internet');
+$v_read_tides = new Voice_Cmd 'When is the next [High Tide,Low Tide,Moonrise,Moonset]?';
+$v_read_tides->set_info('Show tide, moonrise and moonset information from the Internet');
 $p_get_tides = new Process_Item;
 $tide_site   = $config_parms{weather_tide_site}
   if $config_parms{weather_tide_site};
 $tide_site = &escape($tide_site);
-set $p_get_tides
-  "get_url http://tbone.biol.sc.edu/tide/tideshow.cgi?site=$tide_site $f_tides";
+set $p_get_tides "get_url http://tbone.biol.sc.edu/tide/tideshow.cgi?site=$tide_site $f_tides";
 trigger_delete "get tide info";
 
 #noloop=stop
@@ -35,8 +32,7 @@
     )
     or said $v_get_tides)
 {
-    $v_get_tides->respond(
-        "app=tides Retrieving tide information for $tide_site...")
+    $v_get_tides->respond("app=tides Retrieving tide information for $tide_site...")
       if said $v_get_tides;
     unlink $f_tides;
     $p_get_tides->start;
@@ -109,9 +105,7 @@
             /^(\d\d\d\d)-(\d\d)-(\d\d)  (\d\d):(\d\d) \w\w\w\s+(-?\d+\.\d+ (feet|meters))?\s+?(Low Tide|High Tide|Sunrise|Sunset|Moonrise|Moonset)$/
           )
         {
-            my $timediff =
-              timelocal( 0, $minu, $hour, $date, $mnth - 1, $year - 1900 ) -
-              $Time;
+            my $timediff = timelocal( 0, $minu, $hour, $date, $mnth - 1, $year - 1900 ) - $Time;
             my $time_str = "$mnth/$date $hour:$minu";
             print_log "$time_str $size $event \n";
             $Weather{'Previous High Tide'} = $time_str
diff --git a/code/common/weather_upload.pl b/code/common/weather_upload.pl
index 63e33a04f..4c440f70b 100644
--- a/code/common/weather_upload.pl
+++ b/code/common/weather_upload.pl
@@ -39,10 +39,8 @@
 #use POSIX qw(strftime);
 
 $p_weather_update = new Process_Item;
-$v_weather_update =
-  new Voice_Cmd '[Show results from,Run] wunderground.com upload';
-my $weather_update_html_path =
-  "$config_parms{data_dir}/web/wu-result.html";    #noloop
+$v_weather_update = new Voice_Cmd '[Show results from,Run] wunderground.com upload';
+my $weather_update_html_path = "$config_parms{data_dir}/web/wu-result.html";    #noloop
 
 # Create trigger
 
@@ -54,8 +52,7 @@
         : 10
       );
 
-    &trigger_set( $command, "run_voice_cmd('Run wunderground.com upload')",
-        'NoExpire', 'upload weather' )
+    &trigger_set( $command, "run_voice_cmd('Run wunderground.com upload')", 'NoExpire', 'upload weather' )
       unless &trigger_get('upload weather');
 }
 
@@ -81,8 +78,7 @@
     my $weather_dewoutdoor  = $Weather{DewOutdoor};
 
     if ( $config_parms{weather_uom_temp} eq 'C' ) {
-        grep { $_ = convert_c2f($_) if defined $_; }
-          ( $weather_tempoutdoor, $weather_dewoutdoor );
+        grep { $_ = convert_c2f($_) if defined $_; } ( $weather_tempoutdoor, $weather_dewoutdoor );
     }
 
     my $weather_baromsea = $Weather{BaromSea};
@@ -96,8 +92,7 @@
         }
     }
 
-    if ( defined $weather_baromsea and $config_parms{weather_uom_baro} eq 'mb' )
-    {
+    if ( defined $weather_baromsea and $config_parms{weather_uom_baro} eq 'mb' ) {
         $weather_baromsea = convert_mb2in($weather_baromsea);
     }
 
@@ -105,12 +100,10 @@
     my $weather_windavgspeed  = $Weather{WindAvgSpeed};
 
     if ( $config_parms{weather_uom_wind} eq 'kph' ) {
-        grep { $_ = convert_km2mile($_) if defined $_; }
-          ( $weather_windgustspeed, $weather_windavgspeed );
+        grep { $_ = convert_km2mile($_) if defined $_; } ( $weather_windgustspeed, $weather_windavgspeed );
     }
     if ( $config_parms{weather_uom_wind} eq 'm/s' ) {
-        grep { $_ = convert_mps2mph($_) if defined $_; }
-          ( $weather_windgustspeed, $weather_windavgspeed );
+        grep { $_ = convert_mps2mph($_) if defined $_; } ( $weather_windgustspeed, $weather_windavgspeed );
     }
 
     my $weather_rainrate = $Weather{RainRate};
@@ -136,8 +129,7 @@
             if ( $weather_rainrate >= 1 ) {    # 1+ inches per hour sounds heavy
                 $weather_conditions = '+RA';
             }
-            if ( $weather_rainrate <= 0.1 )
-            {    # 0.1- inches per hour sounds light
+            if ( $weather_rainrate <= 0.1 ) {    # 0.1- inches per hour sounds light
                 $weather_conditions = '-RA';
             }
         }
@@ -162,10 +154,8 @@
         }
     }
 
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      gmtime();
-    my $utc = sprintf "%s-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1,
-      $mday, $hour, $min, $sec;
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = gmtime();
+    my $utc = sprintf "%s-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
     $utc = &escape($utc);
 
     my $url =
@@ -198,8 +188,7 @@
 # *** Need to parse the response to look for errors
 
 if ( done_now $p_weather_update) {
-    $v_weather_update->respond(
-        'app=wunderground connected=0 Weather upload completed.');
+    $v_weather_update->respond('app=wunderground connected=0 Weather upload completed.');
 
 }
 
diff --git a/code/common/weather_warnings.pl b/code/common/weather_warnings.pl
index 29d7ace91..0b287dd99 100644
--- a/code/common/weather_warnings.pl
+++ b/code/common/weather_warnings.pl
@@ -13,8 +13,7 @@
 
 # 01/05/2014 Created by Steve Switzer (steve@switzerny.org)
 
-$f_weather_forecast_warning =
-  new File_Item "$config_parms{data_dir}/web/weather_forecast.txt";
+$f_weather_forecast_warning = new File_Item "$config_parms{data_dir}/web/weather_forecast.txt";
 set_watch $f_weather_forecast_warning if $Reload;
 
 $v_get_weather_warning = new Voice_Cmd 'Get the weather warnings', 0;
@@ -27,8 +26,7 @@
 if ( said $v_weather_warning) {
     my $response = $Weather{Warning};
     print_log($response);
-    $v_weather_warning->respond(
-        "app=weatherwarning important=1 Weather Warning: $response")
+    $v_weather_warning->respond("app=weatherwarning important=1 Weather Warning: $response")
       unless $response =~ /^$/i;
 }
 
@@ -65,12 +63,8 @@
 
 # lets allow the user to control via triggers
 if ($Reload) {
-    &trigger_set(
-        "time_cron '11 8,11,16,19 * * *'",
-        "run_voice_cmd 'Read weather warnings'",
-        'NoExpire',
-        'read weather warnings'
-    ) unless &trigger_get('read weather warnings');
+    &trigger_set( "time_cron '11 8,11,16,19 * * *'", "run_voice_cmd 'Read weather warnings'", 'NoExpire', 'read weather warnings' )
+      unless &trigger_get('read weather warnings');
 }
 
 =begin comment
diff --git a/code/common/weather_weatherbug.pl b/code/common/weather_weatherbug.pl
index ab5d1ef6e..161584047 100755
--- a/code/common/weather_weatherbug.pl
+++ b/code/common/weather_weatherbug.pl
@@ -48,10 +48,9 @@
 
         # Define config parameters
         # add variables for the weatherbug feed
-        my $weatherbug_city  = $config_parms{weather_weatherbug_city};
-        my $weatherbug_state = lc( $config_parms{weather_weatherbug_state} );
-        my $weatherbug_country =
-          lc( $config_parms{weather_weatherbug_country} );
+        my $weatherbug_city      = $config_parms{weather_weatherbug_city};
+        my $weatherbug_state     = lc( $config_parms{weather_weatherbug_state} );
+        my $weatherbug_country   = lc( $config_parms{weather_weatherbug_country} );
         my $weatherbug_units     = $config_parms{weather_weatherbug_units};
         my $weatherbug_citycode  = $config_parms{weather_weatherbug_citycode};
         my $weatherbug_zipcode   = $config_parms{weather_weatherbug_zipcode};
@@ -78,10 +77,8 @@
         my $weatherbug_url;
         my $key =
           "A" . ( ( ( 149 * 37 * 2 * 5 * 37 + 23 ) * 9 * 17 ) + 10 ) * 3 * 5;
-        my $weatherbug_file =
-          $config_parms{data_dir} . '/web/weather_weatherbug_frcst.xml';
-        my $weatherbug_obs_file =
-          $config_parms{data_dir} . '/web/weather_weatherbug_obs.xml';
+        my $weatherbug_file     = $config_parms{data_dir} . '/web/weather_weatherbug_frcst.xml';
+        my $weatherbug_obs_file = $config_parms{data_dir} . '/web/weather_weatherbug_obs.xml';
 
         # Define the url that is used to fetch the forecast
         # use the lattitude and longitude form if they are available
@@ -114,27 +111,19 @@
           . "&unittype="
           . $weatherbug_units
           if ( $weatherbug_citycode ne "" );
-        logit( "$config_parms{data_dir}/web/weatherbug_debug",
-            $weatherbug_url, 13, 0 )
+        logit( "$config_parms{data_dir}/web/weatherbug_debug", $weatherbug_url, 13, 0 )
           if ( $Debug{weatherbug} );
 
         # Define the new process item that fetchs the RSS feed for the location
-        $p_weather_weatherbug_forecast = new Process_Item(
-            qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
+        $p_weather_weatherbug_forecast = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
 
         # Need to add a process to search for the citycode
-        $weatherbug_url =
-            "http://api.wxbug.net/getLocationsXML.aspx?ACode="
-          . $key
-          . "&searchString="
-          . lc($weatherbug_city);
-        logit( "$config_parms{data_dir}/web/weatherbug_debug",
-            $weatherbug_url, 13, 0 )
+        $weatherbug_url = "http://api.wxbug.net/getLocationsXML.aspx?ACode=" . $key . "&searchString=" . lc($weatherbug_city);
+        logit( "$config_parms{data_dir}/web/weatherbug_debug", $weatherbug_url, 13, 0 )
           if ( $Debug{weatherbug} );
 
         # Define the new process item that fetchs the RSS feed for the location
-        $p_weather_weatherbug_citycode = new Process_Item(
-            qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
+        $p_weather_weatherbug_citycode = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_file"});
 
         # Need to add a process to get the live observations
         # use the lattitude and longitude form if they are available
@@ -167,13 +156,11 @@
           . "&unittype="
           . $weatherbug_units
           if ( $weatherbug_citycode ne "" );
-        logit( "$config_parms{data_dir}/web/weatherbug_debug",
-            $weatherbug_url, 13, 0 )
+        logit( "$config_parms{data_dir}/web/weatherbug_debug", $weatherbug_url, 13, 0 )
           if ( $Debug{weatherbug} );
 
         # Define the new process item that fetchs the RSS feed for the location
-        $p_weather_weatherbug_liveweather = new Process_Item(
-            qq{get_url -quiet "$weatherbug_url" "$weatherbug_obs_file"});
+        $p_weather_weatherbug_liveweather = new Process_Item(qq{get_url -quiet "$weatherbug_url" "$weatherbug_obs_file"});
 
         # Define the voice commands that are used to get and process the RSS feed
         my $weatherbug_states = 'getforecast,LiveWeather,getcitycode,debug';
@@ -370,99 +357,55 @@
 
         # conditions simplified for rain and snow
         my @wxbug_precip_type = (
-            "Clear",    "Overcast", "Overcast", "Overcast",
-            "Clear",    "Rain",     "Rain",     "Clear",
-            "Snow",     "Snow",     "Clear",    "Snow",
-            "Snow",     "Overcast", "Rain",     "Rain",
-            "Clear",    "Clear",    "Rain",     "Snow",
-            "Rain",     "Ice",      "Rain",     "Overcast",
-            "Overcast", "Ice",      "Clear",    "Snow",
-            "Ice",      "Snow",     "Rain",     "Clear",
-            "Snow",     "Overcast", "Overcast", "Clear",
-            "Ice",      "Clear",    "Rain",     "Snow",
-            "Snow",     "Rain",     "Rain",     "Snow",
-            "Snow",     "Rain",     "Ice",      "Ice",
-            "Ice",      "Ice",      "Clear",    "Overcast",
-            "Rain",     "Rain",     "Snow",     "Snow",
-            "Ice",      "Ice",      "Rain",     "Rain",
-            "Ice",      "Rain",     "Snow",     "Rain",
-            "Clear",    "Clear",    "Overcast", "Clear",
-            "Overcast", "Clear",    "Clear",    "Overcast",
-            "Clear",    "Overcast", "Clear",    "Clear",
-            "Clear",    "Clear",    "Snow",     "Snow",
-            "Snow",     "Rain",     "Rain",     "Rain",
-            "Snow",     "Snow",     "Snow",     "Rain",
-            "Rain",     "Rain",     "Ice",      "Ice",
-            "Ice",      "Rain",     "Rain",     "Rain",
-            "Snow",     "Snow",     "Snow",     "Ice",
-            "Ice",      "Ice",      "Snow",     "Snow",
-            "Snow",     "Rain",     "Rain",     "Rain",
-            "Rain",     "Rain",     "Rain",     "Snow",
-            "Snow",     "Snow",     "Rain",     "Rain",
-            "Rain",     "Snow",     "Snow",     "Snow",
-            "Ice",      "Ice",      "Ice",      "Ice",
-            "Ice",      "Ice",      "Snow",     "Snow",
-            "Snow",     "Ice",      "Ice",      "Ice",
-            "Rain",     "Rain",     "Rain",     "Ice",
-            "Ice",      "Ice",      "Snow",     "Rain",
-            "Snow",     "Rain",     "Ice",      "Rain",
-            "Snow",     "Ice",      "Snow",     "Rain",
-            "Rain",     "Snow",     "Rain",     "Snow",
-            "Ice",      "Ice",      "Snow",     "Ice",
-            "Rain",     "Ice",      "Clear",    "Overcast",
-            "Snow",     "Mixed",    "Rain",     "Rain",
-            "Mixed",    "Rain",     "Mixed",    "Rain",
-            "Rain",     "",         "Rain",     "Mixed",
-            "Mixed",    "Rain",     "Mixed",    "Mixed",
+            "Clear",    "Overcast", "Overcast", "Overcast", "Clear",    "Rain",     "Rain",  "Clear",
+            "Snow",     "Snow",     "Clear",    "Snow",     "Snow",     "Overcast", "Rain",  "Rain",
+            "Clear",    "Clear",    "Rain",     "Snow",     "Rain",     "Ice",      "Rain",  "Overcast",
+            "Overcast", "Ice",      "Clear",    "Snow",     "Ice",      "Snow",     "Rain",  "Clear",
+            "Snow",     "Overcast", "Overcast", "Clear",    "Ice",      "Clear",    "Rain",  "Snow",
+            "Snow",     "Rain",     "Rain",     "Snow",     "Snow",     "Rain",     "Ice",   "Ice",
+            "Ice",      "Ice",      "Clear",    "Overcast", "Rain",     "Rain",     "Snow",  "Snow",
+            "Ice",      "Ice",      "Rain",     "Rain",     "Ice",      "Rain",     "Snow",  "Rain",
+            "Clear",    "Clear",    "Overcast", "Clear",    "Overcast", "Clear",    "Clear", "Overcast",
+            "Clear",    "Overcast", "Clear",    "Clear",    "Clear",    "Clear",    "Snow",  "Snow",
+            "Snow",     "Rain",     "Rain",     "Rain",     "Snow",     "Snow",     "Snow",  "Rain",
+            "Rain",     "Rain",     "Ice",      "Ice",      "Ice",      "Rain",     "Rain",  "Rain",
+            "Snow",     "Snow",     "Snow",     "Ice",      "Ice",      "Ice",      "Snow",  "Snow",
+            "Snow",     "Rain",     "Rain",     "Rain",     "Rain",     "Rain",     "Rain",  "Snow",
+            "Snow",     "Snow",     "Rain",     "Rain",     "Rain",     "Snow",     "Snow",  "Snow",
+            "Ice",      "Ice",      "Ice",      "Ice",      "Ice",      "Ice",      "Snow",  "Snow",
+            "Snow",     "Ice",      "Ice",      "Ice",      "Rain",     "Rain",     "Rain",  "Ice",
+            "Ice",      "Ice",      "Snow",     "Rain",     "Snow",     "Rain",     "Ice",   "Rain",
+            "Snow",     "Ice",      "Snow",     "Rain",     "Rain",     "Snow",     "Rain",  "Snow",
+            "Ice",      "Ice",      "Snow",     "Ice",      "Rain",     "Ice",      "Clear", "Overcast",
+            "Snow",     "Mixed",    "Rain",     "Rain",     "Mixed",    "Rain",     "Mixed", "Rain",
+            "Rain",     "",         "Rain",     "Mixed",    "Mixed",    "Rain",     "Mixed", "Mixed",
             "Snow"
         );
 
         # inferred amount of precipatation
         my @wxbug_precip_ammount = (
-            "None",     "None",     "None",     "None",
-            "None",     "Moderate", "Moderate", "None",
-            "Moderate", "Light",    "None",     "Light",
-            "Moderate", "None",     "Moderate", "Light",
-            "None",     "None",     "Moderate", "Light",
-            "Light",    "Light",    "Light",    "None",
-            "None",     "Light",    "None",     "Light",
-            "Light",    "Light",    "Light",    "None",
-            "Light",    "None",     "None",     "None",
-            "Light",    "None",     "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Moderate", "Moderate",
-            "Light",    "Light",    "None",     "None",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Trace",    "Trace",
-            "Trace",    "Trace",    "Heavy",    "Heavy",
-            "None",     "None",     "None",     "None",
-            "None",     "None",     "None",     "None",
-            "None",     "None",     "None",     "None",
-            "None",     "None",     "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Trace",    "Trace",    "Trace",    "Trace",
-            "Trace",    "Trace",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Light",    "Light",    "Light",    "Light",
-            "Trace",    "Trace",    "None",     "None",
-            "Light",    "Light",    "Trace",    "Heavy",
-            "Trace",    "Trace",    "Trace",    "Trace",
-            "Trace",    "Trace",    "Trace",    "Trace",
-            "Trace",    "Trace",    "Trace",    "Trace",
+            "None",     "None",  "None",     "None",  "None",     "Moderate", "Moderate", "None",
+            "Moderate", "Light", "None",     "Light", "Moderate", "None",     "Moderate", "Light",
+            "None",     "None",  "Moderate", "Light", "Light",    "Light",    "Light",    "None",
+            "None",     "Light", "None",     "Light", "Light",    "Light",    "Light",    "None",
+            "Light",    "None",  "None",     "None",  "Light",    "None",     "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Moderate", "Moderate",
+            "Light",    "Light", "None",     "None",  "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Trace",    "Trace", "Trace",    "Trace",    "Heavy",    "Heavy",
+            "None",     "None",  "None",     "None",  "None",     "None",     "None",     "None",
+            "None",     "None",  "None",     "None",  "None",     "None",     "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Trace",    "Trace",    "Trace",    "Trace",
+            "Trace",    "Trace", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Light",    "Light",    "Light",    "Light",
+            "Light",    "Light", "Light",    "Light", "Trace",    "Trace",    "None",     "None",
+            "Light",    "Light", "Trace",    "Heavy", "Trace",    "Trace",    "Trace",    "Trace",
+            "Trace",    "Trace", "Trace",    "Trace", "Trace",    "Trace",    "Trace",    "Trace",
             "Trace"
         );
 
@@ -489,13 +432,13 @@
         if ( $weatherbug_state = $v_weatherbug->{said} ) {
             if ( $weatherbug_state eq 'getforecast' ) {
                 start $p_weather_weatherbug_forecast;
-            } # ----------------------------------------------------------------------
+            }    # ----------------------------------------------------------------------
             if ( $weatherbug_state eq 'getcitycode' ) {
                 start $p_weather_weatherbug_citycode;
-            } # ----------------------------------------------------------------------
+            }    # ----------------------------------------------------------------------
             if ( $weatherbug_state eq 'LiveWeather' ) {
                 start $p_weather_weatherbug_liveweather;
-            } # ----------------------------------------------------------------------
+            }    # ----------------------------------------------------------------------
             if ( $weatherbug_state eq 'debug' ) {
 
                 # toggle the debug state
@@ -503,14 +446,14 @@
                 $debug = 0 if ( $Debug{weatherbug} == 1 );
                 $debug = 1 if ( $Debug{weatherbug} == 0 );
                 $Debug{weatherbug} = $debug;
-            } # ----------------------------------------------------------------------
+            }    # ----------------------------------------------------------------------
         }
 
         #------------- End of voice commands said if block ---------------------
         # this next code run when the processes are completed and the file is ready
         # ------------ Get LiveWeather -----------------
         if ( done_now $p_weather_weatherbug_liveweather) {
-            $Weather{weatherbug_obsv_valid} = 0; #Set to not valid unless proven
+            $Weather{weatherbug_obsv_valid} = 0;    #Set to not valid unless proven
             my $weatherbug_xml = file_read $weatherbug_obs_file;
             print_log "Weatherbug location liveweather.";
 
@@ -546,16 +489,10 @@
             my ($f_obsec) = $f_obdate =~ /$pattern/;
 
             #<aws:am-pm abbrv="PM" />
-            my $pattern = '<aws:am-pm abbrv="([APM]*)"';
-            my ($f_obampm) = $f_obdate =~ /$pattern/;
-            my $f_obsdate =
-                $f_obmonth . "/"
-              . $f_obday . "/"
-              . $f_obyear . " "
-              . $f_obhour . ":"
-              . $f_obmin . " "
-              . $f_obampm;
-            my $pattern = '<aws:station>(.*?)</aws:station>';
+            my $pattern     = '<aws:am-pm abbrv="([APM]*)"';
+            my ($f_obampm)  = $f_obdate =~ /$pattern/;
+            my $f_obsdate   = $f_obmonth . "/" . $f_obday . "/" . $f_obyear . " " . $f_obhour . ":" . $f_obmin . " " . $f_obampm;
+            my $pattern     = '<aws:station>(.*?)</aws:station>';
             my ($f_station) = $f_observation =~ /$pattern/;
 
             #<aws:requested-station-id />
@@ -599,13 +536,7 @@
             my ($f_obsec)   = $f_obdate =~ /$pattern/;
             my $pattern     = '<aws:am-pm abbrv="([APM]*)"';
             my ($f_obampm)  = $f_obdate =~ /$pattern/;
-            my $f_gustdate =
-                $f_obmonth . "/"
-              . $f_obday . "/"
-              . $f_obyear . " "
-              . $f_obhour . ":"
-              . $f_obmin . " "
-              . $f_obampm;
+            my $f_gustdate  = $f_obmonth . "/" . $f_obday . "/" . $f_obyear . " " . $f_obhour . ":" . $f_obmin . " " . $f_obampm;
 
             #<aws:gust-time>
             #<aws:year number="2008" />
@@ -690,18 +621,15 @@
             my ($f_winddirectionavg) = $f_observation =~ /$pattern/;
 
             #<aws:wind-direction-avg>SSW</aws:wind-direction-avg>
-            $Weather{weatherbug_obsv_date}              = $f_obsdate;
-            $Weather{weatherbug_obsv_station}           = $f_station;
-            $Weather{weatherbug_obsv_currentconditions} = $f_currentcondition;
-            $Weather{weatherbug_obsv_currentconditionnumber} =
-              $f_currentconditionnum;
+            $Weather{weatherbug_obsv_date}                   = $f_obsdate;
+            $Weather{weatherbug_obsv_station}                = $f_station;
+            $Weather{weatherbug_obsv_currentconditions}      = $f_currentcondition;
+            $Weather{weatherbug_obsv_currentconditionnumber} = $f_currentconditionnum;
 
             # then the extensions developed for mh tests
             if ( $f_currentconditionnum <= $wxbug_maximum_code ) {
-                $Weather{weatherbug_obsv_precip_type} =
-                  $wxbug_precip_type[$f_currentconditionnum];
-                $Weather{weatherbug_obsv_precip_ammount} =
-                  $wxbug_precip_ammount[$f_currentconditionnum];
+                $Weather{weatherbug_obsv_precip_type}    = $wxbug_precip_type[$f_currentconditionnum];
+                $Weather{weatherbug_obsv_precip_ammount} = $wxbug_precip_ammount[$f_currentconditionnum];
             }
             else {    # We are here because the code is > known table
                 $Weather{weatherbug_obsv_precip_type}    = "Unknown";
@@ -728,14 +656,11 @@
 
             #prepare a vector to pass data to internet weather
             my %wxbug_pass;
-            $wxbug_pass{TempOutdoor} = $f_temp;
-            $wxbug_pass{DewOutdoor}  = $f_dewpoint;
-            $wxbug_pass{WindAvgDir} =
-              &Weather_Common::convert_wind_dir_abbr_to_num(
-                $f_winddirectionavg);
-            $wxbug_pass{WindAvgSpeed} = $f_windspeedavg;
-            $wxbug_pass{WindGustDir} =
-              &Weather_Common::convert_wind_dir_abbr_to_num($f_gustdirection);
+            $wxbug_pass{TempOutdoor}   = $f_temp;
+            $wxbug_pass{DewOutdoor}    = $f_dewpoint;
+            $wxbug_pass{WindAvgDir}    = &Weather_Common::convert_wind_dir_abbr_to_num($f_winddirectionavg);
+            $wxbug_pass{WindAvgSpeed}  = $f_windspeedavg;
+            $wxbug_pass{WindGustDir}   = &Weather_Common::convert_wind_dir_abbr_to_num($f_gustdirection);
             $wxbug_pass{WindGustSpeed} = $f_gustspeed;
             $wxbug_pass{WindGustTime}  = $f_gustdate;
 
@@ -773,10 +698,8 @@
             $wxbug_pass{Barom}                = $f_pressure;
             $wxbug_pass{HumidOutdoorMeasured} = 1;
             $wxbug_pass{HumidOutdoor}         = $f_humidity;
-            $wxbug_pass{RainRate} =
-              $wxbug_precip_ammount[$f_currentconditionnum];
-            &Weather_Common::populate_internet_weather( \%wxbug_pass,
-                $config_parms{weather_weatherbug_elements} );
+            $wxbug_pass{RainRate}             = $wxbug_precip_ammount[$f_currentconditionnum];
+            &Weather_Common::populate_internet_weather( \%wxbug_pass, $config_parms{weather_weatherbug_elements} );
 
             &Weather_Common::weather_updated;
         }
@@ -820,11 +743,9 @@
                     my ($f_zipcode)     = $weatherbug_location =~ /$pattern/;
                     my $pattern         = 'citycode="(\d+)"';
                     my ($f_citycode)    = $weatherbug_location =~ /$pattern/;
-                    print_log
-                      "Citycode=$f_citycode for $f_cityname,$f_statename,$f_countryname."
+                    print_log "Citycode=$f_citycode for $f_cityname,$f_statename,$f_countryname."
                       if ( $f_citycode != 0 );
-                    print_log
-                      "Zipcode=$f_zipcode for $f_cityname,$f_statename,$f_countryname."
+                    print_log "Zipcode=$f_zipcode for $f_cityname,$f_statename,$f_countryname."
                       if ( $f_zipcode != 0 );
                 }
                 print_log "Weatherbug location search result.";
@@ -846,19 +767,11 @@
             # Do a test to see if the data returned is likely valid.
             # There should be a title for forecast in the text for the
             # city if the fetch was successful
-            $Weather{weatherbug_fcst_valid} = 0; #Set to not valid unless proven
+            $Weather{weatherbug_fcst_valid} = 0;    #Set to not valid unless proven
             my $search_for = "Forecast for $weatherbug_city";
             my $title      = $channel->first_child_text("title");
-            logit(
-                "$config_parms{data_dir}/web/weatherbug_debug",
-                "Search for: " . $search_for,
-                13, 0
-            ) if ( $Debug{weatherbug} );
-            logit(
-                "$config_parms{data_dir}/web/weatherbug_debug",
-                "WeatherBug returned: $title",
-                13, 0
-            ) if ( $Debug{weatherbug} );
+            logit( "$config_parms{data_dir}/web/weatherbug_debug", "Search for: " . $search_for,  13, 0 ) if ( $Debug{weatherbug} );
+            logit( "$config_parms{data_dir}/web/weatherbug_debug", "WeatherBug returned: $title", 13, 0 ) if ( $Debug{weatherbug} );
             if ( $title =~ /$search_for/i ) {
                 $Weather{weatherbug_fcst_valid} = 1;
             }
@@ -866,21 +779,16 @@
                 # the test for forecast failed
                 # Since there is not an forecast title assume failure
                 $Weather{weatherbug_valid} = 0;
-                print_log
-                  "weatherbug: Error Did not find forecast for $weatherbug_city.";
-                print_log
-                  "weatherbug: Check the $weatherbug_file file for which city was found and modify the config parameters.";
+                print_log "weatherbug: Error Did not find forecast for $weatherbug_city.";
+                print_log "weatherbug: Check the $weatherbug_file file for which city was found and modify the config parameters.";
                 goto fail;
             }
 
             # Valid forecast so record the forecast date and time to live
             my $f_date       = $channel->first_child_text("lastBuildDate");
             my $f_timetolive = $channel->first_child_text("ttl");
-            logit(
-                "$config_parms{data_dir}/web/weatherbug_debug",
-                $f_date . ' for ' . $f_timetolive . ' minutes',
-                13, 0
-            ) if ( $Debug{weatherbug} );
+            logit( "$config_parms{data_dir}/web/weatherbug_debug", $f_date . ' for ' . $f_timetolive . ' minutes', 13, 0 )
+              if ( $Debug{weatherbug} );
 
             my $fcast_counter = 0;
 
@@ -892,8 +800,7 @@
                 next unless my $f_day = $title->att("alttitle");
 
                 # If we got here we have a valid forecast to process
-                logit( "$config_parms{data_dir}/web/weatherbug_debug",
-                    $forecast->print, 13, 0 )
+                logit( "$config_parms{data_dir}/web/weatherbug_debug", $forecast->print, 13, 0 )
                   if ( $Debug{weatherbug} );
                 $f_day = ucfirst( lc($f_day) );
 
@@ -940,8 +847,7 @@
                     }
                 }
 
-                my $f_prediction =
-                  $forecast->first_child_text("aws:prediction");
+                my $f_prediction = $forecast->first_child_text("aws:prediction");
 
                 # Get the chance of rain or snow
                 my $pattern = 'There is a (\d+)% chance of precipitation';
@@ -1019,8 +925,7 @@
                       . ' valid for '
                       . $f_timetolive
                       . ' minutes.';
-                    logit( "$config_parms{data_dir}/web/weatherbug_debug",
-                        $temp, 13, 0 );
+                    logit( "$config_parms{data_dir}/web/weatherbug_debug", $temp, 13, 0 );
                 }
 
                 # load the forecast into the hash
@@ -1055,8 +960,7 @@
                 $Weather{$hashindex} = $f_conditions;
                 my $hashindex = "weatherbug_frcst_" . $findex . "_precip_type";
                 $Weather{$hashindex} = $f_precip_type;
-                my $hashindex =
-                  "weatherbug_frcst_" . $findex . "_precip_ammount";
+                my $hashindex = "weatherbug_frcst_" . $findex . "_precip_ammount";
                 $Weather{$hashindex} = $f_precip_ammount;
 
                 # increment the forecast counter for the next forecast day
diff --git a/code/common/x10_item_commands.pl b/code/common/x10_item_commands.pl
index 58d4feec1..738f5b1ee 100644
--- a/code/common/x10_item_commands.pl
+++ b/code/common/x10_item_commands.pl
@@ -21,38 +21,25 @@
             $states = $config_parms{x10_menu_states}
               unless $object->isa('X10_Appliance')
               or $object->isa('X10_Appliancelinc');
-            $states .=
-              ',add to scene,remove from scene,set ramp rate,set on level'
+            $states .= ',add to scene,remove from scene,set ramp rate,set on level'
               if $object->isa('X10_Switchlinc')
               or $object->isa('X10_Appliancelinc')
               or $object->isa('X10_Lamplinc')
               or $object->isa('X10_Keypadlinc');
-            $object_string .=
-              "$object_name_v  = new Voice_Cmd '$command [$states]';\n";
+            $object_string .= "$object_name_v  = new Voice_Cmd '$command [$states]';\n";
             $object_string .= "$object_name_v -> tie_items($object_name);\n\n";
-            $object_string .=
-              &store_object_data( $object_name_v, 'Voice_Cmd', 'X10',
-                'x10_item_commands' );
+            $object_string .= &store_object_data( $object_name_v, 'Voice_Cmd', 'X10', 'x10_item_commands' );
         }
         else {
             $states = 'on,off,resume,enroll,unenroll,manual';
-            $object_string .=
-              "$object_name_v  = new Voice_Cmd '$command [$states]';\n";
-            $object_string .=
-              "$object_name_v -> tie_event('$object_name->enroll', 'enroll');\n\n";
-            $object_string .=
-              "$object_name_v -> tie_event('$object_name->remove_all_members', 'unenroll');\n\n";
-            $object_string .=
-              "$object_name_v -> tie_items($object_name, 'on');\n\n";
-            $object_string .=
-              "$object_name_v -> tie_items($object_name, 'off');\n\n";
-            $object_string .=
-              "$object_name_v -> tie_items($object_name, 'resume');\n\n";
-            $object_string .=
-              "$object_name_v -> tie_items($object_name, 'manual');\n\n";
-            $object_string .=
-              &store_object_data( $object_name_v, 'Voice_Cmd', 'X10',
-                'x10_scene_commands' );
+            $object_string .= "$object_name_v  = new Voice_Cmd '$command [$states]';\n";
+            $object_string .= "$object_name_v -> tie_event('$object_name->enroll', 'enroll');\n\n";
+            $object_string .= "$object_name_v -> tie_event('$object_name->remove_all_members', 'unenroll');\n\n";
+            $object_string .= "$object_name_v -> tie_items($object_name, 'on');\n\n";
+            $object_string .= "$object_name_v -> tie_items($object_name, 'off');\n\n";
+            $object_string .= "$object_name_v -> tie_items($object_name, 'resume');\n\n";
+            $object_string .= "$object_name_v -> tie_items($object_name, 'manual');\n\n";
+            $object_string .= &store_object_data( $object_name_v, 'Voice_Cmd', 'X10', 'x10_scene_commands' );
         }
     }
     eval $object_string;
diff --git a/code/common/x10_reset.pl b/code/common/x10_reset.pl
index 6aec2e00c..e7ad439b2 100644
--- a/code/common/x10_reset.pl
+++ b/code/common/x10_reset.pl
@@ -12,16 +12,14 @@
 
 if ($Reload) {
     my $command = 'state_now $Power_Supply =~ /restored/i';
-    &trigger_set( $command, "run_voice_cmd('Restore all X10 items')",
-        'NoExpire', 'restore x10 items' )
+    &trigger_set( $command, "run_voice_cmd('Restore all X10 items')", 'NoExpire', 'restore x10 items' )
       unless &trigger_get('restore x10 items');
 }
 
 # Events
 
 if ( said $v_reset_x10_states) {
-    $v_reset_x10_states->respond(
-        "Restoring all X10 items to previous states...");
+    $v_reset_x10_states->respond("Restoring all X10 items to previous states...");
     my ( $object_name, $object, $state, $level );
 
     # Use this if you have a Group called PFL with the list of items you wanted restored
diff --git a/code/common/xAP_command.pl b/code/common/xAP_command.pl
index 8ce6bb1c6..6c4837b7c 100644
--- a/code/common/xAP_command.pl
+++ b/code/common/xAP_command.pl
@@ -26,36 +26,29 @@
         $explicitTargets = $$xap_command_external{'command.external'}{targets};
         $targets = $targets . ",$explicitTargets" if defined($explicitTargets);
 
-        print
-          "s=$state, command=$$xap_command_external{'command.external'}{command}, xap=$xap_command_external\n";
+        print "s=$state, command=$$xap_command_external{'command.external'}{command}, xap=$xap_command_external\n";
         $response =
-          &process_external_command(
-            $$xap_command_external{'command.external'}{command},
-            1, $xap_command_external, $targets );
+          &process_external_command( $$xap_command_external{'command.external'}{command}, 1, $xap_command_external, $targets );
 
         # Special error response.  Normal response handled by respond_xap
         if ( $response ne 1 ) {
             my $target = $$xap_command_external{'xap-header'}{'source'};
             $target = '*'
-              unless $target
-              ;    # not good form as target='*' will get stripped out; but ...
-            &xAP::sendXap( $target, "command.response",
-                'command.response' => { response => '', error => 1 } );
+              unless $target;    # not good form as target='*' will get stripped out; but ...
+            &xAP::sendXap( $target, "command.response", 'command.response' => { response => '', error => 1 } );
 
             # respond with a message indicating failure if xap targets specified
             if ( defined($explicitTargets) ) {
                 &::respond(
                     target => $explicitTargets,
-                    text =>
-                      "Failure on command: $$xap_command_external{'command.external'}{command}"
+                    text   => "Failure on command: $$xap_command_external{'command.external'}{command}"
                 );
             }
 
             # respond w/ xap "ackmsg" if it is defined--particularly useful for non-info-oriented commands
             # note: the "ackmsg" response here occurs after any implicit responds occuring in process_external_command
         }
-        elsif ( defined( $$xap_command_external{'command.external'}{ackmsg} ) )
-        {
+        elsif ( defined( $$xap_command_external{'command.external'}{ackmsg} ) ) {
             if ( defined($explicitTargets) ) {
                 &::respond(
                     target => $explicitTargets,
@@ -64,8 +57,7 @@
             }
             else {
                 # assume that the user wanted the ackmsg spoken if no targets are defined
-                &::respond(
-                    "$$xap_command_external{'command.external'}{ackmsg}");
+                &::respond("$$xap_command_external{'command.external'}{ackmsg}");
             }
         }
         $explicitTargets = undef;
@@ -87,16 +79,12 @@
         my $target;
         $xap_command_external2->{set_by} = "xap [msgr:$respondtgt]";
 
-        my $response =
-          &process_external_command( $command, 1, $xap_command_external2,
-            $target );
+        my $response = &process_external_command( $command, 1, $xap_command_external2, $target );
 
         # Special error response.  Normal response handled by respond_xap
         if ( $response ne 1 ) {
             my $target = '*';
-            &xAP::sendXap( $target, "messenger.cmd",
-                'message.send' =>
-                  { to => $respondtgt, body => 'Error encountered' } );
+            &xAP::sendXap( $target, "messenger.cmd", 'message.send' => { to => $respondtgt, body => 'Error encountered' } );
         }
     }
 
@@ -111,13 +99,11 @@ sub respond_xap {
     my $target = $parms{to};
     my ( $xapclass, $to ) = $target =~ /(.*):(.*)/;
     if ( $xapclass eq 'msgr' ) {
-        &xAP::sendXap( '*', "messenger.cmd",
-            "message.send" => { to => $to, body => $parms{text} } );
+        &xAP::sendXap( '*', "messenger.cmd", "message.send" => { to => $to, body => $parms{text} } );
     }
     else {
         $target = '*'
-          unless
-          $target;  # not good form as target='*' will get stripped out; but ...
+          unless $target;    # not good form as target='*' will get stripped out; but ...
         &xAP::sendXap(
             $target,
             "command.response",
@@ -146,8 +132,7 @@ sub respond_xap {
         my $error = $$xap_command_response{'command.response'}{error};
 
         if ($error) {
-            &::print_log( "An command response error was received from "
-                  . $$xap_command_response{'xap-header'}{source} );
+            &::print_log( "An command response error was received from " . $$xap_command_response{'xap-header'}{source} );
         }
         elsif ($response) {
             &::speak("$app $mode $response");
@@ -177,8 +162,7 @@ sub respond_xap {
         $source = '*'
           unless $source;    # revert to blind broadcast if not resolvable
         $item->set( $state, "xAP [$source]" );
-        print "xAP item mirrored: name=$name, state=$state, set_by=$set_by "
-          . "target=$target source=$source\n"
+        print "xAP item mirrored: name=$name, state=$state, set_by=$set_by " . "target=$target source=$source\n"
           if $Debug{xap_item};
     }
 }
diff --git a/code/common/xAP_news.pl b/code/common/xAP_news.pl
index c8476a6a1..44f21730a 100644
--- a/code/common/xAP_news.pl
+++ b/code/common/xAP_news.pl
@@ -19,7 +19,7 @@
         print "xAP_news: s=$station $section t=$title\n" if $Debug{xap_news};
         next if !$title or $News->{titles}{$title};
         $link = $1
-          if $link =~ /base=(http.+)/; # Drop redirect prefix found on some urls
+          if $link =~ /base=(http.+)/;    # Drop redirect prefix found on some urls
         $News->{titles}{$title}{link}    = $link;
         $News->{titles}{$title}{station} = $station;
         $News->{titles}{$title}{time}    = $Time_Now;
@@ -33,8 +33,7 @@
     my $news    = "$station: $title";
 
     my ( %log, $log );
-    $config_parms{xAP_news} =
-      'cnn => msg&display, slashdot => speak&display, default => display&print'
+    $config_parms{xAP_news} = 'cnn => msg&display, slashdot => speak&display, default => display&print'
       unless $config_parms{xAP_news};
     &main::read_parm_hash( \%log, lc $config_parms{xAP_news} );
     $log = $log{$station};
diff --git a/code/common/xAP_send.pl b/code/common/xAP_send.pl
index b64de5075..b4cdef2d0 100644
--- a/code/common/xAP_send.pl
+++ b/code/common/xAP_send.pl
@@ -17,12 +17,7 @@
 if ( new_minute 1 and ( $xap_echo_all or $config_parms{xap_echo_weather} ) ) {
 
     # Scheme from: From: http://www.xapautomation.org/modules.php?name=Sections&op=viewarticle&artid=2
-    my $f_date =
-        $Year
-      . ( ( length($Month) == 1 ) ? '0' : '' )
-      . $Month
-      . ( ( length($Mday) == 1 ) ? '0' : '' )
-      . $Mday;
+    my $f_date = $Year . ( ( length($Month) == 1 ) ? '0' : '' ) . $Month . ( ( length($Mday) == 1 ) ? '0' : '' ) . $Mday;
     my $f_tod = ($Dark) ? 'Night' : 'Day';
     my $f_time =
         ( ( length($Hour) == 1 ) ? '0' : '' )
@@ -31,8 +26,7 @@
       . $Minute . ':'
       . ( ( length($Second) == 1 ) ? '0' : '' )
       . $Second;
-    my ( $sunriseh, $sunrisem, $sunrisec ) =
-      $Time_Sunrise =~ /(\S+):(\S+) (\S+)/;
+    my ( $sunriseh, $sunrisem, $sunrisec ) = $Time_Sunrise =~ /(\S+):(\S+) (\S+)/;
     $sunriseh += 12 if $sunrisec =~ /pm/i;
     my ( $sunseth, $sunsetm, $sunsetc ) = $Time_Sunset =~ /(\S+):(\S+) (\S+)/;
     $sunseth += 12 if $sunsetc =~ /pm/i;
@@ -42,10 +36,7 @@
     my $windspeedc = ( $config_parms{weather_uom_wind} =~ /mph/i ) ? 'M' : 'K';
     my $tempc      = ( $config_parms{weather_uom_temp} =~ /^f$/i ) ? 'F' : 'C';
 
-    my $f_description =
-        $Weather{Clouds}
-      . ( ( $Weather{Clouds} ) ? ' ' : '' )
-      . $Weather{Conditions};
+    my $f_description = $Weather{Clouds} . ( ( $Weather{Clouds} ) ? ' ' : '' ) . $Weather{Conditions};
     my $conditions =
       ( $Weather{Conditions} ) ? $Weather{Conditions} : $Weather{Clouds};
     my $f_icon = '';
@@ -56,8 +47,7 @@
         $f_icon = 'sunny';
     }
 
-    my $f_winddir =
-      &Weather_Common::convert_wind_dir_to_abbr( $Weather{WindAvgDir} );
+    my $f_winddir = &Weather_Common::convert_wind_dir_to_abbr( $Weather{WindAvgDir} );
 
     my ( $weatherrpt, $timerpt );
     $weatherrpt->{'UTC'}             = $f_utc;
@@ -154,8 +144,7 @@ sub xAP_send_speak {
     my $voice = $$parms_ref{'voice'};
     if ($voice) {
         my (%voice_names);
-        &main::read_parm_hash( \%voice_names,
-            $main::config_parms{voice_names} );
+        &main::read_parm_hash( \%voice_names, $main::config_parms{voice_names} );
         if ( exists( $voice_names{$voice} ) ) {
             $voice = $voice_names{$voice};
         }
@@ -193,12 +182,9 @@ sub xAP_send_speak {
     my $source    = $_xap_speech_echo_obj->{'xap-header'}{source};
     my $classname = $_xap_speech_echo_obj->{'xap-header'}{class};
     return
-      unless (
-           ( ( $classname eq 'tts.speak' ) and $config_parms{xap_echo_speech} )
-        or
-        ( ( $classname eq 'mhtts.speak' ) and $config_parms{xap_echo_mhspeech} )
-        or $xap_echo_all
-      );
+      unless ( ( ( $classname eq 'tts.speak' ) and $config_parms{xap_echo_speech} )
+        or ( ( $classname eq 'mhtts.speak' ) and $config_parms{xap_echo_mhspeech} )
+        or $xap_echo_all );
     my $local_xap_address = &xAP::get_xap_mh_source_info();
     my $text_to_speak     = $_xap_speech_echo_obj->{'tts.speak'}{say};
     print "DBG xAP speech echo source = $source says: $text_to_speak\n"
diff --git a/code/common/xPL_test.pl b/code/common/xPL_test.pl
index 9996ea90b..74839e342 100755
--- a/code/common/xPL_test.pl
+++ b/code/common/xPL_test.pl
@@ -28,10 +28,8 @@
 # Note how $state is used to flag the field that state will correlate to.
 #
 $xpl_speak1_v = new Voice_Cmd 'Test speech to an xpl client [1,2]';
-$xpl_speak1 =
-  new xPL_Item( 'tonyt-tts.voice1', 'tts.basic' => { speech => '$state' } );
-$xpl_speak2 = new xPL_Item( 'tonyt-ttsagent.agent1',
-    'tts.basic' => { speech => '$state' } );
+$xpl_speak1   = new xPL_Item( 'tonyt-tts.voice1', 'tts.basic' => { speech => '$state' } );
+$xpl_speak2   = new xPL_Item( 'tonyt-ttsagent.agent1', 'tts.basic' => { speech => '$state' } );
 set $xpl_speak1 "xpl client says the time is $Time_Now"
   if state_now $xpl_speak1_v == 1;
 set $xpl_speak2 "Hi, I'm an agent.   Today is $Date_Now"
@@ -40,16 +38,13 @@
 #
 # Test X10 data. Note:  Not yet tested with any X10 clients yet
 #
-$outside_light_xpl =
-  new xPL_Item( 'ACME-LAMP.outside', 'lamp.basic' => { action => '$state' } );
-$outside_light_xpl->tie_event(
-    'print_log "xpl says outside light was set to $state"');
+$outside_light_xpl = new xPL_Item( 'ACME-LAMP.outside', 'lamp.basic' => { action => '$state' } );
+$outside_light_xpl->tie_event('print_log "xpl says outside light was set to $state"');
 
 #
 # Test the Tony's nifty RIO xPL client
 #
-$rio_kitchen =
-  new xPL_Item( 'tonyt-rio.unit100', 'rio.basic' => { sel => '$state' } );
+$rio_kitchen = new xPL_Item( 'tonyt-rio.unit100', 'rio.basic' => { sel => '$state' } );
 $rio_kitchen = new xPL_Rio('tonyt-rio.unit100');
 
 my $rio_states = join ',', @{ $$rio_kitchen{states} };
@@ -71,8 +66,7 @@
 
     set $outside_light_xpl TOGGLE if $state == 1;
 
-    &xAP::send( 'xPL', 'ACME-LAMP.LIVINGROOM',
-        'lamp.basic' => { action => 'on' } )
+    &xAP::send( 'xPL', 'ACME-LAMP.LIVINGROOM', 'lamp.basic' => { action => 'on' } )
       if $state == 2;
 
     &xAP::send( 'xPL', 'tonyt-rio.unit100', 'rio.basic' => { sel => 'skip' } )
@@ -101,7 +95,6 @@ sub xpl_speak {
       if $parms{volume};
 
     for my $room (@rooms) {
-        &xAP::send( 'xPL', "tonyt-tts.$room",
-            'tts.basic' => { speech => $parms{text} } );
+        &xAP::send( 'xPL', "tonyt-tts.$room", 'tts.basic' => { speech => $parms{text} } );
     }
 }
diff --git a/code/common/xbmc_notification.pl b/code/common/xbmc_notification.pl
index 8ef3f1576..05527059e 100644
--- a/code/common/xbmc_notification.pl
+++ b/code/common/xbmc_notification.pl
@@ -30,9 +30,7 @@ sub display_xbmcosd {
     my ( $title, $text ) = @_;
 
     unless ( $config_parms{xbmc_notify_address} ) {
-        print_log(
-            "xbmc_notify_address has not been set in mh.ini, Unable to notify XBMC."
-        );
+        print_log( "xbmc_notify_address has not been set in mh.ini, Unable to notify XBMC." );
         return;
     }
 
diff --git a/code/common/xosd.pl b/code/common/xosd.pl
index 7a493c05b..ae0fe26c2 100644
--- a/code/common/xosd.pl
+++ b/code/common/xosd.pl
@@ -41,8 +41,7 @@
 sub display_osd {
     my ($text) = @_;
     set $Xosd_text $text;
-    set $Xosd_state
-      'off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~15~off';
+    set $Xosd_state 'off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~1~off~1~on~15~off';
 }
 
 $v_xosd = new Voice_Cmd("Test xosd");
diff --git a/code/examples/DSC5401/DSC5401-2nd_approach.pl b/code/examples/DSC5401/DSC5401-2nd_approach.pl
index 3b4f090a8..653af464b 100644
--- a/code/examples/DSC5401/DSC5401-2nd_approach.pl
+++ b/code/examples/DSC5401/DSC5401-2nd_approach.pl
@@ -26,15 +26,12 @@ sub DSC2SQL {
 
     DSC2SQL("system $AlarmState by $DSC->{user_name} ($DSC->{user_id})")
       if $AlarmState =~ /^armed/i;
-    Send_Email( "misterhouse",
-        "Alarm armed by user $DSC->{user_name} or MH reboot",
-        $::config_parms{Pager} )
+    Send_Email( "misterhouse", "Alarm armed by user $DSC->{user_name} or MH reboot", $::config_parms{Pager} )
       if $AlarmState =~ /^armed/i;
 
     DSC2SQL("system $AlarmState by $DSC->{user_name} ($DSC->{user_id})")
       if $AlarmState =~ /^disarmed/i;
-    Send_Email( "misterhouse", "Alarm disarmed by user $DSC->{user_name}",
-        $::config_parms{Pager} )
+    Send_Email( "misterhouse", "Alarm disarmed by user $DSC->{user_name}", $::config_parms{Pager} )
       if $AlarmState =~ /^disarmed/i;
 
     DSC2SQL("system is now in $AlarmState") if $AlarmState =~ /^alarm/i;
@@ -110,13 +107,8 @@ sub DSC2SQL {
                 }
 
                 # send a page to my cell phone
-                ($MovieFile) = $MovieFile =~
-                  /.*\/(.*)$/;    # get only the file name without path
-                Send_Email(
-                    "Motion detected",
-                    "Motion detected in file $MovieFile",
-                    $::config_parms{Pager}
-                );
+                ($MovieFile) = $MovieFile =~ /.*\/(.*)$/;    # get only the file name without path
+                Send_Email( "Motion detected", "Motion detected in file $MovieFile", $::config_parms{Pager} );
                 print_log "Motion detected while alarm is on ($MovieFile)";
                 unlink $::config_parms{MotionLastMovie};
             }
@@ -223,16 +215,13 @@ sub DSC2SQL {
 $v_alarm_status = new Voice_Cmd "DSC Status Report";
 $DSC->cmd("001") if said $v_alarm_status;
 
-$v_alarm_partition_arm =
-  new Voice_Cmd "DSC Arm partition 1 without access code";
+$v_alarm_partition_arm = new Voice_Cmd "DSC Arm partition 1 without access code";
 $DSC->cmd( "PartitionArmControl", 1 ) if said $v_alarm_partition_arm;
 
 # 010
-$v_alarm_set_time_date =
-  new Voice_Cmd "DSC Set Alarm system to the current computer time";
+$v_alarm_set_time_date = new Voice_Cmd "DSC Set Alarm system to the current computer time";
 if ( said $v_alarm_set_time_date) {
-    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime(time);
+    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
     $year = sprintf( "%02d", $year % 100 );
     $mon += 1;
     $m    = ( $m < 10 )    ? "0" . $m    : $m;
@@ -241,26 +230,21 @@ sub DSC2SQL {
     $mon  = ( $mon < 10 )  ? "0" . $mon  : $mon;
     my $TimeStamp = "$h$m$mon$mday$year";
     &::print_log("Setting time on DSC panel to $TimeStamp");
-    &::logit(
-        "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-        "Setting time on DSC panel to $TimeStamp"
-    );
+    &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "Setting time on DSC panel to $TimeStamp" );
     $DSC->cmd( "SetDateTime", $TimeStamp );
 }
 
 # here you have to give the user access code, replace #### with the access code
 # note this is not secure
 # 033
-$v_alarm_partition_arm_code =
-  new Voice_Cmd "DSC Arm partition 1 from webpage with user code";
+$v_alarm_partition_arm_code = new Voice_Cmd "DSC Arm partition 1 from webpage with user code";
 $DSC->cmd( "PartitionArmControlWithCode", "1", "$PWD" )
   if said $v_alarm_partition_arm_code;
 
 # here you have to give the user access code, replace #### with the access code
 # note this is not secure
 # 040
-$v_alarm_partition_disarm =
-  new Voice_Cmd "DSC Disarm partition 1 from webpage with user code";
+$v_alarm_partition_disarm = new Voice_Cmd "DSC Disarm partition 1 from webpage with user code";
 $DSC->cmd( "PartitionDisarmControl", "1", "$PWD" )
   if said $v_alarm_partition_disarm;
 
diff --git a/code/examples/DSC5401/DSC_Alert_Controls.pl b/code/examples/DSC5401/DSC_Alert_Controls.pl
index 9357b1755..c26f7dfe7 100644
--- a/code/examples/DSC5401/DSC_Alert_Controls.pl
+++ b/code/examples/DSC5401/DSC_Alert_Controls.pl
@@ -30,10 +30,8 @@
 }
 
 if ( ( $alarm_previous_state = 1 ) && ( $DSC->state_now =~ /^disarmed/ ) ) {
-    print_log
-      "DSC Restored after alarm By: $DSC->{user_name} ($DSC->{user_id})";
-    $DSC_text =
-      "DSC Alarm Restored by $DSC->{user_name} ($DSC->{user_id}) $Date_Now $Time_Now";
+    print_log "DSC Restored after alarm By: $DSC->{user_name} ($DSC->{user_id})";
+    $DSC_text = "DSC Alarm Restored by $DSC->{user_name} ($DSC->{user_id}) $Date_Now $Time_Now";
 
     &alarm_page("$DSC_text");
     $DSC_text             = "";
@@ -43,8 +41,7 @@
 if ( expired $DSC_Alarm_Timer) {
     $alarm_previous_state = 0;
     print_log "DSC-MH Automatic Reset Alarm after infaction... ";
-    $DSC_text =
-      "DSC-MH Automatic Reset Alarm after infaction... $Date_Now $Time_Now";
+    $DSC_text = "DSC-MH Automatic Reset Alarm after infaction... $Date_Now $Time_Now";
     &alarm_page("$DSC_text");
     $DSC_text = "";
 }
diff --git a/code/examples/DSC5401/DSC_Clock.pl b/code/examples/DSC5401/DSC_Clock.pl
index 786087c39..5112bf46e 100644
--- a/code/examples/DSC5401/DSC_Clock.pl
+++ b/code/examples/DSC5401/DSC_Clock.pl
@@ -14,8 +14,7 @@
 
 #- Each new day Sync DSC Time Clock to MH
 if ($New_Day) {
-    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime(time);
+    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
     $year = sprintf( "%02d", $year % 100 );
     $mon += 1;
     $m    = ( $m < 10 )    ? "0" . $m    : $m;
@@ -24,10 +23,7 @@
     $mon  = ( $mon < 10 )  ? "0" . $mon  : $mon;
     my $TimeStamp = "$h$m$mon$mday$year";
     &::print_log("Setting time on DSC panel to $TimeStamp");
-    &::logit(
-        "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-        "Setting time on DSC panel to $TimeStamp"
-    );
+    &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "Setting time on DSC panel to $TimeStamp" );
     $DSC->cmd( "SetDateTime", $TimeStamp );
 }    # END of new day
 
diff --git a/code/examples/DSC5401/DSCmotion.pl b/code/examples/DSC5401/DSCmotion.pl
index 180fbe32b..92eccaa3a 100644
--- a/code/examples/DSC5401/DSCmotion.pl
+++ b/code/examples/DSC5401/DSCmotion.pl
@@ -133,12 +133,12 @@
         if ( $State_Light eq OFF ) {
             set $Cuisine_Lumiere -40 if Time_Schedule( $Time_Sunset, "22:00" );
             set $Cuisine_Lumiere -45 if Time_Schedule( "22:00",      "23:59" );
-            set $Cuisine_Lumiere -50 if Time_Schedule( "00:00", $Time_Sunrise );
+            set $Cuisine_Lumiere -50 if Time_Schedule( "00:00",      $Time_Sunrise );
         }
         if ( active $IR_Cuisine1_Timer) { unset $IR_Cuisine1_Timer }
         set $IR_Cuisine1_Timer 600 if Time_Schedule( $Time_Sunset, "21:00" );
         set $IR_Cuisine1_Timer 300 if Time_Schedule( "21:00",      "23:59" );
-        set $IR_Cuisine1_Timer 120 if Time_Schedule( "00:00", $Time_Sunrise );
+        set $IR_Cuisine1_Timer 120 if Time_Schedule( "00:00",      $Time_Sunrise );
     }
 
     #--- T O I L E T T E
@@ -156,7 +156,7 @@
         if ( active $IR_Toilette_Timer) { unset $IR_Toilette_Timer }
         set $IR_Toilette_Timer 600 if Time_Schedule( $Time_Sunset, "23:00" );
         set $IR_Toilette_Timer 300 if Time_Schedule( "23:00",      "23:59" );
-        set $IR_Toilette_Timer 200 if Time_Schedule( "00:00", $Time_Sunrise );
+        set $IR_Toilette_Timer 200 if Time_Schedule( "00:00",      $Time_Sunrise );
     }
 
     #--- E N T R E   C O T E
@@ -171,7 +171,7 @@
         if ( active $IR_Entre_Cote_Timer) { unset $IR_Entre_Cote_Timer }
         set $IR_Entre_Cote_Timer 600 if Time_Schedule( $Time_Sunset, "21:00" );
         set $IR_Entre_Cote_Timer 300 if Time_Schedule( "21:00",      "23:59" );
-        set $IR_Entre_Cote_Timer 200 if Time_Schedule( "00:00", $Time_Sunrise );
+        set $IR_Entre_Cote_Timer 200 if Time_Schedule( "00:00",      $Time_Sunrise );
     }
 }    #--- If Dark
 #
@@ -235,8 +235,7 @@ sub Time_Schedule {
     my $Time_Stop  = my_str2time($time2);
 
     if ( $Time_Stop <= $Time_Start ) {
-        print_log
-          "Error Time Schedule Stop:($Time_Stop) <= Start:($Time_Start)";
+        print_log "Error Time Schedule Stop:($Time_Stop) <= Start:($Time_Start)";
         return 0;
     }
     elsif ( ( $Time >= $Time_Start ) && ( $Time <= $Time_Stop ) ) {
diff --git a/code/examples/ISDN.pl b/code/examples/ISDN.pl
index 986a71c49..f3ea87980 100644
--- a/code/examples/ISDN.pl
+++ b/code/examples/ISDN.pl
@@ -25,19 +25,19 @@
 
     my ( $NumChannels, %current, %service );
 
-    my $i = 4;    # Start at first option flag
+    my $i = 4;                                             # Start at first option flag
     while ( $i < length($packet) ) {
         my $option = unpack( 'C', substr( $packet, $i,     1 ) );
         my $length = unpack( 'C', substr( $packet, $i + 1, 1 ) );
         $i += 2;
         print_log "Option = $option Length = $length " if $config_parms{debug};
 
-        if ( $option == 1 ) {    # Number of channels running
+        if ( $option == 1 ) {                              # Number of channels running
             $NumChannels = unpack( 'C', substr( $packet, $i, 1 ) );
             print_log "NumChannels = $NumChannels\n" if $config_parms{debug};
         }
 
-        if ( $option == 2 ) {    # Call Type/Direction Channel 1
+        if ( $option == 2 ) {                              # Call Type/Direction Channel 1
             $current{1}{callflag} = unpack( 'C', substr( $packet, $i, 1 ) );
             if ( 1 == $current{1}{callflag} ) {
                 $current{1}{calltype} = 'VOICE';
@@ -59,8 +59,7 @@
                 $current{1}{calltype} = '';
                 $current{1}{calldir}  = '';
             }
-            print_log
-              "Current call channel 1 = $current{1}{callflag} $current{1}{calltype} $current{1}{calldir}\n"
+            print_log "Current call channel 1 = $current{1}{callflag} $current{1}{calltype} $current{1}{calldir}\n"
               if $config_parms{debug};
         }
 
@@ -138,8 +137,7 @@
                 $current{2}{calltype} = '';
                 $current{2}{calldir}  = '';
             }
-            print_log
-              "Current call Channel 2 = $current{2}{callflag} $current{2}{calltype} $current{2}{calldir}\n"
+            print_log "Current call Channel 2 = $current{2}{callflag} $current{2}{calltype} $current{2}{calldir}\n"
               if $config_parms{debug};
         }
 
@@ -250,13 +248,10 @@
 sub callerid {
     my ($cid_nmbr) = @_;
     my $cid_speak_nmbr =
-        substr( $cid_nmbr, 0, 3 ) . "."
-      . substr( $cid_nmbr, 3, 3 ) . "."
-      . substr( $cid_nmbr, 6, 4 );        # Pauses for speak
+      substr( $cid_nmbr, 0, 3 ) . "." . substr( $cid_nmbr, 3, 3 ) . "." . substr( $cid_nmbr, 6, 4 );    # Pauses for speak
     my $areacode = substr( $cid_nmbr, 0, 3 );
     $cid_speak_nmbr = substr( $cid_speak_nmbr, 3, 8 )
-      if ( $areacode eq $config_parms{local_area_code} )
-      ;                                   # Drop area code if same
+      if ( $areacode eq $config_parms{local_area_code} );                                               # Drop area code if same
 #### $Caller_ID::state_by_areacode{$areacode};
     # Put Spaces in the Phone Number to 'speak' correctly
     my @chars = split //, $cid_speak_nmbr;
@@ -265,15 +260,13 @@ sub callerid {
         $cid_speak_nmbr .= $char . " ";
     }
 
-    my $cid_speak_name = '';              # for now...
-                                          # Long term logs
-    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-        "$cid_nmbr $cid_name" );
-    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $cid_nmbr, "$Time_Now $Date_Now $Year name=$cid_name" );
+    my $cid_speak_name = '';                                                                            # for now...
+                                                                                                        # Long term logs
+    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$cid_nmbr $cid_name" );
+    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $cid_nmbr, "$Time_Now $Date_Now $Year name=$cid_name" );
 
     # Short term log; speak or clear via X10 keypresses.
-    open( CALLLOG, ">>$config_parms{data_dir}\\phone\\callerid.log" );  # Log it
+    open( CALLLOG, ">>$config_parms{data_dir}\\phone\\callerid.log" );                                  # Log it
     print CALLLOG "$Date_Now`$Time_Now`$cid_speak_name`$cid_speak_nmbr\n";
     close CALLLOG;
 
diff --git a/code/examples/Insteon_thermostat.pl b/code/examples/Insteon_thermostat.pl
index add1c959c..a92c0d2bb 100755
--- a/code/examples/Insteon_thermostat.pl
+++ b/code/examples/Insteon_thermostat.pl
@@ -25,8 +25,7 @@
 if ( my $state = state_now $thermostat) {
     print_log("[HVAC] Got new thermostat state: $state");
     if ( $state eq 'temp_change' ) {
-        print_log(
-            "[HVAC] Thermostat temp_change to " . $thermostat->get_temp );
+        print_log( "[HVAC] Thermostat temp_change to " . $thermostat->get_temp );
     }
 }
 
@@ -88,8 +87,7 @@
     $thermostat->cool_setpoint(77);
     $thermostat->poll_setpoint();
 }
-$v_set_nighttime_setpoints =
-  new Voice_Cmd('Set thermostat nighttime setpoints');
+$v_set_nighttime_setpoints = new Voice_Cmd('Set thermostat nighttime setpoints');
 if ( said $v_set_nighttime_setpoints) {
     $thermostat->mode('auto');
     $thermostat->heat_setpoint(70);
diff --git a/code/examples/Voice_Cmd_enumeration.pl b/code/examples/Voice_Cmd_enumeration.pl
index 741f46ab7..ecee9a84f 100644
--- a/code/examples/Voice_Cmd_enumeration.pl
+++ b/code/examples/Voice_Cmd_enumeration.pl
@@ -3,8 +3,7 @@
 # with  a 'state enumeration group' bounded with [].
 
 # Example of several phrase enumeration groups
-$v_test1 =
-  new Voice_Cmd("{turn,set} the {living,famliy} room {light,lights} [on,off]");
+$v_test1 = new Voice_Cmd("{turn,set} the {living,famliy} room {light,lights} [on,off]");
 
 # Example of how to specify optional words
 $v_test2 = new Voice_Cmd("{Please, } tell me the time");
diff --git a/code/examples/hello_print.pl b/code/examples/hello_print.pl
index a5d244a8e..5b6b39128 100644
--- a/code/examples/hello_print.pl
+++ b/code/examples/hello_print.pl
@@ -4,6 +4,5 @@
 if ( $New_Second and !( $Second % 5 ) ) {
     my $uptime_pgm = &time_diff( $Time_Startup_time, time );
     my $uptime_computer = &time_diff( 0, (get_tickcount) / 1000 );
-    print_log
-      "Hi, I was started $uptime_pgm ago. The computer was booted $uptime_computer ago.\n";
+    print_log "Hi, I was started $uptime_pgm ago. The computer was booted $uptime_computer ago.\n";
 }
diff --git a/code/examples/iButton_weather_station.pl b/code/examples/iButton_weather_station.pl
index 653a66074..23f59a45f 100755
--- a/code/examples/iButton_weather_station.pl
+++ b/code/examples/iButton_weather_station.pl
@@ -36,8 +36,7 @@
     $Weather{WindSpeed}   = state $ib_wind_speed;
     #
     # Define the derived variables
-    $Weather{WindGustDir} =
-      $Weather{WindDir};    # Whats the relation between Dir and GustDir?
+    $Weather{WindGustDir}   = $Weather{WindDir};                        # Whats the relation between Dir and GustDir?
     $Weather{WindAvgDir}    = &average_wind_dir( $Weather{WindDir} );
     $Weather{WindGustSpeed} = $Weather{WindSpeed}
       if $Weather{WindSpeed} > $Weather{WindGustSpeed};
@@ -48,17 +47,12 @@
     # Log variables
     $Weather{SummaryWind} = sprintf(
         "cur/avg %s(%3.1f)/%s(%3.1f) %3.1f%s/%3.1f%s",
-        ( &convert_wind_dir_to_abbr( $Weather{WindDir} ) ),
-        $Weather{WindDir},
-        ( &convert_wind_dir_to_abbr( $Weather{WindAvgDir} ) ),
-        $Weather{WindAvgDir},
-        $Weather{WindSpeed},
-        $main::config_parms{weather_uom_wind},
-        $Weather{WindAvgSpeed},
-        $main::config_parms{weather_uom_wind}
+        ( &convert_wind_dir_to_abbr( $Weather{WindDir} ) ),    $Weather{WindDir},
+        ( &convert_wind_dir_to_abbr( $Weather{WindAvgDir} ) ), $Weather{WindAvgDir},
+        $Weather{WindSpeed},                                   $main::config_parms{weather_uom_wind},
+        $Weather{WindAvgSpeed},                                $main::config_parms{weather_uom_wind}
     );
-    $Weather{SummaryTemp} = sprintf( "%3.1f%s",
-        $Weather{TempOutdoor}, $main::config_parms{weather_uom_temp} );
+    $Weather{SummaryTemp} = sprintf( "%3.1f%s", $Weather{TempOutdoor}, $main::config_parms{weather_uom_temp} );
     #
     print_log "Wind $Weather{SummaryWind}, Temperature $Weather{SummaryTemp}";
     &Weather_Common::weather_updated;
@@ -104,9 +98,7 @@ sub convert_wind_dir_to_abbr {
     my ($dir) = @_;
     return 'unknown' if $dir !~ /^[\d \.]+$/;
     if ( $dir >= 0 and $dir <= 360 ) {
-        return
-          qw{North NNE NE ENE East ESE SE SSE South SSW SW WSW West WNW NW NNW North}
-          [ ( ( $dir + 11.25 ) / 22.5 ) % 16 ];
+        return qw{North NNE NE ENE East ESE SE SSE South SSW SW WSW West WNW NW NNW North} [ ( ( $dir + 11.25 ) / 22.5 ) % 16 ];
     }
     return 'unknown';
 }
@@ -116,15 +108,11 @@ sub windchill {
     my $wind = shift;
     my $chill;
 
-    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) )
-    {
+    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) ) {
         $chill = '';
     }
     else {
-        $chill =
-          ( 13.12 + 0.6215 * $temp -
-              11.37 * ( $wind**0.16 ) +
-              0.3965 * $temp * ( $wind**0.16 ) );
+        $chill = ( 13.12 + 0.6215 * $temp - 11.37 * ( $wind**0.16 ) + 0.3965 * $temp * ( $wind**0.16 ) );
         $chill = int( $chill + 0.5 );
         print "temp $temp wind $wind chill $chill\n";
     }
@@ -136,13 +124,10 @@ sub iButton_wind_read {
     #wind speed (mph)
     #
     my $wind_time1 = &get_tickcount;
-    my $count =
-      $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
+    my $count      = $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
     #
     if ($wind_time2) {
-        my $revolution_sec =
-          ( ( $count - $last_wind_count ) * 1000 ) /
-          ( $wind_time1 - $wind_time2 ) / 2.0;
+        my $revolution_sec = ( ( $count - $last_wind_count ) * 1000 ) / ( $wind_time1 - $wind_time2 ) / 2.0;
         set $ib_wind_speed sprintf( "%3.2f", $revolution_sec * 2.453 );
     }
     #
@@ -207,17 +192,12 @@ sub read_ds2450 {
     # H=high,M=medium,L=low,Z=zero
     #
     $ib_wind_dir->Hardware::iButton::Device::DS2450::convert('all');
-    my ( $A, $B, $C, $D ) =
-      $ib_wind_dir->Hardware::iButton::Device::DS2450::readAD('all');
+    my ( $A, $B, $C, $D ) = $ib_wind_dir->Hardware::iButton::Device::DS2450::readAD('all');
     my $channel_A_state = &volts_to_state($A);
     my $channel_B_state = &volts_to_state($B);
     my $channel_C_state = &volts_to_state($C);
     my $channel_D_state = &volts_to_state($D);
-    return
-        $channel_A_state
-      . $channel_B_state
-      . $channel_C_state
-      . $channel_D_state;
+    return $channel_A_state . $channel_B_state . $channel_C_state . $channel_D_state;
 }
 
 sub volts_to_state {
@@ -254,20 +234,14 @@ sub setup_ds2450 {
         $D{resolution} = 4;
         $D{range}      = 5.12;
         #
-        if (
-            $ib_wind_dir->Hardware::iButton::Device::DS2450::setup(
-                $VCC, \%A, \%B, \%C, \%D
-            )
-          )
-        {
+        if ( $ib_wind_dir->Hardware::iButton::Device::DS2450::setup( $VCC, \%A, \%B, \%C, \%D ) ) {
             $setupds2450 = 1;
         }
         if ( $setupds2450 = 1 ) {
             print_log "Initialised weather station DS2450";
         }
         else {
-            print_log
-              "Failed to initialise weather station DS2450, retrying...";
+            print_log "Failed to initialise weather station DS2450, retrying...";
             sleep 1;
         }
     }
diff --git a/code/examples/list_groups.pl b/code/examples/list_groups.pl
index e856afa4a..0b65e8b6b 100644
--- a/code/examples/list_groups.pl
+++ b/code/examples/list_groups.pl
@@ -6,8 +6,7 @@
     for my $object_name ( &list_objects_by_type('X10_Item') ) {
         my $object = &get_object_by_name($object_name);
         for my $group ( &list_groups_by_object($object) ) {
-            print
-              "$object->{object_name} is a member of $group->{object_name}\n";
+            print "$object->{object_name} is a member of $group->{object_name}\n";
         }
     }
 }
diff --git a/code/examples/ncpuxa_example.pl b/code/examples/ncpuxa_example.pl
index 7c02288f9..c24f1f97f 100644
--- a/code/examples/ncpuxa_example.pl
+++ b/code/examples/ncpuxa_example.pl
@@ -29,8 +29,7 @@
 
 $TV = new IR_Item 'TV', '', 'ncpuxa', \%tvmap;
 
-$v_tv_control = new Voice_Cmd(
-    "tv [power,on,off,mute,vol+,vol-,ch+,ch-,video1,video2,video3,last,13]");
+$v_tv_control = new Voice_Cmd("tv [power,on,off,mute,vol+,vol-,ch+,ch-,video1,video2,video3,last,13]");
 
 if ( $state = said $v_tv_control) {
     print_log "Setting TV to $state";
@@ -99,8 +98,7 @@
 
 $VCR = new IR_Item 'VCR', '', 'ncpuxa', \%vcrmap;
 
-$v_vcr_control =
-  new Voice_Cmd("vcr [power,on,off,ch+,ch-,record,play,pause,stop,ff,rew]");
+$v_vcr_control = new Voice_Cmd("vcr [power,on,off,ch+,ch-,record,play,pause,stop,ff,rew]");
 
 if ( $state = said $v_vcr_control) {
     print_log "Setting VCR to $state";
@@ -132,8 +130,7 @@
 
 $CD = new IR_Item 'CD', '', 'ncpuxa', \%cdmap;
 
-$v_cd_control =
-  new Voice_Cmd("cd [power,on,off,play,stop,track+,track-,disc+,disc-,pause]");
+$v_cd_control = new Voice_Cmd("cd [power,on,off,play,stop,track+,track-,disc+,disc-,pause]");
 
 if ( $state = said $v_cd_control) {
     print_log "Setting CD to $state";
diff --git a/code/examples/network_items_web.pl b/code/examples/network_items_web.pl
index cd95818cc..f6a4a0b89 100644
--- a/code/examples/network_items_web.pl
+++ b/code/examples/network_items_web.pl
@@ -10,8 +10,7 @@ sub web_networkitems {
     my $nd_up     = 0;
 
     for my $net_item ( list $network_items) {
-        $html_data .=
-          "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
+        $html_data .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>\n";
         my $tmp_name = $net_item->{object_name};
         $tmp_name =~ s/\$//g;
         $html_data .= "<td nowrap>$net_item->{object_name}</td>";
diff --git a/code/examples/ocelot_infrared.pl b/code/examples/ocelot_infrared.pl
index d69a6ae69..5686038ff 100644
--- a/code/examples/ocelot_infrared.pl
+++ b/code/examples/ocelot_infrared.pl
@@ -47,10 +47,7 @@
 
 my $tv_controls       = 'power,vol+,vol-,ch+,ch-,display,last';
 my $tv_local_channels = '2,4,5,7,9,11,13,14';
-my %tv_cable_channels = (
-    'TLC', 69, 'Discovery', 67, 'Comedy', 62, 'VH1', 38,
-    'CNN', 46, 'Animal',    68, 'Food',   55,
-);
+my %tv_cable_channels = ( 'TLC', 69, 'Discovery', 67, 'Comedy', 62, 'VH1', 38, 'CNN', 46, 'Animal', 68, 'Food', 55, );
 
 my $tv_states =
     $tv_controls . ','
@@ -126,8 +123,7 @@
 
 $AMP = new IR_Item 'AMP', '', 'ncpuxa', \%ampmap;
 
-$v_amp_control =
-  new Voice_Cmd("amp [on,off,mute,vol+,vol-,dvd,cd,tv,vcr,tape]");
+$v_amp_control = new Voice_Cmd("amp [on,off,mute,vol+,vol-,dvd,cd,tv,vcr,tape]");
 
 if ( $state = said $v_amp_control) {
     print_log "Setting AMP to $state";
@@ -168,9 +164,7 @@
 
 $DVD = new IR_Item 'DVD', '', 'ncpuxa', \%dvdmap;
 
-$v_dvd_control = new Voice_Cmd(
-    "dvd [power,play,pause,stop,chap+,chap-,menu,up,down,left,right,select,rew,ff]"
-);
+$v_dvd_control = new Voice_Cmd( "dvd [power,play,pause,stop,chap+,chap-,menu,up,down,left,right,select,rew,ff]" );
 
 if ( $state = said $v_dvd_control) {
     print_log "Setting DVD to $state";
@@ -208,9 +202,7 @@
 
 $VCR = new IR_Item 'VCR', '', 'ncpuxa', \%vcrmap;
 
-$v_vcr_control = new Voice_Cmd(
-    "vcr [power,cable,v4,video2,video3,mute,vol+,vol-,ch+,ch-,record,play,pause,stop,ff,rew]"
-);
+$v_vcr_control = new Voice_Cmd( "vcr [power,cable,v4,video2,video3,mute,vol+,vol-,ch+,ch-,record,play,pause,stop,ff,rew]" );
 
 if ( $state = said $v_vcr_control) {
     print_log "Setting VCR to $state";
@@ -257,9 +249,7 @@
 
 $CD = new IR_Item 'CD', '', 'ncpuxa', \%cdmap;
 
-$v_cd_control = new Voice_Cmd(
-    "cd control [on,off,play,stop,next track,previous track,next disc,previous disc,pause]"
-);
+$v_cd_control = new Voice_Cmd( "cd control [on,off,play,stop,next track,previous track,next disc,previous disc,pause]" );
 
 if ( $state = said $v_cd_control) {
     $state = "disc+"  if $state eq 'next disc';
diff --git a/code/examples/ocelot_sprinklers.pl b/code/examples/ocelot_sprinklers.pl
index 0d9cd7d21..70dd7e176 100644
--- a/code/examples/ocelot_sprinklers.pl
+++ b/code/examples/ocelot_sprinklers.pl
@@ -9,28 +9,21 @@
 
 =cut
 
-$back_yard_north_lawn_sprinklers =
-  new Serial_Item( 'OUTPUT8high', ON, "ncpuxa" );
+$back_yard_north_lawn_sprinklers = new Serial_Item( 'OUTPUT8high', ON, "ncpuxa" );
 $back_yard_north_lawn_sprinklers->add( 'OUTPUT8low', OFF );
-$back_yard_south_lawn_sprinklers =
-  new Serial_Item( 'OUTPUT9high', ON, "ncpuxa" );
+$back_yard_south_lawn_sprinklers = new Serial_Item( 'OUTPUT9high', ON, "ncpuxa" );
 $back_yard_south_lawn_sprinklers->add( 'OUTPUT9low', OFF );
-$back_yard_far_flowerbed_sprinklers =
-  new Serial_Item( 'OUTPUT10high', ON, "ncpuxa" );
+$back_yard_far_flowerbed_sprinklers = new Serial_Item( 'OUTPUT10high', ON, "ncpuxa" );
 $back_yard_far_flowerbed_sprinklers->add( 'OUTPUT10low', OFF );
-$back_yard_near_flowerbed_sprinklers =
-  new Serial_Item( 'OUTPUT11high', ON, "ncpuxa" );
+$back_yard_near_flowerbed_sprinklers = new Serial_Item( 'OUTPUT11high', ON, "ncpuxa" );
 $back_yard_near_flowerbed_sprinklers->add( 'OUTPUT11low', OFF );
-$front_yard_north_lawn_sprinklers =
-  new Serial_Item( 'OUTPUT12high', ON, "ncpuxa" );
+$front_yard_north_lawn_sprinklers = new Serial_Item( 'OUTPUT12high', ON, "ncpuxa" );
 $front_yard_north_lawn_sprinklers->add( 'OUTPUT12low', OFF );
-$front_yard_south_lawn_sprinklers =
-  new Serial_Item( 'OUTPUT13high', ON, "ncpuxa" );
+$front_yard_south_lawn_sprinklers = new Serial_Item( 'OUTPUT13high', ON, "ncpuxa" );
 $front_yard_south_lawn_sprinklers->add( 'OUTPUT13low', OFF );
 $side_yard_garden_sprinklers = new Serial_Item( 'OUTPUT14high', ON, "ncpuxa" );
 $side_yard_garden_sprinklers->add( 'OUTPUT14low', OFF );
-$front_yard_flowerbed_sprinklers =
-  new Serial_Item( 'OUTPUT15high', ON, "ncpuxa" );
+$front_yard_flowerbed_sprinklers = new Serial_Item( 'OUTPUT15high', ON, "ncpuxa" );
 $front_yard_flowerbed_sprinklers->add( 'OUTPUT15low', OFF );
 
 # noloop=start
@@ -42,8 +35,7 @@
 
 # noloop=stop
 
-eval
-  "my \$toggle = \$$state->state eq 'off' ? 'on' : 'off'; \$$state->set(\$toggle); print_log 'Turning $state ' . \$toggle"
+eval "my \$toggle = \$$state->state eq 'off' ? 'on' : 'off'; \$$state->set(\$toggle); print_log 'Turning $state ' . \$toggle"
   if $state = state_now $list_sprinkler_toggle;
 
 =begin comment
diff --git a/code/examples/onewire_xap.pl b/code/examples/onewire_xap.pl
index 84998de1b..0a3164796 100644
--- a/code/examples/onewire_xap.pl
+++ b/code/examples/onewire_xap.pl
@@ -19,16 +19,14 @@
 my $thermo_temps = "68,69,70,71,72,73,74,75,76,77,78,79,80";
 
 # define voice commands to set thermostat cool and heat setpoints
-$v_thermo_cool_sp =
-  new Voice_Cmd("Set thermostat cool setpoint to [$thermo_temps]");
+$v_thermo_cool_sp = new Voice_Cmd("Set thermostat cool setpoint to [$thermo_temps]");
 if ( $state = said $v_thermo_cool_sp) {
     $main::Save{'cool_setpoint'} = $state;
     $temp_inside->token( 'cool_setpoint', $state );
     $temp_inside->check_tied_state_conditions();
 }
 
-$v_thermo_heat_sp =
-  new Voice_Cmd("Set thermostat heat setpoint to [$thermo_temps]");
+$v_thermo_heat_sp = new Voice_Cmd("Set thermostat heat setpoint to [$thermo_temps]");
 if ( $state = said $v_thermo_heat_sp) {
     $main::Save{'heat_setpoint'} = $state;
     $temp_inside->token( 'heat_setpoint', $state );
@@ -46,9 +44,8 @@
 # now, create the conditions ("rules") used for state transition
 # note the use of $token_<tokentag> syntax
 my $hot_condition     = '$measurement > $token_cool_setpoint';
-my $comfort_condition = '$token_heat_setpoint <= $measurement and '
-  . '$measurement <= $token_cool_setpoint';
-my $cool_condition = '$measurement < $token_heat_setpoint';
+my $comfort_condition = '$token_heat_setpoint <= $measurement and ' . '$measurement <= $token_cool_setpoint';
+my $cool_condition    = '$measurement < $token_heat_setpoint';
 
 # now, tie the conditions
 $temp_inside->tie_state_condition( $hot_condition,     'hot' );
diff --git a/code/examples/organizer_vmode.pl b/code/examples/organizer_vmode.pl
index dccd2ff8a..ec9d41734 100644
--- a/code/examples/organizer_vmode.pl
+++ b/code/examples/organizer_vmode.pl
@@ -13,9 +13,7 @@
 my $organizer_vsdb = "$config_parms{organizer_dir}/calendar.tab";
 
 $org_vacation_check = new Voice_Cmd 'Check for new vacation events';
-$org_vacation_check->set_info(
-    'Creates MisterHouse events based on organizer calendar VACATION categories'
-);
+$org_vacation_check->set_info( 'Creates MisterHouse events based on organizer calendar VACATION categories' );
 
 if ( said $org_vacation_check
     or ( $New_Minute and file_changed $organizer_file) )
@@ -27,8 +25,7 @@
     open( MYCODE, ">$mycode" ) or print_log "Error in open on $mycode: $!\n";
     print MYCODE "\n# Category = Time\n";
     print MYCODE "\n#@ Auto-generated from Organizer_vmode.pl\n\n";
-    print MYCODE
-      " if ((\$New_Minute and (time_now(\"\$New_Day + 0:01\"))) or (\$Reload)) {\n";
+    print MYCODE " if ((\$New_Minute and (time_now(\"\$New_Day + 0:01\"))) or (\$Reload)) {\n";
 
     while ( !$objDB->EOF ) {
         my $date     = $objDB->FieldValue('DATE');
@@ -50,18 +47,15 @@
 
         my $vacation_time =
           &time_date_stamp( 14, ( &my_str2time($calc_time) + 60 ) );
-        my ($vacation_start) =
-          $vacation_time =~ /^(\S\S\S\s\d\d\/\d\d\/\d\d) \d\d:\d\d:\d\d/;
+        my ($vacation_start) = $vacation_time =~ /^(\S\S\S\s\d\d\/\d\d\/\d\d) \d\d:\d\d:\d\d/;
         my $vacation_end = $vacation_start . " 23:59:59";
         $vacation_start .= " 00:00:00";
 
         if ( $vacation eq "on" ) {
 
             #print "db:vmode ct=[$calc_time] vt=[$vacation_time] vd=[$vacation_start]\n";
-            print MYCODE
-              "   if (time_between \"$vacation_start\", \"$vacation_end\") {\n";
-            print MYCODE
-              "     print_log \"Today is a vacation, setting vacation mode\";\n";
+            print MYCODE "   if (time_between \"$vacation_start\", \"$vacation_end\") {\n";
+            print MYCODE "     print_log \"Today is a vacation, setting vacation mode\";\n";
             print MYCODE "     set \$mode_occupied 'vacation';\n";
             print MYCODE "   }; \# Vacation is $event\n\n";
         }
diff --git a/code/examples/play_midi_windows.pl b/code/examples/play_midi_windows.pl
index f46cb1e20..ce58545d4 100644
--- a/code/examples/play_midi_windows.pl
+++ b/code/examples/play_midi_windows.pl
@@ -14,8 +14,7 @@
 #
 
 $midi_test_p = new Process_Item;
-$midi_test_v =
-  new Voice_Cmd '[Start,Stop,Play5,Play10,Play20,Play30] a midi file';
+$midi_test_v = new Voice_Cmd '[Start,Stop,Play5,Play10,Play20,Play30] a midi file';
 $midi_test_t = new Timer;
 
 if ( $state = state_now $midi_test_v) {
diff --git a/code/examples/sendkey_browser.pl b/code/examples/sendkey_browser.pl
index 2cf70117b..f512690b1 100644
--- a/code/examples/sendkey_browser.pl
+++ b/code/examples/sendkey_browser.pl
@@ -8,12 +8,7 @@
 if ( $state = said $browser_test) {
     print_log "Running browser test $state";
     if ( $state == 1 ) {
-        if (
-            my $window = &sendkeys_find_window(
-                'Explorer', 'C:\Progra~1\Intern~1\IEXPLORE.EXE'
-            )
-          )
-        {
+        if ( my $window = &sendkeys_find_window( 'Explorer', 'C:\Progra~1\Intern~1\IEXPLORE.EXE' ) ) {
             my $keys = '\\ctrl\\o\\ctrl-\\';
             &SendKeys( $window, $keys, 1 );
         }
diff --git a/code/examples/serial_interface_comfort.pl b/code/examples/serial_interface_comfort.pl
index 9ff7b4da0..a5a169382 100644
--- a/code/examples/serial_interface_comfort.pl
+++ b/code/examples/serial_interface_comfort.pl
@@ -60,8 +60,7 @@
 
     my @comfort_alarm_states = ( "Idle", "Trouble", "Alert", "Alarm" );
 
-    my @comfort_modes = ( "Security OFF", "Away Mode", "Night Mode", "Day Mode",
-        "Vacation Mode" );
+    my @comfort_modes = ( "Security OFF", "Away Mode", "Night Mode", "Day Mode", "Vacation Mode" );
 
     my @comfort_users = ( "Keypad", "Response" );
 
@@ -119,12 +118,10 @@
     elsif ( $c_command eq "MD" ) {
 
         if ( $c_p2 < 16 ) {
-            print_log
-              "Security Mode Changed to : $comfort_modes[$c_p1] by user $c_p2\n";
+            print_log "Security Mode Changed to : $comfort_modes[$c_p1] by user $c_p2\n";
         }
         else {
-            print_log
-              "Security Mode Changed to : $comfort_modes[$c_p1] by $comfort_users[$c_p2 - 90]\n";
+            print_log "Security Mode Changed to : $comfort_modes[$c_p1] by $comfort_users[$c_p2 - 90]\n";
         }
     }
     else {
@@ -172,8 +169,7 @@ ()
     $comfort_time_set_string = strftime( "%Y%m%d%H%M%S", localtime );
     print_log "Setting Comfort Clock : $comfort_time_set_string\n";
 
-    $comfort->add( $C3 . "DT" . $comfort_time_set_string . "\r",
-        'Set_Time', 'serial_comfort' );
+    $comfort->add( $C3 . "DT" . $comfort_time_set_string . "\r", 'Set_Time', 'serial_comfort' );
     set $comfort 'Set_Time';
 }
 
diff --git a/code/examples/socket_test2.pl b/code/examples/socket_test2.pl
index 7280bf32c..acaf18392 100644
--- a/code/examples/socket_test2.pl
+++ b/code/examples/socket_test2.pl
@@ -11,8 +11,7 @@
 my $client1_address = '192.168.0.2:8084';
 $client1 = new Socket_Item( undef, undef, $client1_address );
 
-$v_test_client1 = new Voice_Cmd(
-    "Run socket test: [display,speak,run,log,file,use mhsend command]");
+$v_test_client1 = new Voice_Cmd("Run socket test: [display,speak,run,log,file,use mhsend command]");
 
 if ( $state = said $v_test_client1) {
     print_log "Running client test $state";
@@ -20,8 +19,7 @@
         start $client1;
 
         # This message will be diplayed on the host for 10 seconds
-        set $client1
-          "display 10\nAuthorization: Basic none\n\nHello from mh at $Time_Now";
+        set $client1 "display 10\nAuthorization: Basic none\n\nHello from mh at $Time_Now";
         stop $client1;
     }
 
@@ -34,22 +32,19 @@
 
     elsif ( $state eq 'run' ) {
         start $client1;
-        set $client1
-          "run\nAuthorization: Basic none\n\n'When will the sun set'";
+        set $client1 "run\nAuthorization: Basic none\n\n'When will the sun set'";
         stop $client1;
     }
 
     elsif ( $state eq 'log' ) {
         start $client1;
-        set $client1
-          "log test\nAuthorization: Basic none\n\nLogged this data in test.log";
+        set $client1 "log test\nAuthorization: Basic none\n\nLogged this data in test.log";
         stop $client1;
     }
 
     elsif ( $state eq 'file' ) {
         start $client1;
-        set $client1
-          "file test.txt\nAuthorization: Basic none\n\nSaved this data in test.txt";
+        set $client1 "file test.txt\nAuthorization: Basic none\n\nSaved this data in test.txt";
         stop $client1;
     }
 
diff --git a/code/examples/test_code_hooks.pl b/code/examples/test_code_hooks.pl
index 6fa9aed65..299124584 100644
--- a/code/examples/test_code_hooks.pl
+++ b/code/examples/test_code_hooks.pl
@@ -15,8 +15,7 @@ sub test_speak_hook {
 }
 
 $v_test_play = new Voice_Cmd 'Test the play code hooks';
-tie_event $v_test_play
-  "&play(rooms => 'living', time => 5, file => 'sound_beep1.wav')";
+tie_event $v_test_play "&play(rooms => 'living', time => 5, file => 'sound_beep1.wav')";
 
 $v_test_speak = new Voice_Cmd 'Test the speak code hooks';
 tie_event $v_test_speak "&speak('rooms=all Testing speak hook')";
diff --git a/code/examples/test_dates.pl b/code/examples/test_dates.pl
index 3647dbae3..b7678bf1b 100644
--- a/code/examples/test_dates.pl
+++ b/code/examples/test_dates.pl
@@ -11,8 +11,7 @@
     # Date::Manip needs it in ISO 8601 form: +-HHMM
     # ... hmmm, this messes up str2time from Date::Parse
     # used by net_mail_summary :(
-    $ENV{TZ} = ( ( $config_parms{time_zone} < 0 ) ? '-' : '+' )
-      . sprintf( "%02d00", abs $config_parms{time_zone} );
+    $ENV{TZ} = ( ( $config_parms{time_zone} < 0 ) ? '-' : '+' ) . sprintf( "%02d00", abs $config_parms{time_zone} );
 }
 
 if ( said $test_dates) {
diff --git a/code/examples/test_display_image.pl b/code/examples/test_display_image.pl
index f42bfd24d..a6ad96de7 100644
--- a/code/examples/test_display_image.pl
+++ b/code/examples/test_display_image.pl
@@ -1,8 +1,7 @@
 $test_pic_v = new Voice_Cmd 'Test display picture [1,2,3,4,5]';
 
 if ( $state = said $test_pic_v) {
-    print_log
-      "Running display picture test $state on $config_parms{html_dir}/graphics";
+    print_log "Running display picture test $state on $config_parms{html_dir}/graphics";
     display "$config_parms{html_dir}/graphics/funny_face.gif" if $state == 1;
     display "$config_parms{html_dir}/graphics/funny_face.jpg" if $state == 2;
 }
diff --git a/code/examples/test_ftp.pl b/code/examples/test_ftp.pl
index cdd09e61c..df42462d2 100644
--- a/code/examples/test_ftp.pl
+++ b/code/examples/test_ftp.pl
@@ -25,8 +25,7 @@
     # Process cmds that start with & are assumed
     # to be internal subroutine and are run with eval
     # Currently this only works on unix systems.
-    set $p_test_ftpb
-      "&main::net_ftp(file => 'c:/junk1.txt', file_remote => 'incoming/junk1.txt',"
+    set $p_test_ftpb "&main::net_ftp(file => 'c:/junk1.txt', file_remote => 'incoming/junk1.txt',"
       . "command => '$state', server => 'misterhouse.net',"
       . "user => 'anonymous', password => 'bruce\@misterhouse.net')";
     start $p_test_ftpb;
@@ -40,8 +39,7 @@
 $v_test_ftpb2 = new Voice_Cmd 'Test external ftp [get,put]';
 if ( $state = said $v_test_ftpb2) {
     print_log "Testing external ftp $state";
-    set $p_test_ftpb
-      "net_ftp -file c:/junk1.txt -file_remote incoming/junk1.txt "
+    set $p_test_ftpb "net_ftp -file c:/junk1.txt -file_remote incoming/junk1.txt "
       . "-command $state -server misterhouse.net "
       . "-user anonymous -password bruce\@misterhouse.net";
     start $p_test_ftpb;
diff --git a/code/examples/test_idle.pl b/code/examples/test_idle.pl
index b7818bdad..eff92e38b 100644
--- a/code/examples/test_idle.pl
+++ b/code/examples/test_idle.pl
@@ -17,6 +17,5 @@
 # Examples of tie_time and a simple if test on time_idle
 
 #$test_idle  -> tie_time('time_idle 4 s',    TOGGLE, 'Item toggled by tie_time idle');
-$test_idle->tie_time( 'time_idle 2 s on',
-    OFF, 'Item set to off by tie_time idle' );
+$test_idle->tie_time( 'time_idle 2 s on', OFF, 'Item set to off by tie_time idle' );
 
diff --git a/code/examples/test_keysend.pl b/code/examples/test_keysend.pl
index 39caa6db9..27c964fb1 100644
--- a/code/examples/test_keysend.pl
+++ b/code/examples/test_keysend.pl
@@ -4,8 +4,7 @@
     print_log "Testing Setupsup sendkeys to outlook";
     my $window;
     if ( &WaitForAnyWindow( 'Outlook', \$window, 1000, 100 ) ) {
-        &SendKeys( $window, "\\alt\\te\\ret\\", 1, 500 )
-          ;    # Send alt Tools sEnd Return (for all accounts)
+        &SendKeys( $window, "\\alt\\te\\ret\\", 1, 500 );    # Send alt Tools sEnd Return (for all accounts)
     }
     else {
         print_log "Outlook is not running";
diff --git a/code/examples/test_process.pl b/code/examples/test_process.pl
index 97e2b9af1..b6ad22897 100644
--- a/code/examples/test_process.pl
+++ b/code/examples/test_process.pl
@@ -21,12 +21,10 @@
     # Example of mixing external and internal processes
     #  - internal & functions only work on unix systems.
     if ( $state == 3 and !$OS_win ) {
-        set $test_process1 'sleep 2', '&main::print_log("mid sleep")',
-          'sleep 2';
+        set $test_process1 'sleep 2', '&main::print_log("mid sleep")', 'sleep 2';
     }
     if ( $state == 4 ) {
-        set $test_process1
-          q[perl -e "print 'test to stdout'; warn 'test to stderr'; sleep 5;"];
+        set $test_process1 q[perl -e "print 'test to stdout'; warn 'test to stderr'; sleep 5;"];
         set_timeout $test_process1 99;
         set_output $test_process1 "/tmp/t.out";
         set_errlog $test_process1 "/tmp/t.err";
diff --git a/code/examples/test_speak.pl b/code/examples/test_speak.pl
index d13fa4aa0..2f8c0730c 100644
--- a/code/examples/test_speak.pl
+++ b/code/examples/test_speak.pl
@@ -1,8 +1,7 @@
 
 print '+' if &Voice_Text::is_speaking;
 
-$test_speak = new Voice_Cmd
-  '[start,stop,pause,resume,rewind,fastforward,fast,normal,slow,150,200,300] test speech';
+$test_speak = new Voice_Cmd '[start,stop,pause,resume,rewind,fastforward,fast,normal,slow,150,200,300] test speech';
 
 if ( $state = state_now $test_speak) {
     if ( $state eq 'start' ) {
diff --git a/code/examples/test_tie.pl b/code/examples/test_tie.pl
index 8f0a3f1f6..3335ed326 100644
--- a/code/examples/test_tie.pl
+++ b/code/examples/test_tie.pl
@@ -2,8 +2,7 @@
 # This is an example of how to tie and untie items and events
 
 # Create test command and items
-$v_test_tie = new Voice_Cmd
-  '[tie_a,untie_a,tie_b,untie_b,tie_all,untie_all] test2 to test1';
+$v_test_tie   = new Voice_Cmd '[tie_a,untie_a,tie_b,untie_b,tie_all,untie_all] test2 to test1';
 $v_test_item1 = new Voice_Cmd 'set test1 to [a,b,c]';
 $item1        = new Generic_Item;
 $item2        = new Generic_Item;
@@ -47,8 +46,7 @@
 $windy = new Generic_Item;
 $windy->set_states( ON, OFF );
 
-$item1->tie_filter( 'state $windy eq ON',
-    ON, 'Overriding item1 ON command because of wind' );
+$item1->tie_filter( 'state $windy eq ON', ON, 'Overriding item1 ON command because of wind' );
 
 # This code will disable an item when we are away from the house
 
diff --git a/code/examples/test_time_add.pl b/code/examples/test_time_add.pl
index 062f66e95..38076926d 100644
--- a/code/examples/test_time_add.pl
+++ b/code/examples/test_time_add.pl
@@ -6,8 +6,7 @@
 if ($Startup) {
     $fishtank_light_on_time  = time_add "$Time_Sunrise_Twilight+3:00";
     $fishtank_light_off_time = time_add "$Time_Sunset_Twilight+4:00";
-    $fishtank_light_duration =
-      time_add "$fishtank_light_off_time-$fishtank_light_on_time";
+    $fishtank_light_duration = time_add "$fishtank_light_off_time-$fishtank_light_on_time";
 }
 
 if ($Reread) {
diff --git a/code/examples/test_timer.pl b/code/examples/test_timer.pl
index 766a1c5d6..530f02394 100644
--- a/code/examples/test_timer.pl
+++ b/code/examples/test_timer.pl
@@ -14,9 +14,8 @@
 }
 
 # This shows a count up timer
-$test_timer = new Timer;
-$test_timerv =
-  new Voice_Cmd '[start,stop,restart,pause,resume,query] the stopwatch timer';
+$test_timer  = new Timer;
+$test_timerv = new Voice_Cmd '[start,stop,restart,pause,resume,query] the stopwatch timer';
 
 if ( $state = said $test_timerv) {
     start $test_timer   if $state eq 'start';
diff --git a/code/examples/test_volume.pl b/code/examples/test_volume.pl
index 820af79aa..882f84e3b 100644
--- a/code/examples/test_volume.pl
+++ b/code/examples/test_volume.pl
@@ -2,8 +2,7 @@
 # Test setting of volume in speak and play (Windows only for now).
 
 $v_test_sound1 = new Voice_Cmd 'Play a sound at [20%,50%,100%] volume';
-$v_test_sound1->tie_event(
-    'play(file => "hello_from_bruce.wav", volume => "$state")');
+$v_test_sound1->tie_event('play(file => "hello_from_bruce.wav", volume => "$state")');
 $v_test_sound1->tie_event('print_log "Setting test sound to $state volume"');
 
 $v_test_sound2 = new Voice_Cmd 'Speak text at [20%,50%,100%,] volume';
diff --git a/code/examples/test_web_styles.pl b/code/examples/test_web_styles.pl
index 7debdbbd5..1a435a414 100644
--- a/code/examples/test_web_styles.pl
+++ b/code/examples/test_web_styles.pl
@@ -1,24 +1,20 @@
 # Category=Test
 
-$v_test_dropdown = new Voice_Cmd(
-    'Set dropdown thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]'
-);
+$v_test_dropdown = new Voice_Cmd( 'Set dropdown thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]' );
 $v_test_dropdown->set_info('Test of the dropdown widget');
 $v_test_dropdown->set_web_style('dropdown');
 if ( $state = said $v_test_dropdown) {
     speak( text => "Dropdown widget changed to $state degrees." );
 }
 
-$v_test_radio = new Voice_Cmd(
-    'Set radio thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]');
+$v_test_radio = new Voice_Cmd('Set radio thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]');
 $v_test_radio->set_info('Test of the radio widget');
 $v_test_radio->set_web_style('radio');
 if ( $state = said $v_test_radio) {
     speak( text => "Radio widget changed to $state degrees." );
 }
 
-$v_test_url = new Voice_Cmd(
-    'Set url thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]');
+$v_test_url = new Voice_Cmd('Set url thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,78,79,80]');
 $v_test_url->set_info('Test of the url widget');
 $v_test_url->set_web_style('url');
 if ( $state = said $v_test_url) {
diff --git a/code/examples/tie_example_bill.pl b/code/examples/tie_example_bill.pl
index 83ea65739..dc6443b65 100644
--- a/code/examples/tie_example_bill.pl
+++ b/code/examples/tie_example_bill.pl
@@ -30,19 +30,14 @@
     'on', 'log=fountain.log Fountain ON generated due to time of day' );
 $Outside_Courtyard_Fountain->tie_time( '00,07 16,17,18,29,20,21 * * *',
     'on', 'log=fountain.log Fountain ON generated due to time of day' );
-$Outside_Courtyard_Fountain->tie_time( '00,03,07 22 * * *',
-    'off', 'log=fountain.log Fountain OFF generated due to time of day' );
+$Outside_Courtyard_Fountain->tie_time( '00,03,07 22 * * *', 'off', 'log=fountain.log Fountain OFF generated due to time of day' );
 
 $Outside_Courtyard_Fountain->tie_filter( '$Mode_Vacation->state() eq "on"',
     'on', 'log=fountain.log Fountain ON overridden by vacation mode' );
 $Outside_Courtyard_Fountain->tie_filter( '$Windy->state() eq "1"',
-    'on',
-    'log=fountain.log Fountain ON overridden due to high winds detected' );
-$Outside_Courtyard_Fountain->tie_filter(
-    '$Cold_outside->state() eq "1"',
-    'on',
-    'log=fountain.log Fountain ON overridden due to cold outdoor temperatures'
-);
+    'on', 'log=fountain.log Fountain ON overridden due to high winds detected' );
+$Outside_Courtyard_Fountain->tie_filter( '$Cold_outside->state() eq "1"',
+    'on', 'log=fountain.log Fountain ON overridden due to cold outdoor temperatures' );
 
 #noloop=stop
 
@@ -62,39 +57,29 @@
 #noloop=start
 
 # Morning watering cycle
-$Sprinklers->tie_time( '30 05 * * *', 'on:5,3,2,3,5,2',
-    'log=irrigation.log Running first morning watering cycle' );
-$Sprinklers->tie_time( '30 06 * * *', 'on:5,3,2,3,5,2',
-    'log=irrigation.log Running second morning watering cycle' );
-$Sprinklers->tie_time( '30 07 * * *', 'on:5,3,0,3,5,0',
-    'log=irrigation.log Running third morning watering cycle' );
+$Sprinklers->tie_time( '30 05 * * *', 'on:5,3,2,3,5,2', 'log=irrigation.log Running first morning watering cycle' );
+$Sprinklers->tie_time( '30 06 * * *', 'on:5,3,2,3,5,2', 'log=irrigation.log Running second morning watering cycle' );
+$Sprinklers->tie_time( '30 07 * * *', 'on:5,3,0,3,5,0', 'log=irrigation.log Running third morning watering cycle' );
 
 # Evening watering cycle
-$Sprinklers->tie_time( '$Time_Sunset-1:20', 'on:0,1,0,1',
-    'log=irrigation.log Running first evening watering cycle' );
-$Sprinklers->tie_time( '$Time_Sunset-1:00', 'on:0,1,0,1',
-    'log=irrigation.log Running second evening watering cycle' );
-$Sprinklers->tie_time( '$Time_Sunset-0:40', 'on:0,1,0,1',
-    'log=irrigation.log Running third evening watering cycle' );
-$Sprinklers->tie_time( '$Time_Sunset-0:20', 'on:0,1,0,1',
-    'log=irrigation.log Running fourth evening watering cycle' );
+$Sprinklers->tie_time( '$Time_Sunset-1:20', 'on:0,1,0,1', 'log=irrigation.log Running first evening watering cycle' );
+$Sprinklers->tie_time( '$Time_Sunset-1:00', 'on:0,1,0,1', 'log=irrigation.log Running second evening watering cycle' );
+$Sprinklers->tie_time( '$Time_Sunset-0:40', 'on:0,1,0,1', 'log=irrigation.log Running third evening watering cycle' );
+$Sprinklers->tie_time( '$Time_Sunset-0:20', 'on:0,1,0,1', 'log=irrigation.log Running fourth evening watering cycle' );
 
 # When watering is finished, set the default watering times (one minute per zone)
 $Sprinklers->tie_event( '$Sprinklers->set_runtimes(1,1,1,1,1,1)',
-    'complete',
-    'log=irrigation.log Zone cascade complete, setting default run times' );
+    'complete', 'log=irrigation.log Zone cascade complete, setting default run times' );
 
 # Enable the sprinklers every day at midnight (in case they were disabled for the day due to rain/weather/manual/etc)
-$SprinkerEnable->tie_time( '00 00 * * *', 'on',
-    'log=irrigation.log Sending midnight sprinkler enable command' );
+$SprinkerEnable->tie_time( '00 00 * * *', 'on', 'log=irrigation.log Sending midnight sprinkler enable command' );
 
 # Link the sprinkler test item to the sprinkler on command
 $SprinklerTest->tie_items( $Sprinklers, "on", "on:1,1,1,1,1,1",
     'log=irrigation.log Sprinklers sent on due to sprinkler test command' );
 
 # Filter ON commands to the zone cascade if the cold weather flag is set
-$Sprinklers->tie_filter( '$Cold_outside->state() eq "1"',
-    'on', 'log=irrigation.log Sprinkler run overridden due to cold weather' );
+$Sprinklers->tie_filter( '$Cold_outside->state() eq "1"', 'on', 'log=irrigation.log Sprinkler run overridden due to cold weather' );
 
 #noloop=stop
 
diff --git a/code/examples/timer_remarks.pl b/code/examples/timer_remarks.pl
index a554652fb..a3216baf8 100644
--- a/code/examples/timer_remarks.pl
+++ b/code/examples/timer_remarks.pl
@@ -2,8 +2,7 @@
 # An example of how to add some character to your timer reminders :)
 
 $v_laundry_timer = new Voice_Cmd('Laundry timer [on,off]');
-$v_laundry_timer->set_info(
-    'Set a 35 minute timer to remind when the cloths are washed/dried');
+$v_laundry_timer->set_info('Set a 35 minute timer to remind when the cloths are washed/dried');
 
 $timer_laundry = new Timer;
 
@@ -40,7 +39,6 @@ sub laundry_reminder {
         'are having dinner',
         'are electrocuting each other with static'
     );
-    speak "rooms=all The laundry clothes "
-      . $laundry_reminders[ int rand @laundry_reminders ];
+    speak "rooms=all The laundry clothes " . $laundry_reminders[ int rand @laundry_reminders ];
 }
 
diff --git a/code/examples/timer_reminder.pl b/code/examples/timer_reminder.pl
index 1918ce91d..7891dd1df 100644
--- a/code/examples/timer_reminder.pl
+++ b/code/examples/timer_reminder.pl
@@ -4,8 +4,7 @@
 $timer_school_v = new Voice_Cmd 'Set the school timer';
 
 $timer_school1 = new Timer;
-$timer_school1->set( 15 * 60,
-    "speak 'Timer expired.  Go get the kids from school'" )
+$timer_school1->set( 15 * 60, "speak 'Timer expired.  Go get the kids from school'" )
   if said $timer_school_v;
 
 $timer_school2 = new Timer;
diff --git a/code/examples/tk_examples.pl b/code/examples/tk_examples.pl
index 0c8b674d1..dc2baaac5 100644
--- a/code/examples/tk_examples.pl
+++ b/code/examples/tk_examples.pl
@@ -1,8 +1,7 @@
 
 # This code shows how to use a Generic_Item and tk button to store/test/change a state
 
-my $alarm_states =
-  "Disarmed,Disarming,Arming,Armed,Violated,Exit Delay,Entry Delay";
+my $alarm_states = "Disarmed,Disarming,Arming,Armed,Violated,Exit Delay,Entry Delay";
 my @alarm_states = split ',', $alarm_states;
 
 $alarm_status   = new Generic_Item;
diff --git a/code/examples/volume_level_reset_httpq.pl b/code/examples/volume_level_reset_httpq.pl
index 4a3cb8f74..ed81f8211 100644
--- a/code/examples/volume_level_reset_httpq.pl
+++ b/code/examples/volume_level_reset_httpq.pl
@@ -3,14 +3,13 @@
 # Category=All
 
 $movement_sensor = new Serial_Item( 'XAJ', ON );    # Need ON and OFF
-$movement_sensor->add( 'XAK', OFF );    # Just once to control all Hawkeyes
-$movement_sensor_unit = new Serial_Item( 'XA4', 'office' )
-  ;    # Add one line per Hawkeye, Set code to Hawkeye
+$movement_sensor->add( 'XAK', OFF );                # Just once to control all Hawkeyes
+$movement_sensor_unit = new Serial_Item( 'XA4', 'office' );    # Add one line per Hawkeye, Set code to Hawkeye
 $movement_sensor_unit->add( 'XA5', 'frontdoor' );
 $movement_sensor_unit->add( 'XA6', 'pool' );
 $movement_sensor_unit->add( 'XA7', 'serverroom' );
 
-$timer_office      = new Timer();    # Set one timer per Hawkeye
+$timer_office      = new Timer();                              # Set one timer per Hawkeye
 $timer_front_door  = new Timer();
 $timer_pool        = new Timer();
 $timer_server_room = new Timer();
diff --git a/code/examples/win_registry_set_sound.pl b/code/examples/win_registry_set_sound.pl
index 2550dc881..ce29ac909 100644
--- a/code/examples/win_registry_set_sound.pl
+++ b/code/examples/win_registry_set_sound.pl
@@ -5,11 +5,9 @@
 $sound_set = new Voice_Cmd 'Set sound device to [modem,sound card]';
 
 if ( $state = said $sound_set) {
-    $state =
-      ( $state eq 'modem' ) ? 'Modem #0 Line Playback' : 'SB Live! Wave Device';
+    $state = ( $state eq 'modem' ) ? 'Modem #0 Line Playback' : 'SB Live! Wave Device';
     print_log "Setting sound device to $state";
-    registry_set 'HKEY_CURRENT_USER\Software\Microsoft\Multimedia\Sound Mapper',
-      'Playback', 1, $state;
+    registry_set 'HKEY_CURRENT_USER\Software\Microsoft\Multimedia\Sound Mapper', 'Playback', 1, $state;
 
     #   $state = 'HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput\\TokenEnums\\MMAudioOut\\' . $state;
     #   registry_set 'HKEY_CURRENT_USER\Software\Microsoft\Speech\AudioOutput', 'DefaultTokenId', 1, $state;
diff --git a/code/examples/x10_cycle_light1.pl b/code/examples/x10_cycle_light1.pl
index ec336ff99..f7defd707 100644
--- a/code/examples/x10_cycle_light1.pl
+++ b/code/examples/x10_cycle_light1.pl
@@ -21,9 +21,8 @@
 sub step_light {
     my ($light_to_step) = shift;
     my (@step_states)   = sort numerically @_
-      ; #sort list so that incoming args can be in any order - note that you'll need the 'numerically' subroutine.
-    my ($light_has_been_set) =
-      0;    #to keep track of whether light has been set within loop
+      ;    #sort list so that incoming args can be in any order - note that you'll need the 'numerically' subroutine.
+    my ($light_has_been_set) = 0;    #to keep track of whether light has been set within loop
 
     my $light_current_level = level $light_to_step;
     my $light_current_state = state $light_to_step;
@@ -35,28 +34,21 @@ sub step_light {
         print_log $light_to_step->{object_name}
           . " is currently OFF. Setting it to "
           . $step_states[ scalar(@step_states) - 1 ] . ".";
-        set $light_to_step $step_states[ scalar(@step_states) - 1 ]
-          ;    #set to last in list
+        set $light_to_step $step_states[ scalar(@step_states) - 1 ];    #set to last in list
 
     }
     else {
 
         for ( my $i = scalar(@step_states) - 1; $i >= 0; --$i ) {
-            if ( $light_current_level > $step_states[$i] )
-            {    #step through the incoming states...
-                print_log "Setting "
-                  . $light_to_step->{object_name} . " to "
-                  . $step_states[$i];
+            if ( $light_current_level > $step_states[$i] ) {            #step through the incoming states...
+                print_log "Setting " . $light_to_step->{object_name} . " to " . $step_states[$i];
                 $light_has_been_set = 1;
                 set $light_to_step $step_states[$i];
-                last;    #don't loop any more if we set the light this pass
+                last;                                                   #don't loop any more if we set the light this pass
             }
         }
-        if ( $light_has_been_set == 0 )
-        {                #we didn't set the light when passing through the loop
-            print_log "Setting "
-              . $light_to_step->{object_name} . " to "
-              . $step_states[ scalar(@step_states) - 1 ];
+        if ( $light_has_been_set == 0 ) {                               #we didn't set the light when passing through the loop
+            print_log "Setting " . $light_to_step->{object_name} . " to " . $step_states[ scalar(@step_states) - 1 ];
             set $light_to_step $step_states[ scalar(@step_states) - 1 ];
         }
 
diff --git a/code/examples/x10_motion_sensors.pl b/code/examples/x10_motion_sensors.pl
index 674c3ed39..303572e48 100644
--- a/code/examples/x10_motion_sensors.pl
+++ b/code/examples/x10_motion_sensors.pl
@@ -3,8 +3,7 @@
 
 $motion_sensor1 = new Serial_Item 'XA1AJ', 'garage';
 $motion_sensor1->add( 'XA2AJ', 'deck' );
-$motion_sensor1->tie_event(
-    '&net_mail_send(subject => "$state motion at $Time_Date")');
+$motion_sensor1->tie_event('&net_mail_send(subject => "$state motion at $Time_Date")');
 
 # Detects motion from an 2 X10 motion sensors, one on the stairs
 # and one in the hallway.
diff --git a/code/examples/x10_preset_dim.pl b/code/examples/x10_preset_dim.pl
index 17fce9c4b..730bb06e5 100644
--- a/code/examples/x10_preset_dim.pl
+++ b/code/examples/x10_preset_dim.pl
@@ -6,18 +6,14 @@
 # - Note: extended codes only work with the CM11 interface and a compatable receiver
 #   like the LM14A/PLM21 2 way X10 pro lamp modules.
 
-$test_light1 =
-  new X10_Item('O7');  # X10_Item supports relative brightness level states +-##
-$test_light2 = new X10_Item( 'O7', 'CM11', 'LM14' )
-  ;                    # X10_Lamp supports direct   brightness level states ##%
+$test_light1 = new X10_Item('O7');                      # X10_Item supports relative brightness level states +-##
+$test_light2 = new X10_Item( 'O7', 'CM11', 'LM14' );    # X10_Lamp supports direct   brightness level states ##%
 
 # All X10 items support direct preset dim commands &P## (1->64)
-$v_test_light1 = new Voice_Cmd(
-    "Set test light to [on,off,bright,dim,-10,-20,-30,-50,-70,+10,+20,+30,+50,+70,&P3,&P10,&P30,&P40,&P50,&P60]"
-);
+$v_test_light1 =
+  new Voice_Cmd( "Set test light to [on,off,bright,dim,-10,-20,-30,-50,-70,+10,+20,+30,+50,+70,&P3,&P10,&P30,&P40,&P50,&P60]" );
 $v_test_light2 = new Voice_Cmd(
-    "Set test light to [on,off,bright,dim,2%,4%,5%,10%,20%,30%,40%,50%,60%,70%,80%,90%,&P3,&P10,&P30,&P40,&P50,&P60]"
-);
+    "Set test light to [on,off,bright,dim,2%,4%,5%,10%,20%,30%,40%,50%,60%,70%,80%,90%,&P3,&P10,&P30,&P40,&P50,&P60]" );
 
 set $test_light1 $state if $state = said $v_test_light1;
 set $test_light2 $state if $state = said $v_test_light2;
@@ -33,8 +29,7 @@
 
 #For example:
 
-$TX10 = new Serial_Item( 'XM4' . 'E' . 'PRESET_DIM1', 'Increase temp' )
-  ;    #preset  8='E'
-$TX10->add( 'XM4' . 'F' . 'PRESET_DIM1', 'Decrease temp' );    #preset  9='F'
-$TX10->add( 'XM4' . 'O' . 'PRESET_DIM2', 'Preset on' );        #preset 18='O'
-$TX10->add( 'XM4' . 'P' . 'PRESET_DIM2', 'Preset off' );       #preset 19='P'
+$TX10 = new Serial_Item( 'XM4' . 'E' . 'PRESET_DIM1', 'Increase temp' );    #preset  8='E'
+$TX10->add( 'XM4' . 'F' . 'PRESET_DIM1', 'Decrease temp' );                 #preset  9='F'
+$TX10->add( 'XM4' . 'O' . 'PRESET_DIM2', 'Preset on' );                     #preset 18='O'
+$TX10->add( 'XM4' . 'P' . 'PRESET_DIM2', 'Preset off' );                    #preset 19='P'
diff --git a/code/examples/x10_set_group.pl b/code/examples/x10_set_group.pl
index fbcee5758..86644039b 100644
--- a/code/examples/x10_set_group.pl
+++ b/code/examples/x10_set_group.pl
@@ -16,7 +16,7 @@
 
     #&set_all_but($Indoor_Lights, 'OFF', $Master_Scott_Light); # turn off all indoor lights except scott's reading light
     &set_all_but( $Indoor_Lights, 'OFF', list $Kitchen, list $Living_room)
-      ; #turn off all indoor lights except the kitchen and living room lights (groups)
+      ;    #turn off all indoor lights except the kitchen and living room lights (groups)
 }
 
 sub set_all_but {
@@ -27,18 +27,15 @@ sub set_all_but {
     # step through each item in the group ($item gets valued for each pass)
     foreach my $item ( list $group) {
 
-        my $found = 0
-          ; # zero out the variable that we'll set to 1 if this $item is in the list of objects to be ignored
-        foreach my $item_to_skip (@items_to_skip)
-        {    # step through the items to skip...
+        my $found = 0;    # zero out the variable that we'll set to 1 if this $item is in the list of objects to be ignored
+        foreach my $item_to_skip (@items_to_skip) {    # step through the items to skip...
             $found = 1
               if $item == $item_to_skip
-              ; # and make see if the item to skip is the current $item we are about to set (from the outer foreach loop)
-        } # is there a better way to do that? does perl have a 'list contains ...' type function?
+              ;    # and make see if the item to skip is the current $item we are about to set (from the outer foreach loop)
+        }    # is there a better way to do that? does perl have a 'list contains ...' type function?
 
         set $item $state
-          unless $found
-          ; # if it wasn't in the skip list, go ahead and set it to the specified state
+          unless $found;    # if it wasn't in the skip list, go ahead and set it to the specified state
         print_log "setting " . $item->{object_name} . " to " . $state
           unless $found;    # log what we're doing...
 
diff --git a/code/proxy/proxy_server.pl b/code/proxy/proxy_server.pl
index d0022a3e6..bae4c62a1 100644
--- a/code/proxy/proxy_server.pl
+++ b/code/proxy/proxy_server.pl
@@ -22,8 +22,7 @@
 
 =cut
 
-$proxy_server =
-  new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" );
+$proxy_server = new Socket_Item( undef, undef, 'server_proxy', undef, undef, undef, "\035" );
 
 #print '.';                      # A heartbeat
 
@@ -35,19 +34,16 @@
     and ( $Startup or said $v_proxy_init) )
 {
     print "Connecting to server\n";
-    my $s_proxy_init = new Socket_Item( undef, undef,
-        $config_parms{mh_server} . ":" . $config_parms{mh_proxyreg_port} );
+    my $s_proxy_init = new Socket_Item( undef, undef, $config_parms{mh_server} . ":" . $config_parms{mh_proxyreg_port} );
     start $s_proxy_init;
-    set $s_proxy_init
-      "$config_parms{password},$config_parms{proxy_name},$config_parms{server_proxy_port}";
+    set $s_proxy_init "$config_parms{password},$config_parms{proxy_name},$config_parms{server_proxy_port}";
 }
 
 # Process incoming requests from the real mh
 if ( $state = said $proxy_server) {
     my ( $interface, $function, @data ) = split $;, $state;
     my $client = $Socket_Ports{'server_proxy'}{client_ip_address};
-    print
-      "Proxy data received from mh: client=$client, interface=$interface function=$function data=@data.\n"
+    print "Proxy data received from mh: client=$client, interface=$interface function=$function data=@data.\n"
       if $Debug{'proxy'};
 
     if ( $function eq 'send_serial_data' ) {
@@ -61,13 +57,11 @@
         # It is first set on the host MH by x10_priority.pl to the $interface
         # string and then we set it here to 'idle' when done sending.
         if ( $config_parms{mh_proxy_status} and $proxy_server->active() ) {
-            set $proxy_server join( $;, 'set', '$proxy_x10_send', 'idle' ),
-              'all';
+            set $proxy_server join( $;, 'set', '$proxy_x10_send', 'idle' ), 'all';
         }
     }
     elsif ( $function eq 'send_ir' ) {
-        &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object},
-            $data[0] );
+        &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object}, $data[0] );
     }
     elsif ( $function eq 'uirt2_send' ) {
         $main::Serial_Ports{UIRT2}{object}->write( pack 'C*', @data );
@@ -97,12 +91,10 @@
     elsif ( $function eq 'lynx10plc' ) {
         my $function2 = shift @data;
         if ( $function2 eq 'send_plc' ) {
-            &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object},
-                $data[0], $data[1] );
+            &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object}, $data[0], $data[1] );
         }
         elsif ( $function2 eq 'readDeviceInfo' ) {
-            &Lynx10PLC::readDeviceInfo( $main::Serial_Ports{Lynx10PLC}{object},
-                $data[0] );
+            &Lynx10PLC::readDeviceInfo( $main::Serial_Ports{Lynx10PLC}{object}, $data[0] );
         }
     }
 }
@@ -116,8 +108,7 @@ sub proxy_serial_data {
     print "Proxy serial data sent to mh: interface=$interface data=$data.\n"
       if $Debug{proxy};
     if ( $proxy_server->active() ) {
-        set $proxy_server join( $;, 'serial', $data, $interface ),
-          'all';    # all writes out to all clients
+        set $proxy_server join( $;, 'serial', $data, $interface ), 'all';    # all writes out to all clients
     }
 }
 
diff --git a/code/public/AudioControl.pl b/code/public/AudioControl.pl
index c80112e40..273533c74 100644
--- a/code/public/AudioControl.pl
+++ b/code/public/AudioControl.pl
@@ -86,8 +86,7 @@ sub AudioPlayerRelayCommand {
 
     print "AudioPlayerRelayCommand $object $command\n";
 
-    ( $audio_zones{ $object->{music_zone_name} }[0] )->{zone_device}
-      ->set("$command");
+    ( $audio_zones{ $object->{music_zone_name} }[0] )->{zone_device}->set("$command");
 }
 
 sub AudioZoneSetup {
@@ -99,75 +98,39 @@ sub AudioZoneSetup {
     $defaultzone = $object->{music_zone_name}
       if $object->{music_zone_name} ne undef;
 
-    $object->tie_event( '&::AudioZoneSetNext($object,\'' . $defaultzone . '\')',
-        "startup" );
-    $object->tie_event( '&::AudioZoneSetNext($object, "next")', "macro243" );
-    $object->tie_event( '&::AudioZoneSetNext($object, "prev")', "macro244" );
+    $object->tie_event( '&::AudioZoneSetNext($object,\'' . $defaultzone . '\')', "startup" );
+    $object->tie_event( '&::AudioZoneSetNext($object, "next")',                  "macro243" );
+    $object->tie_event( '&::AudioZoneSetNext($object, "prev")',                  "macro244" );
 
     #$object->tie_event('&::AudioInputSetNext($object, "next")', "macro245");
     #$object->tie_event('&::AudioInputSetNext($object, "prev")', "macro246");
 
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "on")', "macro252" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "off")',
-        "macro253" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "mute")',
-        "macro247" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "volume:up")',
-        "macro248" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "volume:down")',
-        "macro249" );
-
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:01")',
-        "macro222" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:02")',
-        "macro223" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:03")',
-        "macro224" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:04")',
-        "macro225" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:05")',
-        "macro226" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:06")',
-        "macro227" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:07")',
-        "macro228" );
-    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:08")',
-        "macro229" );
-
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/background.m3u")',
-        'macro230'
-    );
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/classical.m3u")',
-        'macro231'
-    );
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/romance.m3u")',
-        'macro232'
-    );
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/baby.m3u")',
-        'macro233'
-    );
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/party.m3u")',
-        'macro234'
-    );
-    $object->tie_event(
-        '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/all.m3u")',
-        'macro235'
-    );
-    $object->tie_event( '&::AudioPlayerRelayCommand($object, "next")',
-        'macro250' );
-    $object->tie_event( '&::AudioPlayerRelayCommand($object, "prev")',
-        'macro251' );
-    $object->tie_event( '&::AudioPlayerRelayCommand($object, "stop")',
-        'macro254' );
-    $object->tie_event( '&::AudioPlayerRelayCommand($object, "pause")',
-        'macro255' );
-    $object->tie_event( '&::AudioPlayerRelayCommand($object, "play")',
-        'macro256' );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "on")',          "macro252" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "off")',         "macro253" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "mute")',        "macro247" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "volume:up")',   "macro248" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "volume:down")', "macro249" );
+
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:01")', "macro222" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:02")', "macro223" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:03")', "macro224" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:04")', "macro225" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:05")', "macro226" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:06")', "macro227" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:07")', "macro228" );
+    $object->tie_event( '&::AudioZoneRelayCommand($object, "input:08")', "macro229" );
+
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/background.m3u")', 'macro230' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/classical.m3u")',  'macro231' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/romance.m3u")',    'macro232' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/baby.m3u")',       'macro233' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/party.m3u")',      'macro234' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "playlist://centari/media/playlists/all.m3u")',        'macro235' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "next")',                                              'macro250' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "prev")',                                              'macro251' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "stop")',                                              'macro254' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "pause")',                                             'macro255' );
+    $object->tie_event( '&::AudioPlayerRelayCommand($object, "play")',                                              'macro256' );
 }
 
 sub AudioDeviceSetupPlayers {
diff --git a/code/public/Brian/grlevel3.pl b/code/public/Brian/grlevel3.pl
index 886701183..b00f5c483 100644
--- a/code/public/Brian/grlevel3.pl
+++ b/code/public/Brian/grlevel3.pl
@@ -12,12 +12,8 @@
 
 # Category = Vehicles
 
-my ( $ItsRunning, @callretlines, $Temp, $get_url_string, @QVCArray, $StripInfo,
-    $QVCArrayBit );
-my (
-    $ValidReport, $TimeStamp, $GRLatitude, $GRLongitude,
-    $GRDirection, $GRSpeed,   $GRTest,     $FinalOutput
-);
+my ( $ItsRunning, @callretlines, $Temp, $get_url_string, @QVCArray, $StripInfo, $QVCArrayBit );
+my ( $ValidReport, $TimeStamp, $GRLatitude, $GRLongitude, $GRDirection, $GRSpeed, $GRTest, $FinalOutput );
 my ( $ShortCallsign, $ShortCallsignLength, $OtherStuff );
 
 $p_get_track_data   = new Process_Item;
@@ -32,8 +28,7 @@
     open( APRSLOG, ">c:/mh/data/web/grlevel3.txt" );    # Log it
     print APRSLOG "Refresh: 1\n";
     print APRSLOG "Color: 255 255 255\n";
-    print APRSLOG
-      'IconFile: 1, 16, 16, 8, 8, "http://kliers.net/skywarn/APRS.png"';
+    print APRSLOG 'IconFile: 1, 16, 16, 8, 8, "http://kliers.net/skywarn/APRS.png"';
     print APRSLOG "\n";
     print APRSLOG 'Font: 1, 11, 1, "Courier New"';
     print APRSLOG "\n";
@@ -51,8 +46,7 @@
 
     foreach $Temp (@callretlines) {
         chomp $Temp;    # get rid of CR/LF
-        $get_url_string =
-          "get_url http://www.findu.com/cgi-bin/posit.cgi?call=";
+        $get_url_string = "get_url http://www.findu.com/cgi-bin/posit.cgi?call=";
         $get_url_string .= $Temp;
         $get_url_string .= "\&time=1\&comma=1 c:/mh/data/web/";
         $get_url_string .= $Temp;
@@ -93,8 +87,7 @@
         if ( $ValidReport eq '1' ) {
             ( $ShortCallsign, $OtherStuff ) = ( split( '-', $Temp ) )[ 0, 1 ];
             $ShortCallsignLength = ( length($ShortCallsign) );
-            $ShortCallsign =
-              substr( $ShortCallsign, ( $ShortCallsignLength - 3 ), 3 );
+            $ShortCallsign = substr( $ShortCallsign, ( $ShortCallsignLength - 3 ), 3 );
 
             open( APRSLOG, ">>c:/mh/data/web/grlevel3.txt" );
             print APRSLOG "Object: ";
diff --git a/code/public/Brian/klier.pl b/code/public/Brian/klier.pl
index 8cdc7883d..067edddc5 100644
--- a/code/public/Brian/klier.pl
+++ b/code/public/Brian/klier.pl
@@ -154,8 +154,7 @@
 $v_ambient_lights = new Voice_Cmd("Ambient Lights");
 
 # Turn entryway and living room lamp on at sunset
-if ( ( $state = said $v_ambient_lights) or ( time_now "$Time_Sunset - 1:00" ) )
-{
+if ( ( $state = said $v_ambient_lights) or ( time_now "$Time_Sunset - 1:00" ) ) {
     set $ambient_lights 'off';
     set $ambient_lights 'on';
     set $computer_room_light '-50';
@@ -554,8 +553,7 @@
 
 if ( state_now $motion_detector_living_room eq 'motion' ) {
     print_log "Motion - Living Room";
-    logit( "$Pgm_Path/../web/mh/motion.log",
-        "Motion Detected Living Room<BR>" );
+    logit( "$Pgm_Path/../web/mh/motion.log", "Motion Detected Living Room<BR>" );
 
     if (    ( state $alarmactive eq 'on' )
         and ( seconds_remaining_now $timer_alarm == '0' ) )
@@ -835,22 +833,14 @@
 
 $v_set_wakeup_alarm_on = new Voice_Cmd("Alarm Clock On");
 if ( $state = said $v_set_wakeup_alarm_on) {
-    &trigger_set(
-        "time_cron '0 6 * * 1,2,3,4,5'",
-        "run_voice_cmd 'Play Music from Upstairs'",
-        "NoExpire", "ALARM ON", 1
-    );
+    &trigger_set( "time_cron '0 6 * * 1,2,3,4,5'", "run_voice_cmd 'Play Music from Upstairs'", "NoExpire", "ALARM ON", 1 );
     speak "Alarm now active for tomorrow morning.";
     print_log "Alarm now active for tomorrow morning.";
 }
 
 $v_set_wakeup_alarm_off = new Voice_Cmd("Alarm Clock Off");
 if ( $state = said $v_set_wakeup_alarm_off) {
-    &trigger_set(
-        "time_cron '0 6 * * 1,2,3,4,5'",
-        "run_voice_cmd 'Play Music from Upstairs'",
-        "Disabled", "ALARM ON", 1
-    );
+    &trigger_set( "time_cron '0 6 * * 1,2,3,4,5'", "run_voice_cmd 'Play Music from Upstairs'", "Disabled", "ALARM ON", 1 );
     speak "Alarm clock now off.";
     print_log "Alarm clock now off.";
 }
@@ -870,8 +860,7 @@
 if ( time_cron('33 20,21 * * 0,1,2,3,4') ) {
     ( $af, $af, $atx, $af ) = &trigger_get('ALARM ON');
     if ( $atx eq 'Disabled' ) {
-        speak
-          "Notice: Please be aware that the alarm clock for tomorrow morning is off.";
+        speak "Notice: Please be aware that the alarm clock for tomorrow morning is off.";
         print_log "Alarm Clock Reminder Sent.";
     }
 }
@@ -1040,9 +1029,8 @@
 }
 
 if ( $Weather{TempOutdoor} ne $Weather{WindChill} ) {
-    speak(
-        "It's $Time_Now. Temp is $Weather{TempOutdoor}. Winnd Chill is $Weather{WindChill}."
-    ) if time_cron('30 10,11,12,13,14,15,16,17,18,19,20 * * *');
+    speak( "It's $Time_Now. Temp is $Weather{TempOutdoor}. Winnd Chill is $Weather{WindChill}." )
+      if time_cron('30 10,11,12,13,14,15,16,17,18,19,20 * * *');
 }
 
 # Category=Entertainment
diff --git a/code/public/Brian/phonestuff.pl b/code/public/Brian/phonestuff.pl
index 8f66f6513..ef230144d 100644
--- a/code/public/Brian/phonestuff.pl
+++ b/code/public/Brian/phonestuff.pl
@@ -11,8 +11,7 @@
 
 # Declare Variables
 
-use vars
-  qw($CompPhoneNumber $PhoneName $PhoneNumber $PhoneTime $PhoneDate $PhoneNumberSpoken);
+use vars qw($CompPhoneNumber $PhoneName $PhoneNumber $PhoneTime $PhoneDate $PhoneNumberSpoken);
 
 # Set Variables used by my custom code to match the callerid.pl
 
diff --git a/code/public/Brian/radar-wx.pl b/code/public/Brian/radar-wx.pl
index 8b9cb111e..3bdc3e698 100644
--- a/code/public/Brian/radar-wx.pl
+++ b/code/public/Brian/radar-wx.pl
@@ -8,8 +8,7 @@
 my ( $DownloadedRainTotal, $DownloadedRainRate );
 my ( $DownDay, $DownHour, $DownMinute );
 
-if ( state $enable_transmit eq 'yes' and time_cron('6,15,21,36,45,51 * * * *') )
-{
+if ( state $enable_transmit eq 'yes' and time_cron('6,15,21,36,45,51 * * * *') ) {
     run_voice_cmd "Send Faribault Airport Weather";
 }
 
diff --git a/code/public/Brian/stormwarning.pl b/code/public/Brian/stormwarning.pl
index 1658b8294..0a51db1b7 100644
--- a/code/public/Brian/stormwarning.pl
+++ b/code/public/Brian/stormwarning.pl
@@ -1,10 +1,8 @@
 # Category = Weather
 
 my $wx_warnings = "$config_parms{data_dir}/web/wx_warnings";
-$p_wx_warnings = new Process_Item
-  "get_url http://www.weather.gov/alerts/mn.cap $wx_warnings.xml";
-$v_wx_warnings =
-  new Voice_Cmd '[Get,Show,Display,Read,Parse] the latest NWS Announcements';
+$p_wx_warnings = new Process_Item "get_url http://www.weather.gov/alerts/mn.cap $wx_warnings.xml";
+$v_wx_warnings = new Voice_Cmd '[Get,Show,Display,Read,Parse] the latest NWS Announcements';
 
 $state = said $v_wx_warnings;
 if ( $state eq 'Get'
@@ -17,8 +15,7 @@
 speak "$wx_warnings.txt" if $state eq 'Read';
 
 if ( done_now $p_wx_warnings or $state eq 'Parse' ) {
-    my ( $finalsummarytx, $finalsummary, $summary, $tempcode, $localwarnflag,
-        $i );
+    my ( $finalsummarytx, $finalsummary, $summary, $tempcode, $localwarnflag, $i );
     $localwarnflag = 0;
     for ( file_read "$wx_warnings.xml" ) {
         $summary = "";
diff --git a/code/public/Brian/tracking.pl b/code/public/Brian/tracking.pl
index 25f019764..a5f6be02d 100644
--- a/code/public/Brian/tracking.pl
+++ b/code/public/Brian/tracking.pl
@@ -74,14 +74,8 @@
   '$WXWindSpeed', '$WXHrPrecip';
 
 my ( $APRSFoundAPRS, $APRSPacketDigi, $GPSTime, $APRSStatus, $MsgLine );
-my (
-    $GPSLatitudeDegrees,  $GPSLatitudeMinutes,
-    $GPSLongitudeDegrees, $GPSCallsign
-);
-my (
-    $GPSLongitudeMinutes, $GPSLatitude, $GPSLongitude,
-    $GPSDistance,         $GPSLongitudeMinutes100
-);
+my ( $GPSLatitudeDegrees, $GPSLatitudeMinutes, $GPSLongitudeDegrees, $GPSCallsign );
+my ( $GPSLongitudeMinutes, $GPSLatitude, $GPSLongitude, $GPSDistance, $GPSLongitudeMinutes100 );
 my ( $GPSLstBr, $GPSLstBrLat, $GPSLstBrLon );
 
 my ( @gpscomplines, $GPSTempCompPlace, $GPSTempCompDist, $GPSTempCompLine );
@@ -96,8 +90,7 @@
 
 my ( @namelines, $TempName, $TempNameCall, $TempNameName );
 
-my ( $i, $j, $k, $CallsignPart, $PacketPart, $GPSSpeed, $GPSCourse,
-    $GPSCourseVoice );
+my ( $i, $j, $k, $CallsignPart, $PacketPart, $GPSSpeed, $GPSCourse, $GPSCourseVoice );
 my ( $ToCallsignPart, $LastGPSCallsign,  $LastGPSDistance, $LastGPSLstBr );
 my ( $APRSCallsign,   $APRSStringLength, $APRSString,      $MessageX10Command );
 my ($MessageX10Action);
@@ -113,13 +106,11 @@
 
 # Setup TELNET Server 2 (port 14439) to output what the TNC hears
 
-$telnet = new Socket_Item( '#Welcome to MisterHouse APRS Tracking!',
-    'APRSWelcome', 'server_aprs' );
+$telnet = new Socket_Item( '#Welcome to MisterHouse APRS Tracking!', 'APRSWelcome', 'server_aprs' );
 
 # Send Welcome Message out port 2 if connected.
 set $telnet 'APRSWelcome' if active_now $telnet;
-set $telnet
-  'APRSERVE>APRS:javaTITLE:N0QVC MisterHouse - tracking.pl - Brian Klier, N0QVC'
+set $telnet 'APRSERVE>APRS:javaTITLE:N0QVC MisterHouse - tracking.pl - Brian Klier, N0QVC'
   if active_now $telnet;
 
 my $socket_speak_loop;
@@ -130,8 +121,7 @@
 
 # TNC Output Lines
 
-$tnc_output = new Socket_Item(
-    'user MYCALL pass MYPASS vers Misterhouse Win32 filter f/N0QVC-1/75',
+$tnc_output = new Socket_Item( 'user MYCALL pass MYPASS vers Misterhouse Win32 filter f/N0QVC-1/75',
     'login', 'midwest.aprs2.net:14580', undef, 'tcp', 'records' );
 $tnc_output->add( '?WX?', 'wxquery' );
 $tnc_output->add(
@@ -154,7 +144,7 @@
     set $timer_email_digipeat 1;
     set $timer_myvehicle_process 1;
     set $enable_transmit 'yes';
-    $HamCall = $config_parms{tracking_callsign};  # Feed in my Tracking Callsign
+    $HamCall = $config_parms{tracking_callsign};    # Feed in my Tracking Callsign
     open( GPSCOMP, "$config_parms{code_dir}/tracking.pos" );    # Open for input
     @gpscomplines = <GPSCOMP>;                                  # Open array and
                                                                 # read in data
@@ -265,16 +255,12 @@
             speak "Temperature is $CurrentTemp degrees.";
         }
         if ( $CurrentTemp ne $CurrentChill ) {
-            print_log
-              "Temperature is $CurrentTemp degrees.  Wind Chill is $CurrentChill degrees.";
-            speak
-              "Temperature is $CurrentTemp degrees.  Winnd Chill is $CurrentChill degrees.";
+            print_log "Temperature is $CurrentTemp degrees.  Wind Chill is $CurrentChill degrees.";
+            speak "Temperature is $CurrentTemp degrees.  Winnd Chill is $CurrentChill degrees.";
         }
         if ( $CurrentHrPrecip != 0 ) {
-            print_log
-              "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-            speak
-              "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+            print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+            speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
         }
     }
     elsif ( $CurrentTemp eq '' ) {
@@ -287,10 +273,8 @@
 
 if ( $state = said $v_curr_precip) {
     if ( $CurrentHrPrecip != 0 ) {
-        print_log
-          "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
-        speak
-          "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+        print_log "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
+        speak "$CurrentHrPrecip inches of rain in the last hour. $Current24HrPrecip total inches of rain today.";
     }
     elsif ( $CurrentTemp eq '' ) {
         print_log "No weather packets received.";
@@ -308,9 +292,7 @@
     logit( "$Pgm_Path/../web/mh/weather.html",
         "<FONT SIZE=-2>Temp: $CurrentTemp &nbsp;&nbsp;&nbsp;Wind Chill: $CurrentChill &nbsp;&nbsp;&nbsp;Wind: $LastWXWindDir/$LastWXWindSpeed &nbsp;&nbsp;&nbsp;Precipitation: $WXHrPrecip/$WX24HrPrecip<BR></FONT>"
     );
-    logit( "$Pgm_Path/../data/logs/weather.log",
-        ",$CurrentTemp,$LastWXWindDir,$LastWXWindSpeed,$WXHrPrecip,$WX24HrPrecip"
-    );
+    logit( "$Pgm_Path/../data/logs/weather.log", ",$CurrentTemp,$LastWXWindDir,$LastWXWindSpeed,$WXHrPrecip,$WX24HrPrecip" );
 }
 
 # Daily Weather and Tracking Log Backup
@@ -323,8 +305,7 @@
     close WXGRAPHIN;
     open( NEWDAY, ">$config_parms{html_dir}/mh/tracking/today.html" );
     close NEWDAY;
-    my $html =
-      qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
+    my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
     $html .=
       qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
     logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0, 1;
@@ -337,8 +318,7 @@
 
     #file_cat "$config_parms{html_dir}/mh/tracking/week2.html", "$config_parms{html_dir}/mh/tracking/old/${Year_Month_Now}.html";
     #rename "$config_parms{html_dir}/mh/tracking/week1.html", "$config_parms{html_dir}/mh/tracking/week2.html"  or print_log "Error in aprs rename 2: $!";
-    my $html =
-      qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
+    my $html = qq[<link rel="STYLESHEET" href="/default.css" type="text/css">\n<table>\n];
     $html .=
       qq[<tr><td><b>Date Time</b></td><td><b>Vehicle Heading and Speed</b></td><td><b>Location</b></td><td><b>New Location</b></td></tr>\n];
     logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 1;
@@ -364,11 +344,11 @@
     print APRSLOG "$APRSString\n";
     close APRSLOG;
 
-    print_msg "TRACK: $APRSString";    # Monitor to Msg Window
+    print_msg "TRACK: $APRSString";                         # Monitor to Msg Window
 
-    $APRSFoundAPRS    = "";                         # Reset Found Flag
-                                                    # $APRSPacketDigi = "";
-    $APRSStringLength = ( length($APRSString) );    # Save Length of Ser
+    $APRSFoundAPRS    = "";                                 # Reset Found Flag
+                                                            # $APRSPacketDigi = "";
+    $APRSStringLength = ( length($APRSString) );            # Save Length of Ser
 
     # Send the packet out TELNET if connected...
     set $telnet $APRSString if active $telnet;
@@ -376,7 +356,7 @@
     # Decode the Callsign and different parts from the Packet
 
     ( $CallsignPart, $MsgLine ) =
-      ( split( '::', $APRSString ) )[ 0, 1 ];       #New Line for Msging
+      ( split( '::', $APRSString ) )[ 0, 1 ];               #New Line for Msging
     ( $CallsignPart, $PacketPart ) = ( split( ':', $APRSString ) )[ 0, 1 ];
     ( $APRSCallsign, $ToCallsignPart ) =
       ( split( '>', $CallsignPart ) )[ 0, 1 ];
@@ -454,8 +434,8 @@
             }
 
             if ( substr( $PacketPart, 0, 6 ) eq '$GPRMC' ) {
-                ( $GPSTime, $GPSLatitude, $GPSLongitude, $GPSSpeed, $GPSCourse )
-                  = ( split( ',', $PacketPart ) )[ 1, 3, 5, 7, 8 ];
+                ( $GPSTime, $GPSLatitude, $GPSLongitude, $GPSSpeed, $GPSCourse ) =
+                  ( split( ',', $PacketPart ) )[ 1, 3, 5, 7, 8 ];
             }
 
             if ( substr( $PacketPart, 0, 6 ) eq '$GPGGA' ) {
@@ -467,15 +447,13 @@
                 || ( substr( $PacketPart, 0, 6 ) eq '$GPGGA' ) )
             {
 
-                $GPSTime = ( substr( $GPSTime, 0, 6 ) );    # Get the GPS Time
+                $GPSTime            = ( substr( $GPSTime,     0, 6 ) );    # Get the GPS Time
                 $GPSLatitudeDegrees = ( substr( $GPSLatitude, 0, 2 ) );
                 $GPSLatitudeMinutes = ( substr( $GPSLatitude, 2, 8 ) );
-                $GPSLatitude =
-                  ( $GPSLatitudeDegrees + ( $GPSLatitudeMinutes / 60 ) );
+                $GPSLatitude = ( $GPSLatitudeDegrees + ( $GPSLatitudeMinutes / 60 ) );
                 $GPSLongitudeDegrees = ( substr( $GPSLongitude, 0, 3 ) );
                 $GPSLongitudeMinutes = ( substr( $GPSLongitude, 3, 8 ) );
-                $GPSLongitude =
-                  ( $GPSLongitudeDegrees + ( $GPSLongitudeMinutes / 60 ) );
+                $GPSLongitude = ( $GPSLongitudeDegrees + ( $GPSLongitudeMinutes / 60 ) );
 
                 # Convert the GPS Speed to MPH
                 $GPSSpeed = ( $GPSSpeed * 1.853248 ) / 1.609344;
@@ -488,8 +466,7 @@
             {
 
                 $GPSLongitudeDegrees = ( substr( $PacketPart, 1, 1 ) );
-                $GPSLongitudeDegrees =
-                  ( unpack( 'C', $GPSLongitudeDegrees ) ) - 28;
+                $GPSLongitudeDegrees = ( unpack( 'C', $GPSLongitudeDegrees ) ) - 28;
                 if (    $GPSLongitudeDegrees >= 180
                     and $GPSLongitudeDegrees <= 189 )
                 {
@@ -502,29 +479,23 @@
                 }
 
                 $GPSLongitudeMinutes = ( substr( $PacketPart, 2, 1 ) );
-                $GPSLongitudeMinutes =
-                  ( unpack( 'C', $GPSLongitudeMinutes ) ) - 28;
+                $GPSLongitudeMinutes = ( unpack( 'C', $GPSLongitudeMinutes ) ) - 28;
                 if ( $GPSLongitudeMinutes > 60 ) {
                     $GPSLongitudeMinutes = $GPSLongitudeMinutes - 60;
                 }
 
                 # Added Lines from Roger
                 $GPSLongitudeMinutes100 = ( substr( $PacketPart, 3, 1 ) );
-                $GPSLongitudeMinutes100 =
-                  ( unpack( 'C', $GPSLongitudeMinutes100 ) ) - 28;
+                $GPSLongitudeMinutes100 = ( unpack( 'C', $GPSLongitudeMinutes100 ) ) - 28;
 
-                $GPSLongitude =
-                  ( $GPSLongitudeDegrees +
-                      ( $GPSLongitudeMinutes / 60 ) +
-                      ( $GPSLongitudeMinutes100 / 6000 ) );
+                $GPSLongitude = ( $GPSLongitudeDegrees + ( $GPSLongitudeMinutes / 60 ) + ( $GPSLongitudeMinutes100 / 6000 ) );
 
                 $GPSSpeed = ( substr( $PacketPart, 4, 1 ) );
                 $GPSSpeed = ( ( unpack( 'C', $GPSSpeed ) ) - 28 ) * 10;
 
                 # $CallsignPart simply used as a temp variable
                 $CallsignPart = ( substr( $PacketPart, 5, 1 ) );
-                $GPSSpeed = ( ( ( unpack( 'C', $CallsignPart ) ) - 28 ) / 10 ) +
-                  $GPSSpeed;
+                $GPSSpeed = ( ( ( unpack( 'C', $CallsignPart ) ) - 28 ) / 10 ) + $GPSSpeed;
 
                 $GPSCourse = ( ( unpack( 'C', $CallsignPart ) ) - 28 ) % 10;
 
@@ -548,8 +519,7 @@
 
                 # Load the tens digit of Degrees Latitude
                 $GPSLatitudeDegrees = ( substr( $ToCallsignPart, 0, 1 ) );
-                $GPSLatitudeDegrees =
-                  ( unpack( 'C', $GPSLatitudeDegrees ) ) - 32;
+                $GPSLatitudeDegrees = ( unpack( 'C', $GPSLatitudeDegrees ) ) - 32;
                 $GPSLatitudeDegrees = ( $GPSLatitudeDegrees & 15 ) * 10;
 
                 # Load the ones digit of Degrees Latitude (temp variable used)
@@ -562,8 +532,7 @@
 
                 # Load the tens digit of Minutes Latitude
                 $GPSLatitudeMinutes = ( substr( $ToCallsignPart, 2, 1 ) );
-                $GPSLatitudeMinutes =
-                  ( unpack( 'C', $GPSLatitudeMinutes ) ) - 32;
+                $GPSLatitudeMinutes = ( unpack( 'C', $GPSLatitudeMinutes ) ) - 32;
                 $GPSLatitudeMinutes = ( $GPSLatitudeMinutes & 15 ) * 10;
 
                 # Load the ones digit of Minutes Latitude (temp variable used)
@@ -589,20 +558,14 @@
                 # Here's our hundreds of Minutes Latitude
                 $CallsignPart = $CallsignPart + $GPSDistance;
 
-                $GPSLatitude =
-                  ( $GPSLatitudeDegrees +
-                      ( $GPSLatitudeMinutes / 60 ) +
-                      ( $CallsignPart / 6000 ) );
+                $GPSLatitude = ( $GPSLatitudeDegrees + ( $GPSLatitudeMinutes / 60 ) + ( $CallsignPart / 6000 ) );
             }
 
             # --- Do the following for all received GPS Strings
 
             # Calculate distance station is away
-            $GPSDistance = &great_circle_distance(
-                $GPSLatitude, $GPSLongitude,
-                abs $config_parms{latitude},
-                abs $config_parms{longitude}
-            );
+            $GPSDistance =
+              &great_circle_distance( $GPSLatitude, $GPSLongitude, abs $config_parms{latitude}, abs $config_parms{longitude} );
             $GPSDistance = round( $GPSDistance, 1 );
 
             # Calculate bearing from the Position file
@@ -611,14 +574,10 @@
                   ( split( ',', $GPSTempCompLine ) )[ 0, 1, 2 ];
 
                 # Calculate distance station is away from pos file
-                $GPSTempCompDist = &great_circle_distance(
-                    $GPSLatitude,    $GPSLongitude,
-                    $GPSTempCompLat, abs $GPSTempCompLong
-                );
+                $GPSTempCompDist = &great_circle_distance( $GPSLatitude, $GPSLongitude, $GPSTempCompLat, abs $GPSTempCompLong );
                 $GPSTempCompDist = round( $GPSTempCompDist, 1 );
 
-                if ( $GPSTempCompDist < 15 and $GPSTempCompDist < $GPSCompDist )
-                {
+                if ( $GPSTempCompDist < 15 and $GPSTempCompDist < $GPSCompDist ) {
                     $GPSCompPlace = $GPSTempCompPlace;
                     $GPSCompDist  = $GPSTempCompDist;
                     $GPSCompLat   = $GPSTempCompLat;
@@ -692,40 +651,30 @@
             }
 
             # Add bearing from station in position file IF it's a new position report
-            if (
-                (
-                       ( $GPSCallsign ne $LastGPSCallsign )
-                    || ( $GPSDistance ne $LastGPSDistance )
-                )
-                and ( $GPSCompDist ne '9999' )
-              )
+            if (    ( ( $GPSCallsign ne $LastGPSCallsign ) || ( $GPSDistance ne $LastGPSDistance ) )
+                and ( $GPSCompDist ne '9999' ) )
             {
-                $GPSSpeakString2 =
-                  "Currently $GPSCompDist miles $GPSCompLstBr of $GPSCompPlace.";
+                $GPSSpeakString2 = "Currently $GPSCompDist miles $GPSCompLstBr of $GPSCompPlace.";
 
                 # and form a special speak string just for on the air
-                $GPSSpeakString3 =
-                  "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign $GPSCompDist mi $GPSCompLstBr of $GPSCompPlace.";
+                $GPSSpeakString3 = "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign $GPSCompDist mi $GPSCompLstBr of $GPSCompPlace.";
 
                 if ( $GPSDistance <= 0.2 ) {
                     $GPSSpeakString2 = "Currently near $GPSCompPlace.";
-                    $GPSSpeakString3 =
-                      "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign near $GPSCompPlace.";
+                    $GPSSpeakString3 = "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign near $GPSCompPlace.";
                 }
                 if (    ( substr( $PacketPart, 0, 6 ) eq '$GPRMC' )
                     and ( $GPSDistance <= 0.1 )
                     and ( $GPSSpeed <= 1 ) )
                 {
                     $GPSSpeakString2 = "Currently parked at $GPSCompPlace.";
-                    $GPSSpeakString3 =
-                      "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign parked at $GPSCompPlace.";
+                    $GPSSpeakString3 = "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign parked at $GPSCompPlace.";
                 }
                 if (    ( substr( $PacketPart, 0, 6 ) eq '$GPGGA' )
                     and ( $GPSDistance <= 0.1 ) )
                 {
                     $GPSSpeakString2 = "Currently at $GPSCompPlace.";
-                    $GPSSpeakString3 =
-                      "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign at $GPSCompPlace.";
+                    $GPSSpeakString3 = "$HamCall>APRSMH,TCPIP*:>$RealAPRSCallsign at $GPSCompPlace.";
                 }
 
 ### ***         ### REMARKED OUT, DON'T TRANSMIT WHERE PEOPLE ARE AT
@@ -790,13 +739,8 @@
 
                 # If It's not the same as the last report, say it.
 
-                if (
-                    (
-                           ( $GPSCallsign ne $LastGPSCallsign )
-                        || ( $GPSDistance ne $LastGPSDistance )
-                    )
-                    and ( $GPSSpeed ne '0' )
-                  )
+                if (    ( ( $GPSCallsign ne $LastGPSCallsign ) || ( $GPSDistance ne $LastGPSDistance ) )
+                    and ( $GPSSpeed ne '0' ) )
                 {
 
                     if ( $config_parms{tracking_shortannounce} == 0 ) {
@@ -830,25 +774,18 @@
 
                 # If the GPS is Stationary, say the following.
 
-                if (
-                    (
-                           ( $GPSCallsign ne $LastGPSCallsign )
-                        || ( $GPSDistance ne $LastGPSDistance )
-                    )
-                    and ( $GPSSpeed eq '0' )
-                  )
+                if (    ( ( $GPSCallsign ne $LastGPSCallsign ) || ( $GPSDistance ne $LastGPSDistance ) )
+                    and ( $GPSSpeed eq '0' ) )
                 {
 
                     if ( $config_parms{tracking_shortannounce} == 0 ) {
-                        $GPSSpeakString =
-                          "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2";
+                        $GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2";
                     }
 
                     if ( $config_parms{tracking_shortannounce} == 1 ) {
                         $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
                         if ( $GPSSpeakString2 eq '' ) {
-                            $GPSSpeakString =
-                              "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.";
+                            $GPSSpeakString = "$GPSCallsign is parked $GPSDistance miles $GPSLstBr of us.";
                         }
                     }
 
@@ -882,15 +819,13 @@
                 {
 
                     if ( $config_parms{tracking_shortannounce} == 0 ) {
-                        $GPSSpeakString =
-                          "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2";
+                        $GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.  $GPSSpeakString2";
                     }
 
                     if ( $config_parms{tracking_shortannounce} == 1 ) {
                         $GPSSpeakString = "$GPSCallsign is $GPSSpeakString2";
                         if ( $GPSSpeakString2 eq '' ) {
-                            $GPSSpeakString =
-                              "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.";
+                            $GPSSpeakString = "$GPSCallsign is $GPSDistance miles $GPSLstBr of us.";
                         }
                     }
 
@@ -918,11 +853,7 @@
             # Procedure to Complete a process when my vehicle is close to home
             # But only every 5 minutes, we don't want this process happening every time a position is received.
 
-            if (
-                (
-                    substr( $RealAPRSCallsign, 0, ( length($HamCall) ) ) eq
-                    $HamCall
-                )
+            if (    ( substr( $RealAPRSCallsign, 0, ( length($HamCall) ) ) eq $HamCall )
                 and ( $GPSDistance < 0.2 )
                 and expired $timer_myvehicle_process)
             {
@@ -936,15 +867,12 @@
             $j = $GPSLatitude;
 
             my $html = qq[<FORM ACTION='/SET:last_response' target='speech'>\n];
-            $html .=
-              qq[<tr><td>$Date_Now $Time_Now </td><td>$GPSSpeakString</td>\n];
+            $html .= qq[<tr><td>$Date_Now $Time_Now </td><td>$GPSSpeakString</td>\n];
             $html .= qq[<td><a href="http://www.mapblast.com/myblast/map.mb?];
             $html .= qq|CT=$j\%3A$i\%3A10000">$GPSSpeakString2</a></td>\n|;
-            $html .=
-              qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
+            $html .= qq[<td><INPUT name=aprs_location_name type='text' SIZE=10 onChange=submit>\n];
             $i = -$i;    # For logging form data in .pos
-            $html .=
-              qq[<INPUT name=aprs_location_loc type='hidden' value='$j,$i'></td></tr></FORM>\n\n];
+            $html .= qq[<INPUT name=aprs_location_loc type='hidden' value='$j,$i'></td></tr></FORM>\n\n];
 
             logit "$config_parms{html_dir}/mh/tracking/today.html", $html, 0;
             logit "$config_parms{html_dir}/mh/tracking/week1.html", $html, 0;
@@ -974,31 +902,21 @@
             $k = ' ';
             $k = ( $k x $i );
 
-            print_log
-              "Email gateway: Callsign=$RealAPRSCallsign, to=$CallsignPart data=$PacketPart\n";
+            print_log "Email gateway: Callsign=$RealAPRSCallsign, to=$CallsignPart data=$PacketPart\n";
             set $timer_email_digipeat 10;    # ensure it doesn't send twice
 
             # Send the mail!!
             #if (&net_connect_check) {
-            $i =
-                "$HamCall>APRSMH,TCPIP*::"
-              . $RealAPRSCallsign
-              . $k . ":ack"
-              . $MessageAck;
+            $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":ack" . $MessageAck;
             if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
 
             &net_mail_send(
                 to      => $CallsignPart,
                 subject => "A message from $RealAPRSCallsign (APRS)",
-                text =>
-                  "The following is an E-Mail sent to you through the $HamCall MisterHouse APRS Radio Gateway\n\n$PacketPart"
+                text => "The following is an E-Mail sent to you through the $HamCall MisterHouse APRS Radio Gateway\n\n$PacketPart"
             );
 
-            $i =
-                "$HamCall>APRSMH,TCPIP*::"
-              . $RealAPRSCallsign
-              . $k
-              . ":Your E-Mail Message has been sent.{7";
+            $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":Your E-Mail Message has been sent.{7";
             if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
 
             #}
@@ -1040,8 +958,7 @@
             # Check to see if it is a voice command to process from our CALLSIGN:
 
             if (    substr( $PacketPart, 0, 4 ) eq 'X10-'
-                and substr( $RealAPRSCallsign, 0, length($HamCall) ) eq
-                $HamCall )
+                and substr( $RealAPRSCallsign, 0, length($HamCall) ) eq $HamCall )
             {
 
                 # Split the line so $PacketPart is actually the message received to process.
@@ -1052,17 +969,9 @@
                 print_log "X10 received from APRS: $PacketPart";
                 speak "X10 received from A P R S: $PacketPart";
 
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k . ":ack"
-                  . $MessageAck;
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":ack" . $MessageAck;
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k
-                  . ":X-10 Message Received.{9";
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":X-10 Message Received.{9";
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
                 $MsgLine = "";
             }
@@ -1076,17 +985,9 @@
             # Respond to ?WX? requests with the temperature.
 
             elsif ( substr( $PacketPart, 0, 4 ) eq '?WX?' ) {
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k . ":ack"
-                  . $MessageAck;
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":ack" . $MessageAck;
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k
-                  . ": Current Temperature: $CurrentTemp.{4";
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ": Current Temperature: $CurrentTemp.{4";
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
                 $MsgLine = "";
             }
@@ -1094,17 +995,9 @@
             # Respond to ?PHONE? requests with last call.
 
             elsif ( substr( $PacketPart, 0, 7 ) eq '?PHONE?' ) {
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k . ":ack"
-                  . $MessageAck;
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":ack" . $MessageAck;
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k
-                  . ": Last Call: $PhoneName ($PhoneNumber){6";
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ": Last Call: $PhoneName ($PhoneNumber){6";
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
                 $MsgLine = "";
             }
@@ -1114,11 +1007,7 @@
             else {
                 print_log "Incoming Message from $APRSCallsign: $PacketPart";
                 speak "Incoming Message from $APRSCallsign. $PacketPart";
-                $i =
-                    "$HamCall>APRSMH,TCPIP*::"
-                  . $RealAPRSCallsign
-                  . $k . ":ack"
-                  . $MessageAck;
+                $i = "$HamCall>APRSMH,TCPIP*::" . $RealAPRSCallsign . $k . ":ack" . $MessageAck;
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
                 if ( state $enable_transmit eq 'yes' ) { set $tnc_output $i }
                 $MsgLine = "";
@@ -1131,10 +1020,8 @@
         # At miles of us, temperature is 31 degrees.  Winnd is out of the north at 4N/ miles an hour.
 
         if (
-            ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'dU' )
-            || (
-                substr( $APRSString, ( $APRSStringLength - 6 ), 6 ) eq
-                'dU2kFM' )
+               ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'dU' )
+            || ( substr( $APRSString, ( $APRSStringLength - 6 ), 6 ) eq 'dU2kFM' )
             || ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'wU' )
             || ( substr( $APRSString, ( $APRSStringLength - 4 ), 4 ) eq 'DsVP' )
             || (    substr( $PacketPart, 38, 1 ) eq 't'
@@ -1173,23 +1060,19 @@
 
             # If It's a DOS Weather String,
 
-            if (
-                ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'dU' )
-                || (
-                    substr( $APRSString, ( $APRSStringLength - 6 ), 6 ) eq
-                    'dU2kFM' )
-              )
+            if (   ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'dU' )
+                || ( substr( $APRSString, ( $APRSStringLength - 6 ), 6 ) eq 'dU2kFM' ) )
             {
 
-                $WXTime = ( substr( $PacketPart, 3, 4 ) );   # Time of WX Report
-                $WXWindDir = ( substr( $PacketPart, 27, 3 ) );  # Wind Direction
+                $WXTime      = ( substr( $PacketPart, 3,  4 ) );    # Time of WX Report
+                $WXWindDir   = ( substr( $PacketPart, 27, 3 ) );    # Wind Direction
                 $WXWindSpeed = ( substr( $PacketPart, 31, 3 ) );    # Wind Speed
 
                 # Get rid of those damn 0's in the Speed
                 if ( substr( $WXWindSpeed, 0, 2 ) eq '00' ) {
                     $WXWindSpeed = ( substr( $WXWindSpeed, 2, 1 ) );
                 }
-                if ( $WXWindSpeed ne '0' ) {    # Except if wind speed IS 0
+                if ( $WXWindSpeed ne '0' ) {                        # Except if wind speed IS 0
                     if ( substr( $WXWindSpeed, 0, 1 ) eq '0' ) {
                         $WXWindSpeed = ( substr( $WXWindSpeed, 1, 2 ) );
                     }
@@ -1197,18 +1080,13 @@
 
                 $WXLatitudeDegrees = ( substr( $PacketPart, 8,  2 ) );
                 $WXLatitudeMinutes = ( substr( $PacketPart, 10, 5 ) );
-                $WXLatitude =
-                  ( $WXLatitudeDegrees + ( $WXLatitudeMinutes / 60 ) );
+                $WXLatitude = ( $WXLatitudeDegrees + ( $WXLatitudeMinutes / 60 ) );
                 $WXLongitudeDegrees = ( substr( $PacketPart, 17, 3 ) );
                 $WXLongitudeMinutes = ( substr( $PacketPart, 20, 5 ) );
-                $WXLongitude =
-                  ( $WXLongitudeDegrees + ( $WXLongitudeMinutes / 60 ) );
-
-                $WXDistance = &great_circle_distance(
-                    $WXLatitude, $WXLongitude,
-                    abs $config_parms{latitude},
-                    abs $config_parms{longitude}
-                );
+                $WXLongitude = ( $WXLongitudeDegrees + ( $WXLongitudeMinutes / 60 ) );
+
+                $WXDistance =
+                  &great_circle_distance( $WXLatitude, $WXLongitude, abs $config_parms{latitude}, abs $config_parms{longitude} );
                 $WXDistance = round( $WXDistance, 1 );
 
                 # Calculate if station is north/west/east/south of ours
@@ -1243,33 +1121,25 @@
             # For New Windows UII/U2000 String Only
 
             if (
-                ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'wU' )
-                || (
-                    substr( $APRSString, ( $APRSStringLength - 2 ), 2 ) eq
-                    'WD' )
-                || (
-                    substr( $APRSString, ( $APRSStringLength - 5 ), 2 ) eq
-                    'WD' )
-                || (
-                    substr( $APRSString, ( $APRSStringLength - 3 ), 2 ) eq
-                    'WX' )
+                   ( substr( $APRSString, ( $APRSStringLength - 4 ), 2 ) eq 'wU' )
+                || ( substr( $APRSString, ( $APRSStringLength - 2 ), 2 ) eq 'WD' )
+                || ( substr( $APRSString, ( $APRSStringLength - 5 ), 2 ) eq 'WD' )
+                || ( substr( $APRSString, ( $APRSStringLength - 3 ), 2 ) eq 'WX' )
                 || (    substr( $PacketPart, 38, 1 ) eq 't'
                     and substr( $PacketPart, 42, 1 ) eq 'r' )
-                || (
-                    substr( $APRSString, ( $APRSStringLength - 4 ), 4 ) eq
-                    'DsVP' )
+                || ( substr( $APRSString, ( $APRSStringLength - 4 ), 4 ) eq 'DsVP' )
               )
             {
 
-                $WXTime = ( substr( $PacketPart, 5, 4 ) );   # Time of WX Report
-                $WXWindDir = ( substr( $PacketPart, 10, 3 ) );  # Wind Direction
+                $WXTime      = ( substr( $PacketPart, 5,  4 ) );    # Time of WX Report
+                $WXWindDir   = ( substr( $PacketPart, 10, 3 ) );    # Wind Direction
                 $WXWindSpeed = ( substr( $PacketPart, 14, 3 ) );    # Wind Speed
 
                 # Get rid of those damn 0's in the Speed
                 if ( substr( $WXWindSpeed, 0, 2 ) eq '00' ) {
                     $WXWindSpeed = ( substr( $WXWindSpeed, 2, 1 ) );
                 }
-                if ( $WXWindSpeed ne '0' ) {    # Except if wind speed IS 0
+                if ( $WXWindSpeed ne '0' ) {                        # Except if wind speed IS 0
                     if ( substr( $WXWindSpeed, 0, 1 ) eq '0' ) {
                         $WXWindSpeed = ( substr( $WXWindSpeed, 1, 2 ) );
                     }
@@ -1319,11 +1189,7 @@
                   ( split( ',', $WXTempCompLine ) )[ 0, 1, 2 ];
 
                 # Calculate distance station is away from pos file
-                $WXTempCompDist = &great_circle_distance(
-                    $WXLatitude, $WXLongitude,
-                    abs $WXTempCompLat,
-                    abs $WXTempCompLong
-                );
+                $WXTempCompDist = &great_circle_distance( $WXLatitude, $WXLongitude, abs $WXTempCompLat, abs $WXTempCompLong );
                 $WXTempCompDist = round( $WXTempCompDist, 1 );
 
                 if ( $WXTempCompDist < 150 and $WXTempCompDist < $WXCompDist ) {
@@ -1371,16 +1237,10 @@
             }
 
             # Add bearing from station in position file IF it's a new position report
-            if (
-                (
-                       ( $WXCallsign ne $LastWXCallsign )
-                    || ( $WXDistance ne $LastWXDistance )
-                )
-                and ( $GPSCompDist ne '9999' )
-              )
+            if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) )
+                and ( $GPSCompDist ne '9999' ) )
             {
-                $WXSpeakString2 =
-                  "Station is located $WXCompDist miles $WXCompLstBr of $WXCompPlace.";
+                $WXSpeakString2 = "Station is located $WXCompDist miles $WXCompLstBr of $WXCompPlace.";
             }
 
             if ( substr( $PacketPart, 35, 1 ) eq 'T' ) {    # If a traditional,
@@ -1390,7 +1250,7 @@
                 if ( substr( $WXTemp, 0, 2 ) eq '00' ) {
                     $WXTemp = ( substr( $WXTemp, 2, 1 ) );
                 }
-                if ( $WXTemp ne '0' ) {    # Except if temp IS 0
+                if ( $WXTemp ne '0' ) {                     # Except if temp IS 0
                     if ( substr( $WXTemp, 0, 1 ) eq '0' ) {
                         $WXTemp = ( substr( $WXTemp, 1, 2 ) );
                     }
@@ -1398,10 +1258,7 @@
 
                 # Calculate Wind Chill if temp is less than 45 degrees
                 if ( $WXTemp <= 45 ) {
-                    $WXWindChill =
-                      .0817 *
-                      ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed )
-                      * ( $WXTemp - 91.4 ) + 91.4;
+                    $WXWindChill = .0817 * ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed ) * ( $WXTemp - 91.4 ) + 91.4;
                     $WXWindChill = round( $WXWindChill, 0 );
                     if ( $WXWindSpeed <= 5 ) { $WXWindChill = $WXTemp }
                 }
@@ -1443,24 +1300,16 @@
 
                 # If It's not the same as the last report, say it.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed ne '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed ne '0' ) )
                 {
                     $WXSpeakString =
                       "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
                     if ( $WXTemp <= 45 and $WXTemp ne $WXWindChill ) {
-                        $WXSpeakString =
-                          $WXSpeakString . "  The winnd chill is $WXWindChill.";
+                        $WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill.";
                     }
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
 
@@ -1476,20 +1325,12 @@
 
                 # If the wind is calm, say the following.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed eq '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed eq '0' ) )
                 {
-                    $WXSpeakString =
-                      "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
 
@@ -1503,7 +1344,7 @@
                     }
                 }
 
-                $LastWXCallsign   = $WXCallsign;  # Save last WX rpt information
+                $LastWXCallsign   = $WXCallsign;     # Save last WX rpt information
                 $LastWXDistance   = $WXDistance;
                 $LastWXTemp       = $WXTemp;
                 $LastWXWindDir    = $WXWindDir;
@@ -1513,14 +1354,14 @@
                 $LastWX24HrPrecip = $WX24HrPrecip;
             }
 
-            elsif ( substr( $PacketPart, 38, 1 ) eq 't' ) {   # If a new format,
+            elsif ( substr( $PacketPart, 38, 1 ) eq 't' ) {    # If a new format,
                 $WXTemp = ( substr( $PacketPart, 39, 3 ) );
 
                 # Get rid of those damn 0's in the Temperature
                 if ( substr( $WXTemp, 0, 2 ) eq '00' ) {
                     $WXTemp = ( substr( $WXTemp, 2, 1 ) );
                 }
-                if ( $WXTemp ne '0' ) {    # Except if temp IS 0
+                if ( $WXTemp ne '0' ) {                        # Except if temp IS 0
                     if ( substr( $WXTemp, 0, 1 ) eq '0' ) {
                         $WXTemp = ( substr( $WXTemp, 1, 2 ) );
                     }
@@ -1528,10 +1369,7 @@
 
                 # Calculate Wind Chill if temp is less than 45 degrees
                 if ( $WXTemp <= 45 ) {
-                    $WXWindChill =
-                      .0817 *
-                      ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed )
-                      * ( $WXTemp - 91.4 ) + 91.4;
+                    $WXWindChill = .0817 * ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed ) * ( $WXTemp - 91.4 ) + 91.4;
                     $WXWindChill = round( $WXWindChill, 0 );
                     if ( $WXWindSpeed <= 5 ) { $WXWindChill = $WXTemp }
                 }
@@ -1573,28 +1411,19 @@
 
                 # If It's not the same as the last report, say it.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed ne '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed ne '0' ) )
                 {
                     $WXSpeakString =
                       "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
                     if ( $WXTemp <= 45 and $WXTemp ne $WXWindChill ) {
-                        $WXSpeakString =
-                          $WXSpeakString . "  The winnd chill is $WXWindChill.";
+                        $WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill.";
                     }
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     if ( $WX24HrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WX24HrPrecip inches of rain total today.";
+                        $WXSpeakString = $WXSpeakString . "  $WX24HrPrecip inches of rain total today.";
                     }
                     $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
 
@@ -1610,24 +1439,15 @@
 
                 # If the wind is calm, say the following.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed eq '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed eq '0' ) )
                 {
-                    $WXSpeakString =
-                      "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
+                    $WXSpeakString = "At $WXDistance miles $WXLstBr of us, temperature is $WXTemp degrees.  Winnd is calm.";
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     if ( $WX24HrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WX24HrPrecip inches of rain total today.";
+                        $WXSpeakString = $WXSpeakString . "  $WX24HrPrecip inches of rain total today.";
                     }
                     $WXSpeakString = $WXSpeakString . "  $WXSpeakString2";
 
@@ -1641,7 +1461,7 @@
                     }
                 }
 
-                $LastWXCallsign   = $WXCallsign;  # Save last WX rpt information
+                $LastWXCallsign   = $WXCallsign;     # Save last WX rpt information
                 $LastWXDistance   = $WXDistance;
                 $LastWXTemp       = $WXTemp;
                 $LastWXWindDir    = $WXWindDir;
@@ -1652,16 +1472,16 @@
 
             }
 
-            elsif ( substr( $PacketPart, 21, 1 ) eq 't' ) { # If WINDOWS format,
-                $WXDistance = 999.9;                        # Because we don't
-                                                            # have the position
-                $WXTemp = ( substr( $PacketPart, 22, 3 ) );
+            elsif ( substr( $PacketPart, 21, 1 ) eq 't' ) {    # If WINDOWS format,
+                $WXDistance = 999.9;                              # Because we don't
+                                                                  # have the position
+                $WXTemp     = ( substr( $PacketPart, 22, 3 ) );
 
                 # Get rid of those damn 0's in the Temperature
                 if ( substr( $WXTemp, 0, 2 ) eq '00' ) {
                     $WXTemp = ( substr( $WXTemp, 2, 1 ) );
                 }
-                if ( $WXTemp ne '0' ) {    # Except if temp IS 0
+                if ( $WXTemp ne '0' ) {                           # Except if temp IS 0
                     if ( substr( $WXTemp, 0, 1 ) eq '0' ) {
                         $WXTemp = ( substr( $WXTemp, 1, 2 ) );
                     }
@@ -1669,10 +1489,7 @@
 
                 # Calculate Wind Chill if temp is less than 45 degrees
                 if ( $WXTemp <= 45 ) {
-                    $WXWindChill =
-                      .0817 *
-                      ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed )
-                      * ( $WXTemp - 91.4 ) + 91.4;
+                    $WXWindChill = .0817 * ( 3.71 * sqrt($WXWindSpeed) + 5.81 - .25 * $WXWindSpeed ) * ( $WXTemp - 91.4 ) + 91.4;
                     $WXWindChill = round( $WXWindChill, 0 );
                     if ( $WXWindSpeed <= 5 ) { $WXWindChill = $WXTemp }
                 }
@@ -1714,28 +1531,19 @@
 
                 # If It's not the same as the last report, say it.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed ne '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed ne '0' ) )
                 {
                     $WXSpeakString =
                       "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is out of the $WXWindDirVoice at $WXWindSpeed miles an hour.";
                     if ( $WXTemp <= 45 and $WXTemp ne $WXWindChill ) {
-                        $WXSpeakString =
-                          $WXSpeakString . "  The winnd chill is $WXWindChill.";
+                        $WXSpeakString = $WXSpeakString . "  The winnd chill is $WXWindChill.";
                     }
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     if ( $WX24HrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WX24HrPrecip inches of rain total today.";
+                        $WXSpeakString = $WXSpeakString . "  $WX24HrPrecip inches of rain total today.";
                     }
 
                     print_log "$WXSpeakString";
@@ -1750,24 +1558,15 @@
 
                 # If the wind is calm, say the following.
 
-                if (
-                    (
-                           ( $WXCallsign ne $LastWXCallsign )
-                        || ( $WXDistance ne $LastWXDistance )
-                        || ( $WXTemp ne $LastWXTemp )
-                    )
-                    and ( $WXWindSpeed eq '0' )
-                  )
+                if (    ( ( $WXCallsign ne $LastWXCallsign ) || ( $WXDistance ne $LastWXDistance ) || ( $WXTemp ne $LastWXTemp ) )
+                    and ( $WXWindSpeed eq '0' ) )
                 {
-                    $WXSpeakString =
-                      "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is calm.";
+                    $WXSpeakString = "$APRSCallsign reports temperature of $WXTemp degrees.  Winnd is calm.";
                     if ( $WXHrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WXHrPrecip inches of rain in the last hour.";
+                        $WXSpeakString = $WXSpeakString . "  $WXHrPrecip inches of rain in the last hour.";
                     }
                     if ( $WX24HrPrecip != 0 ) {
-                        $WXSpeakString = $WXSpeakString
-                          . "  $WX24HrPrecip inches of rain total today.";
+                        $WXSpeakString = $WXSpeakString . "  $WX24HrPrecip inches of rain total today.";
                     }
 
                     print_log "$WXSpeakString";
@@ -1780,7 +1579,7 @@
                     }
                 }
 
-                $LastWXCallsign   = $WXCallsign;  # Save last WX rpt information
+                $LastWXCallsign   = $WXCallsign;     # Save last WX rpt information
                 $LastWXDistance   = $WXDistance;
                 $LastWXTemp       = $WXTemp;
                 $LastWXWindDir    = $WXWindDir;
@@ -1826,9 +1625,8 @@ sub great_circle_distance {
     my ( $lat1, $lon1, $lat2, $lon2 ) = map { &degrees_to_radians($_) } @_;
 
     #   my $radius = 6367; # km
-    my $radius = 3956;                              # miles
-    my $d = ( sin( ( $lat2 - $lat1 ) / 2 ) )**2 +
-      cos($lat1) * cos($lat2) * ( sin( ( $lon2 - $lon1 ) / 2 ) )**2;
+    my $radius = 3956;                                                                                             # miles
+    my $d = ( sin( ( $lat2 - $lat1 ) / 2 ) )**2 + cos($lat1) * cos($lat2) * ( sin( ( $lon2 - $lon1 ) / 2 ) )**2;
     $d = $radius * 2 * atan2( sqrt($d), sqrt( 1 - $d ) );
     return round( $d, 1 );
 }
diff --git a/code/public/Brian/xpl.pl b/code/public/Brian/xpl.pl
index 9b9bee137..f77267742 100644
--- a/code/public/Brian/xpl.pl
+++ b/code/public/Brian/xpl.pl
@@ -3,8 +3,7 @@
 my $xpllastcommand;
 my $xpljabberdevice;
 
-$xpl_balloon = new xPL_Item( 'medusa-balloon.klierpc',
-    'log.basic' => { speech => '$state' } );
+$xpl_balloon     = new xPL_Item( 'medusa-balloon.klierpc', 'log.basic' => { speech => '$state' } );
 $xpl_jabber      = new xPL_Item('doghouse-blabber.archeserver20');
 $xpl_jabber_resp = new xPL_Item(
     'doghouse-blabber.archestar20',
diff --git a/code/public/Compool.pl b/code/public/Compool.pl
index a51b1f3bd..2ba0230d8 100644
--- a/code/public/Compool.pl
+++ b/code/public/Compool.pl
@@ -9,48 +9,28 @@
 
 # Pool run cycle.  Turns on at 9am every day.  Turns off at 1pm and 5pm.  The 1pm turn off time (wintermodeoff)
 # will be filtered out if the outside temperature is above 70.
-$PoolTimer->tie_time( '00,01,02 09 * * *',
-    'on', 'log=pool.log Pool pump on requested' );
-$PoolTimer->tie_time(
-    '00,01,02 13,14,15,16 * * *',
-    'wintermodeoff',
-    'log=pool.log Pool pump wintermodeoff requested ($time)'
-);
-$PoolTimer->tie_time( '00,01,02 17 * * *',
-    'off', 'log=pool.log Pool pump turned off requested (5 pm)' );
+$PoolTimer->tie_time( '00,01,02 09 * * *',          'on',            'log=pool.log Pool pump on requested' );
+$PoolTimer->tie_time( '00,01,02 13,14,15,16 * * *', 'wintermodeoff', 'log=pool.log Pool pump wintermodeoff requested ($time)' );
+$PoolTimer->tie_time( '00,01,02 17 * * *',          'off',           'log=pool.log Pool pump turned off requested (5 pm)' );
 $PoolTimer->tie_filter(
     '($Outdoor_temperature->state() > 70) && ($PoolTemp->state() < $PoolDesiredTemp->state())',
     'wintermodeoff',
     'log=pool.log Pool off requested (early afternoon) overridden due to outside temperature'
 );
-$PoolTimer->tie_filter( '$Pool->state() eq "on"',
-    'on', 'log=pool.log Pool on overridden due to already on' );
-$PoolTimer->tie_filter(
-    '$SpaOverflow->state() eq "on"',
-    'wintermodeoff',
-    'log=pool.log Pool off overridden due to overflow on'
-);
-$PoolTimer->tie_filter(
-    '$Waterfall->state() eq "on"',
-    'wintermodeoff',
-    'log=pool.log Pool off overridden due to waterfall on'
-);
+$PoolTimer->tie_filter( '$Pool->state() eq "on"',        'on',            'log=pool.log Pool on overridden due to already on' );
+$PoolTimer->tie_filter( '$SpaOverflow->state() eq "on"', 'wintermodeoff', 'log=pool.log Pool off overridden due to overflow on' );
+$PoolTimer->tie_filter( '$Waterfall->state() eq "on"',   'wintermodeoff', 'log=pool.log Pool off overridden due to waterfall on' );
 
-$PoolTimer->tie_items( $Pool, 'on', 'on', 'log=pool.log Pool on command sent' );
-$PoolTimer->tie_items( $Pool, 'off', 'off',
-    'log=pool.log Pool off command sent' );
-$PoolTimer->tie_items( $Pool, 'wintermodeoff', 'off',
-    'log=pool.log Winteroff request detected translating into true off command'
-);
+$PoolTimer->tie_items( $Pool, 'on',            'on',  'log=pool.log Pool on command sent' );
+$PoolTimer->tie_items( $Pool, 'off',           'off', 'log=pool.log Pool off command sent' );
+$PoolTimer->tie_items( $Pool, 'wintermodeoff', 'off', 'log=pool.log Winteroff request detected translating into true off command' );
 
 #
 # When the Pool_ShockMode is set in Stargate then turn the pool on for
 # extra time here (8 am on and 7 pm on till Midnight)
 #
 if ( $Startup or $New_Minute ) {
-    print "Pool ShockMode is set to: "
-      . $Mode_PoolShock->state() . "="
-      . $SG_Pool_ShockMode->state() . "\n";
+    print "Pool ShockMode is set to: " . $Mode_PoolShock->state() . "=" . $SG_Pool_ShockMode->state() . "\n";
     print "Outside temperature is "
       . $Outdoor_temperature->state()
       . " and Pool temperature is "
@@ -108,26 +88,14 @@
     # Use a tied event so the LCD updates quickly and doesn't wait for the Compool equipment
     # to receive and process the request
     #
-    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($Pool,90,2)',
-        'macro210' );
-    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($Spa,90,4)',
-        'macro211' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($Waterfall,90,6)', 'macro212' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($SpaOverflow,90,7)',
-        'macro213' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($PoolLights,91,2)',
-        'macro214' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($MalibuLights,91,3)',
-        'macro215' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($SpotLights,91,4)',
-        'macro216' );
-    $All_LCD->tie_event(
-        '&::CompoolSetStargateLCDDetailsReverse($FanLamps,91,5)', 'macro217' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($Pool,90,2)',         'macro210' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($Spa,90,4)',          'macro211' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($Waterfall,90,6)',    'macro212' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($SpaOverflow,90,7)',  'macro213' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($PoolLights,91,2)',   'macro214' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($MalibuLights,91,3)', 'macro215' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($SpotLights,91,4)',   'macro216' );
+    $All_LCD->tie_event( '&::CompoolSetStargateLCDDetailsReverse($FanLamps,91,5)',     'macro217' );
 }
 
 my $CompoolSetStargateLCD_Last_Loop_Count = 0;
@@ -237,13 +205,11 @@ sub CompoolSetStargateLCDDetailsReverse {
 # Pool voice commands
 #
 #noloop=start
-$v_compool_set_pool_temperature =
-  new Voice_Cmd('Set Pool Temperature to [82,84,86,88,90,92]');
+$v_compool_set_pool_temperature = new Voice_Cmd('Set Pool Temperature to [82,84,86,88,90,92]');
 $v_compool_set_pool_temperature->set_info('Set the pool target temperature');
 $v_compool_set_pool_temperature->set_icon('fountain');
 
-$v_compool_set_spa_temperature =
-  new Voice_Cmd('Set Spa Temperature to [96,98,100,102,104]');
+$v_compool_set_spa_temperature = new Voice_Cmd('Set Spa Temperature to [96,98,100,102,104]');
 $v_compool_set_spa_temperature->set_info('Set the spa target temperature');
 $v_compool_set_spa_temperature->set_icon('fountain');
 
@@ -252,14 +218,11 @@ sub CompoolSetStargateLCDDetailsReverse {
 $v_compool_status->set_authority('anyone');
 $v_compool_status->set_icon('stats');
 
-$v_compool_waterfall_timer =
-  new Voice_Cmd('Turn on the waterfall for [10,20,30,60,90,120] minutes');
-$v_compool_waterfall_timer->set_info(
-    'Turn on the waterfall under timer control');
+$v_compool_waterfall_timer = new Voice_Cmd('Turn on the waterfall for [10,20,30,60,90,120] minutes');
+$v_compool_waterfall_timer->set_info('Turn on the waterfall under timer control');
 $v_compool_waterfall_timer->set_icon('timer');
 
-$v_compool_spa_timer =
-  new Voice_Cmd('Turn on spa scene for [1,10,20,30,60,90,120] minutes');
+$v_compool_spa_timer = new Voice_Cmd('Turn on spa scene for [1,10,20,30,60,90,120] minutes');
 $v_compool_spa_timer->set_info('Turn on the spa scene under timer control');
 $v_compool_spa_timer->set_icon('timer');
 
@@ -280,72 +243,39 @@ sub CompoolSetStargateLCDDetailsReverse {
 
     # Basic temperature settings
     $status .= "Pool status report:\n";
-    $status .=
-        "Pool Temperature is : "
-      . &Compool::get_temp( $port, 'pool' )
-      . " degrees\n";
-    $status .=
-        "Pool limit is       : "
-      . &Compool::get_temp( $port, 'pooldesired' )
-      . " degrees\n";
-    $status .=
-        "Spa Temperature is  : "
-      . &Compool::get_temp( $port, 'spa' )
-      . " degrees\n";
-    $status .=
-        "Spa limit is        : "
-      . &Compool::get_temp( $port, 'spadesired' )
-      . " degrees\n";
-    $status .=
-        "Air Temperature is  : "
-      . &Compool::get_temp( $port, 'air' )
-      . " degrees\n";
-    $status .=
-        "Solar Temperature is: "
-      . &Compool::get_temp( $port, 'poolsolar' )
-      . " degrees\n";
+    $status .= "Pool Temperature is : " . &Compool::get_temp( $port, 'pool' ) . " degrees\n";
+    $status .= "Pool limit is       : " . &Compool::get_temp( $port, 'pooldesired' ) . " degrees\n";
+    $status .= "Spa Temperature is  : " . &Compool::get_temp( $port, 'spa' ) . " degrees\n";
+    $status .= "Spa limit is        : " . &Compool::get_temp( $port, 'spadesired' ) . " degrees\n";
+    $status .= "Air Temperature is  : " . &Compool::get_temp( $port, 'air' ) . " degrees\n";
+    $status .= "Solar Temperature is: " . &Compool::get_temp( $port, 'poolsolar' ) . " degrees\n";
 
     # Primary equipment
-    $status .=
-      "The Pool is         : " . &Compool::get_device( $port, 'pool' ) . "\n";
-    $status .=
-      "The Spa is          : " . &Compool::get_device( $port, 'spa' ) . "\n";
-    $status .=
-      "The waterfall is    : " . &Compool::get_device( $port, 'aux1' ) . "\n";
-    $status .=
-      "The spa waterfall is: " . &Compool::get_device( $port, 'aux2' ) . "\n";
-    $status .=
-      "The pool lights are : " . &Compool::get_device( $port, 'aux3' ) . "\n";
-    $status .=
-      "The malibu's are    : " . &Compool::get_device( $port, 'aux4' ) . "\n";
-    $status .=
-      "The spotlights are  : " . &Compool::get_device( $port, 'aux5' ) . "\n";
-    $status .=
-      "The fans are        : " . &Compool::get_device( $port, 'aux6' ) . "\n";
-    $status .=
-      "The music is        : " . &Compool::get_device( $port, 'aux7' ) . "\n";
+    $status .= "The Pool is         : " . &Compool::get_device( $port, 'pool' ) . "\n";
+    $status .= "The Spa is          : " . &Compool::get_device( $port, 'spa' ) . "\n";
+    $status .= "The waterfall is    : " . &Compool::get_device( $port, 'aux1' ) . "\n";
+    $status .= "The spa waterfall is: " . &Compool::get_device( $port, 'aux2' ) . "\n";
+    $status .= "The pool lights are : " . &Compool::get_device( $port, 'aux3' ) . "\n";
+    $status .= "The malibu's are    : " . &Compool::get_device( $port, 'aux4' ) . "\n";
+    $status .= "The spotlights are  : " . &Compool::get_device( $port, 'aux5' ) . "\n";
+    $status .= "The fans are        : " . &Compool::get_device( $port, 'aux6' ) . "\n";
+    $status .= "The music is        : " . &Compool::get_device( $port, 'aux7' ) . "\n";
 
     # Secondary equipment
-    $status .= "The Service mode is : "
-      . &Compool::get_device( $port, 'service' ) . "\n";
-    $status .=
-      "The Gas heater is   : " . &Compool::get_device( $port, 'heater' ) . "\n";
-    $status .=
-      "The Solar heater is : " . &Compool::get_device( $port, 'solar' ) . "\n";
-    $status .=
-      "The Remote is       : " . &Compool::get_device( $port, 'remote' ) . "\n";
+    $status .= "The Service mode is : " . &Compool::get_device( $port, 'service' ) . "\n";
+    $status .= "The Gas heater is   : " . &Compool::get_device( $port, 'heater' ) . "\n";
+    $status .= "The Solar heater is : " . &Compool::get_device( $port, 'solar' ) . "\n";
+    $status .= "The Remote is       : " . &Compool::get_device( $port, 'remote' ) . "\n";
 
     #   $status .= "The Display is      : " . &Compool::get_device($port, 'display') . "\n";
     #   $status .= "Solar is available  : " . &Compool::get_device($port, 'allowsolar') . "\n";
     #   $status .= "The aux7 is         : " . &Compool::get_device($port, 'aux7') . "\n";
-    $status .=
-      "The Freeze alert is : " . &Compool::get_device( $port, 'freeze' ) . "\n";
+    $status .= "The Freeze alert is : " . &Compool::get_device( $port, 'freeze' ) . "\n";
     if ( $Mode_PoolShock->state() < 1 ) {
         $status .= "The ShockMode is    : off\n";
     }
     else {
-        $status .=
-          "The ShockMode set   : " . $Mode_PoolShock->state() . " days\n";
+        $status .= "The ShockMode set   : " . $Mode_PoolShock->state() . " days\n";
     }
 
     print_log $status;
@@ -354,22 +284,17 @@ sub CompoolSetStargateLCDDetailsReverse {
 
 if ( $state = said $v_compool_waterfall_timer) {
     speak "A timer has been set for $state minutes";
-    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object},
-        'aux1', 'on', $state * 60 );
+    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object}, 'aux1', 'on', $state * 60 );
 }
 
 if ( $state = said $v_compool_spa_timer) {
     speak "A timer has been set for $state minutes";
 
     # Turn on Malibu, Pool, Waterfall, and then Spa
-    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object},
-        'aux4', 'on', $state * 60 );
-    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object},
-        'aux3', 'on', $state * 60 );
-    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object},
-        'aux1', 'on', $state * 60 );
-    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object},
-        'spa', 'on', $state * 60 );
+    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object}, 'aux4', 'on', $state * 60 );
+    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object}, 'aux3', 'on', $state * 60 );
+    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object}, 'aux1', 'on', $state * 60 );
+    &Compool::set_device_with_timer( $Serial_Ports{Compool}{object}, 'spa',  'on', $state * 60 );
 }
 
 # speak "Pool temp below 78\n" if(&Compool::get_temp_now($Serial_Ports{Compool}{object}, 'pool', '<',78) and &Compool::get_device($Serial_Ports{Compool}{object}, 'pool') eq "on");
diff --git a/code/public/Compool_test.pl b/code/public/Compool_test.pl
index a46e459d9..4c5026de7 100644
--- a/code/public/Compool_test.pl
+++ b/code/public/Compool_test.pl
@@ -1,9 +1,7 @@
 # Category=Compool
 # Some simple events to debug new Compool subroutines
 
-$v_compool_test = new Voice_Cmd(
-    'Test compool [status,set_time,set_temp,get_temp,get_temp_now,set_device,get_device]'
-);
+$v_compool_test = new Voice_Cmd( 'Test compool [status,set_time,set_temp,get_temp,get_temp_now,set_device,get_device]' );
 
 if (   &Compool::get_temp_now( $Serial_Ports{Compool}{object}, 'pool' )
     && &Compool::get_temp( $Serial_Ports{Compool}{object}, 'pool' ) < 100 )
@@ -15,13 +13,11 @@
 #unless($test eq undef) {print "Setting is " . $test . "\n";};
 
 if ( &Compool::get_device_now( $Serial_Ports{Compool}{object}, 'pool' ) ) {
-    print "The pool is now "
-      . &Compool::get_device( $Serial_Ports{Compool}{object}, 'pool' ) . "\n";
+    print "The pool is now " . &Compool::get_device( $Serial_Ports{Compool}{object}, 'pool' ) . "\n";
 }
 
 if ( &Compool::get_device_now( $Serial_Ports{Compool}{object}, 'aux1' ) ) {
-    print "The aux1 is now "
-      . &Compool::get_device( $Serial_Ports{Compool}{object}, 'aux1' ) . "\n";
+    print "The aux1 is now " . &Compool::get_device( $Serial_Ports{Compool}{object}, 'aux1' ) . "\n";
 }
 
 if ( $state = said $v_compool_test) {
@@ -45,9 +41,7 @@
         }
     }
     elsif ( $state eq 'get_temp' ) {
-        print "Pool Temperature is "
-          . &Compool::get_temp( $port, 'pool' )
-          . " degrees\n";
+        print "Pool Temperature is " . &Compool::get_temp( $port, 'pool' ) . " degrees\n";
     }
     elsif ( $state eq 'set_device' ) {
         if ( &Compool::set_device( $port, 'aux1', 'on' ) != -1 ) {
@@ -63,51 +57,29 @@
     elsif ( $state eq 'status' ) {
 
         # Basic temperature settings
-        print "Pool Temperature is : "
-          . &Compool::get_temp( $port, 'pool' )
-          . " degrees\n";
-        print "Spa Temperature is  : "
-          . &Compool::get_temp( $port, 'spa' )
-          . " degrees\n";
-        print "Air Temperature is  : "
-          . &Compool::get_temp( $port, 'air' )
-          . " degrees\n";
+        print "Pool Temperature is : " . &Compool::get_temp( $port, 'pool' ) . " degrees\n";
+        print "Spa Temperature is  : " . &Compool::get_temp( $port, 'spa' ) . " degrees\n";
+        print "Air Temperature is  : " . &Compool::get_temp( $port, 'air' ) . " degrees\n";
 
         # Primary equipment
-        print "The Spa is          : "
-          . &Compool::get_device( $port, 'spa' ) . "\n";
-        print "The Pool is         : "
-          . &Compool::get_device( $port, 'pool' ) . "\n";
-        print "The Aux1 is         : "
-          . &Compool::get_device( $port, 'aux1' ) . "\n";
-        print "The Aux2 is         : "
-          . &Compool::get_device( $port, 'aux2' ) . "\n";
-        print "The Aux3 is         : "
-          . &Compool::get_device( $port, 'aux3' ) . "\n";
-        print "The Aux4 is         : "
-          . &Compool::get_device( $port, 'aux4' ) . "\n";
-        print "The Aux5 is         : "
-          . &Compool::get_device( $port, 'aux5' ) . "\n";
-        print "The Aux6 is         : "
-          . &Compool::get_device( $port, 'aux6' ) . "\n";
+        print "The Spa is          : " . &Compool::get_device( $port, 'spa' ) . "\n";
+        print "The Pool is         : " . &Compool::get_device( $port, 'pool' ) . "\n";
+        print "The Aux1 is         : " . &Compool::get_device( $port, 'aux1' ) . "\n";
+        print "The Aux2 is         : " . &Compool::get_device( $port, 'aux2' ) . "\n";
+        print "The Aux3 is         : " . &Compool::get_device( $port, 'aux3' ) . "\n";
+        print "The Aux4 is         : " . &Compool::get_device( $port, 'aux4' ) . "\n";
+        print "The Aux5 is         : " . &Compool::get_device( $port, 'aux5' ) . "\n";
+        print "The Aux6 is         : " . &Compool::get_device( $port, 'aux6' ) . "\n";
 
         # Secondary equipment
-        print "The Service mode is : "
-          . &Compool::get_device( $port, 'service' ) . "\n";
-        print "The Heater is       : "
-          . &Compool::get_device( $port, 'heater' ) . "\n";
-        print "The Solar is        : "
-          . &Compool::get_device( $port, 'solar' ) . "\n";
-        print "The Remote is       : "
-          . &Compool::get_device( $port, 'remote' ) . "\n";
-        print "The Display is      : "
-          . &Compool::get_device( $port, 'display' ) . "\n";
-        print "Solar is available  : "
-          . &Compool::get_device( $port, 'allowsolar' ) . "\n";
-        print "The aux7 is         : "
-          . &Compool::get_device( $port, 'aux7' ) . "\n";
-        print "The Freeze mode is  : "
-          . &Compool::get_device( $port, 'freeze' ) . "\n";
+        print "The Service mode is : " . &Compool::get_device( $port, 'service' ) . "\n";
+        print "The Heater is       : " . &Compool::get_device( $port, 'heater' ) . "\n";
+        print "The Solar is        : " . &Compool::get_device( $port, 'solar' ) . "\n";
+        print "The Remote is       : " . &Compool::get_device( $port, 'remote' ) . "\n";
+        print "The Display is      : " . &Compool::get_device( $port, 'display' ) . "\n";
+        print "Solar is available  : " . &Compool::get_device( $port, 'allowsolar' ) . "\n";
+        print "The aux7 is         : " . &Compool::get_device( $port, 'aux7' ) . "\n";
+        print "The Freeze mode is  : " . &Compool::get_device( $port, 'freeze' ) . "\n";
     }
     else {
         print "unknown request\n";
diff --git a/code/public/Danal/Cat_Box.pl b/code/public/Danal/Cat_Box.pl
index a675711ae..92af5e4af 100644
--- a/code/public/Danal/Cat_Box.pl
+++ b/code/public/Danal/Cat_Box.pl
@@ -40,8 +40,7 @@
     my $tcat  = parsedate("$date $time");
     my $tdiff = $tnow - $tcat;
     my $days  = int 0.5 + ( $tdiff / ( 24 * 60 * 60 ) );
-    print_log
-      "Cat Box Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
+    print_log "Cat Box Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
 
     if ( $days > 3 ) {
         print_log "Speaking Cat Box nag message";
@@ -78,10 +77,8 @@
     my $days  = int $tdiff / ( 24 * 60 * 60 );
 
     if ( $tdiff > 9 * 24 * 60 * 60 ) {
-        print_log
-          "Automated Cat box last changed $days days ago; speaking nag message";
-        speak
-          "Djeeni says: Meeeoow, Change the automated cat box.  It has been $days days.";
+        print_log "Automated Cat box last changed $days days ago; speaking nag message";
+        speak "Djeeni says: Meeeoow, Change the automated cat box.  It has been $days days.";
     }
 
 }
diff --git a/code/public/Danal/Christmas_Lights.pl b/code/public/Danal/Christmas_Lights.pl
index 1b1ec722f..86f3b29ac 100644
--- a/code/public/Danal/Christmas_Lights.pl
+++ b/code/public/Danal/Christmas_Lights.pl
@@ -17,6 +17,6 @@
         set $Christmas_Lights ON          if time_cron '* * * 11,12 *';
         set $Stairway_Christmas_Lights ON if time_cron '* * * 11,12 *';
     }
-    set $Christmas_Lights OFF if ( time_cron '3,6 0 * * *' );    # Midnight
-    set $Stairway_Christmas_Lights OFF if ( time_cron '4,7 1 * * *' );  # One AM
+    set $Christmas_Lights OFF          if ( time_cron '3,6 0 * * *' );    # Midnight
+    set $Stairway_Christmas_Lights OFF if ( time_cron '4,7 1 * * *' );    # One AM
 }    # End of New Minute code
diff --git a/code/public/Danal/Garage_Door.pl b/code/public/Danal/Garage_Door.pl
index 44a192545..228dcbacd 100644
--- a/code/public/Danal/Garage_Door.pl
+++ b/code/public/Danal/Garage_Door.pl
@@ -11,11 +11,9 @@
 #                                                                #
 ##################################################################
 
-use vars '$door1_old', '$door2_old', '$door3_old', '$warning_sent',
-  '$door_moved';
+use vars '$door1_old', '$door2_old', '$door3_old', '$warning_sent', '$door_moved';
 
-$garage_doors =
-  new X10_Garage_Door('D');   # CHANGE THIS to housecode of your RF Vehicle Link
+$garage_doors      = new X10_Garage_Door('D');    # CHANGE THIS to housecode of your RF Vehicle Link
 $timer_garage_door = new Timer();
 $timer_garage_annc = new Timer();
 
@@ -35,8 +33,7 @@
 # Transmission received from door(s)
 if ( state_now $garage_doors) {
     my $state = state $garage_doors;
-    my ( $en1, $en2, $en3, $which, $door1, $door2, $door3 ) =
-      $state =~ /(\S)(\S)(\S)(\S)(\S)(\S)(\S)/;
+    my ( $en1, $en2, $en3, $which, $door1, $door2, $door3 ) = $state =~ /(\S)(\S)(\S)(\S)(\S)(\S)(\S)/;
     my %table_dcode = qw(O Open C Closed);
 
     my $debug = 1 if $config_parms{debug} eq 'garage';
@@ -52,42 +49,36 @@
 
     if ( $which eq '1' ) {
         if ( $door1 eq $door1_old ) {
-            print_log
-              "Door 1 timer or retransmit update, door1 $table_dcode{$door1}\n"
+            print_log "Door 1 timer or retransmit update, door1 $table_dcode{$door1}\n"
               if $debug;
         }
         else {
             $door_moved = 1;
-            print_log
-              "Door 1 status change, old $table_dcode{$door1_old}, new $table_dcode{$door1}\n";
+            print_log "Door 1 status change, old $table_dcode{$door1_old}, new $table_dcode{$door1}\n";
             &garage_speak("Door <emph>1</emph> is $table_dcode{$door1}");
         }
     }
 
     if ( $which eq '2' ) {
         if ( $door2 eq $door2_old ) {
-            print_log
-              "Door 2 timer or retransmit update, door2 $table_dcode{$door2}\n"
+            print_log "Door 2 timer or retransmit update, door2 $table_dcode{$door2}\n"
               if $debug;
         }
         else {
             $door_moved = 1;
-            print_log
-              "Door 2 status change, old $table_dcode{$door2_old}, new $table_dcode{$door2}\n";
+            print_log "Door 2 status change, old $table_dcode{$door2_old}, new $table_dcode{$door2}\n";
             &garage_speak("Door <emph>2</emph> is $table_dcode{$door2}");
         }
     }
 
     if ( $which eq '3' ) {
         if ( $door3 eq $door3_old ) {
-            print_log
-              "Door 3 timer or retransmit update, door3 $table_dcode{$door3}\n"
+            print_log "Door 3 timer or retransmit update, door3 $table_dcode{$door3}\n"
               if $debug;
         }
         else {
             $door_moved = 1;
-            print_log
-              "Door 3 status change, old $table_dcode{$door3_old}, new $table_dcode{$door3}\n";
+            print_log "Door 3 status change, old $table_dcode{$door3_old}, new $table_dcode{$door3}\n";
             &garage_speak("Door <emph>3<emph> is $table_dcode{$door3}");
         }
     }
@@ -100,8 +91,7 @@
 # If a door actually moved (as opposed to a re-transmit), set/check some timers.
 if ($door_moved) {
     my $state = state $garage_doors;
-    if ( substr( $state, 4, 3 ) eq "CCC" )
-    {    # All Doors Closed, cancel any timers; undo any warnings.
+    if ( substr( $state, 4, 3 ) eq "CCC" ) {    # All Doors Closed, cancel any timers; undo any warnings.
         unset $timer_garage_door;
         unset $timer_garage_annc;
         if ($warning_sent) {
@@ -109,7 +99,7 @@
             $warning_sent = 0;
         }
     }
-    else {    # Start (or push out) a timer if anything is open
+    else {                                      # Start (or push out) a timer if anything is open
         set $timer_garage_door 60 * 5;
         set $timer_garage_annc 60 * 4;
     }
@@ -153,8 +143,7 @@
     if ( $c_state eq 'GC6' ) {
         print_log "Garage Door Override timer cancelled";
         &garage_speak("Garage command cancel acknowledged");
-        set $timer_garage_override 1
-          ;    # Set to 1 second to force 'expired' check soon.
+        set $timer_garage_override 1;    # Set to 1 second to force 'expired' check soon.
         unset $timer_garage_annc;
     }
 }    # End of Garage Control button pushed
@@ -177,8 +166,7 @@
     $state = substr( $state, 4, 3 );
     if ( $state ne "CCC" ) {
         if ( !$warning_sent ) {
-            &garage_notify(
-                "Warning, Garage doors open too long <spell>$state</spell>");
+            &garage_notify("Warning, Garage doors open too long <spell>$state</spell>");
             $warning_sent = 1;
         }
         else {
@@ -196,9 +184,7 @@
     my $state = state $garage_doors;
     $state = substr( $state, 4, 3 );
     if ( $state ne "CCC" ) {
-        &garage_notify(
-            "Warning, Garage override expired with doors <spell>$state</spell>"
-        );
+        &garage_notify( "Warning, Garage override expired with doors <spell>$state</spell>" );
         $warning_sent = 1;
         set $timer_garage_door 60 * 2;
     }
@@ -211,8 +197,7 @@
 
 if ( said $v_Garage_Query) {
     my $state = state $garage_doors;
-    my ( $en1, $en2, $en3, $which, $door1, $door2, $door3 ) =
-      $state =~ /(\S)(\S)(\S)(\S)(\S)(\S)(\S)/;
+    my ( $en1, $en2, $en3, $which, $door1, $door2, $door3 ) = $state =~ /(\S)(\S)(\S)(\S)(\S)(\S)(\S)/;
     my %table_dcode = qw(O Open C Closed);
 
     print_log "State=$state\n";
@@ -253,11 +238,9 @@
 sub garage_notify {
     my ($text) = @_;
 
-    my $p1 = new Process_Item(
-        "send_sprint_pcs -to danal -text \"$text $Date_Now $Time_Now\" ");
+    my $p1 = new Process_Item("send_sprint_pcs -to danal -text \"$text $Date_Now $Time_Now\" ");
     start $p1;    # Run externally so as not to hang MH process
-    my $p2 = new Process_Item(
-        "alpha_page -pin 1488774 -message \"$text $Date_Now $Time_Now\" ");
+    my $p2 = new Process_Item("alpha_page -pin 1488774 -message \"$text $Date_Now $Time_Now\" ");
     start $p2;    # Run externally so as not to hang MH process
 
     print_log "Garage notification sent, text = $text";
diff --git a/code/public/Danal/ISDN.pl b/code/public/Danal/ISDN.pl
index 048bcb57e..b0a0ff113 100644
--- a/code/public/Danal/ISDN.pl
+++ b/code/public/Danal/ISDN.pl
@@ -27,19 +27,19 @@
 
     my ( $NumChannels, %current, %service );
 
-    my $i = 4;    # Start at first option flag
+    my $i = 4;                                             # Start at first option flag
     while ( $i < length($packet) ) {
         my $option = unpack( 'C', substr( $packet, $i,     1 ) );
         my $length = unpack( 'C', substr( $packet, $i + 1, 1 ) );
         $i += 2;
         print_log "Option = $option Length = $length " if $debug;
 
-        if ( $option == 1 ) {    # Number of channels running
+        if ( $option == 1 ) {                              # Number of channels running
             $NumChannels = unpack( 'C', substr( $packet, $i, 1 ) );
             print_log "NumChannels = $NumChannels\n" if $debug;
         }
 
-        if ( $option == 2 ) {    # Call Type/Direction Channel 1
+        if ( $option == 2 ) {                              # Call Type/Direction Channel 1
             $current{1}{callflag} = unpack( 'C', substr( $packet, $i, 1 ) );
             if ( 1 == $current{1}{callflag} ) {
                 $current{1}{calltype} = 'VOICE';
@@ -61,8 +61,7 @@
                 $current{1}{calltype} = '';
                 $current{1}{calldir}  = '';
             }
-            print_log
-              "Current call channel 1 = $current{1}{callflag} $current{1}{calltype} $current{1}{calldir}\n"
+            print_log "Current call channel 1 = $current{1}{callflag} $current{1}{calltype} $current{1}{calldir}\n"
               if $debug;
         }
 
@@ -133,8 +132,7 @@
                 $current{2}{calltype} = '';
                 $current{2}{calldir}  = '';
             }
-            print_log
-              "Current call Channel 2 = $current{2}{callflag} $current{2}{calltype} $current{2}{calldir}\n"
+            print_log "Current call Channel 2 = $current{2}{callflag} $current{2}{calltype} $current{2}{calldir}\n"
               if $debug;
         }
 
@@ -243,8 +241,7 @@
     {    # New data call?
         $data1_call = $current{1}{destname};
         if ( $data1_call eq $config_parms{isdn_internet} ) {
-            print_log
-              "Outgoing ISDN Data Call detected to $data1_call; starting TZO process";
+            print_log "Outgoing ISDN Data Call detected to $data1_call; starting TZO process";
             start $p_set_ip_3com_tzo;
         }
     }
@@ -255,8 +252,7 @@
     {    # New data call?
         $data2_call = $current{2}{destname};
         if ( $data2_call eq $config_parms{isdn_internet} ) {
-            print_log
-              "Outgoing ISDN Data Call detected to $data2_call; starting TZO process";
+            print_log "Outgoing ISDN Data Call detected to $data2_call; starting TZO process";
             start $p_set_ip_3com_tzo;
         }
     }
@@ -285,13 +281,10 @@ sub callerid {
     return;
     my ($cid_nmbr) = @_;
     my $cid_speak_nmbr =
-        substr( $cid_nmbr, 0, 3 ) . "."
-      . substr( $cid_nmbr, 3, 3 ) . "."
-      . substr( $cid_nmbr, 6, 4 );        # Pauses for speak
+      substr( $cid_nmbr, 0, 3 ) . "." . substr( $cid_nmbr, 3, 3 ) . "." . substr( $cid_nmbr, 6, 4 );    # Pauses for speak
     my $areacode = substr( $cid_nmbr, 0, 3 );
     $cid_speak_nmbr = substr( $cid_speak_nmbr, 3, 8 )
-      if ( $areacode eq $config_parms{local_area_code} )
-      ;                                   # Drop area code if same
+      if ( $areacode eq $config_parms{local_area_code} );                                               # Drop area code if same
 #### $Caller_ID::state_by_areacode{$areacode};
     # Put Spaces in the Phone Number to 'speak' correctly
     my @chars = split //, $cid_speak_nmbr;
@@ -300,16 +293,14 @@ sub callerid {
         $cid_speak_nmbr .= $char . " ";
     }
 
-    my $cid_speak_name = '';              # for now...
-    my $cid_name       = '';              # for now...
-                                          # Long term logs
-    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-        "$cid_nmbr $cid_name" );
-    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $cid_nmbr, "$Time_Now $Date_Now $Year name=$cid_name" );
+    my $cid_speak_name = '';                                                                            # for now...
+    my $cid_name       = '';                                                                            # for now...
+                                                                                                        # Long term logs
+    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$cid_nmbr $cid_name" );
+    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $cid_nmbr, "$Time_Now $Date_Now $Year name=$cid_name" );
 
     # Short term log; speak or clear via X10 keypresses.
-    open( CALLLOG, ">>$config_parms{data_dir}\\phone\\callerid.log" );  # Log it
+    open( CALLLOG, ">>$config_parms{data_dir}\\phone\\callerid.log" );                                  # Log it
     print CALLLOG "$Date_Now`$Time_Now`$cid_speak_name`$cid_speak_nmbr\n";
     close CALLLOG;
 
diff --git a/code/public/Danal/ISDN_ip.pl b/code/public/Danal/ISDN_ip.pl
index 5f2bc3f11..ff0b2c216 100644
--- a/code/public/Danal/ISDN_ip.pl
+++ b/code/public/Danal/ISDN_ip.pl
@@ -21,13 +21,10 @@
 my $f_ISDN_addr = "$config_parms{data_dir}/web/ISDN_addr.txt";
 my $f_ISDN_html = "$config_parms{data_dir}/web/ISDN_addr.html";
 
-$p_ISDN_addr =
-  new Process_Item("get_url http://lanmodem/stat3.htm $f_ISDN_html");
+$p_ISDN_addr = new Process_Item("get_url http://lanmodem/stat3.htm $f_ISDN_html");
 
-$v_ISDN_addr =
-  new Voice_Cmd('[Get,Read,Show] the 3Com ISDN Lan Modem Internet IP address');
-$v_ISDN_addr->set_info(
-    "The IP address of the other end of the call; our public IP");
+$v_ISDN_addr = new Voice_Cmd('[Get,Read,Show] the 3Com ISDN Lan Modem Internet IP address');
+$v_ISDN_addr->set_info("The IP address of the other end of the call; our public IP");
 
 speak($f_ISDN_addr)   if said $v_ISDN_addr eq 'Read';
 display($f_ISDN_addr) if said $v_ISDN_addr eq 'Show';
diff --git a/code/public/Danal/Master_Bedroom.pl b/code/public/Danal/Master_Bedroom.pl
index 8da4da526..6ecc1c2f3 100644
--- a/code/public/Danal/Master_Bedroom.pl
+++ b/code/public/Danal/Master_Bedroom.pl
@@ -45,8 +45,7 @@
 
 if ($New_Minute) {
     if ( time_now("$Time_Sunset - 0:30") ) {
-        print_log
-          "Sunset at $Time_Sunset; now dusk, set up Master Bedroom for evening";
+        print_log "Sunset at $Time_Sunset; now dusk, set up Master Bedroom for evening";
         set $Debbie_Lamp ON;
         set $Danal_Lamp ON;
     }
@@ -141,12 +140,10 @@ sub master_morning {
     my $tnow  = parsedate('now');
     my $tmst  = parsedate("$date $time");
     my $tdiff = $tnow - $tmst;
-    print_log
-      "Master Control Timers: Last date/time $date $time, seconds $tmst, secs now $tnow, diff $tdiff";
+    print_log "Master Control Timers: Last date/time $date $time, seconds $tmst, secs now $tnow, diff $tdiff";
 
     if ( $tdiff < 6 * 60 * 60 ) {
-        print_log
-          "Master Control manipulated this morning; morning routine automation canceled";
+        print_log "Master Control manipulated this morning; morning routine automation canceled";
     }
     else {
         set $Debbie_Fan OFF;
diff --git a/code/public/Danal/Pool_Maint.pl b/code/public/Danal/Pool_Maint.pl
index fe778580b..6c87d5745 100644
--- a/code/public/Danal/Pool_Maint.pl
+++ b/code/public/Danal/Pool_Maint.pl
@@ -20,8 +20,7 @@
     my $state = state $Pool_Maint_age;
     speak(
         volume => 90,
-        text =>
-          "Djeeni says: Good Job swimmer, you maintained the pool and spa."
+        text   => "Djeeni says: Good Job swimmer, you maintained the pool and spa."
     );
     print_log "Pool Maint age object set to $state; nag timers start now";
 }
@@ -36,16 +35,14 @@
     my $tcat  = parsedate("$date $time");
     my $tdiff = $tnow - $tcat;
     my $days  = int 0.5 + ( $tdiff / ( 24 * 60 * 60 ) );
-    print_log
-      "Pool Maint age Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
+    print_log "Pool Maint age Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
 
     if ( $days > 5 ) {
         print_log "Speaking Pool Maint nag message";
         my $state = state $Pool_Maint_age;
         speak(
             volume => 70,
-            text =>
-              "Djeeni says: Time to maintain the pool and spa, please shock the pool with $state."
+            text   => "Djeeni says: Time to maintain the pool and spa, please shock the pool with $state."
         );
 
         #set $Pool_Maint_Reminder ON if 'on' ne state $Pool_Maint_Reminder;
@@ -68,15 +65,13 @@
     my $tcat  = parsedate("$date $time");
     my $tdiff = $tnow - $tcat;
     my $days  = int 0.5 + ( $tdiff / ( 24 * 60 * 60 ) );
-    print_log
-      "Pool Maint age Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
+    print_log "Pool Maint age Timers: Last date/time $date $time, Seconds before now $tdiff, Days before now $days";
 
     if ( $days > 8 ) {
         print_log "Speaking Pool Maint nag message";
         speak(
             volume => 50,
-            text =>
-              "Djeeni says: You skipped a weekend, Time to catch up on pool maintenance"
+            text   => "Djeeni says: You skipped a weekend, Time to catch up on pool maintenance"
         );
         speak( volume => 50, text => "Please shock the pool with $state." );
 
diff --git a/code/public/Danal/Satellite_TLE.pl b/code/public/Danal/Satellite_TLE.pl
index 3048e9c3e..068aa66fc 100644
--- a/code/public/Danal/Satellite_TLE.pl
+++ b/code/public/Danal/Satellite_TLE.pl
@@ -1,20 +1,17 @@
 #Category=Astronomy
 
 $v_get_Satellite_TLE = new Voice_Cmd('Get Satellite TLE');
-$v_get_Satellite_TLE->set_info(
-    "Get Two Line Elements for 100 Brightest Satellites");
+$v_get_Satellite_TLE->set_info("Get Two Line Elements for 100 Brightest Satellites");
 
 #my $f_Satellite_TLE   = "$config_parms{data_dir}/data/visual100TLE.txt";
 my $f_Satellite_TLE = "C:/TLE/visual100TLE.txt";
 my $u_Satellite_TLE = 'http://www.celestrak.com/NORAD/elements/visual.txt';
 
-$p_Satellite_TLE =
-  new Process_Item("get_url $u_Satellite_TLE $f_Satellite_TLE");
+$p_Satellite_TLE = new Process_Item("get_url $u_Satellite_TLE $f_Satellite_TLE");
 
 if ( my $state = state_now $v_get_Satellite_TLE) {
     start $p_Satellite_TLE;
-    print_log
-      "Getting Visual 100 Satellite TLEs from $u_Satellite_TLE; placing in $f_Satellite_TLE";
+    print_log "Getting Visual 100 Satellite TLEs from $u_Satellite_TLE; placing in $f_Satellite_TLE";
 }
 
 if ( done_now $p_Satellite_TLE) {
diff --git a/code/public/Danal/alarm.pl b/code/public/Danal/alarm.pl
index 96482702d..de870c8b8 100644
--- a/code/public/Danal/alarm.pl
+++ b/code/public/Danal/alarm.pl
@@ -34,11 +34,9 @@
 sub alarm_notify {
     my ($text) = @_;
 
-    my $p1 = new Process_Item(
-        "send_sprint_pcs -to danal -text \"$text $Date_Now $Time_Now\" ");
+    my $p1 = new Process_Item("send_sprint_pcs -to danal -text \"$text $Date_Now $Time_Now\" ");
     start $p1;    # Run externally so as not to hang MH process
-    my $p2 = new Process_Item(
-        "alpha_page -pin 1488774 -message \"$text $Date_Now $Time_Now\" ");
+    my $p2 = new Process_Item("alpha_page -pin 1488774 -message \"$text $Date_Now $Time_Now\" ");
     start $p2;    # Run externally so as not to hang MH process
     net_mail_send(
         account => 'DanalHome',
diff --git a/code/public/Danal/aqualink.pl b/code/public/Danal/aqualink.pl
index 694b73108..86d558ed4 100644
--- a/code/public/Danal/aqualink.pl
+++ b/code/public/Danal/aqualink.pl
@@ -118,8 +118,7 @@
         if ( $command eq 'AIRTMP' ) {
             &aqualinklog("Air Temp $value $AIRTMPmode");
             $Save{PoolAIRTMP} = $value;
-            speak
-              "Djeeni says: Pool Air temperature is currently $value degrees."
+            speak "Djeeni says: Pool Air temperature is currently $value degrees."
               if $AIRTMPmode ne '';
             $AIRTMPmode = '';
         }
@@ -191,8 +190,7 @@
         if ( $command eq 'OPMODE' ) {
             &aqualinklog("OPMODE $value $OPMODEmode");
             $Save{PoolOPMODE} = $value;
-            speak
-              "Djeeni says: Aqualink system operation mode is currently $value."
+            speak "Djeeni says: Aqualink system operation mode is currently $value."
               if $OPMODEmode ne '';
             $OPMODEmode = '';
         }
@@ -343,8 +341,7 @@
             &aqualinklog("SPA $value $SPAmode");
             $value = ( $value eq 'on' ) ? 'Spa' : 'Pool';
             $Save{PoolSPA} = $value;
-            speak
-              "Djeeni says: The Pool Spa mode is currently $value. Repeat $value"
+            speak "Djeeni says: The Pool Spa mode is currently $value. Repeat $value"
               if $SPAmode ne '';
             $SPAmode = '';
         }
@@ -383,8 +380,7 @@
                 $value = $value / 100;
                 &aqualinklog("VBAT $value $VBATmode");
                 $Save{PoolVBAT} = $value;
-                speak
-                  "Djeeni says: The Pool backup battery voltage is currently $value."
+                speak "Djeeni says: The Pool backup battery voltage is currently $value."
                   if $VBATmode ne '';
                 $VBATmode = '';
             }
@@ -407,8 +403,7 @@
 
     #Check for a reset of the RS Serial Adapter
     if ( $data =~ m#^Jandy Products.*# ) {
-        run_after_delay 2,
-          sub { set $aqualink "#ECHO=0"; set $aqualink "#COSMSGS=1"; };
+        run_after_delay 2, sub { set $aqualink "#ECHO=0"; set $aqualink "#COSMSGS=1"; };
     }
 
 }    # End of data from aqualink
@@ -556,14 +551,12 @@
 set_icon $v_pool_aux5_speak 'info';
 if ( $state = said $v_pool_display_status) {
     print_log "Display Pool Status";
-    my $results =
-      "<pre>Pool Settings, all as of last explicit query or notification:\n";
+    my $results = "<pre>Pool Settings, all as of last explicit query or notification:\n";
     $results .= "\n";
     $results .= "Pool area Air Temperature = $Save{PoolAIRTMP}\n";
     $results .= "            Pool/Spa Mode = $Save{PoolSPA}\n";
     $results .= "       Main (filter) Pump = $Save{PoolPUMP}\n";
-    $results .=
-      "     Cleaner (sweep) Pump = $Save{PoolCLEANR} (a.k.a $CLEANR)\n";
+    $results .= "     Cleaner (sweep) Pump = $Save{PoolCLEANR} (a.k.a $CLEANR)\n";
     $results .= "\n";
     $results .= "   Pool Water Temperature = $Save{PoolPOOLTMP}\n";
     $results .= "     Pool Water Set Point = $Save{PoolPOOLSP}\n";
@@ -720,8 +713,7 @@
 ##########################################################################
 # Category=Pool SysDiag
 
-$v_pool_diag =
-  new Voice_Cmd("Run the Aqualink serial adapter diagnostics (bad/fails)");
+$v_pool_diag = new Voice_Cmd("Run the Aqualink serial adapter diagnostics (bad/fails)");
 set_icon $v_pool_diag 'debug';
 if ( $state = said $v_pool_diag) { set $aqualink "#DIAG"; }
 
@@ -778,8 +770,7 @@
 
 sub aqualinklog {
     my ($text) = @_;
-    &::logit( "$::config_parms{data_dir}/logs/aqualink.$::Year_Month_Now.log",
-        "Aqualink: $text" );
+    &::logit( "$::config_parms{data_dir}/logs/aqualink.$::Year_Month_Now.log", "Aqualink: $text" );
 }
 
 #Commands
diff --git a/code/public/Danal/pa_control.pl b/code/public/Danal/pa_control.pl
index 7d91ed1ac..85549963d 100644
--- a/code/public/Danal/pa_control.pl
+++ b/code/public/Danal/pa_control.pl
@@ -32,10 +32,8 @@
 ##################################################################
 
 my @speakers;
-my $DIO_address = 'A'
-  ;  # Weeder DIO boards have an DIP switch settable prefix.  Set this to match.
-my $port_name =
-  'weeder';    # edit to match weeder serial port name from mh.private.ini
+my $DIO_address = 'A';         # Weeder DIO boards have an DIP switch settable prefix.  Set this to match.
+my $port_name   = 'weeder';    # edit to match weeder serial port name from mh.private.ini
 $pa_speaker_timer = new Timer;
 
 # PA relay items.
@@ -66,10 +64,7 @@
 $pa_outdoor->{bitmask} = 0x80;
 $pa_outdoor->{notall}  = 1;
 
-@speakers = (
-    $pa_master, $pa_office, $pa_kitchen, $pa_garage, $pa_5, $pa_6, $pa_7,
-    $pa_outdoor
-);
+@speakers = ( $pa_master, $pa_office, $pa_kitchen, $pa_garage, $pa_5, $pa_6, $pa_7, $pa_outdoor );
 
 ##################################################################
 # Code run by speak & play pre-hooks
@@ -104,7 +99,7 @@ sub pa_stub {
         }
     }
     &set_DIO;
-    select undef, undef, undef, .05; # adjust to delay sound until relays settle
+    select undef, undef, undef, .05;    # adjust to delay sound until relays settle
 }
 
 ##################################################################
diff --git a/code/public/Danal/pa_test.pl b/code/public/Danal/pa_test.pl
index f5ba3b86d..5fd722d3b 100644
--- a/code/public/Danal/pa_test.pl
+++ b/code/public/Danal/pa_test.pl
@@ -20,9 +20,9 @@
     mode   => 'unmuted',
     volume => 100,
     text   => "rooms=Office This message in Office Only"
-)                                                     if said $v_to100;
-speak "rooms=Kitchen This message in Kitchen Only"    if said $v_tk;
-speak "rooms=Garage Test This message in Garage Only" if said $v_tg;
+)                                                               if said $v_to100;
+speak "rooms=Kitchen This message in Kitchen Only"              if said $v_tk;
+speak "rooms=Garage Test This message in Garage Only"           if said $v_tg;
 speak "rooms=Office,kitchen This message in Office and Kitchen" if said $v_tok;
 
 if ( said $v_tmult) {
diff --git a/code/public/Danal/test_volume.pl b/code/public/Danal/test_volume.pl
index b1f10fe0f..7dce32610 100644
--- a/code/public/Danal/test_volume.pl
+++ b/code/public/Danal/test_volume.pl
@@ -2,8 +2,7 @@
 # Test setting of volume in speak and play (Windows only for now).
 
 $v_test_sound1 = new Voice_Cmd 'Play a sound at [20%,50%,100%] volume';
-$v_test_sound1->tie_event(
-    'play(file => "hello_from_bruce.wav", volume => "$state")');
+$v_test_sound1->tie_event('play(file => "hello_from_bruce.wav", volume => "$state")');
 $v_test_sound1->tie_event('print_log "Setting test sound to $state volume"');
 
 $v_test_sound2 = new Voice_Cmd 'Speak text at [20,50,100,] volume';
diff --git a/code/public/Danal/timer_kitchen.pl b/code/public/Danal/timer_kitchen.pl
index 72d9c9ccd..d0435d620 100644
--- a/code/public/Danal/timer_kitchen.pl
+++ b/code/public/Danal/timer_kitchen.pl
@@ -24,8 +24,7 @@
     $result .= &plural( $temp, "minute" ) . " left on Lower Oven timer\n"
       if ( $temp != 0 );
     $temp = minutes_remaining $timer_RFBurn;
-    $result .=
-      &plural( $temp, "minute" ) . " left on Right Front Burner timer\n"
+    $result .= &plural( $temp, "minute" ) . " left on Right Front Burner timer\n"
       if ( $temp != 0 );
     $temp = minutes_remaining $timer_LFBurn;
     $result .= &plural( $temp, "minute" ) . " left on Left Front Burner timer\n"
@@ -66,30 +65,18 @@
 
 my %timer_reminder_intervals = map { $_, 1 } ( 1, 5, 10, 20, 30, 60 );
 
-$v_UpOven_timer = new Voice_Cmd(
-    'Set Upper Oven Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_LwOven_timer = new Voice_Cmd(
-    'Set Lower Oven Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_RFBurn_timer = new Voice_Cmd(
-    'Set Right Front Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_LFBurn_timer = new Voice_Cmd(
-    'Set Left Front Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_RRBurn_timer = new Voice_Cmd(
-    'Set Right Rear Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_LRBurn_timer = new Voice_Cmd(
-    'Set Left Rear Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_EXTim1_timer = new Voice_Cmd(
-    'Set Extra Timer 1 for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
-$v_EXTim2_timer = new Voice_Cmd(
-    'Set Extra Timer 2 for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes'
-);
+$v_UpOven_timer = new Voice_Cmd( 'Set Upper Oven Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_LwOven_timer = new Voice_Cmd( 'Set Lower Oven Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_RFBurn_timer =
+  new Voice_Cmd( 'Set Right Front Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_LFBurn_timer =
+  new Voice_Cmd( 'Set Left Front Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_RRBurn_timer =
+  new Voice_Cmd( 'Set Right Rear Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_LRBurn_timer =
+  new Voice_Cmd( 'Set Left Rear Burner Timer for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_EXTim1_timer = new Voice_Cmd( 'Set Extra Timer 1 for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
+$v_EXTim2_timer = new Voice_Cmd( 'Set Extra Timer 2 for [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,45,60,90,120] minutes' );
 
 set_order $v_UpOven_timer '03';
 set_order $v_LwOven_timer '04';
diff --git a/code/public/Esensor_EM01.pl b/code/public/Esensor_EM01.pl
index 873d01fe5..0d4e16abe 100644
--- a/code/public/Esensor_EM01.pl
+++ b/code/public/Esensor_EM01.pl
@@ -29,8 +29,7 @@
 my $f_sensor184_html = "$config_parms{data_dir}/web/esensor184.html";
 my $f_sensor184_url  = $config_parms{Esensor184_id};
 
-$p_check_sensor184 = new Process_Item
-  qq[get_url "http://$f_sensor184_url/index.html" "$f_sensor184_html"];
+$p_check_sensor184 = new Process_Item qq[get_url "http://$f_sensor184_url/index.html" "$f_sensor184_html"];
 $v_check_sensor184 = new Voice_Cmd('[Get,Read,Check] sernsor184');
 
 if ( ( $New_Minute and ( ( $Minute % 5 ) == 2 ) ) ) {
@@ -61,8 +60,7 @@
 }
 my $text2 = file_read $f_sensor184_text;
 
-my ( $TempSpare1, $HumidSpare1 ) =
-  $text2 =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
+my ( $TempSpare1, $HumidSpare1 ) = $text2 =~ /\D\D\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*[\d.]+/;
 
 #    my ($E_sensor185, $TempIndoor, $HumidIndoor, $SunSensor) = $text2 =~ /\D(\D)\d+TF\D+([\d.]+)\D*HU\D*([\d.]+)\D*IL\D*([\d.]+)/;
 
diff --git a/code/public/NetCallerID.pl b/code/public/NetCallerID.pl
index 02c1ed82e..a7ae53d9f 100644
--- a/code/public/NetCallerID.pl
+++ b/code/public/NetCallerID.pl
@@ -30,37 +30,29 @@
 
 # define variables
 use vars qw($PhoneName $PhoneNumber $PhoneTime $PhoneDate);
-my ( $NameDone, $NumberDone );
-my ( $callerbn, $PhoneNumberz );
-my (
-    $PhoneDateLog,   $PhoneTimeLog, $PhoneNameLog,
-    $PhoneNumberLog, @callloglines, $CallLogTempLine
-);
-my ( $last, $first, $middle, $areacode, $local_number, $caller );
+my ( $NameDone,     $NumberDone );
+my ( $callerbn,     $PhoneNumberz );
+my ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog, @callloglines, $CallLogTempLine );
+my ( $last,         $first, $middle, $areacode, $local_number, $caller );
 my $Num_Of_Calls = 0;
 
 $NetCallerID = new Serial_Item( undef, undef, 'serial5' );
 if ( my $NetCaller = said $NetCallerID) {
     print "$NetCaller\n";
-    ( $PhoneNumber, $PhoneName ) =
-      $NetCaller =~ /^.+\.NMBR(\d+)\.{3}NAME(.+)\+{3}$/;
-    print "Name = $PhoneName, Number = $PhoneNumber\n"
-      ;    # make sure I am getting what I think I want.
+    ( $PhoneNumber, $PhoneName ) = $NetCaller =~ /^.+\.NMBR(\d+)\.{3}NAME(.+)\+{3}$/;
+    print "Name = $PhoneName, Number = $PhoneNumber\n";    # make sure I am getting what I think I want.
     $NumberDone = "yes";
     $NameDone   = "yes";
 
     ( $last, $first, $middle ) = ( split( ' ', $PhoneName ) )[ 0, 1, 2 ];
     $first = ucfirst( lc($first) );
     $first = ucfirst( lc($middle) )
-      if length($first) == 1;    # Last M First format
+      if length($first) == 1;                              # Last M First format
     $last = ucfirst( lc($last) );
 
     $areacode     = ( substr( $PhoneNumber, 0, 3 ) );
     $local_number = ( substr( $PhoneNumber, 3, 7 ) );
-    $PhoneNumberz =
-        substr( $PhoneNumber, 0, 3 ) . "-"
-      . substr( $PhoneNumber, 3, 3 ) . "-"
-      . substr( $PhoneNumber, 6, 4 );
+    $PhoneNumberz = substr( $PhoneNumber, 0, 3 ) . "-" . substr( $PhoneNumber, 3, 3 ) . "-" . substr( $PhoneNumber, 6, 4 );
 
     # if there is no caller id info, you get the following data from the NetCallerID
     # I don't know what shows up if teh caller is a private number
@@ -93,16 +85,14 @@
     }
     else {
         #      $caller = "$first $last";
-        $caller = "$last"
-          ; #The last name is typically the only complete  name you will get, depending on the length of the person's name
-            # print_msg "caller name = $caller, last name = $last";
+        $caller =
+          "$last";    #The last name is typically the only complete  name you will get, depending on the length of the person's name
+                      # print_msg "caller name = $caller, last name = $last";
     }
 
     # Log the data for use by display_callers
-    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-        "$PhoneNumber $PhoneName" );
-    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
+    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName" );
+    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
 
     # If the incoming area code is the same, drop it from being spoken.
     if ( $areacode eq $config_parms{local_area_code} ) {
@@ -112,14 +102,10 @@
     # Put pauses in between area code, exchange, and number for
     # announce reasons
     if ( length($PhoneNumber) == 7 ) {
-        $PhoneNumber =
-          substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
+        $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
     }
     if ( length($PhoneNumber) == 10 ) {
-        $PhoneNumber =
-            substr( $PhoneNumber, 0, 3 ) . "."
-          . substr( $PhoneNumber, 3, 3 ) . "."
-          . substr( $PhoneNumber, 6, 4 );
+        $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 3 ) . "." . substr( $PhoneNumber, 6, 4 );
     }
 
     # Log the data in a special file to announce from Palmpad
diff --git a/code/public/Nick/mh_control.pl b/code/public/Nick/mh_control.pl
index 23ad69fe7..e71e59f55 100644
--- a/code/public/Nick/mh_control.pl
+++ b/code/public/Nick/mh_control.pl
@@ -19,16 +19,13 @@
     my $uptime_computer = &time_diff( $Time_Boot_time, (get_tickcount) / 1000 );
 
     #   speak("I was started on $Time_Startup\n");
-    speak(
-        "I was started $uptime_pgm ago. The computer was booted $uptime_computer ago."
-    );
+    speak( "I was started $uptime_pgm ago. The computer was booted $uptime_computer ago." );
 }
 
 $v_reboot = new Voice_Cmd("Reboot the computer");
 if ( said $v_reboot and $OS_win ) {
     speak("The house computer will reboot in 5 minutes.");
-    Win32::InitiateSystemShutdown( 'HOUSE', 'Rebooting in 5 minutes',
-        300, 1, 1 );
+    Win32::InitiateSystemShutdown( 'HOUSE', 'Rebooting in 5 minutes', 300, 1, 1 );
 }
 
 # Another way might be to run the following:
@@ -143,8 +140,7 @@
             $states .= "$$object{id_by_state}{$state}=$state, ";
         }
         $results .= sprintf( "ID:%-5s File:%-15s Object:%-15s states: %s\n",
-            $first_state, $object->{filename}, $object->{object_name},
-            $states );
+            $first_state, $object->{filename}, $object->{object_name}, $states );
     }
     display $results, 60, 'Serial Items', 'fixed';
 }
diff --git a/code/public/Nick/mhsend_server.pl b/code/public/Nick/mhsend_server.pl
index 887b59518..c55b58d7f 100644
--- a/code/public/Nick/mhsend_server.pl
+++ b/code/public/Nick/mhsend_server.pl
@@ -21,8 +21,7 @@
     my ( $name, $name_short );
 
     #   my ($name, $name_short) = net_domain_name('server_data');
-    print_log
-      "Received server_data data: name=$name: action=$action arg=$action_arg";
+    print_log "Received server_data data: name=$name: action=$action arg=$action_arg";
 
     # Read header and optional password (until blank record)
     my $handle = handle $mhsend_server;
@@ -68,8 +67,7 @@
         }
         else {
             display( $msg, 120, "Internet Message from $name" );
-            $response =
-              "Data was too long ... it was displayed instead of being spoken";
+            $response = "Data was too long ... it was displayed instead of being spoken";
         }
     }
     elsif ( $action eq 'run' ) {
diff --git a/code/public/Nick/mp3_control.pl b/code/public/Nick/mp3_control.pl
index 7b9326468..1ac7cc56a 100644
--- a/code/public/Nick/mp3_control.pl
+++ b/code/public/Nick/mp3_control.pl
@@ -3,8 +3,7 @@
 # On Windows, this calls a winamp control program called wactrl, by david_kindred@iname.com
 # On linux,   this calls ???
 
-my $mp3_states =
-  "Play,Stop,Pause,Next Song,Previous Song,Volume Up,Volume Down,Random Song,Toggle Shuffle,Toggle Repeat";
+my $mp3_states = "Play,Stop,Pause,Next Song,Previous Song,Volume Up,Volume Down,Random Song,Toggle Shuffle,Toggle Repeat";
 $v_mp3_control = new Voice_Cmd("Set mp3 player to [$mp3_states]");
 
 # This translates from speakable commands to program commands
@@ -30,33 +29,27 @@
     if ( $config_parms{mp3_program_control} eq 'httpq' ) {
         my $url = "http://localhost:$config_parms{mp3_program_port}";
         if ( $command eq 'Random Song' ) {
-            my $mp3_num_tracks =
-              get "$url/getlistlength?p=$config_parms{mp3_program_password}";
-            my $song          = int( rand($mp3_num_tracks) );
-            my $mp3_song_name = get
-              "$url/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$song";
+            my $mp3_num_tracks = get "$url/getlistlength?p=$config_parms{mp3_program_password}";
+            my $song           = int( rand($mp3_num_tracks) );
+            my $mp3_song_name  = get "$url/getplaylisttitle?p=$config_parms{mp3_program_password}&a=$song";
             $mp3_song_name =~ s/[\n\r]//g;
             print_log "Now Playing $mp3_song_name";
             get "$url/stop?p=$config_parms{mp3_program_password}";
-            get
-              "$url/setplaylistpos?p=$config_parms{mp3_program_password}&a=$song";
-            print_log filter_cr get
-              "$url/play?p=$config_parms{mp3_program_password}";
+            get "$url/setplaylistpos?p=$config_parms{mp3_program_password}&a=$song";
+            print_log filter_cr get "$url/play?p=$config_parms{mp3_program_password}";
         }
         elsif ( $command =~ /volume/i ) {
             $temp = '';
 
             # 10 passes is about 20 percent
             for my $pass ( 1 .. 10 ) {
-                $temp .= filter_cr get
-                  "$url/$command?p=$config_parms{mp3_program_password}";
+                $temp .= filter_cr get "$url/$command?p=$config_parms{mp3_program_password}";
             }
             print_log "Winamp (httpq) set to $command: $temp";
         }
         else {
             print "$url/$command?p=$config_parms{mp3_program_password}\n";
-            $temp = filter_cr get
-              "$url/$command?p=$config_parms{mp3_program_password}";
+            $temp = filter_cr get "$url/$command?p=$config_parms{mp3_program_password}";
             print_log "Winamp (httpq) set to $command: $temp";
         }
     }
diff --git a/code/public/Nick/tk_frames.pl b/code/public/Nick/tk_frames.pl
index 6c4ab4ec5..407cac8a9 100644
--- a/code/public/Nick/tk_frames.pl
+++ b/code/public/Nick/tk_frames.pl
@@ -40,8 +40,7 @@
         $Tk_objects{cmd_list} = &tk_command_list( $Tk_objects{ftl} );
         $Tk_objects{cmd_list}->pack(qw/-side top -expand 1 -fill both/);
 
-        $Tk_objects{cmd_list}
-          ->insert( 0, ' ', ' ', ' ', &list_voice_cmds_match('') )
+        $Tk_objects{cmd_list}->insert( 0, ' ', ' ', ' ', &list_voice_cmds_match('') )
           if $Startup;    # Init with all commands
 
         $Tk_objects{msg_window} = $Tk_objects{ftl}->Scrolled(
diff --git a/code/public/Nick/tk_widgets.pl b/code/public/Nick/tk_widgets.pl
index f5997992c..deb3aed72 100644
--- a/code/public/Nick/tk_widgets.pl
+++ b/code/public/Nick/tk_widgets.pl
@@ -19,9 +19,8 @@
     &tk_mbutton( 'Help', \&help );
 
     &tk_button(
-        'Reload (F1)', \&read_code,   'Pause (F2)', \&pause,
-        ' Exit (F3) ', \&sig_handler, 'Debug (F4)', \&toggle_debug,
-        'Log (F5)',    \&toggle_log
+        'Reload (F1)', \&read_code,    'Pause (F2)', \&pause, ' Exit (F3) ', \&sig_handler,
+        'Debug (F4)',  \&toggle_debug, 'Log (F5)',   \&toggle_log
     );
 
     &tk_label( \$Tk_objects{label_time} );
@@ -32,11 +31,7 @@
 
     &tk_entry( "Sleep time", \$Loop_Sleep_Time, "Tk passes", \$Loop_Tk_Passes );
 
-    &tk_radiobutton(
-        'Mode', \$Save{mode},
-        [ 'normal', 'mute', 'offline' ],
-        [ 'Normal', 'Mute', 'Offline' ]
-    );
+    &tk_radiobutton( 'Mode', \$Save{mode}, [ 'normal', 'mute', 'offline' ], [ 'Normal', 'Mute', 'Offline' ] );
 
     #   &tk_radiobutton('Debug', \$config_parms{debug}, [1, 0], ['On', 'Off']);
     #    &tk_checkbutton('Debug on', \$config_parms{debug});
diff --git a/code/public/Nick/wakeup.pl b/code/public/Nick/wakeup.pl
index eba9eb970..cf0e2624e 100644
--- a/code/public/Nick/wakeup.pl
+++ b/code/public/Nick/wakeup.pl
@@ -1,8 +1,7 @@
 # Category=Wakeup
 
 &tk_entry( 'Wakeup Time', \$Save{wakeup_time} );
-&tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time},
-    [ '6 am', '6:15 am', '6:30 am', '6:45 am', '8 am', ' ' ] );
+&tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time}, [ '6 am', '6:15 am', '6:30 am', '6:45 am', '8 am', ' ' ] );
 
 $v_wakeup_nick = new Voice_Cmd('Wakeup Nick');
 
diff --git a/code/public/Owfs_hvac.pl b/code/public/Owfs_hvac.pl
index 6a3fe5a94..649f8d511 100644
--- a/code/public/Owfs_hvac.pl
+++ b/code/public/Owfs_hvac.pl
@@ -7,62 +7,20 @@
 
 my ( $function, @parms ) = @ARGV;
 
-my (
-    $sun_0_time, $sun_0_temp, $sun_0_zone,
-    $sun_1_time, $sun_1_temp, $sun_1_zone
-);
-my (
-    $sun_2_time, $sun_2_temp, $sun_2_zone,
-    $sun_3_time, $sun_3_temp, $sun_3_zone
-);
-my (
-    $mon_0_time, $mon_0_temp, $mon_0_zone,
-    $mon_1_time, $mon_1_temp, $mon_1_zone
-);
-my (
-    $mon_2_time, $mon_2_temp, $mon_2_zone,
-    $mon_3_time, $mon_3_temp, $mon_3_zone
-);
-my (
-    $tue_0_time, $tue_0_temp, $tue_0_zone,
-    $tue_1_time, $tue_1_temp, $tue_1_zone
-);
-my (
-    $tue_2_time, $tue_2_temp, $tue_2_zone,
-    $tue_3_time, $tue_3_temp, $tue_3_zone
-);
-my (
-    $wed_0_time, $wed_0_temp, $wed_0_zone,
-    $wed_1_time, $wed_1_temp, $wed_1_zone
-);
-my (
-    $wed_2_time, $wed_2_temp, $wed_2_zone,
-    $wed_3_time, $wed_3_temp, $wed_3_zone
-);
-my (
-    $thu_0_time, $thu_0_temp, $thu_0_zone,
-    $thu_1_time, $thu_1_temp, $thu_1_zone
-);
-my (
-    $thu_2_time, $thu_2_temp, $thu_2_zone,
-    $thu_3_time, $thu_3_temp, $thu_3_zone
-);
-my (
-    $fri_0_time, $fri_0_temp, $fri_0_zone,
-    $fri_1_time, $fri_1_temp, $fri_1_zone
-);
-my (
-    $fri_2_time, $fri_2_temp, $fri_2_zone,
-    $fri_3_time, $fri_3_temp, $fri_3_zone
-);
-my (
-    $sat_0_time, $sat_0_temp, $sat_0_zone,
-    $sat_1_time, $sat_1_temp, $sat_1_zone
-);
-my (
-    $sat_2_time, $sat_2_temp, $sat_2_zone,
-    $sat_3_time, $sat_3_temp, $sat_3_zone
-);
+my ( $sun_0_time, $sun_0_temp, $sun_0_zone, $sun_1_time, $sun_1_temp, $sun_1_zone );
+my ( $sun_2_time, $sun_2_temp, $sun_2_zone, $sun_3_time, $sun_3_temp, $sun_3_zone );
+my ( $mon_0_time, $mon_0_temp, $mon_0_zone, $mon_1_time, $mon_1_temp, $mon_1_zone );
+my ( $mon_2_time, $mon_2_temp, $mon_2_zone, $mon_3_time, $mon_3_temp, $mon_3_zone );
+my ( $tue_0_time, $tue_0_temp, $tue_0_zone, $tue_1_time, $tue_1_temp, $tue_1_zone );
+my ( $tue_2_time, $tue_2_temp, $tue_2_zone, $tue_3_time, $tue_3_temp, $tue_3_zone );
+my ( $wed_0_time, $wed_0_temp, $wed_0_zone, $wed_1_time, $wed_1_temp, $wed_1_zone );
+my ( $wed_2_time, $wed_2_temp, $wed_2_zone, $wed_3_time, $wed_3_temp, $wed_3_zone );
+my ( $thu_0_time, $thu_0_temp, $thu_0_zone, $thu_1_time, $thu_1_temp, $thu_1_zone );
+my ( $thu_2_time, $thu_2_temp, $thu_2_zone, $thu_3_time, $thu_3_temp, $thu_3_zone );
+my ( $fri_0_time, $fri_0_temp, $fri_0_zone, $fri_1_time, $fri_1_temp, $fri_1_zone );
+my ( $fri_2_time, $fri_2_temp, $fri_2_zone, $fri_3_time, $fri_3_temp, $fri_3_zone );
+my ( $sat_0_time, $sat_0_temp, $sat_0_zone, $sat_1_time, $sat_1_temp, $sat_1_zone );
+my ( $sat_2_time, $sat_2_temp, $sat_2_zone, $sat_3_time, $sat_3_temp, $sat_3_zone );
 
 if ( $function eq 'set' ) {
     return &hvac_set();
@@ -292,10 +250,7 @@ sub hvac_ask {
         if ( $hold_timer eq "00:00" ) {
             $hold_timer_remain = "Forever";
         }
-        $state_disp .= "  "
-          . '<font style="color:red">HOLD '
-          . "$hold_timer_remain"
-          . '</font>';
+        $state_disp .= "  " . '<font style="color:red">HOLD ' . "$hold_timer_remain" . '</font>';
     }
 
     my %temps = $thermostat->get_temperatures();
@@ -350,8 +305,7 @@ sub hvac_ask {
 |;
 
     if ($hold) {
-        $html .=
-          '<P>Click <a href="Owfs_hvac.pl?cancel">here to cancel the hold</a>.</P>';
+        $html .= '<P>Click <a href="Owfs_hvac.pl?cancel">here to cancel the hold</a>.</P>';
     }
     else {
         $html .= qq|
diff --git a/code/public/Pushover-test.pl b/code/public/Pushover-test.pl
index 46767bf5b..938dbedb5 100644
--- a/code/public/Pushover-test.pl
+++ b/code/public/Pushover-test.pl
@@ -7,20 +7,17 @@
 
 use Pushover;
 
-$v_send_pushover_to_all =
-  new Voice_Cmd 'Send pushover notification to [all,tusdroidrazrhd]';
+$v_send_pushover_to_all = new Voice_Cmd 'Send pushover notification to [all,tusdroidrazrhd]';
 my $push = new Pushover();
 
 if ( $state = said $v_send_pushover_to_all) {
     if ( $state eq "all" ) {
         print_log "Sending Pushover notification to all devices";
-        $push->notify( "A low priority test message",
-            { title => 'Test title', priority => -1 } );
+        $push->notify( "A low priority test message", { title => 'Test title', priority => -1 } );
     }
     else {
         print_log "Sending Pushover notification to $state";
-        $push->notify( "A low priority test message to $state",
-            { title => 'Test title', priority => -1, device => $state } );
+        $push->notify( "A low priority test message to $state", { title => 'Test title', priority => -1, device => $state } );
     }
 }
 
diff --git a/code/public/RCSs.pl b/code/public/RCSs.pl
index 870dc37fa..4896c2f39 100644
--- a/code/public/RCSs.pl
+++ b/code/public/RCSs.pl
@@ -43,8 +43,7 @@
     $rcs0->cool_setpoint($state);
 }
 
-$v_rcs_heat =
-  new Voice_Cmd("Set Thermostat heat setpoint to [$rcs_temperatures]");
+$v_rcs_heat = new Voice_Cmd("Set Thermostat heat setpoint to [$rcs_temperatures]");
 if ( $state = said $v_rcs_heat) {
     $rcs0->heat_setpoint($state);
 }
diff --git a/code/public/Ricardo/bin/get_earthquakes_sp b/code/public/Ricardo/bin/get_earthquakes_sp
index 44be4438f..e4258441e 100644
--- a/code/public/Ricardo/bin/get_earthquakes_sp
+++ b/code/public/Ricardo/bin/get_earthquakes_sp
@@ -30,8 +30,7 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
@@ -77,10 +76,8 @@ use Date::Parse;
 use Date::Format;
 
 my $earthquakes_URL;
-$earthquakes_URL =
-  'http://pangea.ign.es/servidor/sismo/cnis/proximo/proximo.html';
-my $f_earthquakes_html =
-  "$config_parms{data_dir}/../web/ia5/outside/earthquakes.html";
+$earthquakes_URL = 'http://pangea.ign.es/servidor/sismo/cnis/proximo/proximo.html';
+my $f_earthquakes_html = "$config_parms{data_dir}/../web/ia5/outside/earthquakes.html";
 my $f_earthquakes_data = "$config_parms{data_dir}/earthquakes_data";
 
 my $debug = 1 if ( $parms{debug} );
@@ -92,8 +89,7 @@ my $debug = 1 if ( $parms{debug} );
 get_url_ua( $earthquakes_URL, $f_earthquakes_html );
 
 my $html = &file_read($f_earthquakes_html);
-$html =~
-  s|<html>|<html>\n<BASE href='http://pangea.ign.es/servidor/sismo/cnis/proximo/'>|i;
+$html =~ s|<html>|<html>\n<BASE href='http://pangea.ign.es/servidor/sismo/cnis/proximo/'>|i;
 &file_write( $f_earthquakes_html, $html );
 print STDERR "File: $f_earthquakes_html, writen\n" if $debug;
 my $text = &html_to_text($html);
diff --git a/code/public/Ricardo/bin/get_news_sp b/code/public/Ricardo/bin/get_news_sp
index d427bb576..3d23ac5fa 100644
--- a/code/public/Ricardo/bin/get_news_sp
+++ b/code/public/Ricardo/bin/get_news_sp
@@ -28,8 +28,7 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
diff --git a/code/public/Ricardo/bin/get_tv_com b/code/public/Ricardo/bin/get_tv_com
index c064a4e81..4f4d1104a 100644
--- a/code/public/Ricardo/bin/get_tv_com
+++ b/code/public/Ricardo/bin/get_tv_com
@@ -26,22 +26,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision: 0.1 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision: 0.1 $ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,    "reget",  "h", "help", "v", "debug",
-        "showId:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "showId:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -93,8 +87,7 @@ use Date::Format;
 $parms{showId} = 0 unless $parms{showId};
 
 # Get the list of programs from the list file.
-my $programs_file =
-  $config_parms{code_dir} . "/" . $config_parms{TV_com_progs_file};
+my $programs_file = $config_parms{code_dir} . "/" . $config_parms{TV_com_progs_file};
 open( TV_PROGRAMS, $programs_file )
   or print "Warning, could not open $programs_file!\n", return 1;
 my (@TV_com_progs) = <TV_PROGRAMS>;
@@ -191,13 +184,11 @@ sub parse_tv_com {
     $html =~ m/\<title\>\s*([^<]*) TV Show/i;
     $ProgramName = $1;
 
-    $html =~
-      m/span class=\"f-C00\"\>\s*([\w]+)\s*([\w]+)\s*([\w]+),\s*([\w]+)/i;
+    $html =~ m/span class=\"f-C00\"\>\s*([\w]+)\s*([\w]+)\s*([\w]+),\s*([\w]+)/i;
     $EpisodeDate = $1 . " " . $2 . " " . $3 . ", " . $4;
 
     # Get the program time
-    $html =~
-      m/Airs Next: \<span class=\"f-333\"\>\s*([\w]+)\s+([\w]+)\s+([\w]+)\s+([\d:]+)\s+([\w]+)/i;
+    $html =~ m/Airs Next: \<span class=\"f-333\"\>\s*([\w]+)\s+([\w]+)\s+([\w]+)\s+([\d:]+)\s+([\w]+)/i;
     if ( $4 ne '' and $5 ne '' ) {
         $EpisodeTime = $4 . " " . $5;
     }
@@ -206,8 +197,7 @@ sub parse_tv_com {
     }
 
     # Get the next episode details.
-    $html =~
-      m/Next Episode:\s*\<a\s*([^\n]*)\>\s*([^\n]*)\<\/a\>\<\/span\>\<br\s*\/\>\s*\n\s*([^\n]*)/i;
+    $html =~ m/Next Episode:\s*\<a\s*([^\n]*)\>\s*([^\n]*)\<\/a\>\<\/span\>\<br\s*\/\>\s*\n\s*([^\n]*)/i;
     $EpisodeName        = $2;
     $EpisodeDescription = $3;
     $EpisodeDescription =~ s/"//g;
@@ -215,8 +205,7 @@ sub parse_tv_com {
     $EpisodeDescription =~ s/\n//g;
     $EpisodeDescription =~ s/\r//g;
 
-    print
-      "Program: $ProgramName\nDate: $EpisodeDate\nTime: $EpisodeTime\nTitle: $EpisodeName\nDescription: $EpisodeDescription\n"
+    print "Program: $ProgramName\nDate: $EpisodeDate\nTime: $EpisodeTime\nTitle: $EpisodeName\nDescription: $EpisodeDescription\n"
       if $parms{v};
 }
 
@@ -239,8 +228,7 @@ sub save_tv_com {
 
     # output format is "TV	date	no time	Prog name	Programmes TV	Episode name & Desc"
     if ($year) {
-        $perl .=
-          "TV$showId\t$year.$month.$day\t$EpisodeTime\t$ProgramName\tProgrammes TV\t$EpisodeName: $EpisodeDescription\n";
+        $perl .= "TV$showId\t$year.$month.$day\t$EpisodeTime\t$ProgramName\tProgrammes TV\t$EpisodeName: $EpisodeDescription\n";
 
         # append the data to the file
         main::logit( $file, $perl, 0, 0 );
diff --git a/code/public/Ricardo/bin/get_tv_grid_sp b/code/public/Ricardo/bin/get_tv_grid_sp
index e28e179c5..3beee4416 100644
--- a/code/public/Ricardo/bin/get_tv_grid_sp
+++ b/code/public/Ricardo/bin/get_tv_grid_sp
@@ -30,20 +30,19 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 use Getopt::Long;
-use vars '%config_parms';      # Not a my, as called from handy_net_utils
+use vars '%config_parms';                    # Not a my, as called from handy_net_utils
 
 #my %config_parms;
 
-require 'handy_utilities.pl';    # For read_mh_opts
+require 'handy_utilities.pl';                # For read_mh_opts
 &main::read_mh_opts( \%config_parms, $Pgm_Path );
 
 BEGIN {
     eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
-}                                # Use BEGIN eval to keep perl2exe happy
+}                                            # Use BEGIN eval to keep perl2exe happy
 
 #======================================================================
 # Variable declarations and other init
@@ -61,11 +60,8 @@ my ( %DBM, %DBM2 );
 # Check invocation options, and print usage message if necessary
 #======================================================================
 if (
-    !&GetOptions(
-        \%parms,     "h",        "help",  "infile=s",
-        "outfile=s", "outdir=s", "reget", "redo",
-        "db=s",      "name=s",   "debug", "channels=s"
-    )
+    !&GetOptions( \%parms, "h", "help", "infile=s", "outfile=s", "outdir=s", "reget", "redo",
+        "db=s", "name=s", "debug", "channels=s" )
     or @ARGV
     or ( $parms{h} or $parms{help} )
   )
@@ -107,13 +103,8 @@ my $debug = $parms{debug};
 setup();
 
 my %channel_name = (
-    'TVE1',   '1-TVE1',
-    'TVE2',   '2-La+2+de+TVE',
-    'A3',     '3-Antena+3',
-    'TELE5',  '4-Tele+5',
-    'TM3',    '6-Telemadrid',
-    'CUATRO', '22-cuatro',
-    'CCMTV',  '17-PROGRAMACION+DE+CASTILLA+LA+MANCHA+TELEVISI%D3N'
+    'TVE1', '1-TVE1', 'TVE2', '2-La+2+de+TVE', 'A3', '3-Antena+3', 'TELE5', '4-Tele+5', 'TM3', '6-Telemadrid',
+    'CUATRO', '22-cuatro', 'CCMTV', '17-PROGRAMACION+DE+CASTILLA+LA+MANCHA+TELEVISI%D3N'
 );
 
 foreach ( split /,/, $parms{channels} ) {
@@ -157,16 +148,14 @@ sub get_cplus_grid {
     for ( $i = 1; $i <= 2; $i++ ) {
         my $tv_grid_URL;
         $tv_grid_URL =
-          'http://www.plus.es/codigo/television/guiatv/resultado.asp?tipo=dh5&c='
+            'http://www.plus.es/codigo/television/guiatv/resultado.asp?tipo=dh5&c='
           . $tv_channel
           . '&pr=L&dia=i'
           . $date
           . '&f=TO&usu=&pag='
           . $i;
-        $f_tv_grid_html =
-          "$config_parms{data_dir}/web/tv_channel_$tv_channel.html";
-        $f_tv_grid_data =
-          "$config_parms{data_dir}/tv_channel_${tv_channel}_data";
+        $f_tv_grid_html = "$config_parms{data_dir}/web/tv_channel_$tv_channel.html";
+        $f_tv_grid_data = "$config_parms{data_dir}/tv_channel_${tv_channel}_data";
 
         get_url_ua( $tv_grid_URL, $f_tv_grid_html );
 
@@ -214,13 +203,9 @@ sub get_general_grid {
 
     my $tv_grid_URL;
     $tv_grid_URL =
-        'http://www.elpais.es/parrillatv/resultados.html?franja=&tipo=&canal='
-      . $channel_name{$tv_channel} . '&dia='
-      . $date;
-    my $f_tv_grid_html =
-      "$config_parms{data_dir}/web/tv_channel_$tv_channel.html";
-    my $f_tv_grid_data =
-      "$config_parms{data_dir}/tv_channel_${tv_channel}_data";
+      'http://www.elpais.es/parrillatv/resultados.html?franja=&tipo=&canal=' . $channel_name{$tv_channel} . '&dia=' . $date;
+    my $f_tv_grid_html = "$config_parms{data_dir}/web/tv_channel_$tv_channel.html";
+    my $f_tv_grid_data = "$config_parms{data_dir}/tv_channel_${tv_channel}_data";
 
     get_url_ua( $tv_grid_URL, $f_tv_grid_html );
 
@@ -259,21 +244,15 @@ sub processFileCPlus {
 
         #Only look at lines with tv programm data on them
         if (m!^.+?:.+\|!) {
-            ( $pgm_name, $pgm_desc, $time_start, $time_end, $pgm_type ) = $_ =~
-              m!^(.+?):\s+(.+)\|.*?\|.*?(\d\d:\d\d)h\. - (\d+:\d+)h\.\s+\((.+)-.*?\)!;
+            ( $pgm_name, $pgm_desc, $time_start, $time_end, $pgm_type ) =
+              $_ =~ m!^(.+?):\s+(.+)\|.*?\|.*?(\d\d:\d\d)h\. - (\d+:\d+)h\.\s+\((.+)-.*?\)!;
         }
         else {
-            ( $pgm_name, $time_start, $time_end, $pgm_type ) = $_ =~
-              m!^(.+)\|.*?\|.*?(\d\d:\d\d)h\. - (\d+:\d+)h\.\s+\((.+)-.*?\)!;
+            ( $pgm_name, $time_start, $time_end, $pgm_type ) = $_ =~ m!^(.+)\|.*?\|.*?(\d\d:\d\d)h\. - (\d+:\d+)h\.\s+\((.+)-.*?\)!;
             $pgm_desc = "";
         }
-        store_in_dbm(
-            $ch_key, $ch_name,
-            $ch_number,  adjust_date( $pgm_date, $time_start, $time_first ),
-            $time_start, $time_end,
-            $pgm_type,   $pgm_name,
-            $pgm_desc
-        );
+        store_in_dbm( $ch_key, $ch_name, $ch_number, adjust_date( $pgm_date, $time_start, $time_first ),
+            $time_start, $time_end, $pgm_type, $pgm_name, $pgm_desc );
 
         print "Programa $_\n" if $debug;
         print "--> $time_start, $time_end, $pgm_type, $pgm_name, $pgm_desc\n"
@@ -291,8 +270,7 @@ sub processFilePais {
     #------------------------------------------------------------
     # Read first line and get channel no., and channel name
     #------------------------------------------------------------
-    my ($ch_name) = $textdata =~
-      m!D�a:.*\sTipo: Todos los tipos\. Canal:\s(.+)\. Franja: Todo el d�a!;
+    my ($ch_name) = $textdata =~ m!D�a:.*\sTipo: Todos los tipos\. Canal:\s(.+)\. Franja: Todo el d�a!;
     print "Channel: $ch_name\n" if $debug;
 
     # delete 2 head lines
@@ -306,14 +284,12 @@ sub processFilePais {
         if (/^(\d+:\d+)\s+(.+)/) {
             if ($time_start) {
                 ($time_end) = $_ =~ m!^(\d+:\d+)\s!;
-                store_in_dbm( $ch_key, $ch_name, 0,
-                    adjust_date( $pgm_date, $time_start, $time_first ),
+                store_in_dbm( $ch_key, $ch_name, 0, adjust_date( $pgm_date, $time_start, $time_first ),
                     $time_start, $time_end, $pgm_type, $pgm_name, $pgm_desc );
                 $time_start = '';
             }
 
-            ( $time_pgm, $pgm_name, $pgm_type ) =
-              $_ =~ m!^(\d\d:\d\d)\s(.*)\s$ch_name\s(.*)!;
+            ( $time_pgm, $pgm_name, $pgm_type ) = $_ =~ m!^(\d\d:\d\d)\s(.*)\s$ch_name\s(.*)!;
             $time_start = $time_pgm;
             if ( !$time_first ) { $time_first = $time_pgm }
             $pgm_desc = '';
@@ -328,8 +304,7 @@ sub processFilePais {
     }
     if ($time_start) {
         $time_end = $time_first;
-        store_in_dbm( $ch_key, $ch_name, 0,
-            adjust_date( $pgm_date, $time_start, $time_first ),
+        store_in_dbm( $ch_key, $ch_name, 0, adjust_date( $pgm_date, $time_start, $time_first ),
             $time_start, $time_end, $pgm_type, $pgm_name, $pgm_desc );
         $time_start = '';
     }
@@ -339,10 +314,7 @@ sub processFilePais {
 # Store the data in the DBM
 #------------------------------------------------------------
 sub store_in_dbm {
-    my (
-        $ch_key,   $ch_name,  $ch_number, $pgm_date, $time_start,
-        $time_end, $pgm_type, $pgm_name,  $pgm_desc
-    ) = @_;
+    my ( $ch_key, $ch_name, $ch_number, $pgm_date, $time_start, $time_end, $pgm_type, $pgm_name, $pgm_desc ) = @_;
     my $db_key = join( $;, $ch_key, $pgm_date, $time_start );
     my $db_data = join( $;, $pgm_name, $pgm_type, $time_end, $pgm_desc );
     $DBM{$db_key} = $db_data;
@@ -359,8 +331,7 @@ sub setup {
     #------------------------------------------------------------
     # Process Incoming Parameters, defaulting as necessary
     #------------------------------------------------------------
-    $parms{channels} =
-      "TVE1,TVE2,A3,TELE5,TM3,CP,CP2,CPC1,CPC2,CPC3,CMA,CMADOS,CL13,FOXGE,AXN"
+    $parms{channels} = "TVE1,TVE2,A3,TELE5,TM3,CP,CP2,CPC1,CPC2,CPC3,CMA,CMADOS,CL13,FOXGE,AXN"
       unless $parms{channels};
     $parms{db} = 'tv' unless $parms{db};
     $parms{outdir} = "$config_parms{html_dir}/$parms{db}"
@@ -493,10 +464,8 @@ sub adjust_date {
     }
 
     #Merge it (year > 2000)
-    my $ptime =
-      timelocal( 0, $pminu, $phour, $pday, $pmonth - 1, $pyear + 100 );
-    my $ftime =
-      timelocal( 0, $fminu, $fhour, $pday, $pmonth - 1, $pyear + 100 );
+    my $ptime = timelocal( 0, $pminu, $phour, $pday, $pmonth - 1, $pyear + 100 );
+    my $ftime = timelocal( 0, $fminu, $fhour, $pday, $pmonth - 1, $pyear + 100 );
 
     #check if program time is before first morning program time
     #this means, program time is next day
diff --git a/code/public/Ricardo/bin/get_tv_info_sp b/code/public/Ricardo/bin/get_tv_info_sp
index 65a9a0bc2..b07e0833a 100644
--- a/code/public/Ricardo/bin/get_tv_info_sp
+++ b/code/public/Ricardo/bin/get_tv_info_sp
@@ -19,23 +19,19 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval
-      "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"; # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
 }
 
 my %parms;
 use Getopt::Long;
 if (
     !&GetOptions(
-        \%parms,      "h",          "help",        "db=s",
-        "channels=s", "dates=s",    "times=s",     "keys=s",
-        "keyfile=s",  'title_only', "increment=s", "outfile1=s",
-        "outfile2=s", "type=s",     "debug",       "quiet"
+        \%parms,     "h",          "help",        "db=s",       "channels=s", "dates=s", "times=s", "keys=s",
+        "keyfile=s", 'title_only', "increment=s", "outfile1=s", "outfile2=s", "type=s",  "debug",   "quiet"
     )
     or @ARGV
     or !(
@@ -107,16 +103,14 @@ eof
 
 # Globals
 my (
-    @channels,   @dates,    @times,     @keys,        @types,
-    %DBM,        %DBM2,     $match_cnt, $match_list1, $match_list2,
-    $date_today, $time_now, $min_begin, $min_now,     $symbol
+    @channels,    @dates,       @times,      @keys,     @types,     %DBM,     %DBM2, $match_cnt,
+    $match_list1, $match_list2, $date_today, $time_now, $min_begin, $min_now, $symbol
 );
 my %config_parms;
 
 &setup;
 &find_match;
-print
-  "\nEncontrados $match_cnt programas. resultados detallados en fichero $parms{outfile2}\n"
+print "\nEncontrados $match_cnt programas. resultados detallados en fichero $parms{outfile2}\n"
   unless $parms{quiet};
 print $match_list1 if $match_cnt < 10;
 
@@ -173,10 +167,8 @@ sub find_match {
                               )
                             {
                                 # The next 2 lines highlight the selected key-word(s), using the selected symbol in mh.ini
-                                $pgm_desc =~
-                                  s/($key)/$symbol$symbol\1$symbol/gi;
-                                $pgm_name =~
-                                  s/($key)/$symbol$symbol\1$symbol/gi;
+                                $pgm_desc =~ s/($key)/$symbol$symbol\1$symbol/gi;
+                                $pgm_name =~ s/($key)/$symbol$symbol\1$symbol/gi;
 
                                 my $ch_data = $DBM2{$ch_key};
                                 my ( $ch_number, $ch_name ) =
@@ -184,20 +176,16 @@ sub find_match {
                                 if ( $parms{debug} ) {
                                     print "\nEncontrado un programa:\n";
                                     print "    Canal: $ch_number $ch_name\n";
-                                    print
-                                      "     Hora: $pgm_date $time_start -> $time_end\n";
+                                    print "     Hora: $pgm_date $time_start -> $time_end\n";
                                     print " Duraci�n: $pgm_length minutos\n";
                                     print "   T�tulo: $pgm_name\n";
                                     print "    Desc.:  $pgm_desc\n\n";
                                 }
 
                                 $match_cnt++;
-                                $pgm_name =~
-                                  s/\*+//g;  # Change **show name** => show name
-                                $pgm_name =~ s/[\\\$\^]//g
-                                  ; # Remove regular expression chars introduced above
-                                my $temp =
-                                  "\n$match_cnt|  $pgm_name| Canal $ch_name| $ch_key| Dial $ch_number|  ";
+                                $pgm_name =~ s/\*+//g;         # Change **show name** => show name
+                                $pgm_name =~ s/[\\\$\^]//g;    # Remove regular expression chars introduced above
+                                my $temp = "\n$match_cnt|  $pgm_name| Canal $ch_name| $ch_key| Dial $ch_number|  ";
 
                                 $temp .= "El $pgm_date| "
                                   if @dates > 1 or $pgm_date ne $date_today;
@@ -228,8 +216,7 @@ sub find_match {
     print OUT1 "Encontrados $match_cnt programas.\n$match_list1";
 
     #    It's a bit tidier like this (I can't actually see the bottom two lines without the CRs)
-    print OUT2
-      "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
+    print OUT2 "Found $match_cnt $parms{name} shows.                             $print_date\n\n$match_list2";
     print OUT2 "\n \n \n \n \n \n \n";
 
     close OUT1;
@@ -277,8 +264,7 @@ sub setup {
     }
     if ( my ( $time_start, $hours ) = $parms{times} =~ /(\S*)\+(\S+)/ ) {
         $time_start = $time_now unless $time_start;
-        my $time_stop =
-          $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
+        my $time_stop = $hours * 60 + &hour_to_min( &ampm_to_hour24($time_start) );
         $time_stop = &min_to_hour($time_stop);
         $parms{times} = "$time_start-$time_stop";
     }
@@ -326,8 +312,7 @@ sub setup {
     $parms{outfile2} = "$config_parms{data_dir}/$parms{db}_info2.txt"
       unless $parms{outfile2};
 
-    print "\nSearching for:\n  channels: @channels\n  times: @times\n  "
-      . "dates: @dates\n  keys: @keys\n  type: @types\n\n"
+    print "\nSearching for:\n  channels: @channels\n  times: @times\n  " . "dates: @dates\n  keys: @keys\n  type: @types\n\n"
       unless $parms{quiet};
 
 }
@@ -411,7 +396,7 @@ sub increment_date {
     my ( $day, $month, $year ) = split( '/', $date );
     $year += 2000;
     my $timeinsec = str2time("$year-$month-$day");
-    $timeinsec += $days * 24 * 60 * 60;   # Add the offest (adjusted to seconds)
+    $timeinsec += $days * 24 * 60 * 60;    # Add the offest (adjusted to seconds)
     ( $day, $month, $year ) = ( localtime($timeinsec) )[ 3, 4, 5 ];
     $year = $year % 100;
     return sprintf( "%02d/%02d/%02d", $day, ++$month, $year );
diff --git a/code/public/Ricardo/bin/get_weather_ca b/code/public/Ricardo/bin/get_weather_ca
index c913c3433..bbab68721 100644
--- a/code/public/Ricardo/bin/get_weather_ca
+++ b/code/public/Ricardo/bin/get_weather_ca
@@ -28,22 +28,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision: 1.4 $ =~ /: (\S+)/; # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision: 1.4 $ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,  "reget",  "h", "help", "v", "debug",
-        "city:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "city:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -99,10 +93,7 @@ $parms{city} = $config_parms{weather_city} unless $parms{city};
 $parms{city} = 'on-117' unless $parms{city};
 
 my $WeatherURL;
-$WeatherURL =
-  sprintf
-  'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true',
-  $parms{city};
+$WeatherURL = sprintf 'http://text.weatheroffice.ec.gc.ca/forecast/city_e.html?%s&b_templatePrint=true', $parms{city};
 
 my $f_weather_html = "$config_parms{data_dir}/web/weather_ca.html";
 my $f_weather_data = "$config_parms{data_dir}/weather_data";
@@ -198,9 +189,7 @@ sub parse_weather_ca {
     # convert the strangely formatted UTC timestamp to local time.
     my $tmp = $1;
 
-    ( $tmp =~
-          m/\s*([0-9]+)\s*([0-9|A-Z|a-z|:]+)\s*\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)/i
-      )
+    ( $tmp =~ m/\s*([0-9]+)\s*([0-9|A-Z|a-z|:]+)\s*\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)\s*([0-9|A-Z|a-z|:]+)/i )
       &&
 
       #	($tmp = $2 . " " . $1 . " " . $3 . " " . $4 . " " . $5);
@@ -214,9 +203,7 @@ sub parse_weather_ca {
     ( $html =~ m/Temperature\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i )
       && ( $Weather{TempOutdoor} = $1 );
 
-    ( $html =~
-          m/Pressure\s*\/\s*Tendency\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)\s*\//i
-    ) && ( $Weather{Barom} = $1 );
+    ( $html =~ m/Pressure\s*\/\s*Tendency\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)\s*\//i ) && ( $Weather{Barom} = $1 );
 
     ( $html =~ m/Visibility\s*:\s*\<\/dt\>\s*\n\s*\<dd\>\s*([^<]+)/i )
       && ( $Weather{Visibility} = $1 );
diff --git a/code/public/Ricardo/bin/get_weather_inm b/code/public/Ricardo/bin/get_weather_inm
index 332cd727e..233581dd6 100644
--- a/code/public/Ricardo/bin/get_weather_inm
+++ b/code/public/Ricardo/bin/get_weather_inm
@@ -29,22 +29,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,  "reget",  "h",       "help",   "v", "debug",
-        "city:s", "zone:s", "state:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "city:s", "zone:s", "state:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -105,8 +99,7 @@ my $WeatherURLdata;
 $WeatherURL     = 'http://www.inm.es/web/infmet/tobsr/emas.html';
 $WeatherURLdata = 'http://www.inm.es/wwb/tobsr/emasdat.js';
 
-my $f_weather_html =
-  "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
+my $f_weather_html = "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
 my $f_weather_data = "$config_parms{data_dir}/weather_data";
 my $f_weather_temp = "$config_parms{data_dir}/weather_temp";
 
diff --git a/code/public/Ricardo/bin/get_weather_meteored b/code/public/Ricardo/bin/get_weather_meteored
index 897e50cfa..e42d6250b 100644
--- a/code/public/Ricardo/bin/get_weather_meteored
+++ b/code/public/Ricardo/bin/get_weather_meteored
@@ -29,22 +29,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,  "reget",  "h",       "help",   "v", "debug",
-        "city:s", "zone:s", "state:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "city:s", "zone:s", "state:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -101,11 +95,9 @@ $parms{city} = $config_parms{weather_meteored_city} unless $parms{city};
 $parms{city} = 'LEMD' unless $parms{city};
 
 my $WeatherURL;
-$WeatherURL =
-  'http://www.meteored.com/situacion_actual/hw3.php?icao=' . $parms{city};
+$WeatherURL = 'http://www.meteored.com/situacion_actual/hw3.php?icao=' . $parms{city};
 
-my $f_weather_html =
-  "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
+my $f_weather_html = "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
 my $f_weather_data = "$config_parms{data_dir}/weather_data";
 my $f_weather_temp = "$config_parms{data_dir}/weather_temp";
 
@@ -117,11 +109,9 @@ my $debug = 1 if ( $parms{debug} );
 
 get_url_ua( $WeatherURL, $f_weather_html );
 my $html = &file_read($f_weather_html);
-$html =~
-  s|<html>|<html>\n<BASE href='http://www.meteored.com/situacion_actual/'>|i;
+$html =~ s|<html>|<html>\n<BASE href='http://www.meteored.com/situacion_actual/'>|i;
 $html =~ s/<\/head>.*?<\!-- METAR METAR/<\/head>\n<\!-- METAR METAR/is;
-$html =~
-  s/END ZONE ROWS----------- \/\/-->.*?$/END ZONE ROWS----------- \/\/-->\n/is;
+$html =~ s/END ZONE ROWS----------- \/\/-->.*?$/END ZONE ROWS----------- \/\/-->\n/is;
 
 #    print "HTML:\n$html\n" if $debug;
 &file_write( $f_weather_html, $html );
@@ -212,9 +202,7 @@ sub parse_weather_meteored {
 
     print STDERR $html if ($debug);
 
-    ( $html =~
-          m/\<td valign="top" colspan="2" align="center"><font size="2">([^<]+)/i
-    ) && ( $Weather{Conditions} = $1 );
+    ( $html =~ m/\<td valign="top" colspan="2" align="center"><font size="2">([^<]+)/i ) && ( $Weather{Conditions} = $1 );
     print STDERR "Conditions|$Weather{Conditions}|\n" if ($debug);
 
     $html =~ s/<.*?>//gs;
diff --git a/code/public/Ricardo/bin/get_weather_sp b/code/public/Ricardo/bin/get_weather_sp
index 472448fd6..70bfb12d6 100644
--- a/code/public/Ricardo/bin/get_weather_sp
+++ b/code/public/Ricardo/bin/get_weather_sp
@@ -30,22 +30,16 @@ BEGIN {
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
 }
 
-my ($Version) =
-  q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
+my ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
 
 #print "Command: $Pgm_Name @ARGV\n";
 #print "Version: $Version\n";
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions(
-        \%parms,  "reget",  "h",       "help",   "v", "debug",
-        "city:s", "zone:s", "state:s", "file=s", "no_log"
-    )
+if (  !&GetOptions( \%parms, "reget", "h", "help", "v", "debug", "city:s", "zone:s", "state:s", "file=s", "no_log" )
     or @ARGV
-    or ( $parms{h} or $parms{help} )
-  )
+    or ( $parms{h} or $parms{help} ) )
 {
     print <<eof;
 
@@ -101,11 +95,9 @@ $parms{city} = $config_parms{weather_city} unless $parms{city};
 $parms{city} = 'SPXX0050' unless $parms{city};
 
 my $WeatherURL;
-$WeatherURL = sprintf 'http://es.weather.yahoo.com/SPXX/%s/index_c.html',
-  $parms{city};
+$WeatherURL = sprintf 'http://es.weather.yahoo.com/SPXX/%s/index_c.html', $parms{city};
 
-my $f_weather_html =
-  "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
+my $f_weather_html = "$config_parms{data_dir}/../web/ia5/outside/weather_local.html";
 my $f_weather_data = "$config_parms{data_dir}/weather_data";
 
 my $debug = 1 if ( $parms{debug} );
diff --git a/code/public/Ricardo/code/internet_earthquakes_sp.pl b/code/public/Ricardo/code/internet_earthquakes_sp.pl
index c3685cb71..f307a2b55 100644
--- a/code/public/Ricardo/code/internet_earthquakes_sp.pl
+++ b/code/public/Ricardo/code/internet_earthquakes_sp.pl
@@ -73,8 +73,7 @@
 my $f_earthquakes_html = "$config_parms{data_dir}/web/earthquakes.html";
 my $f_earthquakes_data = "$config_parms{data_dir}/earthquakes_data";
 $f_earthquakes_file = new File_Item($f_earthquakes_data);
-$f_earthquakes_gif =
-  new File_Item("$config_parms{data_dir}/web/earthquakes.gif");
+$f_earthquakes_gif  = new File_Item("$config_parms{data_dir}/web/earthquakes.gif");
 
 my $image;
 $p_earthquakes_image = new Process_Item;
@@ -137,8 +136,7 @@
     foreach ( split /\n/, $text ) {
 
         #Only look at lines with quake data on them
-        if (/^(\d+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+)\s+(.+)/)
-        {
+        if (/^(\d+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+)\s+(.+)/) {
             $search = $quake = $_;
 
             #    print "Terremoto: $quake\n";
@@ -175,13 +173,9 @@ sub calc_distance {
     $lon1 /= $c;
     $lon2 /= $c;
     $d = 2 * Math::Trig::asin(
-        sqrt(
-            ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 +
-              cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2
-        )
-    );
+        sqrt( ( sin( ( $lat1 - $lat2 ) / 2 ) )**2 + cos($lat1) * cos($lat2) * ( sin( ( $lon1 - $lon2 ) / 2 ) )**2 ) );
 
-    return $d * ( .5 * 7915.6 * .86838 ) * 1.609344;  # convert to Km and return
+    return $d * ( .5 * 7915.6 * .86838 ) * 1.609344;    # convert to Km and return
 }
 
 sub calc_age {
@@ -190,8 +184,7 @@ sub calc_age {
     my $time = shift;
 
     #Split it up
-    my ( $qyear, $qmnth, $qdate, $qhour, $qminu, $qseco ) =
-      $time =~ m!(\S+)/(\S+)/(\S+)\s+(\S+):(\S+):(\S+)!;
+    my ( $qyear, $qmnth, $qdate, $qhour, $qminu, $qseco ) = $time =~ m!(\S+)/(\S+)/(\S+)\s+(\S+):(\S+):(\S+)!;
 
     #Merge it
     my $qtime = timegm( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear );
@@ -204,9 +197,7 @@ sub calc_age {
     $qtime = timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear );
 
     my $midnight = timelocal( 0, 0, 0, $Mday, $Month - 1, $Year - 1900 );
-    my $diff = (
-        time -
-          timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear ) );
+    my $diff = ( time - timelocal( $qseco, $qminu, $qhour, $qdate, $qmnth - 1, $qyear ) );
 
     return "hace " . int( $diff / 60 ) . " minutos " if ( $diff < 60 * 120 );
     return "hace " . int( $diff / ( 60 * 60 ) ) . " horas "
@@ -222,10 +213,7 @@ sub calc_age {
     #   elsif ($qhour == 12) {$hour = "12 PM"}
     #   else {$hour = $qhour - 12 . " PM"}
     return "Ayer a las $hour " if ( $qtime > $midnight - 60 * 60 * 24 );
-    return
-        "hace "
-      . int( $diff / ( 60 * 60 * 24 ) + .5 )
-      . " d�as a las $hour ";
+    return "hace " . int( $diff / ( 60 * 60 * 24 ) + .5 ) . " d�as a las $hour ";
 }
 
 # EVENTO FECHA-HORA GMT LATITUD LONGITUD MAG SENTIDO MEC PROF LOCALIZACI�N
@@ -234,14 +222,8 @@ sub calc_age {
 sub speak_quake {
 
     #   print "Speak_quake: $_\n";
-    if (
-        my (
-            $qevent, $qdate, $qtime,  $qlatd, $qnoso, $qlong,
-            $qeawe,  $qmagn, $qpercv, $qmec,  $qdept, $qloca
-        )
-        = $_ =~
-        m!^(\d+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+)\s*(SI)?\s*(\S+)?\s*(\d+)?\s+(.+)!
-      )
+    if ( my ( $qevent, $qdate, $qtime, $qlatd, $qnoso, $qlong, $qeawe, $qmagn, $qpercv, $qmec, $qdept, $qloca ) =
+        $_ =~ m!^(\d+)\s+(\S+)\s+(\S+)\s+(\S+)([NS])\s+(\S+)([EW])\s+(\S+)\s*(SI)?\s*(\S+)?\s*(\d+)?\s+(.+)! )
     {
         my $distance;
         my $clatd = $config_parms{quakes_ref_latitude};
@@ -252,42 +234,35 @@ sub speak_quake {
         if ( $clatd && $clong && $ccity ) {
 
             # reference to a diferent place
-            $distance = sprintf "%d kil�metros de %s,",
-              calc_distance( $clatd, $clong, $qlatd, $qlong ) + .5, $ccity;
+            $distance = sprintf "%d kil�metros de %s,", calc_distance( $clatd, $clong, $qlatd, $qlong ) + .5, $ccity;
         }
         else {
             # reference distance to mh home city
             $distance = sprintf "%d kil�metros",
-              calc_distance( $config_parms{latitude}, $config_parms{longitude},
-                $qlatd, $qlong ) + .5;
+              calc_distance( $config_parms{latitude}, $config_parms{longitude}, $qlatd, $qlong ) + .5;
         }
         for ( keys %Magnitude_thresholds ) {
             if ( $distance <= $_ and $qmagn >= $Magnitude_thresholds{$_} ) {
 
                 #         my $long_reso = abs(5 * round($qlatd/5)) > 45 ? (abs(5 * round($qlatd/5)) > 65 ? 20 : 10) : 5;
-                $image = 'http://pangea.ign.es/servidor/sismo/cnis/proximo/'
-                  . $qevent . '.gif';
+                $image = 'http://pangea.ign.es/servidor/sismo/cnis/proximo/' . $qevent . '.gif';
                 my ( $direction, $local, $area, $where );
                 ( $direction, $local ) = $qloca =~ m!^([NS]?[EW]?)\s+(.+)!;
 
                 #         print "qloca: $qloca, direction: $direction, local: $local\n";
                 if ($direction) {
-                    $direction =
-                      convert_direction( &convert_to_degrees($direction) );
+                    $direction = convert_direction( &convert_to_degrees($direction) );
                     my $aux = $local;
                     ( $local, $area ) = $aux =~ m!^(.+?)\.(\S+)!;
                     $local = lc $local;
-                    $where = "al $direction de "
-                      . ( $local ? "$local ($area)" : lc $aux );
+                    $where = "al $direction de " . ( $local ? "$local ($area)" : lc $aux );
                 }
                 else {
                     ( $local, $area ) = $qloca =~ m!^(.+?)\.(\S+)!;
                     $local = lc $local;
-                    $where =
-                      "cerca de " . ( $local ? "$local ($area)" : lc $qloca );
+                    $where = "cerca de " . ( $local ? "$local ($area)" : lc $qloca );
                 }
-                speak &calc_age("$qdate $qtime")
-                  . "ha ocurrido un se�smo de magintud $qmagn a una distancia de $distance $where";
+                speak &calc_age("$qdate $qtime") . "ha ocurrido un se�smo de magintud $qmagn a una distancia de $distance $where";
                 return 1;
             }
         }
diff --git a/code/public/Ricardo/code/internet_iridium_sp.pl b/code/public/Ricardo/code/internet_iridium_sp.pl
index c5d8a4b80..d5d9f44e3 100644
--- a/code/public/Ricardo/code/internet_iridium_sp.pl
+++ b/code/public/Ricardo/code/internet_iridium_sp.pl
@@ -21,8 +21,7 @@
 =cut
 
 $iridium_check = new Voice_Cmd '[lee,lista,visualiza] destellos ir�dium';
-$iridium_check->set_info(
-    'Lista horarios y localizaciones de los destellos de satelites ir�dium');
+$iridium_check->set_info('Lista horarios y localizaciones de los destellos de satelites ir�dium');
 
 run_voice_cmd 'lee destellos ir�dium' if $New_Day;
 
@@ -34,8 +33,7 @@
     "http://www.heavens-above.com/iridium.asp?"
   . "lat=$config_parms{latitude}&lng=$config_parms{longitude}&alt=0&TZ=UCT&Dur=7&"
   . "loc=$config_parms{city}";
-$iridium_check_p =
-  new Process_Item qq[get_url "$iridium_check_u" "$iridium_check_f"];
+$iridium_check_p = new Process_Item qq[get_url "$iridium_check_u" "$iridium_check_f"];
 
 #$iridium_check_p = new Process_Item "get_url '$iridium_check_u' '$iridium_check_f'";
 
@@ -90,14 +88,13 @@
                 : "$a[1]/$a[0] $a[2]"
               ) +
               3600 * $config_parms{time_zone};
-            $time += 3600 if (localtime)[8];  # Adjust for daylight savings time
+            $time += 3600 if (localtime)[8];    # Adjust for daylight savings time
             ($time_sec) =
               time_date_stamp( 6, $time ) . ' ' . time_date_stamp( 16, $time );
             ( $time, $sec ) = time_date_stamp( 9, $time );
-            $display .= sprintf "%s, mag=%2d, alt=%3d, azimuth=%3d, %s %s\n",
-              $time_sec, @a[ 3, 4, 5, 9, 10 ];
+            $display .= sprintf "%s, mag=%2d, alt=%3d, azimuth=%3d, %s %s\n", $time_sec, @a[ 3, 4, 5, 9, 10 ];
 
-            next unless $a[4] > 20;    # We can not see them if they are too low
+            next unless $a[4] > 20;             # We can not see them if they are too low
 
             # Create a seperate code file with a time_now for each event
             print MYCODE<<eof;
diff --git a/code/public/Ricardo/code/internet_iss_sp.pl b/code/public/Ricardo/code/internet_iss_sp.pl
index e34a9bafd..310c0eb7a 100644
--- a/code/public/Ricardo/code/internet_iss_sp.pl
+++ b/code/public/Ricardo/code/internet_iss_sp.pl
@@ -14,9 +14,7 @@
 =cut
 
 $iss_check = new Voice_Cmd '[lee,lista,visualiza] pases ISS';
-$iss_check->set_info(
-    'Lista horarios y localizaciones de los pases de la Estaci�n Espacial Internacional (ISS)'
-);
+$iss_check->set_info( 'Lista horarios y localizaciones de los pases de la Estaci�n Espacial Internacional (ISS)' );
 
 run_voice_cmd 'lee pases ISS' if $New_Day;
 
@@ -36,9 +34,8 @@
 
 if ( done_now $iss_check_p or $state eq 'lista' ) {
     my (
-        $display,    $time_s,    $azimuth_s, $time_m, $azimuth_m,
-        $time_e,     $azimuth_e, $sec_s,     $sec_m,  $sec_e,
-        $time_start, $time_max,  $time_end
+        $display, $time_s, $azimuth_s, $time_m,     $azimuth_m, $time_e, $azimuth_e,
+        $sec_s,   $sec_m,  $sec_e,     $time_start, $time_max,  $time_end
     );
     my $html = file_read $iss_check_f;
 
@@ -113,8 +110,7 @@
             $azimuth_s = convert_direction( &convert_to_degrees( $a[5] ) );
             $azimuth_m = convert_direction( &convert_to_degrees( $a[8] ) );
             $azimuth_e = convert_direction( &convert_to_degrees( $a[11] ) );
-            $display .= sprintf "ISS: %s, mag=%2d, alt=%3d, azimuth=%s\n",
-              $time_start, @a[ 2, 4 ], $azimuth_s;
+            $display .= sprintf "ISS: %s, mag=%2d, alt=%3d, azimuth=%s\n", $time_start, @a[ 2, 4 ], $azimuth_s;
 
             next unless $a[7] > 20;    # We can not see them if they are too low
 
diff --git a/code/public/Ricardo/code/news_sp.pl b/code/public/Ricardo/code/news_sp.pl
index 668f344f1..afaed390c 100644
--- a/code/public/Ricardo/code/news_sp.pl
+++ b/code/public/Ricardo/code/news_sp.pl
@@ -9,14 +9,10 @@
 
 # Sections names
 my %Sections_names = (
-    'Hoy',           'Hoy es noticia',
-    'Nacional',      'Nacional',
-    'Internacional', 'Internacional',
-    'Deportes',      "Deportes \/ Segundosfuera",
-    'Sociedad',      'Sociedad',
-    'Finanzas',      "Finanzas \/ Basefinanciera",
-    'Tecnolog�a',    'Tecnolog�a',
-    'Ciencia',       'Ciencia',
+    'Hoy',           'Hoy es noticia', 'Nacional', 'Nacional',
+    'Internacional', 'Internacional',  'Deportes', "Deportes \/ Segundosfuera",
+    'Sociedad',      'Sociedad',       'Finanzas', "Finanzas \/ Basefinanciera",
+    'Tecnolog�a',    'Tecnolog�a',     'Ciencia',  'Ciencia',
     'Cultura',       'Cultura',
 );
 
@@ -27,9 +23,7 @@
 $f_news_file = new File_Item($f_news_data);
 
 $v_news = new Voice_Cmd('[Comprueba,Dime,Borra] las �ltimas noticias');
-$v_news->set_info(
-    "Muestra las �ltimas noticias de las categorias: $config_parms{news_sections}"
-);
+$v_news->set_info( "Muestra las �ltimas noticias de las categorias: $config_parms{news_sections}" );
 $v_news->set_authority('anyone');
 set_icon $v_news 'news';
 
diff --git a/code/public/Ricardo/code/time_info.pl b/code/public/Ricardo/code/time_info.pl
index 5129624e7..3c68ebe15 100644
--- a/code/public/Ricardo/code/time_info.pl
+++ b/code/public/Ricardo/code/time_info.pl
@@ -52,25 +52,20 @@
   and time_random( '* 20-22 * * *', 90 );
 
 $v_sun_set = new Voice_Cmd( 'Cuando es la puesta de sol', 0 );
-$v_sun_set->set_info(
-    "Calcula la puesta de sol para la latitud=$config_parms{latitude}, y longitud=$config_parms{longitude}"
-);
+$v_sun_set->set_info( "Calcula la puesta de sol para la latitud=$config_parms{latitude}, y longitud=$config_parms{longitude}" );
 $v_sun_set->set_authority('anyone');
-respond
-  "El sol sale hoy a las $Time_Sunrise, la puesta de sol es a las $Time_Sunset."
+respond "El sol sale hoy a las $Time_Sunrise, la puesta de sol es a las $Time_Sunset."
   if said $v_sun_set;
 
 speak "Aviso, el sol est� saliendo ahora a las " . say_time($Time_Sunrise)
   if time_now $Time_Sunrise and !$Save{sleeping_parents};
-speak "app=notice Aviso, el sol se est� poniendo ahora a las "
-  . say_time($Time_Sunset)
+speak "app=notice Aviso, el sol se est� poniendo ahora a las " . say_time($Time_Sunset)
   if time_now $Time_Sunset;
 
 $v_moon_info1 = new Voice_Cmd "Cuando es la siguiente luna [nueva,llena]";
 $v_moon_info2 = new Voice_Cmd "Cuando fue la �ltima luna [nueva,llena]";
 $v_moon_info3 = new Voice_Cmd "Cual es la fase de la luna";
-$v_moon_info3->set_info(
-    'fase ser�: Nueva, Cuarto creciente, Llena, Cuarto menguante, ...r');
+$v_moon_info3->set_info('fase ser�: Nueva, Cuarto creciente, Llena, Cuarto menguante, ...r');
 $v_moon_info1->set_authority('anyone');
 $v_moon_info2->set_authority('anyone');
 $v_moon_info3->set_authority('anyone');
@@ -84,18 +79,15 @@
 if ( $state = said $v_moon_info2) {
     my $state_en = $state eq 'nueva' ? 'new' : 'full';
     my $days = &time_diff( $Moon{"time_${state_en}_prev"}, $Time );
-    respond
-      qq[La �ltima luna $state fu� hace $days, el $Moon{"${state_en}_prev"}];
+    respond qq[La �ltima luna $state fu� hace $days, el $Moon{"${state_en}_prev"}];
 }
 
 if ( $state = said $v_moon_info3) {
-    respond
-      qq[la fase de la luna es $Moon{phase}, con un brillo del $Moon{brightness}%, y $Moon{age} dias];
+    respond qq[la fase de la luna es $Moon{phase}, con un brillo del $Moon{brightness}%, y $Moon{age} dias];
 }
 
 $full_moon = new File_Item("$config_parms{data_dir}/remarks/full_moon.txt");
 if ( $Moon{phase} eq 'Llena' and time_random( '* 8-22 * * *', 240 ) ) {
-    respond "app=notice Aviso, est� noche es luna llena.  "
-      . ( read_next $full_moon);
+    respond "app=notice Aviso, est� noche es luna llena.  " . ( read_next $full_moon);
 }
 
diff --git a/code/public/Ricardo/code/tv_com.pl b/code/public/Ricardo/code/tv_com.pl
index 5e20f7b1c..1110f810e 100644
--- a/code/public/Ricardo/code/tv_com.pl
+++ b/code/public/Ricardo/code/tv_com.pl
@@ -69,8 +69,7 @@ sub format_tv_com {
 
 # Fetch the raw HTML TV page from the tv.com webserver, and update the parsed data file.
 sub get_tv_com {
-    my $programs_file =
-      $config_parms{code_dir} . "/" . $config_parms{TV_com_progs_file};
+    my $programs_file = $config_parms{code_dir} . "/" . $config_parms{TV_com_progs_file};
     open( TV_PROGRAMS, $programs_file )
       or print_log "Warning, could not open $programs_file!\n";
     my @AllPrograms = <TV_PROGRAMS>;
diff --git a/code/public/Ricardo/code/tv_grid_sp.pl b/code/public/Ricardo/code/tv_grid_sp.pl
index 6700c0049..d47495997 100644
--- a/code/public/Ricardo/code/tv_grid_sp.pl
+++ b/code/public/Ricardo/code/tv_grid_sp.pl
@@ -8,9 +8,7 @@
 #       Do not change it.
 # This is what downloads tv data.  This needs to be forked/detatched, as it can take a while
 $v_get_tv_grid_data = new Voice_Cmd('Leer rejilla de televisi�n');
-$v_get_tv_grid_data->set_info(
-    'Lee la rejilla de TV para los canales seleccionados y genera la base de datos de TV.'
-);
+$v_get_tv_grid_data->set_info( 'Lee la rejilla de TV para los canales seleccionados y genera la base de datos de TV.' );
 if ( ( said $v_get_tv_grid_data) or time_now('6:35') ) {
     if (&net_connect_check) {
 
diff --git a/code/public/Ricardo/code/tv_info_sp.pl b/code/public/Ricardo/code/tv_info_sp.pl
index 69aa24fe3..3261da16d 100644
--- a/code/public/Ricardo/code/tv_info_sp.pl
+++ b/code/public/Ricardo/code/tv_info_sp.pl
@@ -5,17 +5,13 @@
 
 $f_tv_file = new File_Item("$config_parms{data_dir}/tv_info1.txt");
 
-$v_tv_movies1 =
-  new Voice_Cmd('Qu� {comedias,dramas,ciencia-ficci�n} hay hoy en televisi�n');
-$v_tv_movies1->set_info(
-    'Busca peliculas en todos los canales entre las 21 y las 23');
+$v_tv_movies1 = new Voice_Cmd('Qu� {comedias,dramas,ciencia-ficci�n} hay hoy en televisi�n');
+$v_tv_movies1->set_info('Busca peliculas en todos los canales entre las 21 y las 23');
 
 $v_tv_shows1 = new Voice_Cmd('Qu� programas hay ahora en la televisi�n');
 $v_tv_shows2 = new Voice_Cmd('Qu� programas favoritos hay hoy en televisi�n');
 $v_tv_shows1->set_info('Lista los programas que hay ahora mismo en cada canal');
-$v_tv_shows2->set_info(
-    "Comprueba si hay alguno de los siguientes programas hoy: $config_parms{favorite_tv_shows}"
-);
+$v_tv_shows2->set_info( "Comprueba si hay alguno de los siguientes programas hoy: $config_parms{favorite_tv_shows}" );
 
 if ( $state = said $v_tv_movies1) {
     run qq[get_tv_info_sp -times 21-23 -type $state];
@@ -45,8 +41,7 @@
 
 # Speak/show the results for all of the above requests
 
-$v_tv_results =
-  new Voice_Cmd 'Cu�les son los resultados de buscar programas de televisi�n';
+$v_tv_results = new Voice_Cmd 'Cu�les son los resultados de buscar programas de televisi�n';
 if ( $state = changed $f_tv_file or said $v_tv_results) {
     my $f_tv_info2 = "$config_parms{data_dir}/tv_info2.txt";
 
@@ -64,16 +59,14 @@
         if (
             (
                 ( $title, $ch_name, $ch_key, $ch_num, $start, $end ) =
-                $line =~
-                /^\d+\|\s+(.+)\|\s*Canal (.+)\|\s*(.+)\|\s+Dial\s+(\d+)\|\s*De (\d+:\d+) hasta (\d+:\d+)\|/
+                $line =~ /^\d+\|\s+(.+)\|\s*Canal (.+)\|\s*(.+)\|\s+Dial\s+(\d+)\|\s*De (\d+:\d+) hasta (\d+:\d+)\|/
             )
             or
 
             # 1|  El Ala Oeste| Canal AXN| AXN| Dial 22|  El 12/11/04| De 21:30 hasta 22:20|
             (
-                ( $title, $ch_name, $ch_key, $ch_num, $pgm_date, $start, $end )
-                = $line =~
-                /^\d+\|\s+(.+)\|\s*Canal (.+)\|\s*(.+)\|\s+Dial\s+(\d+)\|\s*El (.+)\s*\|\s*De (\d+:\d+) hasta (\d+:\d+)\|/
+                ( $title, $ch_name, $ch_key, $ch_num, $pgm_date, $start, $end ) =
+                $line =~ /^\d+\|\s+(.+)\|\s*Canal (.+)\|\s*(.+)\|\s+Dial\s+(\d+)\|\s*El (.+)\s*\|\s*De (\d+:\d+) hasta (\d+:\d+)\|/
             )
           )
         {
@@ -91,8 +84,7 @@
                 $aux .= "a las $start hasta $end, en $ch_name";
             }
             else {
-                $aux .=
-                  "a las $start hasta $end, en $ch_name, di�l $ch_num de digital plus";
+                $aux .= "a las $start hasta $end, en $ch_name, di�l $ch_num de digital plus";
             }
             $data[$i] = $aux;
         }
@@ -100,8 +92,7 @@
     }
 
     my $msg = "Hoy emiten ";
-    $msg .= "$show_count"
-      . ( $show_count > 1 ? ' programas favoritos' : ' programa favorito' );
+    $msg .= "$show_count" . ( $show_count > 1 ? ' programas favoritos' : ' programa favorito' );
     if ( $state eq 'favorites today' ) {
         if ( $show_count > 0 ) {
             respond "$msg\: @data";
diff --git a/code/public/Ricardo/code/wakeup.pl b/code/public/Ricardo/code/wakeup.pl
index 9458727f2..185fa5baa 100644
--- a/code/public/Ricardo/code/wakeup.pl
+++ b/code/public/Ricardo/code/wakeup.pl
@@ -13,12 +13,7 @@
 $v_wakeup_parents = new Voice_Cmd('Despertar a los padres');
 $v_wakeup_parents->set_info("No lo hagas!  Los padres quieren dormir.");
 
-if (
-    (
-            time_now( $config_parms{wakeup_time} )
-        and $Workday
-        and ( state $mode_mh ne 'offline' )
-    )
+if ( ( time_now( $config_parms{wakeup_time} ) and $Workday and ( state $mode_mh ne 'offline' ) )
     or said $v_wakeup_parents)
 {
     if ( state $wakeup_bypass) {
@@ -29,12 +24,8 @@
         set $mode_mh 'normal';
         $Save{mode_set} = '';
         set $mode_sleeping 'nobody';
-        speak "rooms=all mode=unmute Buenos d�as.  Son las "
-          . say_time($Time_Now)
-          . " del $Date_Now_Speakable.";
-        speak "rooms=all mode=unmute La temperatura exterior es "
-          . round( $Weather{TempOutdoor} )
-          . " grados";
+        speak "rooms=all mode=unmute Buenos d�as.  Son las " . say_time($Time_Now) . " del $Date_Now_Speakable.";
+        speak "rooms=all mode=unmute La temperatura exterior es " . round( $Weather{TempOutdoor} ) . " grados";
 
         #       run_voice_cmd 'Check for school closing';
 
diff --git a/code/public/Ricardo/code/wakeup_sc.pl b/code/public/Ricardo/code/wakeup_sc.pl
index aba63cae0..32d99c606 100644
--- a/code/public/Ricardo/code/wakeup_sc.pl
+++ b/code/public/Ricardo/code/wakeup_sc.pl
@@ -12,9 +12,7 @@
     set $mode_mh 'normal';
     $Save{mode_set} = '';
     set $mode_sleeping 'nobody';
-    speak "rooms=all mode=unmute Buenos d�as.  Son las "
-      . say_time($Time_Now)
-      . " del $Date_Now_Speakable.";
+    speak "rooms=all mode=unmute Buenos d�as.  Son las " . say_time($Time_Now) . " del $Date_Now_Speakable.";
 }
 
 if ( time_now "$config_parms{wakeup_time}" ) {
diff --git a/code/public/Ricardo/code/weather_inm.pl b/code/public/Ricardo/code/weather_inm.pl
index 51559ce49..e1b6bb428 100644
--- a/code/public/Ricardo/code/weather_inm.pl
+++ b/code/public/Ricardo/code/weather_inm.pl
@@ -27,13 +27,11 @@
 
 # The obligatory voice command.
 $v_weather_page = new Voice_Cmd('[Reget,Get,Read,Show] internet weather');
-$v_weather_page->set_info(
-    "Weather conditions and forecast for $config_parms{weather_inm_city}");
+$v_weather_page->set_info("Weather conditions and forecast for $config_parms{weather_inm_city}");
 $v_weather_page->set_authority('anyone');
 
 $v_weather_forecast = new Voice_Cmd('[Read,Show] weather forecast');
-$v_weather_forecast->set_info(
-    "Weather forecast for $config_parms{weather_inm_city}");
+$v_weather_forecast->set_info("Weather forecast for $config_parms{weather_inm_city}");
 $v_weather_forecast->set_authority('anyone');
 
 speak &format_ec_weather   if said $v_weather_page eq 'Read';
@@ -95,13 +93,8 @@ sub format_ec_weather {
     }
 
     if ( $Weather{WindAvg} ) {
-        $data .=
-            "Viento del "
-          . convert_direction( $Weather{WindAvgDir} ) . " a "
-          . $Weather{WindAvg}
-          . " kilometros por hora";
-        $data .=
-          ", con r�fagas de " . $Weather{WindGust} . " kilometros por hora"
+        $data .= "Viento del " . convert_direction( $Weather{WindAvgDir} ) . " a " . $Weather{WindAvg} . " kilometros por hora";
+        $data .= ", con r�fagas de " . $Weather{WindGust} . " kilometros por hora"
           if ( $Weather{WindGust} );
         $data .= ". ";
     }
@@ -169,14 +162,13 @@ sub fetch_ec_weather {
     #    $Weather{Summary_Short} = sprintf("%2d/%2d/%2d %3d%% %3d%%",
     #                              $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill},
     #                              $Weather{HumidIndoor}, $Weather{HumidOutdoor});
-    $Weather{Summary_Short} = sprintf( "%2d/%2d %3d%%",
-        $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
+    $Weather{Summary_Short} = sprintf( "%2d/%2d %3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
 
     #    $Weather{Summary} = sprintf("In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
     #                              $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill},
     #                              $Weather{HumidIndoor}, $Weather{HumidOutdoor});
-    $Weather{Summary} = sprintf( "out/chill: %2d/%2d Humid:%3d%%",
-        $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
+    $Weather{Summary} =
+      sprintf( "out/chill: %2d/%2d Humid:%3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
 
     # and for fun, speak the current weather to anyone who is listening.
     #&read_ec_weather;
@@ -199,15 +191,11 @@ sub windchill {
 
     my $chill;
 
-    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) )
-    {
+    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) ) {
         $chill = '';
     }
     else {
-        $chill =
-          ( 13.12 + 0.6215 * $temp -
-              11.37 * ( $wind**0.16 ) +
-              0.3965 * $temp * ( $wind**0.16 ) );
+        $chill = ( 13.12 + 0.6215 * $temp - 11.37 * ( $wind**0.16 ) + 0.3965 * $temp * ( $wind**0.16 ) );
         $chill = int( $chill + 0.5 );
 
         print "temp $temp wind $wind chill $chill\n";
@@ -227,10 +215,7 @@ sub dewpoint {
     $humidity /= 100;   # convert from percent to fraction
 
     # saturation vapour pressure
-    my $e_sw =
-      6.1078 *
-      exp( 5.0065 * log( 273.15 / $temp ) ) *
-      exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
+    my $e_sw = 6.1078 * exp( 5.0065 * log( 273.15 / $temp ) ) * exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
 
     # current vapour pressure
     my $e_vp = $humidity * $e_sw;
@@ -238,9 +223,7 @@ sub dewpoint {
     # final
     my $dewpoint = 0;
     if ( $e_vp != 0 ) {
-        $dewpoint =
-          ( 237.3 * log( $e_vp / 6.1078 ) ) /
-          ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
+        $dewpoint = ( 237.3 * log( $e_vp / 6.1078 ) ) / ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
         $dewpoint = int( $dewpoint + 0.5 );
     }
     return $dewpoint;
diff --git a/code/public/Ricardo/code/weather_meteored.pl b/code/public/Ricardo/code/weather_meteored.pl
index 411c0256a..4070d8321 100644
--- a/code/public/Ricardo/code/weather_meteored.pl
+++ b/code/public/Ricardo/code/weather_meteored.pl
@@ -28,8 +28,7 @@
 
 # The obligatory voice command.
 $v_weather_page = new Voice_Cmd('[Reget,Get,Read,Show] internet weather');
-$v_weather_page->set_info(
-    "Weather conditions for $config_parms{weather_meteored_city}");
+$v_weather_page->set_info("Weather conditions for $config_parms{weather_meteored_city}");
 $v_weather_page->set_authority('anyone');
 
 #$v_weather_forecast = new  Voice_Cmd('[Read,Show] weather forecast');
@@ -95,11 +94,7 @@ sub format_ec_weather {
     }
 
     if ( $Weather{WindAvg} ) {
-        $data .=
-            "Viento del "
-          . convert_direction( $Weather{WindAvgDir} ) . " a "
-          . $Weather{WindAvg}
-          . " kilometros por hora";
+        $data .= "Viento del " . convert_direction( $Weather{WindAvgDir} ) . " a " . $Weather{WindAvg} . " kilometros por hora";
 
         #	$data .= ", con r�fagas de " . $Weather{WindGust} . " kilometros por hora" if ($Weather{WindGust});
         $data .= ". ";
@@ -169,18 +164,13 @@ sub fetch_ec_weather {
 
     # create the summaries used by the MH web (and tk?) displays.
     if ( $Weather{TempOutdoor} != $Weather{WindChill} ) {
-        $Weather{Summary_Short} = sprintf( "%2d�/%2d� %3d%%",
-            $Weather{TempOutdoor}, $Weather{WindChill},
-            $Weather{HumidOutdoor} );
-        $Weather{Summary} = sprintf( "out/chill: %2d�C/%2d�C Humid:%3d%%",
-            $Weather{TempOutdoor}, $Weather{WindChill},
-            $Weather{HumidOutdoor} );
+        $Weather{Summary_Short} = sprintf( "%2d�/%2d� %3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
+        $Weather{Summary} =
+          sprintf( "out/chill: %2d�C/%2d�C Humid:%3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
     }
     else {
-        $Weather{Summary_Short} = sprintf( "%2d�C %3d%%",
-            $Weather{TempOutdoor}, $Weather{HumidOutdoor} );
-        $Weather{Summary} = sprintf( "out:%2d�C Humid:%3d%%",
-            $Weather{TempOutdoor}, $Weather{HumidOutdoor} );
+        $Weather{Summary_Short} = sprintf( "%2d�C %3d%%",           $Weather{TempOutdoor}, $Weather{HumidOutdoor} );
+        $Weather{Summary}       = sprintf( "out:%2d�C Humid:%3d%%", $Weather{TempOutdoor}, $Weather{HumidOutdoor} );
     }
 
     # and for fun, speak the current weather to anyone who is listening.
@@ -204,15 +194,11 @@ sub windchill {
 
     my $chill;
 
-    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) )
-    {
+    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) ) {
         $chill = '';
     }
     else {
-        $chill =
-          ( 13.12 + 0.6215 * $temp -
-              11.37 * ( $wind**0.16 ) +
-              0.3965 * $temp * ( $wind**0.16 ) );
+        $chill = ( 13.12 + 0.6215 * $temp - 11.37 * ( $wind**0.16 ) + 0.3965 * $temp * ( $wind**0.16 ) );
         $chill = int( $chill + 0.5 );
 
         print "temp $temp wind $wind chill $chill\n";
@@ -232,10 +218,7 @@ sub dewpoint {
     $humidity /= 100;   # convert from percent to fraction
 
     # saturation vapour pressure
-    my $e_sw =
-      6.1078 *
-      exp( 5.0065 * log( 273.15 / $temp ) ) *
-      exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
+    my $e_sw = 6.1078 * exp( 5.0065 * log( 273.15 / $temp ) ) * exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
 
     # current vapour pressure
     my $e_vp = $humidity * $e_sw;
@@ -243,9 +226,7 @@ sub dewpoint {
     # final
     my $dewpoint = 0;
     if ( $e_vp != 0 ) {
-        $dewpoint =
-          ( 237.3 * log( $e_vp / 6.1078 ) ) /
-          ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
+        $dewpoint = ( 237.3 * log( $e_vp / 6.1078 ) ) / ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
         $dewpoint = int( $dewpoint + 0.5 );
     }
     return $dewpoint;
diff --git a/code/public/Ricardo/code/weather_sp.pl b/code/public/Ricardo/code/weather_sp.pl
index 22e935041..6a8de80f5 100644
--- a/code/public/Ricardo/code/weather_sp.pl
+++ b/code/public/Ricardo/code/weather_sp.pl
@@ -30,13 +30,11 @@
 
 # The obligatory voice command.
 $v_weather_page = new Voice_Cmd('[Reget,Get,Read,Show] internet weather');
-$v_weather_page->set_info(
-    "Weather conditions and forecast for $config_parms{weather_city}");
+$v_weather_page->set_info("Weather conditions and forecast for $config_parms{weather_city}");
 $v_weather_page->set_authority('anyone');
 
 $v_weather_forecast = new Voice_Cmd('[Read,Show] weather forecast');
-$v_weather_forecast->set_info(
-    "Weather forecast for $config_parms{weather_city}");
+$v_weather_forecast->set_info("Weather forecast for $config_parms{weather_city}");
 $v_weather_forecast->set_authority('anyone');
 
 speak &format_ec_weather   if said $v_weather_page eq 'Read';
@@ -89,21 +87,12 @@ sub format_ec_weather {
 
     if ( $Weather{TempOutdoor} > -10 ) {
         $data .=
-            "La humedad es del "
-          . $Weather{HumidOutdoor}
-          . " %, y un punto de condensaci�n de "
-          . $Weather{DewOutdoor}
-          . " grados. ";
+          "La humedad es del " . $Weather{HumidOutdoor} . " %, y un punto de condensaci�n de " . $Weather{DewOutdoor} . " grados. ";
     }
 
     if ( $Weather{WindAvg} ) {
-        $data .=
-            "Viento del "
-          . convert_direction( $Weather{WindAvgDir} ) . " a "
-          . $Weather{WindAvg}
-          . " kilometros por hora";
-        $data .=
-          ", con r�fagas de " . $Weather{WindGust} . " kilometros por hora"
+        $data .= "Viento del " . convert_direction( $Weather{WindAvgDir} ) . " a " . $Weather{WindAvg} . " kilometros por hora";
+        $data .= ", con r�fagas de " . $Weather{WindGust} . " kilometros por hora"
           if ( $Weather{WindGust} );
         $data .= ". ";
     }
@@ -171,14 +160,13 @@ sub fetch_ec_weather {
     #    $Weather{Summary_Short} = sprintf("%2d/%2d/%2d %3d%% %3d%%",
     #                              $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill},
     #                              $Weather{HumidIndoor}, $Weather{HumidOutdoor});
-    $Weather{Summary_Short} = sprintf( "%2d/%2d %3d%%",
-        $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
+    $Weather{Summary_Short} = sprintf( "%2d/%2d %3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
 
     #    $Weather{Summary} = sprintf("In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
     #                              $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill},
     #                              $Weather{HumidIndoor}, $Weather{HumidOutdoor});
-    $Weather{Summary} = sprintf( "out/chill: %2d/%2d Humid:%3d%%",
-        $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
+    $Weather{Summary} =
+      sprintf( "out/chill: %2d/%2d Humid:%3d%%", $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidOutdoor} );
 
     # and for fun, speak the current weather to anyone who is listening.
     #&read_ec_weather;
@@ -201,15 +189,11 @@ sub windchill {
 
     my $chill;
 
-    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) )
-    {
+    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) ) {
         $chill = '';
     }
     else {
-        $chill =
-          ( 13.12 + 0.6215 * $temp -
-              11.37 * ( $wind**0.16 ) +
-              0.3965 * $temp * ( $wind**0.16 ) );
+        $chill = ( 13.12 + 0.6215 * $temp - 11.37 * ( $wind**0.16 ) + 0.3965 * $temp * ( $wind**0.16 ) );
         $chill = int( $chill + 0.5 );
 
         print "temp $temp wind $wind chill $chill\n";
@@ -229,10 +213,7 @@ sub dewpoint {
     $humidity /= 100;   # convert from percent to fraction
 
     # saturation vapour pressure
-    my $e_sw =
-      6.1078 *
-      exp( 5.0065 * log( 273.15 / $temp ) ) *
-      exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
+    my $e_sw = 6.1078 * exp( 5.0065 * log( 273.15 / $temp ) ) * exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
 
     # current vapour pressure
     my $e_vp = $humidity * $e_sw;
@@ -240,9 +221,7 @@ sub dewpoint {
     # final
     my $dewpoint = 0;
     if ( $e_vp != 0 ) {
-        $dewpoint =
-          ( 237.3 * log( $e_vp / 6.1078 ) ) /
-          ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
+        $dewpoint = ( 237.3 * log( $e_vp / 6.1078 ) ) / ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
         $dewpoint = int( $dewpoint + 0.5 );
     }
     return $dewpoint;
diff --git a/code/public/Ricardo/code/weather_station_3600.pl b/code/public/Ricardo/code/weather_station_3600.pl
index 15c7ce59b..68e00025e 100644
--- a/code/public/Ricardo/code/weather_station_3600.pl
+++ b/code/public/Ricardo/code/weather_station_3600.pl
@@ -151,7 +151,7 @@
             if (/^kmh=\"([\d\.]+)\"/) {
                 $Weather{WindGustSpeed} = $1;
                 push( @wind_speed, $Weather{WindGustSpeed} );
-                shift @wind_speed if ( $#wind_speed > 9 );  #limit to 10 samples
+                shift @wind_speed if ( $#wind_speed > 9 );    #limit to 10 samples
                 my ( $wind, $wind_tot, $wind_count );
                 $wind_count = $#wind_speed + 1;
                 $wind_tot   = 0;
@@ -206,21 +206,12 @@
             }
         }
     }
-    $Weather{Summary_Short} = sprintf(
-        "%2d/%2d/%2d %3d%% %3d%%",
-        $Weather{TempIndoor},  $Weather{TempOutdoor}, $Weather{WindChill},
-        $Weather{HumidIndoor}, $Weather{HumidOutdoor}
-    );
-    $Weather{Summary} = sprintf(
-        "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
-        $Weather{TempIndoor},  $Weather{TempOutdoor}, $Weather{WindChill},
-        $Weather{HumidIndoor}, $Weather{HumidOutdoor}
-    );
+    $Weather{Summary_Short} = sprintf( "%2d/%2d/%2d %3d%% %3d%%",
+        $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
+    $Weather{Summary} = sprintf( "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
+        $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
 }
-$Weather{Wind} =
-    $wind_dir_lt . " "
-  . $Weather{WindAvgSpeed} . "/"
-  . $Weather{WindGustSpeed} . " km/h";
+$Weather{Wind} = $wind_dir_lt . " " . $Weather{WindAvgSpeed} . "/" . $Weather{WindGustSpeed} . " km/h";
 
 # This subroutine formats a speakable (well, mostly) summary of the current
 # weather conditions and short term forecast.
@@ -228,8 +219,7 @@ sub format_ws_data {
     my $data;
 
     $temp = $Weather{TempIndoor};
-    $data =
-      "La temperatura interior es de " . sprintf( "%d", $temp ) . " grados";
+    $data = "La temperatura interior es de " . sprintf( "%d", $temp ) . " grados";
     $temp = $Weather{TempOutdoor};
     $data .= ",y hay " . sprintf( "%d", $temp ) . " grados en el exterior";
     $data .= ", con sensaci�n t�rmica de " . $Weather{WindChill} . " grados"
@@ -238,19 +228,12 @@ sub format_ws_data {
 
     if ( $Weather{TempOutdoor} > -10 ) {
         $data .=
-            "La humedad es del "
-          . $Weather{HumidOutdoor}
-          . " %, y un punto de condensaci�n de "
-          . $Weather{DewOutdoor}
-          . " grados. ";
+          "La humedad es del " . $Weather{HumidOutdoor} . " %, y un punto de condensaci�n de " . $Weather{DewOutdoor} . " grados. ";
     }
 
     if ( $Weather{WindGustSpeed} ) {
         $data .=
-            "Viento del "
-          . convert_direction( $Weather{WindGustDir} ) . " a "
-          . $Weather{WindGustSpeed}
-          . " kilometros por hora";
+          "Viento del " . convert_direction( $Weather{WindGustDir} ) . " a " . $Weather{WindGustSpeed} . " kilometros por hora";
         $data .= ". ";
     }
     else {
@@ -263,8 +246,7 @@ sub format_ws_data {
     }
 
     if ( $Weather{RainTotal} > 0.0 ) {
-        $data .=
-          "Han caido $Weather{RainTotal} litros por metro cuadrado en las �ltimas 24 horas. ";
+        $data .= "Han caido $Weather{RainTotal} litros por metro cuadrado en las �ltimas 24 horas. ";
     }
 
     return $data;
diff --git a/code/public/Roger/ahub.pl b/code/public/Roger/ahub.pl
index b7f7104c4..9529e562d 100644
--- a/code/public/Roger/ahub.pl
+++ b/code/public/Roger/ahub.pl
@@ -6,19 +6,16 @@
 
 #use vars '$AHubSweUP','$AHubSweUsers','$AHubSweBps','$AHubSwePkts','$AHubSweVer','$AHubSweTime';
 #use vars '$AHubEastUP','$AHubEastUsers','$AHubEastBps','$AHubEastPkts','$AHubEastVer','$AHubEastTime';
-use vars '$AH2ndStart', '$AH2ndRestarts', '$AH2ndLast', '$AHStart',
-  '$AH2ndAvg', '$AH2ndRaw';
+use vars '$AH2ndStart', '$AH2ndRestarts', '$AH2ndLast', '$AHStart', '$AH2ndAvg', '$AH2ndRaw';
 use vars '@AHubUP', '@AHubUsers', '@AHubUsersX', '@AHubBps', '@AHubPkts',
   '@AHubVer', '@AHubVerX', '@AHubTime', '@AHubTimeX', '@AHubName', '@AHubRaw',
   '@AHubRawX';
 use vars '@AHubCon', '@AHubCon60', '@AHubConX', '@AHubCon60X';
-use vars '@APDName', '@APDLoc', '@APDVer', '@APDUsers', '@APDUsers2',
-  '@APDList', '@APDTime', '@APDRaw';
-use vars '$APDNbr', '$APDLine', '@AHubMail', '@AHubMailX';
+use vars '@APDName', '@APDLoc',    '@APDVer',   '@APDUsers', '@APDUsers2', '@APDList', '@APDTime', '@APDRaw';
+use vars '$APDNbr',  '$APDLine',   '@AHubMail', '@AHubMailX';
 use vars '$WXKey';
 
-use vars '@MailName', '@MailStart', '@MailRem', '@MailAddr', '@MailNbr',
-  '$MailCount';
+use vars '@MailName', '@MailStart', '@MailRem', '@MailAddr', '@MailNbr', '$MailCount';
 
 # my (@APDName,@APDLoc,@APDVer,@APDUsers,@APDUsers2,@APDList,@APDTime,@APDRaw);
 
@@ -40,11 +37,7 @@
 my ( @AHub, @AHubLoc, @AHubWWW, @AHcolor, @AFcolor );
 my ( $AHubLine, $AH2ndTag );
 my ( $AHubUsersSum, $AHubBpsSum, $AHubPktsSum, $AHubUsersXSum, $BordCol );
-my (
-    $Time1,   $Time2,  $Time3,     $Time4,  $Time5,
-    $Diff,    $Avg,    $TempUsers, $TempUp, $TempUsersX,
-    $TempUpX, $bgTime, $bgUp,      $bgTimeX
-);
+my ( $Time1, $Time2, $Time3, $Time4, $Time5, $Diff, $Avg, $TempUsers, $TempUp, $TempUsersX, $TempUpX, $bgTime, $bgUp, $bgTimeX );
 my ( $TempBps, $TempPkts, $TempCon, $TempConX );
 my $bgRed = "bgcolor=\"#FF0000\"";
 my $bgYel = "bgcolor=\"#FFFF00\"";
@@ -68,15 +61,15 @@
 
 if ($Reload) {
     open( AHUB, "$config_parms{code_dir}/ahub.pos" );    # Open	for	input
-    @AHub = <AHUB>;    # Open	array and read in data
-    close AHUB;        # Close the file
+    @AHub = <AHUB>;                                      # Open	array and read in data
+    close AHUB;                                          # Close the file
     $AH2ndLast = 0;
     $count     = 0;
 
     # 	$APDNbr	= 0;
     foreach $AHubLine (@AHub) {
         ( $AHubName[$count], $AHubWWW[$count], $AHubLoc[$count] ) =
-          ( split( ',', $AHubLine ) )[ 0, 1, 2 ];    # Split	each line
+          ( split( ',', $AHubLine ) )[ 0, 1, 2 ];        # Split	each line
         $AHubNbr           = $count;
         $AHubMail[$count]  = 0;
         $AHubMailX[$count] = 0;
@@ -97,14 +90,12 @@
     }
 
     open( AHUB, "$config_parms{code_dir}/ahub.mail" );    # Open	for	input
-    @AHub = <AHUB>;    # Open	array and read in data
-    close AHUB;        # Close the file
+    @AHub = <AHUB>;                                       # Open	array and read in data
+    close AHUB;                                           # Close the file
     $count = 0;
     foreach $AHubLine (@AHub) {
-        (
-            $MailName[$count], $MailStart[$count],
-            $MailRem[$count],  $MailAddr[$count]
-        ) = ( split( ',', $AHubLine ) )[ 0, 1, 2, 3 ];    # Split	each line
+        ( $MailName[$count], $MailStart[$count], $MailRem[$count], $MailAddr[$count] ) =
+          ( split( ',', $AHubLine ) )[ 0, 1, 2, 3 ];      # Split	each line
 
         #		$MailNbr[$count] = 0;
         $MailCount = $count;
@@ -151,10 +142,8 @@
         # AHUBSWE>APRS,TCPIP*:!5848.83N/01652.44EI SM5NRK/AFilterX 1.3,	10 users connected
         # 		print_msg "AHub: $APRSString";						# Monitor to Msg Window
 
-        if ( $APRSString =~
-            /(.*)>.*:.*AHub (.*),(\d+) users,(\d+) bps,(\d+) Pkts UP=(.*\d\d[hd]).*/
-          )
-        {
+        if ( $APRSString =~ /(.*)>.*:.*AHub (.*),(\d+) users,(\d+) bps,(\d+) Pkts UP=(.*\d\d[hd]).*/ ) {
+
             # 			print_msg "AHub: Processing";
             $Name  = $1;
             $Ver   = $2;
@@ -222,7 +211,7 @@
             $Name   = $1;
             $UsersX = $2;
 
-            if ( $APRSString =~ /.*APAX(\d)(\d),.*/ ) { $VerX = $1 . "." . $2 }
+            if ( $APRSString =~ /.*APAX(\d)(\d),.*/ )     { $VerX = $1 . "." . $2 }
             if ( $APRSString =~ /.*:.*AFilterX (.*),.*/ ) { $VerX = $1 }
 
             $count = 0;
@@ -493,9 +482,8 @@
             $Time2 =
               ( $MailStart[$key] + $AHubMail[$count] * $MailRem[$key] ) * 60;
 ##			print_msg "Mail1: $AHubName[$count] $MailName[$key] $AHubTime[$count] $MailStart[$key] $AHubMailX[$count] $MailRem[$key] Time1=$Time1 Time2=$Time2";
-            if ( $AHubName[$count] eq $MailName[$key]
-                and ( time() - $AHubTime[$count] ) >
-                ( $MailStart[$key] + $AHubMail[$count] * $MailRem[$key] ) * 60
+            if (    $AHubName[$count] eq $MailName[$key]
+                and ( time() - $AHubTime[$count] ) > ( $MailStart[$key] + $AHubMail[$count] * $MailRem[$key] ) * 60
                 and $AHubTime[$count] != "" )
             {
                 $Time1 = &utc( $AHubTime[$count] );
@@ -508,33 +496,26 @@
                 #				$Time5 = (time() - $AHubTimeX[$count])/60;
                 #				$Time5 = round $Time5;
                 $AHubMail[$count]++;
-                print_msg
-                  "Warning AHub on $AHubName[$count] $Time1 $AHubMail[$count] $MailAddr[$key]";
-                $MailText =
-                  "Warning, missing status report from AHub on $AHubName[$count]\n\n";
+                print_msg "Warning AHub on $AHubName[$count] $Time1 $AHubMail[$count] $MailAddr[$key]";
+                $MailText = "Warning, missing status report from AHub on $AHubName[$count]\n\n";
                 $MailText = $MailText . "Warning Time: $Time2\n\n";
                 $MailText = $MailText . "AHub warning #: $AHubMail[$count]\n";
                 $MailText = $MailText . "AHub Last Status: $Time1\n";
                 $MailText = $MailText . "AHub delta time: $Time3 minutes\n";
-                $MailText =
-                  $MailText . "AHub Last Packet: $AHubRaw[$count]\n\n";
-                $MailText =
-                  $MailText . "First warning after $MailStart[$key] minutes\n";
-                $MailText =
-                  $MailText . "Next warning after $MailRem[$key] minutes\n\n";
-                $MailText =
-                  $MailText . "This is an automatic message from Roger Bille\n";
+                $MailText = $MailText . "AHub Last Packet: $AHubRaw[$count]\n\n";
+                $MailText = $MailText . "First warning after $MailStart[$key] minutes\n";
+                $MailText = $MailText . "Next warning after $MailRem[$key] minutes\n\n";
+                $MailText = $MailText . "This is an automatic message from Roger Bille\n";
 
                 #				$MailTo = "$MailAddr[$key];temp\@ahubswe.net";
                 #				$MailTo = "$MailAddr[$key]";
                 @List = split( / /, $MailAddr[$key] );
                 foreach $MailTo (@List) {
                     &net_mail_send(
-                        to => "$MailTo",
-                        subject =>
-                          "Warning $AHubMail[$count] for AHub on $AHubName[$count] $Time1.",
-                        text => "$MailText",
-                        from => 'APRSstat@ahubswe.net'
+                        to      => "$MailTo",
+                        subject => "Warning $AHubMail[$count] for AHub on $AHubName[$count] $Time1.",
+                        text    => "$MailText",
+                        from    => 'APRSstat@ahubswe.net'
                     );
                 }
             }
@@ -544,9 +525,8 @@
             $Time2 =
               ( $MailStart[$key] + $AHubMailX[$count] * $MailRem[$key] ) * 60;
 ##			print_msg "Mail2: $AHubName[$count] $MailName[$key] $AHubTimeX[$count] $MailStart[$key] $AHubMailX[$count] $MailRem[$key] Time1=$Time1 Time2=$Time2";
-            if ( $AHubName[$count] eq $MailName[$key]
-                and ( time() - $AHubTimeX[$count] ) >
-                ( $MailStart[$key] + $AHubMailX[$count] * $MailRem[$key] ) * 60
+            if (    $AHubName[$count] eq $MailName[$key]
+                and ( time() - $AHubTimeX[$count] ) > ( $MailStart[$key] + $AHubMailX[$count] * $MailRem[$key] ) * 60
                 and $AHubTimeX[$count] != "" )
             {
                 #				$Time1 = &utc($AHubTime[$count]);
@@ -558,34 +538,26 @@
                 $Time5 = ( time() - $AHubTimeX[$count] ) / 60;
                 $Time5 = round $Time5;
                 $AHubMailX[$count]++;
-                print_msg
-                  "Warning AFilter on $AHubName[$count] $Time4 $AHubMailX[$count] $MailAddr[$key]";
-                $MailText =
-                  "Warning, missing status report from AFilterX on $AHubName[$count]\n\n";
+                print_msg "Warning AFilter on $AHubName[$count] $Time4 $AHubMailX[$count] $MailAddr[$key]";
+                $MailText = "Warning, missing status report from AFilterX on $AHubName[$count]\n\n";
                 $MailText = $MailText . "Warning Time: $Time2\n\n";
-                $MailText =
-                  $MailText . "AFilterX warning #: $AHubMailX[$count]\n";
+                $MailText = $MailText . "AFilterX warning #: $AHubMailX[$count]\n";
                 $MailText = $MailText . "AFilterX Last Status: $Time4\n";
                 $MailText = $MailText . "AFilterX delta time: $Time5 minutes\n";
-                $MailText =
-                  $MailText . "AFilterX Last Packet: $AHubRawX[$count]\n\n";
-                $MailText =
-                  $MailText . "First warning after $MailStart[$key] minutes\n";
-                $MailText =
-                  $MailText . "Next warning after $MailRem[$key] minutes\n\n";
-                $MailText =
-                  $MailText . "This is an automatic message from Roger Bille\n";
+                $MailText = $MailText . "AFilterX Last Packet: $AHubRawX[$count]\n\n";
+                $MailText = $MailText . "First warning after $MailStart[$key] minutes\n";
+                $MailText = $MailText . "Next warning after $MailRem[$key] minutes\n\n";
+                $MailText = $MailText . "This is an automatic message from Roger Bille\n";
 
                 #				$MailTo = "$MailAddr[$key];temp\@ahubswe.net";
                 #				$MailTo = "$MailAddr[$key]";
                 @List = split( / /, $MailAddr[$key] );
                 foreach $MailTo (@List) {
                     &net_mail_send(
-                        to => "$MailTo",
-                        subject =>
-                          "Warning $AHubMailX[$count] for AFilterX on $AHubName[$count] $Time4.",
-                        text => "$MailText",
-                        from => 'APRSstat@ahubswe.net'
+                        to      => "$MailTo",
+                        subject => "Warning $AHubMailX[$count] for AFilterX on $AHubName[$count] $Time4.",
+                        text    => "$MailText",
+                        from    => 'APRSstat@ahubswe.net'
                     );
                 }
             }
@@ -603,10 +575,8 @@ sub create_html {
     # Standard HTML
     #
 
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
 
     open( HTML, ">\\\\server\\d\$\\wwwroot\\ahub.html" );
 
@@ -670,50 +640,31 @@ sub create_html {
 sub ahub_table {
 
     #	open(HTML, ">\\\\server\\d\$\\wwwroot\\ahub_table.html");
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
-    print HTML
-      "<h2	align=\"center\">AHub Statistics</h2>\n<table border=\"1\" width=\"100%\">\n";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    print HTML "<h2	align=\"center\">AHub Statistics</h2>\n<table border=\"1\" width=\"100%\">\n";
 
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"><b><font size=\"2\">Server</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
-    print HTML
-      "<td	width=\"53%\" colspan=\"7\"><b><font size=\"2\"><p align=\"center\">AHub</font></b></td>\n";
-    print HTML
-      "<td	width=\"37%\" colspan=\"4\"><b><font size=\"2\"><p align=\"center\">AFilterX</font></b></td>\n";
+    print HTML "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
+    print HTML "<td	width=\"53%\" colspan=\"7\"><b><font size=\"2\"><p align=\"center\">AHub</font></b></td>\n";
+    print HTML "<td	width=\"37%\" colspan=\"4\"><b><font size=\"2\"><p align=\"center\">AFilterX</font></b></td>\n";
     print HTML "</tr>\n";
 
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><b><font size=\"2\"></font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><b><font size=\"2\"></font></b></td>\n";
-    print HTML
-      "<td	width=\"15%\"$BordCol><b><font size=\"2\">Last Update UTC</font></b></td>\n";
-    print HTML
-      "<td	width=\"7%\"$BordCol><b><font size=\"2\">Version</font></b></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><b><font size=\"2\">Users</font></b></td>\n";
-    print HTML
-      "<td	width=\"7%\"$BordCol><b><font size=\"2\">Connect</font></b></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><b><font size=\"2\">bps</font></b></td>";
-    print HTML
-      "<td	width=\"6%\"$BordCol><b><font size=\"2\">Pkts</font></b></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><b><font size=\"2\">UP Time</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><b><font size=\"2\">Last Update UTC</font></b></td>\n";
-    print HTML
-      "<td	width=\"7%\"$BordCol><b><font size=\"2\">Version</font></b></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><b><font size=\"2\">Users</font></b></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><b><font size=\"2\">Connect</font></b></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><b><font size=\"2\"></font></b></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><b><font size=\"2\"></font></b></td>\n";
+    print HTML "<td	width=\"15%\"$BordCol><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"7%\"$BordCol><b><font size=\"2\">Version</font></b></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><b><font size=\"2\">Users</font></b></td>\n";
+    print HTML "<td	width=\"7%\"$BordCol><b><font size=\"2\">Connect</font></b></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><b><font size=\"2\">bps</font></b></td>";
+    print HTML "<td	width=\"6%\"$BordCol><b><font size=\"2\">Pkts</font></b></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><b><font size=\"2\">UP Time</font></b></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"7%\"$BordCol><b><font size=\"2\">Version</font></b></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><b><font size=\"2\">Users</font></b></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><b><font size=\"2\">Connect</font></b></td>\n";
     print HTML "</tr>\n";
 
     $AHubUsersSum  = 0;
@@ -725,10 +676,9 @@ sub ahub_table {
 
         # code for @AHcolor	and	@AFcolor in	here
 
-        $BordCol =
-          " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-        $Time1 = "";
-        $Time2 = "";
+        $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+        $Time1   = "";
+        $Time2   = "";
         if ( $AHubTime[$count] != "" )  { $Time1 = &utc( $AHubTime[$count] ) }
         if ( $AHubTimeX[$count] != "" ) { $Time2 = &utc( $AHubTimeX[$count] ) }
         $bgTime     = "";
@@ -762,57 +712,39 @@ sub ahub_table {
         if ( $AHubCon60X[$count] == 0 ) { $TempConX = "" }
 
         print HTML "<tr>\n";
-        print HTML
-          "<td	width=\"10%\"$BordCol><a href=$AHubWWW[$count]><font size=\"2\">$AHubName[$count]</font></a></td>\n";
-        print HTML
-          "<td	width=\"14%\"$BordCol><font	size=\"2\">$AHubLoc[$count]</font></td>\n";
-        print HTML
-          "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
-        print HTML
-          "<td	width=\"7%\"$BordCol><font size=\"2\">$AHubVer[$count]</font></td>\n";
-        print HTML
-          "<td	width=\"6%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
-        print HTML
-          "<td width=\"7%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
-        print HTML
-          "<td	width=\"6%\"$BordCol><font size=\"2\">$TempBps</font></td>\n";
-        print HTML
-          "<td	width=\"6%\"$BordCol><font size=\"2\">$TempPkts</font></td>\n";
-        print HTML
-          "<td	width=\"6%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
-        print HTML
-          "<td	width=\"14%\"$BordCol $bgTimeX><font size=\"2\">$Time2</font></td>\n";
-        print HTML
-          "<td	width=\"7%\"$BordCol><font size=\"2\">$AHubVerX[$count]</font></td>\n";
-        print HTML
-          "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsersX</font></td>\n";
-        print HTML
-          "<td	width=\"8%\"$BordCol><font size=\"2\">$TempConX</font></td>\n";
+        print HTML "<td	width=\"10%\"$BordCol><a href=$AHubWWW[$count]><font size=\"2\">$AHubName[$count]</font></a></td>\n";
+        print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$AHubLoc[$count]</font></td>\n";
+        print HTML "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
+        print HTML "<td	width=\"7%\"$BordCol><font size=\"2\">$AHubVer[$count]</font></td>\n";
+        print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
+        print HTML "<td width=\"7%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
+        print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$TempBps</font></td>\n";
+        print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$TempPkts</font></td>\n";
+        print HTML "<td	width=\"6%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
+        print HTML "<td	width=\"14%\"$BordCol $bgTimeX><font size=\"2\">$Time2</font></td>\n";
+        print HTML "<td	width=\"7%\"$BordCol><font size=\"2\">$AHubVerX[$count]</font></td>\n";
+        print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsersX</font></td>\n";
+        print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempConX</font></td>\n";
         print HTML "</tr>\n";
         $AHubUsersSum  = $AHubUsersSum + $AHubUsers[$count];
         $AHubBpsSum    = $AHubBpsSum + $AHubBps[$count];
         $AHubPktsSum   = $AHubPktsSum + $AHubPkts[$count];
         $AHubUsersXSum = $AHubUsersXSum + $AHubUsersX[$count];
     }
-    $BordCol = $BordCol
-      . "	style=\"border-top-style: solid; border-top-color: #000000\"";
+    $BordCol = $BordCol . "	style=\"border-top-style: solid; border-top-color: #000000\"";
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">TOTAL</font></td>\n";
     print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\"></font></td>\n";
     print HTML "<td	width=\"15%\"$BordCol><font	size=\"2\"></font></td>\n";
     print HTML "<td	width=\"7%\"$BordCol><font size=\"2\"></font></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubUsersSum</font></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubUsersSum</font></td>\n";
     print HTML "<td	width=\"7%\"$BordCol><font size=\"2\"></font></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubBpsSum</font></td>\n";
-    print HTML
-      "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubPktsSum</font></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubBpsSum</font></td>\n";
+    print HTML "<td	width=\"6%\"$BordCol><font size=\"2\">$AHubPktsSum</font></td>\n";
     print HTML "<td	width=\"6%\"$BordCol><font size=\"2\"></font></td>\n";
     print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\"></font></td>\n";
     print HTML "<td	width=\"7%\"$BordCol><font size=\"2\"></font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$AHubUsersXSum</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$AHubUsersXSum</font></td>\n";
     print HTML "<td	width=\"8%\"$BordCol><font size=\"2\"></font></td>\n";
     print HTML "</tr>\n";
     print HTML "</table>\n\n";
@@ -823,26 +755,20 @@ sub ahub_table {
 }
 
 sub core_table {
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
-    print HTML
-      "<h2	align=\"center\">Core servers Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    print HTML "<h2	align=\"center\">Core servers Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"><b><font size=\"2\">Server</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
-    print HTML
-      "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
+    print HTML "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Version</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Users</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Connect</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">UP Time</font></b></td>\n";
     print HTML "</tr>\n";
 
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
 
     # First
 
@@ -864,20 +790,13 @@ sub core_table {
     }
     if ( $CoreCon60[1] == 0 ) { $TempCon = "" }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$FirstName (first)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$FirstLoc</font></td>\n";
-    print HTML
-      "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$FirstName (first)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$FirstLoc</font></td>\n";
+    print HTML "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
     print HTML "</tr>\n";
 
     # Second
@@ -899,20 +818,13 @@ sub core_table {
     }
     if ( $CoreCon60[2] == 0 ) { $TempCon = "" }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$SecondName (second)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$SecondLoc</font></td>\n";
-    print HTML
-      "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$SecondName (second)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$SecondLoc</font></td>\n";
+    print HTML "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
     print HTML "</tr>\n";
 
     # Third
@@ -935,20 +847,13 @@ sub core_table {
     }
     if ( $CoreCon60[3] == 0 ) { $TempCon = "" }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$ThirdName (third)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$ThirdLoc</font></td>\n";
-    print HTML
-      "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$ThirdName (third)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$ThirdLoc</font></td>\n";
+    print HTML "<td	width=\"15%\"$BordCol $bgTime><font size=\"2\">$Time1</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempUsers</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$TempCon</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol $bgUp><font size=\"2\">$TempUp</font></td>\n";
     print HTML "</tr>\n";
 
     print HTML "</table>\n\n";
@@ -957,43 +862,33 @@ sub core_table {
 }
 
 sub core_test_table {
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
-    print HTML
-      "<h2	align=\"center\">Core servers Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    print HTML "<h2	align=\"center\">Core servers Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"><b><font size=\"2\">Server</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
-    print HTML
-      "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
+    print HTML "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Version</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Users</font></b></td>\n";
     print HTML "</tr>\n";
 
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
 
     # First
 
     $Time1 = "";
     if ( $FirstTime != "" ) { $Time1 = &utc($FirstTime) }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$FirstName (first)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$FirstLoc</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$FirstName (first)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$FirstLoc</font></td>\n";
     print HTML "<td	width=\"15%\"$BordCol";
     if ( time() - $FirstTime > 1500 and $FirstTime != "" ) {
         print HTML "	bgcolor=\"#FF0000\"";
     }
     print HTML "><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstUsers ($FirstUsers2) $FirstList</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$FirstUsers ($FirstUsers2) $FirstList</font></td>\n";
     print HTML "</tr>\n";
 
     # Second
@@ -1001,19 +896,15 @@ sub core_test_table {
     $Time1 = "";
     if ( $SecondTime != "" ) { $Time1 = &utc($SecondTime) }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$SecondName (second)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$SecondLoc</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$SecondName (second)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$SecondLoc</font></td>\n";
     print HTML "<td	width=\"15%\"$BordCol";
     if ( time() - $SecondTime > 1500 and $SecondTime != "" ) {
         print HTML "	bgcolor=\"#FF0000\"";
     }
     print HTML "><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondUsers ($SecondUsers2) $SecondList</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$SecondUsers ($SecondUsers2) $SecondList</font></td>\n";
     print HTML "</tr>\n";
 
     # Third
@@ -1021,19 +912,15 @@ sub core_test_table {
     $Time1 = "";
     if ( $ThirdTime != "" ) { $Time1 = &utc($ThirdTime) }
     print HTML "<tr>\n";
-    print HTML
-      "<td	width=\"10%\"$BordCol><font	size=\"2\">$ThirdName (third)</font></a></td>\n";
-    print HTML
-      "<td	width=\"14%\"$BordCol><font	size=\"2\">$ThirdLoc</font></td>\n";
+    print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$ThirdName (third)</font></a></td>\n";
+    print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$ThirdLoc</font></td>\n";
     print HTML "<td	width=\"15%\"$BordCol";
     if ( time() - $ThirdTime > 1500 and $ThirdTime != "" ) {
         print HTML "	bgcolor=\"#FF0000\"";
     }
     print HTML "><font size=\"2\">$Time1</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdVer</font></td>\n";
-    print HTML
-      "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdUsers ($ThirdUsers) $ThirdList</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdVer</font></td>\n";
+    print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$ThirdUsers ($ThirdUsers) $ThirdList</font></td>\n";
     print HTML "</tr>\n";
 
     print HTML "</table>\n\n";
@@ -1042,18 +929,13 @@ sub core_test_table {
 }
 
 sub aprsd_table {
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
-    print HTML
-      "<h2	align=\"center\">aprsd Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    print HTML "<h2	align=\"center\">aprsd Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"><b><font size=\"2\">Server</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
-    print HTML
-      "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
+    print HTML "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Version</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Users</font></b></td>\n";
     print HTML "</tr>\n";
@@ -1061,25 +943,20 @@ sub aprsd_table {
     for ( $count = 0; $count <= $APDNbr; $count++ ) {
 
         # code for @AHcolor	and	@AFcolor in	here
-        $BordCol =
-          " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-        $Time1 = "";
+        $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+        $Time1   = "";
         if ( $APDTime[$count] != "" ) { $Time1 = &utc( $APDTime[$count] ) }
         print HTML "<tr>\n";
-        print HTML
-          "<td	width=\"10%\"$BordCol><font	size=\"2\">$APDName[$count]</font></a></td>\n";
-        print HTML
-          "<td	width=\"14%\"$BordCol><font	size=\"2\">$APDLoc[$count]</font></td>\n";
+        print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$APDName[$count]</font></a></td>\n";
+        print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$APDLoc[$count]</font></td>\n";
         print HTML "<td	width=\"15%\"$BordCol";
 
         if ( time() - $APDTime[$count] > 1500 and $APDTime[$count] != "" ) {
             print HTML "	bgcolor=\"#FF0000\"";
         }
         print HTML "><font size=\"2\">$Time1</font></td>\n";
-        print HTML
-          "<td	width=\"8%\"$BordCol><font size=\"2\">$APDVer[$count]</font></td>\n";
-        print HTML
-          "<td	width=\"8%\"$BordCol><font size=\"2\">$APDUsers[$count]</font></td>\n";
+        print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$APDVer[$count]</font></td>\n";
+        print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$APDUsers[$count]</font></td>\n";
         print HTML "</tr>\n";
     }
     print HTML "</table>\n\n";
@@ -1088,18 +965,13 @@ sub aprsd_table {
 }
 
 sub aprsd_test_table {
-    $BordCol =
-      " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-    $BordCol = $BordCol
-      . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
-    print HTML
-      "<h2	align=\"center\">aprsd Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
+    $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+    $BordCol = $BordCol . "	style=\"border-bottom-style: solid;	border-bottom-color: #000000\"";
+    print HTML "<h2	align=\"center\">aprsd Statistics</h2>\n<table border=\"1\"	width=\"100%\">\n";
     print HTML "<tr>\n";
     print HTML "<td	width=\"10%\"><b><font size=\"2\">Server</font></b></td>\n";
-    print HTML
-      "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
-    print HTML
-      "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
+    print HTML "<td	width=\"14%\"><b><font size=\"2\">Location</font></b></td>\n";
+    print HTML "<td	width=\"15%\"><b><font size=\"2\">Last Update UTC</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Version</font></b></td>\n";
     print HTML "<td	width=\"8%\"><b><font size=\"2\">Users</font></b></td>\n";
     print HTML "</tr>\n";
@@ -1107,23 +979,19 @@ sub aprsd_test_table {
     for ( $count = 0; $count <= $APDNbr; $count++ ) {
 
         # code for @AHcolor	and	@AFcolor in	here
-        $BordCol =
-          " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
-        $Time1 = "";
+        $BordCol = " bordercolor=\"#FFFFFF\" bordercolorlight=\"#FFFFFF\" bordercolordark=\"#FFFFFF\"";
+        $Time1   = "";
         if ( $APDTime[$count] != "" ) { $Time1 = &utc( $APDTime[$count] ) }
         print HTML "<tr>\n";
-        print HTML
-          "<td	width=\"10%\"$BordCol><font	size=\"2\">$APDName[$count]</font></a></td>\n";
-        print HTML
-          "<td	width=\"14%\"$BordCol><font	size=\"2\">$APDLoc[$count]</font></td>\n";
+        print HTML "<td	width=\"10%\"$BordCol><font	size=\"2\">$APDName[$count]</font></a></td>\n";
+        print HTML "<td	width=\"14%\"$BordCol><font	size=\"2\">$APDLoc[$count]</font></td>\n";
         print HTML "<td	width=\"15%\"$BordCol";
 
         if ( time() - $APDTime[$count] > 1500 and $APDTime[$count] != "" ) {
             print HTML "	bgcolor=\"#FF0000\"";
         }
         print HTML "><font size=\"2\">$Time1</font></td>\n";
-        print HTML
-          "<td	width=\"8%\"$BordCol><font size=\"2\">$APDVer[$count]</font></td>\n";
+        print HTML "<td	width=\"8%\"$BordCol><font size=\"2\">$APDVer[$count]</font></td>\n";
         print HTML
           "<td	width=\"8%\"$BordCol><font size=\"2\">$APDUsers[$count] ($APDUsers2[$count]) $APDList[$count]</font></td>\n";
         print HTML "</tr>\n";
@@ -1140,8 +1008,7 @@ sub second {
         $Time4 = &utc($AHStart);
         $Diff  = round( ( time() - $AH2ndStart ) / 60 );
 
-        print HTML
-          "second $AH2ndRestarts restarts since $Time4. Last restart $Time3 (Current uptime = $Diff minutes)."
+        print HTML "second $AH2ndRestarts restarts since $Time4. Last restart $Time3 (Current uptime = $Diff minutes)."
           ;    # Average uptime =	$Avg minutes";
         if ( $AH2ndRestarts != 1 ) {
             $Avg = round( ( $AH2ndAvg / ( $AH2ndRestarts - 1 ) ) / 60 );
@@ -1158,27 +1025,21 @@ sub log_page {
     print HTML "</head>\n\n<body>\n\n";
 
     for ( $count = 0; $count <= $AHubNbr; $count++ ) {
-        print HTML
-          "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AHubRaw[$count]</font></p>\n";
-        print HTML
-          "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AHubRawX[$count]</font></p>\n";
+        print HTML "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AHubRaw[$count]</font></p>\n";
+        print HTML "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AHubRawX[$count]</font></p>\n";
     }
     for ( $count = 0; $count <= $APDNbr; $count++ ) {
-        print HTML
-          "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$APDRaw[$count]</font></p>\n";
+        print HTML "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$APDRaw[$count]</font></p>\n";
     }
-    print HTML
-      "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AH2ndRaw</font></p>\n";
+    print HTML "<p style=\"margin-top: 0; margin-bottom: 0\"><font size=\"2\">$AH2ndRaw</font></p>\n";
     print HTML "</body>\n\n</html>\n";
     close HTML;
 }
 
 sub utc {
     my ($ltime) = @_;
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      gmtime($ltime);
-    my $utc = sprintf "%s-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1,
-      $mday, $hour, $min, $sec;
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = gmtime($ltime);
+    my $utc = sprintf "%s-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
     return $utc;
 }
 
@@ -1226,8 +1087,7 @@ sub up {
 
 if ( done_now $p_first_page) {
     my $html = file_read $f_first_html;
-    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($html) );
+    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )->format( HTML::TreeBuilder->new()->parse($html) );
     if ( $text =~ /.*Server up time (.*) hours.*/ ) {
         $FirstStart = time() - $1 * 3600;
 
@@ -1255,8 +1115,7 @@ sub up {
 
 if ( done_now $p_third_page) {
     my $html = file_read $f_third_html;
-    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($html) );
+    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )->format( HTML::TreeBuilder->new()->parse($html) );
     if ( $text =~ /.*Server up time (.*) hours.*/ ) {
         $ThirdStart = time() - $1 * 3600;
 
diff --git a/code/public/Roger/aprsfunc.pl b/code/public/Roger/aprsfunc.pl
index 58e9084c2..564693883 100644
--- a/code/public/Roger/aprsfunc.pl
+++ b/code/public/Roger/aprsfunc.pl
@@ -18,14 +18,13 @@ sub APRSPosition {
     $i = substr( $Data, 0, 1 );
 
     # 	if ($i =~ /[!\/=@]/ ) {			# Match !/=@ for clear text position
-    if ( $i eq '!' or $i eq '/' or $i eq '=' or $i eq '@' )
-    {           # Match !/=@ for clear text position
+    if ( $i eq '!' or $i eq '/' or $i eq '=' or $i eq '@' ) {    # Match !/=@ for clear text position
         ( $lat, $lon, $speed, $course ) = split( ',', &APRSPos($Data) );
     }
-    elsif ( $i eq '$' ) {    # GPS
+    elsif ( $i eq '$' ) {                                        # GPS
         ( $lat, $lon, $speed, $course ) = split( ',', &APRSPosGPS($Data) );
     }
-    else {                   # Only Mic-E remain
+    else {                                                       # Only Mic-E remain
         ( $lat, $lon, $speed, $course ) =
           split( ',', &APRSPosMicE( $Dest, $Data ) );
     }
@@ -34,13 +33,7 @@ sub APRSPosition {
 
     print_msg "$Source $Data";
 
-    ( $Dist, $Bearing ) = split(
-        ',',
-        &CalcDistance(
-            $config_parms{latitude}, $config_parms{longitude},
-            $lat, $lon
-        )
-    );
+    ( $Dist, $Bearing ) = split( ',', &CalcDistance( $config_parms{latitude}, $config_parms{longitude}, $lat, $lon ) );
 
     #	$Dist = round(&CalcDistance ($config_parms{latitude}, $config_parms{longitude}, $lat, $lon),1);
     #	$Bearing = round(&CalcBearing($config_parms{latitude}, $config_parms{longitude}, $lat, $lon));
@@ -49,8 +42,7 @@ sub APRSPosition {
     $Dist = round( $Dist, 1 );
     $Bearing = round($Bearing);
 
-    print_msg sprintf( "%-9s => %2.4f %2.4f %4d %4d %4.1f %d",
-        $Source, $lat, $lon, $speed, $course, $Dist, $Bearing );
+    print_msg sprintf( "%-9s => %2.4f %2.4f %4d %4d %4.1f %d", $Source, $lat, $lon, $speed, $course, $Dist, $Bearing );
 
     &vvRoad( $speed, $lat, $lon );    # Chech if Roadwork should be sent
 
@@ -72,7 +64,7 @@ sub APRSPos {
 
     if (    substr( $Data, $o + 19, 1 ) ne '_'
         and substr( $Data, $o + 23, 1 ) eq '/' )
-    {    # Packet is not a weather packat and has speed/course
+    {                                 # Packet is not a weather packat and has speed/course
         print_msg "Processing course-speed";
         $course = substr( $Data, $o + 20, 3 );
         $speed  = substr( $Data, $o + 24, 3 );
@@ -100,7 +92,7 @@ sub APRSPosGPS {
     return join( ',', $lat, $lon, $speed, $course );
 }
 
-sub APRSPosMicE {    # This is mainly coming from Brian Kliers tracking.pl
+sub APRSPosMicE {                          # This is mainly coming from Brian Kliers tracking.pl
     my ( $Dest, $Data ) = @_;
     my ( $lat, $lon, $speed, $course );
     my ( $GPSLongitudeDegrees, $GPSLongitudeMinutes, $GPSLongitudeMinutes100 );
@@ -123,10 +115,7 @@ sub APRSPosMicE {    # This is mainly coming from Brian Kliers tracking.pl
     $GPSLongitudeMinutes100 = ( substr( $Data, 3, 1 ) );
     $GPSLongitudeMinutes100 = ( unpack( 'C', $GPSLongitudeMinutes100 ) ) - 28;
 
-    $lon =
-      ( $GPSLongitudeDegrees +
-          ( $GPSLongitudeMinutes / 60 ) +
-          ( $GPSLongitudeMinutes100 / 6000 ) );
+    $lon = ( $GPSLongitudeDegrees + ( $GPSLongitudeMinutes / 60 ) + ( $GPSLongitudeMinutes100 / 6000 ) );
 
     $speed = ( substr( $Data, 4, 1 ) );
     $speed = ( ( unpack( 'C', $speed ) ) - 28 ) * 10;
@@ -141,49 +130,40 @@ sub APRSPosMicE {    # This is mainly coming from Brian Kliers tracking.pl
     ;    # Last minute course and speed adjustments per specs
     if ( $course >= 400 ) { $course = $course - 400 }
 
-    $speed = ( $speed * 1.853248 );     # km/h
-    $course = substr( $course, 0, 3 )
-      ;    # Truncate Course to max of	3 numbers for parsing below
+    $speed = ( $speed * 1.853248 );       # km/h
+    $course = substr( $course, 0, 3 );    # Truncate Course to max of	3 numbers for parsing below
 
-    $speed = round($speed);    # Round	the	Speed to the nearest integer
+    $speed = round($speed);               # Round	the	Speed to the nearest integer
 
-    $GPSLatitudeDegrees =
-      ( substr( $Dest, 0, 1 ) );    # Load the tens	digit of Degrees Latitude
+    $GPSLatitudeDegrees = ( substr( $Dest, 0, 1 ) );    # Load the tens	digit of Degrees Latitude
     $GPSLatitudeDegrees = ( unpack( 'C', $GPSLatitudeDegrees ) ) - 32;
     $GPSLatitudeDegrees = ( $GPSLatitudeDegrees & 15 ) * 10;
 
-    $GPSDistance = ( substr( $Dest, 1, 1 ) )
-      ;    # Load the ones	digit of Degrees Latitude (temp	variable used)
+    $GPSDistance = ( substr( $Dest, 1, 1 ) );           # Load the ones	digit of Degrees Latitude (temp	variable used)
     $GPSDistance = ( unpack( 'C', $GPSDistance ) ) - 32;
     $GPSDistance = ( $GPSDistance & 15 );
 
-    $GPSLatitudeDegrees =
-      $GPSLatitudeDegrees + $GPSDistance;    # Here's our Degrees Latitude
+    $GPSLatitudeDegrees = $GPSLatitudeDegrees + $GPSDistance;    # Here's our Degrees Latitude
 
-    $GPSLatitudeMinutes =
-      ( substr( $Dest, 2, 1 ) );    # Load the tens	digit of Minutes Latitude
+    $GPSLatitudeMinutes = ( substr( $Dest, 2, 1 ) );             # Load the tens	digit of Minutes Latitude
     $GPSLatitudeMinutes = ( unpack( 'C', $GPSLatitudeMinutes ) ) - 32;
     $GPSLatitudeMinutes = ( $GPSLatitudeMinutes & 15 ) * 10;
 
-    $GPSDistance = ( substr( $Dest, 3, 1 ) )
-      ;    # Load the ones	digit of Minutes Latitude (temp	variable used)
+    $GPSDistance = ( substr( $Dest, 3, 1 ) );                    # Load the ones	digit of Minutes Latitude (temp	variable used)
     $GPSDistance = ( unpack( 'C', $GPSDistance ) ) - 32;
     $GPSDistance = ( $GPSDistance & 15 );
 
-    $GPSLatitudeMinutes =
-      $GPSLatitudeMinutes + $GPSDistance;    # Here's our Minutes Latitude
+    $GPSLatitudeMinutes = $GPSLatitudeMinutes + $GPSDistance;    # Here's our Minutes Latitude
 
-    $temp = ( substr( $Dest, 4, 1 ) )
-      ;    # Load the tens	digit of hundreds of Minutes Latitude
+    $temp = ( substr( $Dest, 4, 1 ) );                           # Load the tens	digit of hundreds of Minutes Latitude
     $temp = ( unpack( 'C', $temp ) ) - 32;
     $temp = ( $temp & 15 ) * 10;
 
-    $GPSDistance = ( substr( $Dest, 5, 1 ) )
-      ;    # Load the ones	digit of hundreds of Minutes Latitude
+    $GPSDistance = ( substr( $Dest, 5, 1 ) );                    # Load the ones	digit of hundreds of Minutes Latitude
     $GPSDistance = ( unpack( 'C', $GPSDistance ) ) - 32;
     $GPSDistance = ( $GPSDistance & 15 );
 
-    $temp = $temp + $GPSDistance;    # Here's our hundreds of Minutes Latitude
+    $temp = $temp + $GPSDistance;                                # Here's our hundreds of Minutes Latitude
     $lat =
       ( $GPSLatitudeDegrees + ( $GPSLatitudeMinutes / 60 ) + ( $temp / 6000 ) );
 
@@ -219,8 +199,7 @@ sub CalcDistance {
     #	$distance = $dist * 6371;							# 6371 km =	Radius ot the Earth
 
     if ( ( sin($dist) * cos($lat1) ) != 0 ) {
-        $bearing = acos( ( sin($lat2) - sin($lat1) * cos($dist) ) /
-              ( sin($dist) * cos($lat1) ) );
+        $bearing = acos( ( sin($lat2) - sin($lat1) * cos($dist) ) / ( sin($dist) * cos($lat1) ) );
         if ( sin( $lon1 - $lon2 ) > 0 ) {
             $bearing = 2 * 3.1415926536 - $bearing;
         }
@@ -239,11 +218,7 @@ sub CalcDistance {
 #
 sub vvRoad {
     my ( $mySpeed, $lat, $lon ) = @_;
-    my (
-        $dbh6,          $sth6, $sth7,     $query_select6,
-        $query_update6, $myID, $myLatLon, $myLat,
-        $myLon,         $myDist
-    );
+    my ( $dbh6, $sth6, $sth7, $query_select6, $query_update6, $myID, $myLatLon, $myLat, $myLon, $myDist );
     my ($myBearing);
     if ( $mySpeed >= 20 ) {
         $dbh6          = DBI->connect('DBI:ODBC:vv');
@@ -252,18 +227,12 @@ sub vvRoad {
           or print "Can't prepare $query_select6: $dbh6->errstr\n";
         $sth6->execute() or print "can't execute the query: $sth6->errstr\n";
         while ( ( $myID, $myLatLon ) = $sth6->fetchrow_array ) {
-            $myLat = (
-                substr( $myLatLon, 0, 2 ) +
-                  ( substr( $myLatLon, 2, 5 ) / 60 ) );
-            $myLon = (
-                substr( $myLatLon, 10, 2 ) +
-                  ( substr( $myLatLon, 12, 5 ) / 60 ) );
-            ( $myDist, $myBearing ) =
-              &CalcDistance( $lat, $lon, $myLat, $myLon );
+            $myLat = ( substr( $myLatLon, 0,  2 ) + ( substr( $myLatLon, 2,  5 ) / 60 ) );
+            $myLon = ( substr( $myLatLon, 10, 2 ) + ( substr( $myLatLon, 12, 5 ) / 60 ) );
+            ( $myDist, $myBearing ) = &CalcDistance( $lat, $lon, $myLat, $myLon );
             if ( $myDist <= 50 ) {
-                $query_update6 =
-                  "UPDATE Roadwork SET Send = Yes WHERE ID = $myID";
-                $sth7 = $dbh6->prepare($query_update6)
+                $query_update6 = "UPDATE Roadwork SET Send = Yes WHERE ID = $myID";
+                $sth7          = $dbh6->prepare($query_update6)
                   or print "Can't prepare $query_update6: $dbh6->errstr\n";
                 $sth7->execute()
                   or print "can't execute the query: $sth7->errstr\n";
diff --git a/code/public/Roger/aprsin.pl b/code/public/Roger/aprsin.pl
index 1a8b6d5b4..fb375897c 100644
--- a/code/public/Roger/aprsin.pl
+++ b/code/public/Roger/aprsin.pl
@@ -36,37 +36,37 @@
     # Check type of packet
     $i = substr( $APRSData, 0, 1 );
     if ( $i eq '!' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Position without timestamp (no APRS messaging)
+    ;                                  # Position without timestamp (no APRS messaging)
     if ( $i eq '$' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Raw GPS data
+    ;                                  # Raw GPS data
     if ( $i eq "'" ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Old Mic-E and TM-D700
+    ;                                  # Old Mic-E and TM-D700
     if ( $i eq ')' ) { }
-    ;    # Item
+    ;                                  # Item
     if ( $i eq '/' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Position with timestamp (no APRS messaging)
+    ;                                  # Position with timestamp (no APRS messaging)
     if ( $i eq ':' ) { &APRSMsg( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Message
+    ;                                  # Message
     if ( $i eq ';' ) { }
-    ;    # Object
+    ;                                  # Object
     if ( $i eq '<' ) { }
-    ;    # Station Capabilities
+    ;                                  # Station Capabilities
     if ( $i eq '=' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Position without timestamp (with APRS messaging)
+    ;                                  # Position without timestamp (with APRS messaging)
     if ( $i eq '>' ) { }
-    ;    # Status
+    ;                                  # Status
     if ( $i eq '?' ) { }
-    ;    # Query
+    ;                                  # Query
     if ( $i eq '@' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Position with timestamp (with APRS messaging)
+    ;                                  # Position with timestamp (with APRS messaging)
     if ( $i eq 'T' ) { }
-    ;    # Telemetry data
+    ;                                  # Telemetry data
     if ( $i eq '_' ) { }
-    ;    # Weather report
+    ;                                  # Weather report
     if ( $i eq '`' ) { &APRSPosition( $APRSSource, $APRSDest, $APRSData ) }
-    ;    # Mic-E (not TM-D700)
+    ;                                  # Mic-E (not TM-D700)
     if ( $i eq '{' ) { }
-    ;    # User defined
+    ;                                  # User defined
     if ( $i eq '}' ) { }
-    ;    # Third part
+    ;                                  # Third part
 }
diff --git a/code/public/Roger/aprsinit.pl b/code/public/Roger/aprsinit.pl
index 75e256c79..604b32179 100644
--- a/code/public/Roger/aprsinit.pl
+++ b/code/public/Roger/aprsinit.pl
@@ -4,14 +4,11 @@
 
 # This script will initiate APRS, open ports and monitor them.
 
-$tnc_output =
-  new Socket_Item( undef, undef, '192.168.75.2:14579' );    # Nordic feed
-$tnc_output2 = new Socket_Item( undef, undef, '192.168.75.4:14579' )
-  ;    # Special feed for AHub Statistics
+$tnc_output  = new Socket_Item( undef, undef, '192.168.75.2:14579' );    # Nordic feed
+$tnc_output2 = new Socket_Item( undef, undef, '192.168.75.4:14579' );    # Special feed for AHub Statistics
 
 #$tnc_test	 = new Socket_Item(undef, undef, '192.168.75.2:2023');		# Full feed
-$tnc_ahubwx = new Socket_Item( undef, undef, 'ahubwest.net:23' )
-  ;    # AHubWX Feed for AHub Statistics
+$tnc_ahubwx = new Socket_Item( undef, undef, 'ahubwest.net:23' );        # AHubWX Feed for AHub Statistics
 
 unless ( active $tnc_output or not new_second 15 ) {
     print_log "Starting APRS connection to Nordic Feed";
diff --git a/code/public/Roger/aprsmsg.pl b/code/public/Roger/aprsmsg.pl
index 72712f5b3..ad9c1a8b8 100644
--- a/code/public/Roger/aprsmsg.pl
+++ b/code/public/Roger/aprsmsg.pl
@@ -7,16 +7,14 @@
 sub APRSMsg {
     my ( $Source, $Dest, $Data ) = @_;
     my ($Ack);
-    my $HamCall =
-      $config_parms{tracking_callsign};    # Feed	in my Tracking Callsign
+    my $HamCall = $config_parms{tracking_callsign};    # Feed	in my Tracking Callsign
 
     if ( substr( $Data, 1, 6 ) eq 'EMAIL9' ) { &APRSMsgEmail( $Source, $Data ) }
     if ( substr( $Data, 1, length($HamCall) ) eq $HamCall ) {
-        ( $Data, $Ack ) = ( split( '{', $Data ) )[ 0, 1 ];   # Extract Acknumber
-        $Data = ( split( ':', $Data ) )[2];                  # Extract message
-        &APRSSendAck( $Source, $Ack );                       # Send Ack
-        print_msg
-          "New Message recieved from $Source: /cvsroot/misterhouse/mh/code/public/Roger/aprsmsg.pl,v $Data";
+        ( $Data, $Ack ) = ( split( '{', $Data ) )[ 0, 1 ];    # Extract Acknumber
+        $Data = ( split( ':', $Data ) )[2];                   # Extract message
+        &APRSSendAck( $Source, $Ack );                        # Send Ack
+        print_msg "New Message recieved from $Source: /cvsroot/misterhouse/mh/code/public/Roger/aprsmsg.pl,v $Data";
         if ( substr( $Data, 0, 2 ) eq 'R ' ) { &APRSMsgRoad($Data) }
     }
 
@@ -25,12 +23,7 @@ sub APRSMsg {
 sub APRSSendAck {
     my ( $Source, $Ack ) = @_;
     my ($packet);
-    $packet =
-        $config_parms{tracking_callsign}
-      . ">APRS:"
-      . $Source
-      . ( ' ' x ( 9 - length($Source) ) ) . ":ack"
-      . $Ack;
+    $packet = $config_parms{tracking_callsign} . ">APRS:" . $Source . ( ' ' x ( 9 - length($Source) ) ) . ":ack" . $Ack;
     set $tnc_output $packet;
 }
 
@@ -38,8 +31,7 @@ sub APRSMsgEmail {
     my ( $Source, $Data ) = @_;
     my ( $EmailAdr, $EmailBody );
     my ($packet);
-    my $HamCall =
-      $config_parms{tracking_callsign};    # Feed	in my Tracking Callsign
+    my $HamCall = $config_parms{tracking_callsign};    # Feed	in my Tracking Callsign
     ( $EmailAdr, $EmailBody ) = split( ' ', $Data, 2 );
 
     print_log "Email gateway: Callsign=$Source, to=$EmailAdr data=$EmailBody\n";
@@ -48,15 +40,14 @@ sub APRSMsgEmail {
     &net_mail_send(
         to      => $EmailAdr,
         subject => "From $Source via APRS Gateway",
-        text => "From: $Source\n\n$EmailBody\n\nSent via $HamCall APRS Gateway"
+        text    => "From: $Source\n\n$EmailBody\n\nSent via $HamCall APRS Gateway"
     );
     $packet =
         $HamCall
       . ">APRS:"
       . $Source
       . ( ' ' x ( 9 - length($Source) ) )
-      . ":Your E-Mail Message has been sent."
-      ;    # Removed {7 at	end	to not get ack
+      . ":Your E-Mail Message has been sent.";    # Removed {7 at	end	to not get ack
     set $tnc_output $packet;
 }
 
@@ -71,8 +62,7 @@ sub APRSMsgRoad {
         $query_update6 = "UPDATE Roadwork SET Send = Yes";
     }
     else {
-        $query_update6 =
-          "UPDATE Roadwork SET Send = Yes WHERE Lan = \'$myLan\'";
+        $query_update6 = "UPDATE Roadwork SET Send = Yes WHERE Lan = \'$myLan\'";
     }
 
     #	print_msg "$query_update6\n";
diff --git a/code/public/Roger/vvall.pl b/code/public/Roger/vvall.pl
index 78d6fe5e3..2a225506b 100644
--- a/code/public/Roger/vvall.pl
+++ b/code/public/Roger/vvall.pl
@@ -3,11 +3,7 @@
 # Roger Bille
 
 use DBI;
-my (
-    $dbh,      $query_update, $query_insert, $query_select,
-    $sth,      @row,          @vv,           $lan,
-    $BerStart, $BerStopp,     $myTime
-);
+my ( $dbh, $query_update, $query_insert, $query_select, $sth, @row, @vv, $lan, $BerStart, $BerStopp, $myTime );
 
 # RoadWork_2	Stockholms L�n
 
@@ -22,15 +18,15 @@
 
 if ($Reload) {
     open( VV, "$config_parms{code_dir}/vvurl.txt" );    # Open for input
-    @vv = <VV>;    # Open array and read in data
-    close VV;      # Close the file
+    @vv = <VV>;                                         # Open array and read in data
+    close VV;                                           # Close the file
     $count = 0;
     foreach $vvLine (@vv) {
 
         #    	print_log $vvLine;
         if ( $vvLine !~ /^\#/ ) {
             ( $vvLan[$count], $vvLanName[$count], $URLList[$count] ) =
-              ( split( ',', $vvLine ) )[ 0, 1, 2 ];    # Split each line
+              ( split( ',', $vvLine ) )[ 0, 1, 2 ];     # Split each line
             $vvNbr = $count;
 
             #			print_log $vvLanName[$count];
@@ -39,48 +35,27 @@
     }
 }
 
-my $vvURL2 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_2.shtml";
-my $vvURL3 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_3.shtml";
-my $vvURL4 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_4.shtml";
-my $vvURL5 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_5.shtml";
-my $vvURL6 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_6.shtml";
-my $vvURL7 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_7.shtml";
-my $vvURL8 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_8.shtml";
-my $vvURL9 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_9.shtml";
-my $vvURL10 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_10.shtml";
-my $vvURL12 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_12.shtml";
-my $vvURL13 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_13.shtml";
-my $vvURL14 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_14.shtml";
-my $vvURL17 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_17.shtml";
-my $vvURL18 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_18.shtml";
-my $vvURL19 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_19.shtml";
-my $vvURL20 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_20.shtml";
-my $vvURL21 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_21.shtml";
-my $vvURL22 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_22.shtml";
-my $vvURL23 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_23.shtml";
-my $vvURL24 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_24.shtml";
-my $vvURL25 =
-  "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_25.shtml";
+my $vvURL2  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_2.shtml";
+my $vvURL3  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_3.shtml";
+my $vvURL4  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_4.shtml";
+my $vvURL5  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_5.shtml";
+my $vvURL6  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_6.shtml";
+my $vvURL7  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_7.shtml";
+my $vvURL8  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_8.shtml";
+my $vvURL9  = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_9.shtml";
+my $vvURL10 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_10.shtml";
+my $vvURL12 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_12.shtml";
+my $vvURL13 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_13.shtml";
+my $vvURL14 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_14.shtml";
+my $vvURL17 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_17.shtml";
+my $vvURL18 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_18.shtml";
+my $vvURL19 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_19.shtml";
+my $vvURL20 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_20.shtml";
+my $vvURL21 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_21.shtml";
+my $vvURL22 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_22.shtml";
+my $vvURL23 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_23.shtml";
+my $vvURL24 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_24.shtml";
+my $vvURL25 = "http://www.vv.se/triss/trafikinfo/rapporter/RoadWorks/RoadWork_25.shtml";
 
 my $vvFile = "vv";
 
@@ -199,18 +174,14 @@
 sub update {
     my ( $lan, $myhtml, $mypage ) = @_;
     my $html = file_read $myhtml;
-    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($html) );
+    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )->format( HTML::TreeBuilder->new()->parse($html) );
     $text =~ s/\n//g;
     (@vvList) = split( /-----+/, $text );
 
     #	if($text =~ /.*V�garbeten, (.*) L�N.*/) { $lan = $1 };
     #	print "$lan\n";
     foreach $vvLine (@vvList) {
-        if ( $vvLine =~
-            /.*L�ge: ?(.*)Namn: ?(.*)Typ: ?(.*)Ber�knas p�g�: ?(.*)Restriktioner: ?(.*)Beskrivning: ?(.*)/
-          )
-        {
+        if ( $vvLine =~ /.*L�ge: ?(.*)Namn: ?(.*)Typ: ?(.*)Ber�knas p�g�: ?(.*)Restriktioner: ?(.*)Beskrivning: ?(.*)/ ) {
             &process( $lan, $vvLine, $1, $2, $3, $4, $5, $6 );
         }
     }
@@ -218,13 +189,11 @@ sub update {
 }
 
 sub process {
-    my ( $myLan, $myraw, $myLage, $myNamn, $myTyp, $myBer, $myRes, $myBesk ) =
-      @_;
+    my ( $myLan, $myraw, $myLage, $myNamn, $myTyp, $myBer, $myRes, $myBesk ) = @_;
     if ( $myraw !~ /L�ge:Namn:Typ:/ and $myLage !~ /^Lv/ ) {
-        $dbh = DBI->connect('DBI:ODBC:vv');
-        $query_select =
-          "SELECT raw FROM Roadwork WHERE raw = \'$myLage $myNamn $myTyp\'";
-        $sth = $dbh->prepare($query_select)
+        $dbh          = DBI->connect('DBI:ODBC:vv');
+        $query_select = "SELECT raw FROM Roadwork WHERE raw = \'$myLage $myNamn $myTyp\'";
+        $sth          = $dbh->prepare($query_select)
           or print "Can't prepare $query_select: $dbh->errstr\n";
         $sth->execute() or print "can't execute the query: $sth->errstr\n";
 
@@ -242,9 +211,8 @@ sub process {
             $sth->execute() or print "can't execute the query: $sth->errstr\n";
         }
         else {
-            $query_update =
-              "UPDATE Roadwork SET Last = \'$myTime\' WHERE raw = \'$myLage $myNamn $myTyp\'";
-            $sth = $dbh->prepare($query_update)
+            $query_update = "UPDATE Roadwork SET Last = \'$myTime\' WHERE raw = \'$myLage $myNamn $myTyp\'";
+            $sth          = $dbh->prepare($query_update)
               or print "Can't prepare $query_update: $dbh->errstr\n";
             $sth->execute() or print "can't execute the query: $sth->errstr\n";
         }
diff --git a/code/public/Roger/vvaprs.pl b/code/public/Roger/vvaprs.pl
index 5a9758d5d..9a7ec863a 100644
--- a/code/public/Roger/vvaprs.pl
+++ b/code/public/Roger/vvaprs.pl
@@ -3,16 +3,9 @@
 # Roger Bille
 
 use DBI;
-my (
-    $dbh2,    $query_update2, $query_insert2, $query_select2,
-    $sth2,    $sth3,          @row2,          $count,
-    $aprs_vv, $aprs_time2
-);
+my ( $dbh2, $query_update2, $query_insert2, $query_select2, $sth2, $sth3, @row2, $count, $aprs_vv, $aprs_time2 );
 my ($myTime);
-my (
-    $myraw,  $myTyp,  $myLan, $myLatLon, $myID,
-    $myNamn, $myDesc, $i,     $k,        $objName
-);
+my ( $myraw, $myTyp, $myLan, $myLatLon, $myID, $myNamn, $myDesc, $i, $k, $objName );
 my ( $mySecond, $myMinute, $myHour,  $myMday, $myMonth, $myYear );
 my ( $RID,      $RName,    $RLatLon, $LID,    $LName,   $LLatLon );
 
@@ -46,9 +39,7 @@
     $count = 0;
 
     #		$myTime = $Year . "-" . $Month . "-" . $Mday . " " . $Time_Now;
-    while ( ( $myraw, $myLatLon, $myID, $myTyp, $myLan, $myNamn ) =
-        $sth2->fetchrow_array )
-    {
+    while ( ( $myraw, $myLatLon, $myID, $myTyp, $myLan, $myNamn ) = $sth2->fetchrow_array ) {
         $count++;
 
         #			print_msg "==> $myraw";
@@ -64,8 +55,7 @@
             $i       = ( 9 - length($objName) );
             $k       = ' ';
             $k       = ( $k x $i );
-            ( $mySecond, $myMinute, $myHour, $myMday, $myMonth, $myYear ) =
-              gmtime $Time;
+            ( $mySecond, $myMinute, $myHour, $myMday, $myMonth, $myYear ) = gmtime $Time;
             if ( $myMday < 10 )   { $myMday   = "0" . $myMday }
             if ( $myHour < 10 )   { $myHour   = "0" . $myHour }
             if ( $myMinute < 10 ) { $myMinute = "0" . $myMinute }
@@ -82,9 +72,8 @@
 
             #				set	$tnc_output3	$aprs_vv;
 
-            $query_update2 =
-              "UPDATE Roadwork SET Sent = $Time,Send = No WHERE raw = \'$myraw\'";
-            $sth3 = $dbh2->prepare($query_update2)
+            $query_update2 = "UPDATE Roadwork SET Sent = $Time,Send = No WHERE raw = \'$myraw\'";
+            $sth3          = $dbh2->prepare($query_update2)
               or print "Can't prepare $query_update2: $dbh2->errstr\n";
             $sth3->execute()
               or print "can't execute the query: $sth3->errstr\n";
@@ -145,24 +134,20 @@
       or print "Can't prepare $query_select: $dbh5->errstr\n";
     $sth5->execute() or print "can't execute the query: $sth5->errstr\n";
     $count = 1;
-    while ( ( $RID, $RName, $RLatLon, $LID, $LName, $LLatLon ) =
-        $sth5->fetchrow_array )
-    {
+    while ( ( $RID, $RName, $RLatLon, $LID, $LName, $LLatLon ) = $sth5->fetchrow_array ) {
         $count++;
         print "==> $RID, $RName, $RLatLon, $LID, $LName, $LLatLon";
         if ( $RLatLon eq "" and $LLatLon ne "" ) {
-            $query_update2 =
-              "UPDATE Roadwork SET LatLon = \'$LLatLon\' WHERE ID = $RID";
-            $sth3 = $dbh5->prepare($query_update2)
+            $query_update2 = "UPDATE Roadwork SET LatLon = \'$LLatLon\' WHERE ID = $RID";
+            $sth3          = $dbh5->prepare($query_update2)
               or print "Can't prepare $query_update2: $dbh5->errstr\n";
             $sth3->execute()
               or print "can't execute the query: $sth3->errstr\n";
             $sth3->finish();
         }
         if ( $RLatLon ne "" and $LLatLon eq "" ) {
-            $query_update2 =
-              "UPDATE Location SET LatLon = \'$RLatLon\' WHERE ID = $LID";
-            $sth3 = $dbh5->prepare($query_update2)
+            $query_update2 = "UPDATE Location SET LatLon = \'$RLatLon\' WHERE ID = $LID";
+            $sth3          = $dbh5->prepare($query_update2)
               or print "Can't prepare $query_update2: $dbh5->errstr\n";
             $sth3->execute()
               or print "can't execute the query: $sth3->errstr\n";
diff --git a/code/public/Roger/weather_se.pl b/code/public/Roger/weather_se.pl
index d2d0ac56d..0eb94ac75 100644
--- a/code/public/Roger/weather_se.pl
+++ b/code/public/Roger/weather_se.pl
@@ -18,26 +18,14 @@
 #my	$StateProvince = $config_parms{state};
 #my	$CityPage =	$config_parms{city};
 #
-my (
-    $text,     @data,           $data,       $data_temp,
-    $data_dew, $wind_direction, $wind_speed, $gust_speed,
-    $temp,     $dew,            $presure,    $dag
-);
-my (
-    @airport,        $aprs_ws,        $aprs_winddir,
-    $aprs_windspeed, $aprs_gustspeed, $aprs_temp,
-    $aprs_dev,       $aprs_presure,   $aprs_time
-);
-my (
-    $aprs_humidity, $AirportCode, $AirportPos,
-    $AirportName,   $AirportLine, $Metar
-);
+my ( $text, @data, $data, $data_temp, $data_dew, $wind_direction, $wind_speed, $gust_speed, $temp, $dew, $presure, $dag );
+my ( @airport, $aprs_ws, $aprs_winddir, $aprs_windspeed, $aprs_gustspeed, $aprs_temp, $aprs_dev, $aprs_presure, $aprs_time );
+my ( $aprs_humidity, $AirportCode, $AirportPos, $AirportName, $AirportLine, $Metar );
 my ( $E_pressure, $Es_pressure );
 my $HtmlFindFlag = 0;
 ######my $WeatherURL="http://www.egats.org/cgibin/wxread2.cgi?stations=ESKN";	###	Does not work yet, ESKN	in 2 places
-my $WeatherURL = "http://blinder.lfv.se/cgi/met/metar.sweden";
-my $WeatherURLForecast =
-  "http://www.tv4.se/nyheterna/vadret/vadret_sverige2.asp?lan=13&location=156";
+my $WeatherURL         = "http://blinder.lfv.se/cgi/met/metar.sweden";
+my $WeatherURLForecast = "http://www.tv4.se/nyheterna/vadret/vadret_sverige2.asp?lan=13&location=156";
 
 ######my $WeatherFile=(split(/\./, (split(/\//,$WeatherURL))[5]	))[0];
 my $WeatherFile         = "weather_conditions";
@@ -48,12 +36,9 @@
 $p_weather_page = new Process_Item("get_url	$WeatherURL	$f_weather_html");
 $v_weather_page = new Voice_Cmd('[Get,Read,Show] weather conditions');
 $v_weather_page->set_info('Get	the	weather	conditions at Skavsta airport');
-my $f_weather_forecast_page =
-  "$config_parms{data_dir}/web/$WeatherFileForecast.txt";
-my $f_weather_forecast_html =
-  "$config_parms{data_dir}/web/$WeatherFileForecast.html";
-$p_weather_forecast_page =
-  new Process_Item("get_url $WeatherURLForecast $f_weather_forecast_html");
+my $f_weather_forecast_page = "$config_parms{data_dir}/web/$WeatherFileForecast.txt";
+my $f_weather_forecast_html = "$config_parms{data_dir}/web/$WeatherFileForecast.html";
+$p_weather_forecast_page = new Process_Item("get_url $WeatherURLForecast $f_weather_forecast_html");
 $v_weather_forecast_page = new Voice_Cmd('[Get,Read,Show] weather forecast');
 $v_weather_forecast_page->set_info('Get the weather forecast from TV4');
 ####$v_weather_page-> set_info("Weather	conditions and forecast	for	$config_parms{city}, $config_parms{state}  $config_parms{country}");
@@ -69,8 +54,8 @@
 
 if ($Reload) {
     open( AIRPOS, "$config_parms{code_dir}/weather.pos" );    #	Open for input
-    @airport = <AIRPOS>;    #	Open array and read	in data
-    close AIRPOS;           #	Close the file
+    @airport = <AIRPOS>;                                      #	Open array and read	in data
+    close AIRPOS;                                             #	Close the file
 }
 
 #speak($f_weather_page)
@@ -116,8 +101,7 @@
     # Do this only if we the file has not already been updated today and it	is not empty
     if (    0
         and -s $f_weather_forecast_html > 10
-        and time_date_stamp( 6, $f_weather_forecast_html ) eq
-        time_date_stamp(6) )
+        and time_date_stamp( 6, $f_weather_forecast_html ) eq time_date_stamp(6) )
     {
         print_log "Weather forecast	page is	current";
         display $f_weather_forecast_page;
@@ -140,8 +124,7 @@
 if ( done_now $p_weather_page) {
     my $html = file_read $f_weather_html;
 
-    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($html) );
+    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )->format( HTML::TreeBuilder->new()->parse($html) );
 
     # New section for APRS Weather objects - Roger Bille
     # V0.1	2001-06-16
@@ -151,103 +134,86 @@
     foreach $AirportLine (@airport) {    # Run for each airport in array
         ( $AirportCode, $AirportPos, $AirportName ) =
           ( split( ',', $AirportLine ) )[ 0, 1, 2 ];    # Split	each line
-        chomp $AirportName;    # Remove any trailing linefeed
+        chomp $AirportName;                             # Remove any trailing linefeed
 
-        if ( $text =~ /$AirportCode / ) {    # Check	if Airport is in text
-            $Metar = $text;                     # Copy text	so it is not changed
-            $Metar =~ s/.+$AirportCode /$1/s;   # Remove all before
-            $Metar =~ s/=.+/$1/s;               # Remove all after
+        if ( $text =~ /$AirportCode / ) {               # Check	if Airport is in text
+            $Metar = $text;                             # Copy text	so it is not changed
+            $Metar =~ s/.+$AirportCode /$1/s;           # Remove all before
+            $Metar =~ s/=.+/$1/s;                       # Remove all after
 
-            @data = split( ' ', $Metar );       # Split	field by field
-            foreach $data (@data) {             # Process each field
+            @data = split( ' ', $Metar );               # Split	field by field
+            foreach $data (@data) {                     # Process each field
 
-                if ( $data =~ /KT/ ) {    # Check	if Wind	data (03010KT,VRB02KT)
+                if ( $data =~ /KT/ ) {                  # Check	if Wind	data (03010KT,VRB02KT)
                     $aprs_winddir = substr( $data, 0, 3 );    # Wind direction
-                    if ( $aprs_winddir eq "VRB" )
-                    {    # Check	if variable	direction
-                        $aprs_winddir = "...";    # Set aprs to variable
+                    if ( $aprs_winddir eq "VRB" ) {           # Check	if variable	direction
+                        $aprs_winddir = "...";                # Set aprs to variable
                     }
-                    $wind_speed = substr( $data, 3, 2 );    # Windspeed	in knot
-                    $wind_speed =~ s/^0+/$1/s;    # Remove beginning 0�s
+                    $wind_speed = substr( $data, 3, 2 );      # Windspeed	in knot
+                    $wind_speed =~ s/^0+/$1/s;                # Remove beginning 0�s
                     $aprs_windspeed =
-                      sprintf( "%03d", $wind_speed * 1.852 / 1.609344 )
-                      ;    # Convert to mph with 3 characters	beginning with 0's
+                      sprintf( "%03d", $wind_speed * 1.852 / 1.609344 );    # Convert to mph with 3 characters	beginning with 0's
                     $gust_speed = 0;
                     if ( $data =~ /G/ ) {
                         $gust_speed = substr( $data, 6, 2 );
                         $aprs_gustspeed =
-                          sprintf( "%03d", $gust_speed * 1.852 / 1.609344 )
-                          ; # Convert to mph with 3 characters	beginning with 0's
+                          sprintf( "%03d", $gust_speed * 1.852 / 1.609344 );   # Convert to mph with 3 characters	beginning with 0's
                     }
                 }
 
-                if ( $data =~ /\// ) {    # Check	if Temp	and	Dew
+                if ( $data =~ /\// ) {                                         # Check	if Temp	and	Dew
                     ( $data_temp, $data_dew ) =
-                      split( "/", $data );    # Split	temp and dew
-                    if ( $data_temp =~ /M/ ) {    # Check	if negative
-                        $temp = substr( $data_temp, 1, 2 );    # Temperatur in	C
-                        $temp =~ s/^0+/$1/s;    # Remove beginning 0's
-                        $temp = $temp * -1;     # Negative
+                      split( "/", $data );                                     # Split	temp and dew
+                    if ( $data_temp =~ /M/ ) {                                 # Check	if negative
+                        $temp = substr( $data_temp, 1, 2 );                    # Temperatur in	C
+                        $temp =~ s/^0+/$1/s;                                   # Remove beginning 0's
+                        $temp = $temp * -1;                                    # Negative
                     }
                     else {
-                        $temp = substr( $data_temp, 0, 2 );    # Temperatur in	C
-                        $temp =~ s/^0+/$1/s;    # Remove beginning 0's
+                        $temp = substr( $data_temp, 0, 2 );                    # Temperatur in	C
+                        $temp =~ s/^0+/$1/s;                                   # Remove beginning 0's
                     }
-                    if ( $data_dew =~ /M/ ) {    # Check	if negative
-                        $dew = substr( $data_dew, 1, 2 );    # Dewpoint in C
-                        $dew =~ s/^0+/$1/s;    # Remove beginning 0's
-                        $dew = $dew * -1;      # Negative
+                    if ( $data_dew =~ /M/ ) {                                  # Check	if negative
+                        $dew = substr( $data_dew, 1, 2 );                      # Dewpoint in C
+                        $dew =~ s/^0+/$1/s;                                    # Remove beginning 0's
+                        $dew = $dew * -1;                                      # Negative
                     }
                     else {
-                        $dew = substr( $data_dew, 0, 2 );    # Dewpoint in C
-                        $dew =~ s/^0+/$1/s;    # Remove beginning 0's
+                        $dew = substr( $data_dew, 0, 2 );                      # Dewpoint in C
+                        $dew =~ s/^0+/$1/s;                                    # Remove beginning 0's
                     }
-                    $aprs_temp = sprintf( "%03d", $temp * 9 / 5 + 32 )
-                      ;                        # Convert to F with	formating
-                    $aprs_dev = sprintf( "%03d", $dew * 9 / 5 + 32 )
-                      ;                        # Convert to F with	formating
-                    $Es_pressure =
-                      6.11 * 10.0**( 7.5 * $temp / ( 237.7 + $temp ) )
-                      ;    # Caluculate Saturation	Vapor Pressure
-                    $E_pressure = 6.11 * 10.0**( 7.5 * $dew / ( 237.7 + $dew ) )
-                      ;    # Caluculate Actual	Vapor Pressure
-                    $aprs_humidity = ( $E_pressure / $Es_pressure ) *
-                      100;    # Calculate	Relative Humidity
-                    if ( $aprs_humidity >= 100 )
-                    {         # Check	if humidity	is 100%	or more
-                        $aprs_humidity =
-                          99;    # Convert to APRS format (of 100% =	00)
+                    $aprs_temp = sprintf( "%03d", $temp * 9 / 5 + 32 );        # Convert to F with	formating
+                    $aprs_dev  = sprintf( "%03d", $dew * 9 / 5 + 32 );         # Convert to F with	formating
+                    $Es_pressure = 6.11 * 10.0**( 7.5 * $temp / ( 237.7 + $temp ) );    # Caluculate Saturation	Vapor Pressure
+                    $E_pressure  = 6.11 * 10.0**( 7.5 * $dew /  ( 237.7 + $dew ) );     # Caluculate Actual	Vapor Pressure
+                    $aprs_humidity = ( $E_pressure / $Es_pressure ) * 100;              # Calculate	Relative Humidity
+                    if ( $aprs_humidity >= 100 ) {                                      # Check	if humidity	is 100%	or more
+                        $aprs_humidity = 99;                                            # Convert to APRS format (of 100% =	00)
                     }
-                    $aprs_humidity = sprintf( "%02d", $aprs_humidity )
-                      ;          # Convert to APRS format
+                    $aprs_humidity = sprintf( "%02d", $aprs_humidity );                 # Convert to APRS format
                 }
 
-                if ( $data =~ /Q\d{4}/ ) {    # Check	if Presure (Q1011)
+                if ( $data =~ /Q\d{4}/ ) {                                              # Check	if Presure (Q1011)
                     $presure = substr( $data, 1, 4 );    # Presure in mbar
-                    $aprs_presure = $presure . "0"
-                      ;    # Format and add extra 0 for presure in	thenth:s mbar
+                    $aprs_presure = $presure . "0";      # Format and add extra 0 for presure in	thenth:s mbar
                 }
 
-                if ( $data =~ /\d{6}Z/ ) {    # Check	for	time stamp (172130Z)
+                if ( $data =~ /\d{6}Z/ ) {               # Check	for	time stamp (172130Z)
                     $aprs_time = substr( $data, 0, 6 );    # Time stamp in	zulu
                 }
 
             }    # End foreach field
                  # Create APRS packet
-            $aprs_ws =
-                "SM5NRK-1>APRS,TRACE5-5:;"
-              . $AirportCode
-              . "     *";    # Header + Airport
-            $aprs_ws =
-              $aprs_ws . $aprs_time . "z" . $AirportPos . "_";    # Time + Pos
-            $aprs_ws = $aprs_ws . $aprs_winddir . "/" . $aprs_windspeed;  # Wind
+            $aprs_ws = "SM5NRK-1>APRS,TRACE5-5:;" . $AirportCode . "     *";    # Header + Airport
+            $aprs_ws = $aprs_ws . $aprs_time . "z" . $AirportPos . "_";         # Time + Pos
+            $aprs_ws = $aprs_ws . $aprs_winddir . "/" . $aprs_windspeed;        # Wind
             if ( $gust_speed != 0 ) {
-                $aprs_ws = $aprs_ws . "g" . $aprs_gustspeed;              # Gust
+                $aprs_ws = $aprs_ws . "g" . $aprs_gustspeed;                    # Gust
             }
-            $aprs_ws = $aprs_ws . "t" . $aprs_temp;        # Temperatur
-            $aprs_ws = $aprs_ws . "b" . $aprs_presure;     # Presure
-            $aprs_ws = $aprs_ws . "h" . $aprs_humidity;    # Humidity
-            $aprs_ws = $aprs_ws . " $AirportName";         # Comment
+            $aprs_ws = $aprs_ws . "t" . $aprs_temp;                             # Temperatur
+            $aprs_ws = $aprs_ws . "b" . $aprs_presure;                          # Presure
+            $aprs_ws = $aprs_ws . "h" . $aprs_humidity;                         # Humidity
+            $aprs_ws = $aprs_ws . " $AirportName";                              # Comment
 
             #			print "$aprs_ws\n";
             set $tnc_output $aprs_ws;
@@ -375,8 +341,7 @@
 if ( done_now $p_weather_forecast_page) {
     my $html = file_read $f_weather_forecast_html;
 
-    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($html) );
+    $text = HTML::FormatText->new( leftmargin => 0, rightmargin => 150 )->format( HTML::TreeBuilder->new()->parse($html) );
 
     print_log $text;
     print_log $Day;
diff --git a/code/public/Xantech_test.pl b/code/public/Xantech_test.pl
index 677b24008..2d44257f1 100644
--- a/code/public/Xantech_test.pl
+++ b/code/public/Xantech_test.pl
@@ -7,8 +7,7 @@
 # The ZPR68 has 6 zones and 8 inputs
 
 # Change these to the names of your rooms
-my @zone_names =
-  ( "ALL Zones", "Zone 1", "Zone 2", "Zone 3", "Zone 4", "Zone 5", "Zone 6" );
+my @zone_names = ( "ALL Zones", "Zone 1", "Zone 2", "Zone 3", "Zone 4", "Zone 5", "Zone 6" );
 
 # Change these to the names of your input sources
 my @input_names = ( "INVALID", "1", "2", "3", "4", "5", "6", "7", "8" );
@@ -43,12 +42,10 @@
     # Mute
     $data .= "<td>";
     if ( $zone_ptr->getstate_mute ) {
-        $data .=
-          "<A href='?set_mute=0&set_zone=$zone_name'> <font color='red'>ON</A>";
+        $data .= "<A href='?set_mute=0&set_zone=$zone_name'> <font color='red'>ON</A>";
     }
     else {
-        $data .=
-          "<A href='?set_mute=1&set_zone=$zone_name'> <font color='green'>OFF</A>";
+        $data .= "<A href='?set_mute=1&set_zone=$zone_name'> <font color='green'>OFF</A>";
     }
 
     # Volume
diff --git a/code/public/Xmms_jukebox.pl b/code/public/Xmms_jukebox.pl
index 0ec11931e..b6acdd142 100644
--- a/code/public/Xmms_jukebox.pl
+++ b/code/public/Xmms_jukebox.pl
@@ -15,14 +15,13 @@
 $v_Play = new Voice_Cmd '[Play] song';
 $v_Play->set_info("Play song on the jukebox");
 
-$v_Stop   = new Voice_Cmd '[Stop] song';
-$v_Pause  = new Voice_Cmd '[Pause] the jukebox';
-$v_Random = new Voice_Cmd '[Randomize] the playlist';
-$v_Sort   = new Voice_Cmd '[Sort] the playlist';
-$v_Next   = new Voice_Cmd '[Next] song';
-$v_Prev   = new Voice_Cmd '[Prev] song';
-$v_Volume =
-  new Voice_Cmd("Set volume to [0,10,20,30,40,50,60,65,70,75,80,85,90,95,100]");
+$v_Stop     = new Voice_Cmd '[Stop] song';
+$v_Pause    = new Voice_Cmd '[Pause] the jukebox';
+$v_Random   = new Voice_Cmd '[Randomize] the playlist';
+$v_Sort     = new Voice_Cmd '[Sort] the playlist';
+$v_Next     = new Voice_Cmd '[Next] song';
+$v_Prev     = new Voice_Cmd '[Prev] song';
+$v_Volume   = new Voice_Cmd("Set volume to [0,10,20,30,40,50,60,65,70,75,80,85,90,95,100]");
 $v_Playlist = new Voice_Cmd("Set Playlist number [1,2,3,4]");
 $v_Now      = new Voice_Cmd("[Now] playing");
 set_icon $v_Now 'music';
diff --git a/code/public/alarm_concept.pl b/code/public/alarm_concept.pl
index 6034b6fb8..2ba0b741e 100644
--- a/code/public/alarm_concept.pl
+++ b/code/public/alarm_concept.pl
@@ -7,15 +7,12 @@
 #####################################################################
 
 # Create the Alarm objects
-my $ComputerRoom = new ConceptZone( 'Computer Room', 120 )
-  ;    # Zone object to handle the motion sensor in the computer room
-my $LoungeRoom =
-  new ConceptZone( 'Lounge Room', 120 );   # Motion sensor in the computer room.
-my $BedRoom =
-  new ConceptZone( 'Bed Room', 120 );      # Motion Sensor in the bed room
-my $BAbyRoom = new ConceptZone( 'Baby Room', 120 );
-my $BackDoor = new ConceptZone('Back Door');    # Read switch on back door
-my $FrontDoor = new ConceptZone('Front Door');   # Reed switch on the front door
+my $ComputerRoom = new ConceptZone( 'Computer Room', 120 );    # Zone object to handle the motion sensor in the computer room
+my $LoungeRoom   = new ConceptZone( 'Lounge Room',   120 );    # Motion sensor in the computer room.
+my $BedRoom      = new ConceptZone( 'Bed Room',      120 );    # Motion Sensor in the bed room
+my $BAbyRoom     = new ConceptZone( 'Baby Room',     120 );
+my $BackDoor  = new ConceptZone('Back Door');                  # Read switch on back door
+my $FrontDoor = new ConceptZone('Front Door');                 # Reed switch on the front door
 
 my $state;
 my $CompLastState;
diff --git a/code/public/alarmclock_david.pl b/code/public/alarmclock_david.pl
index d74ce227f..5f3a5ecfa 100644
--- a/code/public/alarmclock_david.pl
+++ b/code/public/alarmclock_david.pl
@@ -51,12 +51,7 @@
 $v_wakeup_parents = new Voice_Cmd('Wakeup the parents');
 $v_wakeup_parents->set_info("Do not do this!  Parents like to sleep.");
 
-if (
-    (
-            time_now( $Save{wakeup_time} )
-        and $Weekday
-        and $Save{mode} ne 'offline'
-    )
+if ( ( time_now( $Save{wakeup_time} ) and $Weekday and $Save{mode} ne 'offline' )
     or said $v_wakeup_parents)
 {
     $Save{mode}             = 'normal';
diff --git a/code/public/alarmclock_evan.pl b/code/public/alarmclock_evan.pl
index ea309635d..55ee573d3 100644
--- a/code/public/alarmclock_evan.pl
+++ b/code/public/alarmclock_evan.pl
@@ -34,8 +34,7 @@
     if ( $state eq 'on' and $alarm_state eq 'off' ) {         # Set
         if ( $Wday < 5 ) {
             $alarm_switch = "set";
-            speak
-              "Good Night Maggie, Tomorrow is a school day. I have set your alarm for $Save{alarm1_time}";
+            speak "Good Night Maggie, Tomorrow is a school day. I have set your alarm for $Save{alarm1_time}";
         }
         speak "Good Night Maggie" if $Wday > 4;
 
diff --git a/code/public/asterisk_gregg.pl b/code/public/asterisk_gregg.pl
index 653a101fb..906113779 100644
--- a/code/public/asterisk_gregg.pl
+++ b/code/public/asterisk_gregg.pl
@@ -67,11 +67,8 @@
 
 # create the net callerid item instance - since we can use the call waiting feature
 # which * doesn't support for FXO lines
-$ncid_tel_item = new Telephony_Interface(
-    $config_parms{callerid_name},
-    $config_parms{callerid_port},
-    $config_parms{callerid_type}
-);
+$ncid_tel_item =
+  new Telephony_Interface( $config_parms{callerid_name}, $config_parms{callerid_port}, $config_parms{callerid_type} );
 
 # create the lookup object so that inbound and outbound numbers can be converted
 # add both telephony interface items to it
@@ -95,8 +92,7 @@
 # location info derived from area code.  Instead just speak the number if not in
 # my phone.callerid.list and/or if the callername includes the words "call" in it
 # (which is virtually call cell calls and many businesses)
-$cid_announce =
-  new CID_Announce1( $cid_look, 'Call from $format1 on $address' );
+$cid_announce = new CID_Announce1( $cid_look, 'Call from $format1 on $address' );
 
 # tie OSD logic to a cid lookup state change
 # This is used to display CID info on my squeezebox.  Note that it uses
@@ -135,8 +131,7 @@ sub display_vm_info {
     my $vm_msg = "$username has $gregg_vm_new new vm message(s)";
 
     # display the message for 15 seconds
-    &xAP::send( 'xPL', 'slimdev-slimserv.squeezebox',
-        'osd.basic' => { command => 'write', delay => 15, text => $vm_msg } );
+    &xAP::send( 'xPL', 'slimdev-slimserv.squeezebox', 'osd.basic' => { command => 'write', delay => 15, text => $vm_msg } );
 }
 
 sub onoff_hook {
@@ -146,18 +141,10 @@ sub onoff_hook {
             print "gregg desk cid hook\n";
         }
         elsif ( $tel_item->state_now =~ /^onhook/i ) {
-            &xAP::send(
-                'xPL',
-                'xplmedia-client.basementdesk',
-                'media.basic' => { command => 'mute', state => 'OFF' }
-            );
+            &xAP::send( 'xPL', 'xplmedia-client.basementdesk', 'media.basic' => { command => 'mute', state => 'OFF' } );
         }
         elsif ( $tel_item->state_now =~ /^offhook/i ) {
-            &xAP::send(
-                'xPL',
-                'xplmedia-client.basementdesk',
-                'media.basic' => { command => 'mute', state => 'ON' }
-            );
+            &xAP::send( 'xPL', 'xplmedia-client.basementdesk', 'media.basic' => { command => 'mute', state => 'ON' } );
         }
     }
     else {
diff --git a/code/public/asterisk_jason_mhcommand.agi b/code/public/asterisk_jason_mhcommand.agi
index 832800216..b42fd811c 100644
--- a/code/public/asterisk_jason_mhcommand.agi
+++ b/code/public/asterisk_jason_mhcommand.agi
@@ -145,7 +145,6 @@ sub send_voice {
 
     #	$response = $response .	"\nport=" . $port ;
     $response = $response . "\n}\n";
-    $response =
-      $response . $XAP_CLASS . "\n{\ncommand=" . $p_command . "\n" . "}\n";
+    $response = $response . $XAP_CLASS . "\n{\ncommand=" . $p_command . "\n" . "}\n";
     return $response;
 }
diff --git a/code/public/asterisk_robert.pl b/code/public/asterisk_robert.pl
index 6b5a00ba6..f137ed647 100644
--- a/code/public/asterisk_robert.pl
+++ b/code/public/asterisk_robert.pl
@@ -113,15 +113,9 @@
             my $callername   = $1;
             my $callernumber = $2;
             my $astline      = $3;
-            &asterisk_logit( "in", $callernumber, &make_bettername($callername),
-                $ast_to_name{$astline} );
+            &asterisk_logit( "in", $callernumber, &make_bettername($callername), $ast_to_name{$astline} );
             stop $asterisk_server;
-            respond(
-                "mode=unmuted Call from "
-                  . &make_speakable(
-                    $callername, $callernumber, $ast_to_name{$astline}
-                  )
-            );
+            respond( "mode=unmuted Call from " . &make_speakable( $callername, $callernumber, $ast_to_name{$astline} ) );
 
         }
         elsif ( $data =~ /DTMF:/ ) {
@@ -214,8 +208,6 @@ sub asterisk_logit {
     else {
         $filename = 'phone';
     }
-    &::logit(
-        "$::config_parms{data_dir}/phone/logs/$filename.$::Year_Month_Now.log",
-        "number=$number name=$name line=$line type=$type"
-    );
+    &::logit( "$::config_parms{data_dir}/phone/logs/$filename.$::Year_Month_Now.log",
+        "number=$number name=$name line=$line type=$type" );
 }
diff --git a/code/public/asterisk_robert_misterhouse.agi b/code/public/asterisk_robert_misterhouse.agi
index 76885c2bd..4dd84117e 100644
--- a/code/public/asterisk_robert_misterhouse.agi
+++ b/code/public/asterisk_robert_misterhouse.agi
@@ -109,15 +109,13 @@ sub speak_text {
     my ($text) = @_;
     verbose("TTS type is: $ttstype");
     verbose("TEXT OUTPUT: $text");
-    ( undef, $filename ) =
-      tempfile( "/tmp/misterhouseXXXXX", SUFFIX => ".wav" );
+    ( undef, $filename ) = tempfile( "/tmp/misterhouseXXXXX", SUFFIX => ".wav" );
     if ( $ttstype eq "theta" ) {
         $ENV{THETA_HOME} = dirname( dirname($ttscommand) );
         system("$ttscommand -F 8000 -o $filename \"$text\"");
     }
     if ( $ttstype eq "text2wave" ) {
-        system(
-            "echo \"$text\" | $ttscommand -scale 1.5 -F 8000 -o $filename -");
+        system("echo \"$text\" | $ttscommand -scale 1.5 -F 8000 -o $filename -");
     }
     $streamfile = substr( $filename, 0, -4 );
     $AGI->stream_file($streamfile);
diff --git a/code/public/audrey_cid.pl b/code/public/audrey_cid.pl
index 7ceced1f4..2567e758d 100644
--- a/code/public/audrey_cid.pl
+++ b/code/public/audrey_cid.pl
@@ -51,8 +51,7 @@
     # If we have other callerID interfaces (e.g. phone_modem.pl)
     # lets not repeat ourselfs here.
     unless ( $Time - $Save{phone_callerid_Time} < 3 ) {
-        $Save{phone_callerid_nmbr} =
-          $cid_number;    # Save last caller for display in lcdproc.pl
+        $Save{phone_callerid_nmbr} = $cid_number;       # Save last caller for display in lcdproc.pl
         $Save{phone_callerid_time} = "$Hour:$Minute";
         $Save{phone_callerid_Time} = $Time;
 
@@ -61,10 +60,7 @@
         speak voice => 'Female', text => $cid_string;
 
         #  speak("rooms=all_and_out mode=unmuted $caller");
-        logit(
-            "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-            "$cid_number name=$cid_name data=NA line=W" );
-        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-            $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
+        logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$cid_number name=$cid_name data=NA line=W" );
+        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
     }
 }
diff --git a/code/public/caddx.pl b/code/public/caddx.pl
index 88e624a6c..a6f85ef49 100644
--- a/code/public/caddx.pl
+++ b/code/public/caddx.pl
@@ -154,9 +154,8 @@
     "\x10" => ["\x30"],
     "\x12" => [ "\x32", "\x33", "\x34", "\x35" ],
     "\x1d" => sub { &rm_pending_xmit("ack"); },    # msg OK, flush pending msg
-    "\x1f" => sub { &rm_pending_xmit("nak"); }
-    ,    # msg rejected, kill whatever msg caused it
-    "\x1e" => sub { &force_resend() }    # nak from host, resend
+    "\x1f" => sub { &rm_pending_xmit("nak"); },    # msg rejected, kill whatever msg caused it
+    "\x1e" => sub { &force_resend() }              # nak from host, resend
 
 );
 
@@ -351,8 +350,7 @@ BEGIN
         $ob->read_const_time(5000);    ## use a (shorter) timeout
     }
     else {
-        $ob->read_const_time(60000)
-          ;    ## not much to do anyway (except keep an eye on rtc drift)
+        $ob->read_const_time(60000);    ## not much to do anyway (except keep an eye on rtc drift)
     }
 
     my $result;
@@ -525,11 +523,8 @@ sub set_clock {
     $debug_msg && print "set clock processing\n";
     $last_set_clock = $now;
 
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime($now);
-    my $time_hex = pack( "C C C C C C",
-        $year % 100,
-        $mon + 1, $mday, $hour, $min, $wday + 1 );
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime($now);
+    my $time_hex = pack( "C C C C C C", $year % 100, $mon + 1, $mday, $hour, $min, $wday + 1 );
     my $time_fmt = unpack( "H*", $time_hex );
 
     &dump( $time_hex, "time_hex" );
@@ -736,11 +731,7 @@ sub apply_ack {
             }
             else {
 
-                $debug_io && printf(
-                    "pending msg  [%02x] not ack'ed by [%02x]\n",
-                    ord( $xmit_q[0]{msgnum} ),
-                    ord($msghex)
-                );
+                $debug_io && printf( "pending msg  [%02x] not ack'ed by [%02x]\n", ord( $xmit_q[0]{msgnum} ), ord($msghex) );
             }
         }
     }
@@ -910,13 +901,11 @@ sub cache_info {
     my ( $key1, $key2, $data ) = @_;
     my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
       localtime( time() );
-    my $tfmt =
-      sprintf( "%02d/%02d %02d:%02d:%02d", $mon + 1, $mday, $hour, $min, $sec );
+    my $tfmt = sprintf( "%02d/%02d %02d:%02d:%02d", $mon + 1, $mday, $hour, $min, $sec );
 
     if ( exists( $zone_hash{$key1}{$key2} ) ) {
         if ( $zone_hash{$key1}{$key2} ne $data ) {
-            print "$tfmt cache_info changing [$key1],[$key2] from:",
-              "[$zone_hash{$key1}{$key2}], to [$data]\n";
+            print "$tfmt cache_info changing [$key1],[$key2] from:", "[$zone_hash{$key1}{$key2}], to [$data]\n";
             &cache_modified( "old", @_ );
         }
         else {
@@ -953,12 +942,10 @@ sub cache_modified {
 
     ## and report partition transitions...
     if ( $key2 eq "armed" ) {
-        &udp_send(
-            "partition=$key1" . "&" . "$key2=$data&time=$msg_recv_time\n" );
+        &udp_send( "partition=$key1" . "&" . "$key2=$data&time=$msg_recv_time\n" );
     }
     if ( $key2 eq "stay" ) {
-        &udp_send(
-            "partition=$key1" . "&" . "$key2=$data&time=$msg_recv_time\n" );
+        &udp_send( "partition=$key1" . "&" . "$key2=$data&time=$msg_recv_time\n" );
     }
 }
 
diff --git a/code/public/caddx_build_parse.pl b/code/public/caddx_build_parse.pl
index d39343428..1d039f35d 100644
--- a/code/public/caddx_build_parse.pl
+++ b/code/public/caddx_build_parse.pl
@@ -91,8 +91,7 @@ sub main {
                 my $bit  = $2;
 
                 if ( $bit =~ /\d+/ ) {
-                    $code .=
-                      "\$datum=&caddx::parse::getbits(\$msgb[$byte],'$bit') ;\n";
+                    $code .= "\$datum=&caddx::parse::getbits(\$msgb[$byte],'$bit') ;\n";
                     ## $code .= "push(\@msgdata, ['$loc','$name',&getbits(\$msgb[$byte],'$bit') ]);\n";
                 }
                 elsif ( defined $byte ) {
diff --git a/code/public/caddx_parse.pm b/code/public/caddx_parse.pm
index 2b5ae73b7..b2e4a6b40 100644
--- a/code/public/caddx_parse.pm
+++ b/code/public/caddx_parse.pm
@@ -20,68 +20,35 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = join( '', @msgb[ 2 .. 5 ] );
-                    push(
-                        @msgdata,
-                        [
-                            '2-5:', 'Firmware version (i.e. 1.00 (ASCII))',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '2-5:', 'Firmware version (i.e. 1.00 (ASCII))', $datum ] );
                     $datum = $msgb[6];
-                    push(
-                        @msgdata,
-                        [
-                            '6:', 'Supported transition message flags (1)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '6:', 'Supported transition message flags (1)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '0' );
                     push( @msgdata, [ '6:0', '(00h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '1' );
-                    push(
-                        @msgdata,
-                        [
-                            '6:1', '(01h) Interface Configuration Message',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '6:1', '(01h) Interface Configuration Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '2' );
                     push( @msgdata, [ '6:2', '(02h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '3' );
                     push( @msgdata, [ '6:3', '(03h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '4' );
-                    push( @msgdata,
-                        [ '6:4', '(04h) Zone Status Message', $datum ] );
+                    push( @msgdata, [ '6:4', '(04h) Zone Status Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '5' );
-                    push( @msgdata,
-                        [ '6:5', '(05h) Zones Snapshot Message', $datum ] );
+                    push( @msgdata, [ '6:5', '(05h) Zones Snapshot Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '6' );
-                    push( @msgdata,
-                        [ '6:6', '(06h) Partition Status Message', $datum ] );
+                    push( @msgdata, [ '6:6', '(06h) Partition Status Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
-                    push( @msgdata,
-                        [ '6:7', '(07h) Partitions Snapshot Message', $datum ]
-                    );
+                    push( @msgdata, [ '6:7', '(07h) Partitions Snapshot Message', $datum ] );
                     $datum = $msgb[7];
-                    push(
-                        @msgdata,
-                        [
-                            '7:', 'Supported transition message flags (2)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '7:', 'Supported transition message flags (2)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '0' );
-                    push( @msgdata,
-                        [ '7:0', '(08h) System Status Message', $datum ] );
+                    push( @msgdata, [ '7:0', '(08h) System Status Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '1' );
-                    push( @msgdata,
-                        [ '7:1', '(09h) X-10 Message Received', $datum ] );
+                    push( @msgdata, [ '7:1', '(09h) X-10 Message Received', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '2' );
-                    push( @msgdata,
-                        [ '7:2', '(0Ah) Log Event Message', $datum ] );
+                    push( @msgdata, [ '7:2', '(0Ah) Log Event Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '3' );
-                    push( @msgdata,
-                        [ '7:3', '(0Bh) Keypad Message Received', $datum ] );
+                    push( @msgdata, [ '7:3', '(0Bh) Keypad Message Received', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '4' );
                     push( @msgdata, [ '7:4', '(0Ch) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '5' );
@@ -91,65 +58,35 @@
                     $datum = &caddx::parse::getbits( $msgb[7], '7' );
                     push( @msgdata, [ '7:7', '(0Fh) Reserved', $datum ] );
                     $datum = $msgb[8];
-                    push(
-                        @msgdata,
-                        [
-                            '8:', 'Supported request / command flags (1)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '8:', 'Supported request / command flags (1)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '0' );
                     push( @msgdata, [ '8:0', '(20h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '1' );
-                    push(
-                        @msgdata,
-                        [
-                            '8:1', '(21h) Interface Configuration Request',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '8:1', '(21h) Interface Configuration Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '2' );
                     push( @msgdata, [ '8:2', '(22h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '3' );
-                    push( @msgdata,
-                        [ '8:3', '(23h) Zone Name Request', $datum ] );
+                    push( @msgdata, [ '8:3', '(23h) Zone Name Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '4' );
-                    push( @msgdata,
-                        [ '8:4', '(24h) Zone Status Request', $datum ] );
+                    push( @msgdata, [ '8:4', '(24h) Zone Status Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '5' );
-                    push( @msgdata,
-                        [ '8:5', '(25h) Zones Snapshot Request', $datum ] );
+                    push( @msgdata, [ '8:5', '(25h) Zones Snapshot Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '6' );
-                    push( @msgdata,
-                        [ '8:6', '(26h) Partition Status Request', $datum ] );
+                    push( @msgdata, [ '8:6', '(26h) Partition Status Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '7' );
-                    push( @msgdata,
-                        [ '8:7', '(27h) Partitions Snapshot Request', $datum ]
-                    );
+                    push( @msgdata, [ '8:7', '(27h) Partitions Snapshot Request', $datum ] );
                     $datum = $msgb[9];
-                    push(
-                        @msgdata,
-                        [
-                            '9:', 'Supported request / command flags (2)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '9:', 'Supported request / command flags (2)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '0' );
-                    push( @msgdata,
-                        [ '9:0', '(28h) System Status Request', $datum ] );
+                    push( @msgdata, [ '9:0', '(28h) System Status Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '1' );
-                    push( @msgdata,
-                        [ '9:1', '(29h) Send X-10 Message', $datum ] );
+                    push( @msgdata, [ '9:1', '(29h) Send X-10 Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '2' );
-                    push( @msgdata,
-                        [ '9:2', '(2Ah) Log Event Request', $datum ] );
+                    push( @msgdata, [ '9:2', '(2Ah) Log Event Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '3' );
-                    push( @msgdata,
-                        [ '9:3', '(2Bh) Send Keypad Text Message', $datum ] );
+                    push( @msgdata, [ '9:3', '(2Bh) Send Keypad Text Message', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '4' );
-                    push( @msgdata,
-                        [ '9:4', '(2Ch) Keypad Terminal Mode Request', $datum ]
-                    );
+                    push( @msgdata, [ '9:4', '(2Ch) Keypad Terminal Mode Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '5' );
                     push( @msgdata, [ '9:5', '(2Dh) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '6' );
@@ -157,122 +94,43 @@
                     $datum = &caddx::parse::getbits( $msgb[9], '7' );
                     push( @msgdata, [ '9:7', '(2Fh) Reserved', $datum ] );
                     $datum = $msgb[10];
-                    push(
-                        @msgdata,
-                        [
-                            '10:', 'Supported request / command flags (3)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:', 'Supported request / command flags (3)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '0' );
-                    push( @msgdata,
-                        [ '10:0', '(30h) Program Data Request', $datum ] );
+                    push( @msgdata, [ '10:0', '(30h) Program Data Request', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '1' );
-                    push( @msgdata,
-                        [ '10:1', '(31h) Program Data Command', $datum ] );
+                    push( @msgdata, [ '10:1', '(31h) Program Data Command', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '2' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:2', '(32h) User Information Request with PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:2', '(32h) User Information Request with PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '3' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:3',
-                            '(33h) User Information Request without PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:3', '(33h) User Information Request without PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '4' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:4', '(34h) Set User Code Command with PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:4', '(34h) Set User Code Command with PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '5' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:5', '(35h) Set User Code Command without PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:5', '(35h) Set User Code Command without PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '6' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:6',
-                            '(36h) Set User Authorization Command with PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:6', '(36h) Set User Authorization Command with PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '7' );
-                    push(
-                        @msgdata,
-                        [
-                            '10:7',
-                            '(37h) Set User Authorization Command without PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:7', '(37h) Set User Authorization Command without PIN', $datum ] );
                     $datum = $msgb[11];
-                    push(
-                        @msgdata,
-                        [
-                            '11:', 'Supported request / command flags (4)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '11:', 'Supported request / command flags (4)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '0' );
                     push( @msgdata, [ '11:0', '(38h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '1' );
                     push( @msgdata, [ '11:1', '(39h) Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '2' );
-                    push(
-                        @msgdata,
-                        [
-                            '11:2', '(3Ah) Store Communication Event Command',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '11:2', '(3Ah) Store Communication Event Command', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '3' );
-                    push(
-                        @msgdata,
-                        [
-                            '11:3', '(3Bh) Set Clock / Calendar Command',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '11:3', '(3Bh) Set Clock / Calendar Command', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '4' );
-                    push(
-                        @msgdata,
-                        [
-                            '11:4', '(3Ch) Primary Keypad Function with PIN',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '11:4', '(3Ch) Primary Keypad Function with PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '5' );
-                    push(
-                        @msgdata,
-                        [
-                            '11:5',
-                            '(3Dh) Primary Keypad Function without PIN', $datum
-                        ]
-                    );
+                    push( @msgdata, [ '11:5', '(3Dh) Primary Keypad Function without PIN', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '6' );
-                    push( @msgdata,
-                        [ '11:6', '(3Eh) Secondary Keypad Function', $datum ] );
+                    push( @msgdata, [ '11:6', '(3Eh) Secondary Keypad Function', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[11], '7' );
-                    push( @msgdata,
-                        [ '11:7', '(3Fh) Zone Bypass Toggle', $datum ] );
+                    push( @msgdata, [ '11:7', '(3Fh) Zone Bypass Toggle', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [03H]
@@ -292,8 +150,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', '{zone} number (0= zone 1)', $datum ] );
+                    push( @msgdata, [ '2:', '{zone} number (0= zone 1)', $datum ] );
                     $msghash{zone} = $datum;
                     $datum = $msgb[3];
                     push( @msgdata, [ '3:', 'Zone name character 1', $datum ] );
@@ -310,37 +167,28 @@
                     $datum = $msgb[9];
                     push( @msgdata, [ '9:', 'Zone name character 7', $datum ] );
                     $datum = $msgb[10];
-                    push( @msgdata,
-                        [ '10:', 'Zone name character 8', $datum ] );
+                    push( @msgdata, [ '10:', 'Zone name character 8', $datum ] );
                     $datum = $msgb[11];
-                    push( @msgdata,
-                        [ '11:', 'Zone name character 9', $datum ] );
+                    push( @msgdata, [ '11:', 'Zone name character 9', $datum ] );
                     $datum = $msgb[12];
-                    push( @msgdata,
-                        [ '12:', 'Zone name character 10', $datum ] );
+                    push( @msgdata, [ '12:', 'Zone name character 10', $datum ] );
                     $datum = $msgb[13];
-                    push( @msgdata,
-                        [ '13:', 'Zone name character 11', $datum ] );
+                    push( @msgdata, [ '13:', 'Zone name character 11', $datum ] );
                     $datum = $msgb[14];
-                    push( @msgdata,
-                        [ '14:', 'Zone name character 12', $datum ] );
+                    push( @msgdata, [ '14:', 'Zone name character 12', $datum ] );
                     $datum = $msgb[15];
-                    push( @msgdata,
-                        [ '15:', 'Zone name character 13', $datum ] );
+                    push( @msgdata, [ '15:', 'Zone name character 13', $datum ] );
                     $datum = $msgb[16];
-                    push( @msgdata,
-                        [ '16:', 'Zone name character 14', $datum ] );
+                    push( @msgdata, [ '16:', 'Zone name character 14', $datum ] );
                     $datum = $msgb[17];
-                    push( @msgdata,
-                        [ '17:', 'Zone name character 15', $datum ] );
+                    push( @msgdata, [ '17:', 'Zone name character 15', $datum ] );
                     $datum = $msgb[18];
-                    push( @msgdata,
-                        [ '18:', 'Zone name character 16', $datum ] );
+                    push( @msgdata, [ '18:', 'Zone name character 16', $datum ] );
                     $datum = join( '', @msgb[ 3 .. 18 ] );
                     push( @msgdata, [ '3-18:', '{zone_name}', $datum ] );
                     $msghash{zone_name} = $datum;
                     $msghash{_parsed_}  = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                   # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [04H]
@@ -360,8 +208,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', '{zone} number (0= zone 1)', $datum ] );
+                    push( @msgdata, [ '2:', '{zone} number (0= zone 1)', $datum ] );
                     $msghash{zone} = $datum;
                     $datum = $msgb[3];
                     push( @msgdata, [ '3:', 'Partition mask', $datum ] );
@@ -392,8 +239,7 @@
                     $datum = &caddx::parse::getbits( $msgb[4], '3' );
                     push( @msgdata, [ '4:3', 'Follower', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '4' );
-                    push( @msgdata,
-                        [ '4:4', 'Entry / exit  delay 1', $datum ] );
+                    push( @msgdata, [ '4:4', 'Entry / exit  delay 1', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '5' );
                     push( @msgdata, [ '4:5', 'Entry / exit delay 2', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '6' );
@@ -437,16 +283,9 @@
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
                     push( @msgdata, [ '6:7', 'Listen in', $datum ] );
                     $datum = $msgb[7];
-                    push( @msgdata,
-                        [ '7:', 'Zone condition flags (1)', $datum ] );
+                    push( @msgdata, [ '7:', 'Zone condition flags (1)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '0' );
-                    push(
-                        @msgdata,
-                        [
-                            '7:0', '{faulted} Faulted (or delayed trip)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '7:0', '{faulted} Faulted (or delayed trip)', $datum ] );
                     $msghash{faulted} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[7], '1' );
                     push( @msgdata, [ '7:1', '{tampered} Tampered', $datum ] );
@@ -458,8 +297,7 @@
                     push( @msgdata, [ '7:3', '{bypassed} Bypassed', $datum ] );
                     $msghash{bypassed} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[7], '4' );
-                    push( @msgdata,
-                        [ '7:4', 'Inhibited (force armed)', $datum ] );
+                    push( @msgdata, [ '7:4', 'Inhibited (force armed)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '5' );
                     push( @msgdata, [ '7:5', 'Low battery', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '6' );
@@ -467,11 +305,9 @@
                     $datum = &caddx::parse::getbits( $msgb[7], '7' );
                     push( @msgdata, [ '7:7', 'Reserved', $datum ] );
                     $datum = $msgb[8];
-                    push( @msgdata,
-                        [ '8:', 'Zone condition flags (2)', $datum ] );
+                    push( @msgdata, [ '8:', 'Zone condition flags (2)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '0' );
-                    push( @msgdata,
-                        [ '8:0', '{alarm_memory} Alarm memory', $datum ] );
+                    push( @msgdata, [ '8:0', '{alarm_memory} Alarm memory', $datum ] );
                     $msghash{alarm_memory} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[8], '1' );
                     push( @msgdata, [ '8:1', 'Bypass memory', $datum ] );
@@ -488,7 +324,7 @@
                     $datum = &caddx::parse::getbits( $msgb[8], '7' );
                     push( @msgdata, [ '8:7', 'Reserved', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [05H]
@@ -508,87 +344,46 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', '{zone_offset} (0= start at zone 1)', $datum ]
-                    );
+                    push( @msgdata, [ '2:', '{zone_offset} (0= start at zone 1)', $datum ] );
                     $msghash{zone_offset} = $datum;
                     $datum = $msgb[3];
-                    push( @msgdata,
-                        [ '3:', 'Zone 1 & 2 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '3:', 'Zone 1 & 2 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '0' );
-                    push( @msgdata,
-                        [ '3:0', 'Zone 1 faulted (or delayed trip)', $datum ] );
+                    push( @msgdata, [ '3:0', 'Zone 1 faulted (or delayed trip)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '1' );
-                    push( @msgdata,
-                        [ '3:1', 'Zone 1 bypass (or inhibited)', $datum ] );
+                    push( @msgdata, [ '3:1', 'Zone 1 bypass (or inhibited)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '2' );
-                    push(
-                        @msgdata,
-                        [
-                            '3:2',
-                            'Zone 1 trouble (tamper, low battery, or lost)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '3:2', 'Zone 1 trouble (tamper, low battery, or lost)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '3' );
                     push( @msgdata, [ '3:3', 'Zone 1 alarm memory', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '4' );
-                    push( @msgdata,
-                        [ '3:4', 'Zone 2 faulted (or delayed trip)', $datum ] );
+                    push( @msgdata, [ '3:4', 'Zone 2 faulted (or delayed trip)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '5' );
-                    push( @msgdata,
-                        [ '3:5', 'Zone 2 bypass (or inhibited)', $datum ] );
+                    push( @msgdata, [ '3:5', 'Zone 2 bypass (or inhibited)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '6' );
-                    push(
-                        @msgdata,
-                        [
-                            '3:6',
-                            'Zone 2 trouble (tamper, low battery, or lost)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '3:6', 'Zone 2 trouble (tamper, low battery, or lost)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '7' );
                     push( @msgdata, [ '3:7', 'Zone 2 alarm memory', $datum ] );
                     $datum = $msgb[4];
-                    push( @msgdata,
-                        [ '4:', 'Zone 3 & 4 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '4:', 'Zone 3 & 4 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '0' );
-                    push( @msgdata,
-                        [ '4:0', 'Zone 3 faulted (or delayed trip)', $datum ] );
+                    push( @msgdata, [ '4:0', 'Zone 3 faulted (or delayed trip)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '1' );
-                    push( @msgdata,
-                        [ '4:1', 'Zone 3 bypass (or inhibited)', $datum ] );
+                    push( @msgdata, [ '4:1', 'Zone 3 bypass (or inhibited)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '2' );
-                    push(
-                        @msgdata,
-                        [
-                            '4:2',
-                            'Zone 3 trouble (tamper, low battery, or lost)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '4:2', 'Zone 3 trouble (tamper, low battery, or lost)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '3' );
                     push( @msgdata, [ '4:3', 'Zone 3 alarm memory', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '4' );
-                    push( @msgdata,
-                        [ '4:4', 'Zone 4 faulted (or delayed trip)', $datum ] );
+                    push( @msgdata, [ '4:4', 'Zone 4 faulted (or delayed trip)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '5' );
-                    push( @msgdata,
-                        [ '4:5', 'Zone 4 bypass (or inhibited)', $datum ] );
+                    push( @msgdata, [ '4:5', 'Zone 4 bypass (or inhibited)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '6' );
-                    push(
-                        @msgdata,
-                        [
-                            '4:6',
-                            'Zone 4 trouble (tamper, low battery, or lost)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '4:6', 'Zone 4 trouble (tamper, low battery, or lost)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '7' );
                     push( @msgdata, [ '4:7', 'Zone 4 alarm memory', $datum ] );
                     $datum = $msgb[3];
-                    push( @msgdata,
-                        [ '3:', 'Zone 1 & 2 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '3:', 'Zone 1 & 2 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '0-3' );
                     push( @msgdata, [ '3:0-3', '{Zone1} zsnap', $datum ] );
                     $msghash{Zone1} = $datum;
@@ -596,8 +391,7 @@
                     push( @msgdata, [ '3:4-7', '{Zone2} zsnap', $datum ] );
                     $msghash{Zone2} = $datum;
                     $datum = $msgb[4];
-                    push( @msgdata,
-                        [ '4:', 'Zone 3 & 4 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '4:', 'Zone 3 & 4 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '0-3' );
                     push( @msgdata, [ '4:0-3', '{Zone3} zsnap', $datum ] );
                     $msghash{Zone3} = $datum;
@@ -605,8 +399,7 @@
                     push( @msgdata, [ '4:4-7', '{Zone4} zsnap', $datum ] );
                     $msghash{Zone4} = $datum;
                     $datum = $msgb[5];
-                    push( @msgdata,
-                        [ '5:', 'Zone 5 & 6 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '5:', 'Zone 5 & 6 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '0-3' );
                     push( @msgdata, [ '5:0-3', '{Zone5} zsnap', $datum ] );
                     $msghash{Zone5} = $datum;
@@ -614,8 +407,7 @@
                     push( @msgdata, [ '5:4-7', '{Zone6} zsnap', $datum ] );
                     $msghash{Zone6} = $datum;
                     $datum = $msgb[6];
-                    push( @msgdata,
-                        [ '6:', 'Zone 7 & 8 (+offset) status flags', $datum ] );
+                    push( @msgdata, [ '6:', 'Zone 7 & 8 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '0-3' );
                     push( @msgdata, [ '6:0-3', '{Zone7} zsnap', $datum ] );
                     $msghash{Zone7} = $datum;
@@ -623,9 +415,7 @@
                     push( @msgdata, [ '6:4-7', '{Zone8} zsnap', $datum ] );
                     $msghash{Zone8} = $datum;
                     $datum = $msgb[7];
-                    push( @msgdata,
-                        [ '7:', 'Zone 9 & 10 (+offset) status flags', $datum ]
-                    );
+                    push( @msgdata, [ '7:', 'Zone 9 & 10 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '0-3' );
                     push( @msgdata, [ '7:0-3', '{Zone9} zsnap', $datum ] );
                     $msghash{Zone9} = $datum;
@@ -633,9 +423,7 @@
                     push( @msgdata, [ '7:4-7', '{Zone10} zsnap', $datum ] );
                     $msghash{Zone10} = $datum;
                     $datum = $msgb[8];
-                    push( @msgdata,
-                        [ '8:', 'Zone 11 & 12 (+offset) status flags', $datum ]
-                    );
+                    push( @msgdata, [ '8:', 'Zone 11 & 12 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '0-3' );
                     push( @msgdata, [ '8:0-3', '{Zone11} zsnap', $datum ] );
                     $msghash{Zone11} = $datum;
@@ -643,9 +431,7 @@
                     push( @msgdata, [ '8:4-7', '{Zone12} zsnap', $datum ] );
                     $msghash{Zone12} = $datum;
                     $datum = $msgb[9];
-                    push( @msgdata,
-                        [ '9:', 'Zone 13 & 14 (+offset) status flags', $datum ]
-                    );
+                    push( @msgdata, [ '9:', 'Zone 13 & 14 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '0-3' );
                     push( @msgdata, [ '9:0-3', '{Zone13} zsnap', $datum ] );
                     $msghash{Zone13} = $datum;
@@ -653,13 +439,7 @@
                     push( @msgdata, [ '9:4-7', '{Zone14} zsnap', $datum ] );
                     $msghash{Zone14} = $datum;
                     $datum = $msgb[10];
-                    push(
-                        @msgdata,
-                        [
-                            '10:', 'Zone 15 & 16 (+offset) status flags',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '10:', 'Zone 15 & 16 (+offset) status flags', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '0-3' );
                     push( @msgdata, [ '10:0-3', '{Zone15} zsnap', $datum ] );
                     $msghash{Zone15} = $datum;
@@ -667,7 +447,7 @@
                     push( @msgdata, [ '10:4-7', '{Zone16} zsnap', $datum ] );
                     $msghash{Zone16}   = $datum;
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [06H]
@@ -687,18 +467,10 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push(
-                        @msgdata,
-                        [
-                            '2:',
-                            '{hex_partition} Partition number (0= partition 1)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '2:', '{hex_partition} Partition number (0= partition 1)', $datum ] );
                     $msghash{hex_partition} = $datum;
                     $datum = $msgb[3];
-                    push( @msgdata,
-                        [ '3:', 'Partition condition flags (1)', $datum ] );
+                    push( @msgdata, [ '3:', 'Partition condition flags (1)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '0' );
                     push( @msgdata, [ '3:0', 'Bypass code required', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '1' );
@@ -717,8 +489,7 @@
                     $datum = &caddx::parse::getbits( $msgb[3], '7' );
                     push( @msgdata, [ '3:7', 'Instant', $datum ] );
                     $datum = $msgb[4];
-                    push( @msgdata,
-                        [ '4:', 'Partition condition flags (2)', $datum ] );
+                    push( @msgdata, [ '4:', 'Partition condition flags (2)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '0' );
                     push( @msgdata, [ '4:0', 'Previous Alarm', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '1' );
@@ -730,22 +501,19 @@
                     $datum = &caddx::parse::getbits( $msgb[4], '4' );
                     push( @msgdata, [ '4:4', 'Tamper', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '5' );
-                    push( @msgdata,
-                        [ '4:5', 'Cancel command entered', $datum ] );
+                    push( @msgdata, [ '4:5', 'Cancel command entered', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '6' );
                     push( @msgdata, [ '4:6', 'Code entered', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '7' );
                     push( @msgdata, [ '4:7', 'Cancel pending', $datum ] );
                     $datum = $msgb[5];
-                    push( @msgdata,
-                        [ '5:', 'Partition condition flags (3)', $datum ] );
+                    push( @msgdata, [ '5:', 'Partition condition flags (3)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '0' );
                     push( @msgdata, [ '5:0', 'Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '1' );
                     push( @msgdata, [ '5:1', 'Silent exit enabled', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '2' );
-                    push( @msgdata,
-                        [ '5:2', 'Entryguard ({stay} mode)', $datum ] );
+                    push( @msgdata, [ '5:2', 'Entryguard ({stay} mode)', $datum ] );
                     $msghash{stay} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[5], '3' );
                     push( @msgdata, [ '5:3', '{chime} mode on', $datum ] );
@@ -753,22 +521,19 @@
                     $datum = &caddx::parse::getbits( $msgb[5], '4' );
                     push( @msgdata, [ '5:4', 'Entry', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '5' );
-                    push( @msgdata,
-                        [ '5:5', 'Delay expiration warning', $datum ] );
+                    push( @msgdata, [ '5:5', 'Delay expiration warning', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '6' );
                     push( @msgdata, [ '5:6', 'Exit1', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '7' );
                     push( @msgdata, [ '5:7', 'Exit2', $datum ] );
                     $datum = $msgb[6];
-                    push( @msgdata,
-                        [ '6:', 'Partition condition flags (4)', $datum ] );
+                    push( @msgdata, [ '6:', 'Partition condition flags (4)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '0' );
                     push( @msgdata, [ '6:0', 'LED extinguish', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '1' );
                     push( @msgdata, [ '6:1', 'Cross timing', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '2' );
-                    push( @msgdata,
-                        [ '6:2', 'Recent closing being timed', $datum ] );
+                    push( @msgdata, [ '6:2', 'Recent closing being timed', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '3' );
                     push( @msgdata, [ '6:3', 'Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '4' );
@@ -778,18 +543,15 @@
                     $datum = &caddx::parse::getbits( $msgb[6], '6' );
                     push( @msgdata, [ '6:6', 'Sensor low battery', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
-                    push( @msgdata,
-                        [ '6:7', 'Sensor lost supervision', $datum ] );
+                    push( @msgdata, [ '6:7', 'Sensor lost supervision', $datum ] );
                     $datum = $msgb[7];
                     push( @msgdata, [ '7:', 'Last user number', $datum ] );
                     $datum = $msgb[8];
-                    push( @msgdata,
-                        [ '8:', 'Partition condition flags (5)', $datum ] );
+                    push( @msgdata, [ '8:', 'Partition condition flags (5)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '0' );
                     push( @msgdata, [ '8:0', 'Re-exit active', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '1' );
-                    push( @msgdata,
-                        [ '8:1', 'Force arm triggered by auto arm', $datum ] );
+                    push( @msgdata, [ '8:1', 'Force arm triggered by auto arm', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '2' );
                     push( @msgdata, [ '8:2', '{ready} to arm', $datum ] );
                     $msghash{ready} = $datum;
@@ -800,41 +562,29 @@
                     $datum = &caddx::parse::getbits( $msgb[8], '5' );
                     push( @msgdata, [ '8:5', 'Chime on (sounding)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '6' );
-                    push( @msgdata,
-                        [ '8:6', 'Error beep (triple beep)', $datum ] );
+                    push( @msgdata, [ '8:6', 'Error beep (triple beep)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '7' );
-                    push( @msgdata,
-                        [ '8:7', 'Tone on (activation tone)', $datum ] );
+                    push( @msgdata, [ '8:7', 'Tone on (activation tone)', $datum ] );
                     $datum = $msgb[9];
-                    push( @msgdata,
-                        [ '9:', 'Partition condition flags (6)', $datum ] );
+                    push( @msgdata, [ '9:', 'Partition condition flags (6)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '0' );
                     push( @msgdata, [ '9:0', 'Entry 1', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '1' );
                     push( @msgdata, [ '9:1', 'Open period', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '2' );
-                    push( @msgdata,
-                        [ '9:2', 'Alarm sent using phone number 1', $datum ] );
+                    push( @msgdata, [ '9:2', 'Alarm sent using phone number 1', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '3' );
-                    push( @msgdata,
-                        [ '9:3', 'Alarm sent using phone number 2', $datum ] );
+                    push( @msgdata, [ '9:3', 'Alarm sent using phone number 2', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '4' );
-                    push( @msgdata,
-                        [ '9:4', 'Alarm sent using phone number 3', $datum ] );
+                    push( @msgdata, [ '9:4', 'Alarm sent using phone number 3', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '5' );
                     push( @msgdata, [ '9:5', 'Zone bypassed', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '6' );
                     push( @msgdata, [ '9:6', 'Keyswitch armed', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '7' );
-                    push(
-                        @msgdata,
-                        [
-                            '9:7', 'Delay Trip in progress (common zone)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '9:7', 'Delay Trip in progress (common zone)', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [07H]
@@ -854,47 +604,31 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', '{partition1} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '2:', '{partition1} psnap condition flags', $datum ] );
                     $msghash{partition1} = $datum;
                     $datum = $msgb[3];
-                    push( @msgdata,
-                        [ '3:', '{partition2} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '3:', '{partition2} psnap condition flags', $datum ] );
                     $msghash{partition2} = $datum;
                     $datum = $msgb[4];
-                    push( @msgdata,
-                        [ '4:', '{partition3} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '4:', '{partition3} psnap condition flags', $datum ] );
                     $msghash{partition3} = $datum;
                     $datum = $msgb[5];
-                    push( @msgdata,
-                        [ '5:', '{partition4} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '5:', '{partition4} psnap condition flags', $datum ] );
                     $msghash{partition4} = $datum;
                     $datum = $msgb[6];
-                    push( @msgdata,
-                        [ '6:', '{partition5} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '6:', '{partition5} psnap condition flags', $datum ] );
                     $msghash{partition5} = $datum;
                     $datum = $msgb[7];
-                    push( @msgdata,
-                        [ '7:', '{partition6} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '7:', '{partition6} psnap condition flags', $datum ] );
                     $msghash{partition6} = $datum;
                     $datum = $msgb[8];
-                    push( @msgdata,
-                        [ '8:', '{partition7} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '8:', '{partition7} psnap condition flags', $datum ] );
                     $msghash{partition7} = $datum;
                     $datum = $msgb[9];
-                    push( @msgdata,
-                        [ '9:', '{partition8} psnap condition flags', $datum ]
-                    );
+                    push( @msgdata, [ '9:', '{partition8} psnap condition flags', $datum ] );
                     $msghash{partition8} = $datum;
                     $msghash{_parsed_}   = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                    # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [08H]
@@ -922,13 +656,11 @@
                     $datum = &caddx::parse::getbits( $msgb[3], '1' );
                     push( @msgdata, [ '3:1', 'Off hook', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '2' );
-                    push( @msgdata,
-                        [ '3:2', 'Initial handshake received', $datum ] );
+                    push( @msgdata, [ '3:2', 'Initial handshake received', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '3' );
                     push( @msgdata, [ '3:3', 'Download in progress', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '4' );
-                    push( @msgdata,
-                        [ '3:4', 'Dialer delay in progress', $datum ] );
+                    push( @msgdata, [ '3:4', 'Dialer delay in progress', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '5' );
                     push( @msgdata, [ '3:5', 'Using backup phone', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '6' );
@@ -948,8 +680,7 @@
                     $datum = &caddx::parse::getbits( $msgb[4], '4' );
                     push( @msgdata, [ '4:4', 'Box tamper', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '5' );
-                    push( @msgdata,
-                        [ '4:5', 'Siren tamper / trouble', $datum ] );
+                    push( @msgdata, [ '4:5', 'Siren tamper / trouble', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '6' );
                     push( @msgdata, [ '4:6', 'Low Battery', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '7' );
@@ -963,24 +694,11 @@
                     $datum = &caddx::parse::getbits( $msgb[5], '2' );
                     push( @msgdata, [ '5:2', 'Expander low battery', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '3' );
-                    push( @msgdata,
-                        [ '5:3', 'Expander loss of supervision', $datum ] );
+                    push( @msgdata, [ '5:3', 'Expander loss of supervision', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '4' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:4', 'Expander auxiliary output over current',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:4', 'Expander auxiliary output over current', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '5' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:5', 'Auxiliary communication channel failure',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:5', 'Auxiliary communication channel failure', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '6' );
                     push( @msgdata, [ '5:6', 'Expander bell fault', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '7' );
@@ -990,29 +708,19 @@
                     $datum = &caddx::parse::getbits( $msgb[6], '0' );
                     push( @msgdata, [ '6:0', '6 digit PIN enabled', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '1' );
-                    push( @msgdata,
-                        [ '6:1', 'Programming token in use', $datum ] );
+                    push( @msgdata, [ '6:1', 'Programming token in use', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '2' );
-                    push( @msgdata,
-                        [ '6:2', 'PIN required for local download', $datum ] );
+                    push( @msgdata, [ '6:2', 'PIN required for local download', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '3' );
-                    push( @msgdata,
-                        [ '6:3', 'Global pulsing buzzer', $datum ] );
+                    push( @msgdata, [ '6:3', 'Global pulsing buzzer', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '4' );
                     push( @msgdata, [ '6:4', 'Global Siren on', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '5' );
                     push( @msgdata, [ '6:5', 'Global steady siren ', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '6' );
-                    push( @msgdata,
-                        [ '6:6', 'Bus device has line seized', $datum ] );
+                    push( @msgdata, [ '6:6', 'Bus device has line seized', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
-                    push(
-                        @msgdata,
-                        [
-                            '6:7', 'Bus device has requested sniff mode',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '6:7', 'Bus device has requested sniff mode', $datum ] );
                     $datum = $msgb[7];
                     push( @msgdata, [ '7:', '', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '0' );
@@ -1024,35 +732,19 @@
                     $datum = &caddx::parse::getbits( $msgb[7], '3' );
                     push( @msgdata, [ '7:3', 'Ground fault memory', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '4' );
-                    push(
-                        @msgdata,
-                        [
-                            '7:4', 'Fire alarm verification being timed',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '7:4', 'Fire alarm verification being timed', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '5' );
                     push( @msgdata, [ '7:5', 'Smoke power reset', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '6' );
-                    push( @msgdata,
-                        [ '7:6', '50 Hz line power detected', $datum ] );
+                    push( @msgdata, [ '7:6', '50 Hz line power detected', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '7' );
-                    push(
-                        @msgdata,
-                        [
-                            '7:7', 'Timing a high voltage battery charge',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '7:7', 'Timing a high voltage battery charge', $datum ] );
                     $datum = $msgb[8];
                     push( @msgdata, [ '8:', '', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '0' );
-                    push( @msgdata,
-                        [ '8:0', 'Communication since last autotest', $datum ]
-                    );
+                    push( @msgdata, [ '8:0', 'Communication since last autotest', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '1' );
-                    push( @msgdata,
-                        [ '8:1', 'Power up delay in progress', $datum ] );
+                    push( @msgdata, [ '8:1', 'Power up delay in progress', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '2' );
                     push( @msgdata, [ '8:2', 'Walk test mode', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '3' );
@@ -1062,11 +754,9 @@
                     $datum = &caddx::parse::getbits( $msgb[8], '5' );
                     push( @msgdata, [ '8:5', 'Test fixture mode', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '6' );
-                    push( @msgdata,
-                        [ '8:6', 'Control shutdown mode', $datum ] );
+                    push( @msgdata, [ '8:6', 'Control shutdown mode', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[8], '7' );
-                    push( @msgdata,
-                        [ '8:7', 'Timing a cancel window', $datum ] );
+                    push( @msgdata, [ '8:7', 'Timing a cancel window', $datum ] );
                     $datum = $msgb[9];
                     push( @msgdata, [ '9:', '', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '0' );
@@ -1084,27 +774,21 @@
                     $datum = &caddx::parse::getbits( $msgb[9], '6' );
                     push( @msgdata, [ '9:6', 'reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[9], '7' );
-                    push( @msgdata,
-                        [ '9:7', 'Call back in progress', $datum ] );
+                    push( @msgdata, [ '9:7', 'Call back in progress', $datum ] );
                     $datum = $msgb[10];
                     push( @msgdata, [ '10:', '', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '0' );
                     push( @msgdata, [ '10:0', 'Phone line faulted', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '1' );
-                    push( @msgdata,
-                        [ '10:1', 'Voltage present interrupt active', $datum ]
-                    );
+                    push( @msgdata, [ '10:1', 'Voltage present interrupt active', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '2' );
-                    push( @msgdata,
-                        [ '10:2', 'House phone off hook', $datum ] );
+                    push( @msgdata, [ '10:2', 'House phone off hook', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '3' );
-                    push( @msgdata,
-                        [ '10:3', 'Phone line monitor enabled', $datum ] );
+                    push( @msgdata, [ '10:3', 'Phone line monitor enabled', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '4' );
                     push( @msgdata, [ '10:4', 'Sniffing', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '5' );
-                    push( @msgdata,
-                        [ '10:5', 'Last read was off hook', $datum ] );
+                    push( @msgdata, [ '10:5', 'Last read was off hook', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '6' );
                     push( @msgdata, [ '10:6', 'Listen in requested', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[10], '7' );
@@ -1128,10 +812,9 @@
                     $datum = &caddx::parse::getbits( $msgb[11], '7' );
                     push( @msgdata, [ '11:7', 'Valid partition 8', $datum ] );
                     $datum = $msgb[12];
-                    push( @msgdata,
-                        [ '12:', 'Communicator stack pointer', $datum ] );
+                    push( @msgdata, [ '12:', 'Communicator stack pointer', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [09H]
@@ -1151,20 +834,13 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', 'House code (0=house A)', $datum ] );
+                    push( @msgdata, [ '2:', 'House code (0=house A)', $datum ] );
                     $datum = $msgb[3];
                     push( @msgdata, [ '3:', 'Unit code (0=unit 1)', $datum ] );
                     $datum = $msgb[4];
-                    push(
-                        @msgdata,
-                        [
-                            '4:', 'X-10 function code (see table that follows)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '4:', 'X-10 function code (see table that follows)', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [0AH]
@@ -1184,43 +860,19 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', 'Event number of this message', $datum ] );
+                    push( @msgdata, [ '2:', 'Event number of this message', $datum ] );
                     $datum = $msgb[3];
-                    push(
-                        @msgdata,
-                        [
-                            '3:',
-                            'Total log size (number of log entries allowed)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '3:', 'Total log size (number of log entries allowed)', $datum ] );
                     $datum = $msgb[4];
                     push( @msgdata, [ '4:', 'Event type', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '0-6' );
-                    push(
-                        @msgdata,
-                        [
-                            '4:0-6',
-                            'See type definitions in table that follows',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '4:0-6', 'See type definitions in table that follows', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[4], '7' );
-                    push( @msgdata,
-                        [ '4:7', 'Non-reporting event if not set', $datum ] );
+                    push( @msgdata, [ '4:7', 'Non-reporting event if not set', $datum ] );
                     $datum = $msgb[5];
-                    push( @msgdata,
-                        [ '5:', 'Zone / User / Device number', $datum ] );
+                    push( @msgdata, [ '5:', 'Zone / User / Device number', $datum ] );
                     $datum = $msgb[6];
-                    push(
-                        @msgdata,
-                        [
-                            '6:',
-                            'Partition number (0=partition 1, if relevant)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '6:', 'Partition number (0=partition 1, if relevant)', $datum ] );
                     $datum = $msgb[7];
                     push( @msgdata, [ '7:', 'Month (1-12)', $datum ] );
                     $datum = $msgb[8];
@@ -1230,7 +882,7 @@
                     $datum = $msgb[10];
                     push( @msgdata, [ '10:', 'Minute (0-59)', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [0BH]
@@ -1254,7 +906,7 @@
                     $datum = $msgb[3];
                     push( @msgdata, [ '3:', 'Key value', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [10H]
@@ -1276,46 +928,25 @@
                     $datum = $msgb[2];
                     push( @msgdata, [ '2:', 'Device�s buss address', $datum ] );
                     $datum = $msgb[3];
-                    push( @msgdata,
-                        [ '3:', 'Upper logical location / offset', $datum ] );
+                    push( @msgdata, [ '3:', 'Upper logical location / offset', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '0-3' );
-                    push( @msgdata,
-                        [ '3:0-3', 'Bits 8-11 of logical location', $datum ] );
+                    push( @msgdata, [ '3:0-3', 'Bits 8-11 of logical location', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '4' );
-                    push( @msgdata,
-                        [ '3:4', 'Segment size (0=byte, 1=nibble)', $datum ] );
+                    push( @msgdata, [ '3:4', 'Segment size (0=byte, 1=nibble)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '5' );
                     push( @msgdata, [ '3:5', 'Must be 0', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '6' );
-                    push( @msgdata,
-                        [ '3:6', 'Segment offset (0-none, 1=8 bytes)', $datum ]
-                    );
+                    push( @msgdata, [ '3:6', 'Segment offset (0-none, 1=8 bytes)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '7' );
                     push( @msgdata, [ '3:7', 'Must be 0', $datum ] );
                     $datum = $msgb[4];
-                    push( @msgdata,
-                        [ '4:', 'Bits 0-7 of logical location', $datum ] );
+                    push( @msgdata, [ '4:', 'Bits 0-7 of logical location', $datum ] );
                     $datum = $msgb[5];
-                    push( @msgdata,
-                        [ '5:', 'Location length / data type', $datum ] );
+                    push( @msgdata, [ '5:', 'Location length / data type', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '0-4' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:0-4',
-                            'Number of segments in location (0=1 segment)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:0-4', 'Number of segments in location (0=1 segment)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '5-7' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:5-7',
-                            'Data type : 0=Binary,1=Decimal,2=Hex,3=Asc',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:5-7', 'Data type : 0=Binary,1=Decimal,2=Hex,3=Asc', $datum ] );
                     $datum = $msgb[6];
                     push( @msgdata, [ '6:', 'Data byte ', $datum ] );
                     $datum = $msgb[7];
@@ -1333,7 +964,7 @@
                     $datum = $msgb[13];
                     push( @msgdata, [ '13:', 'Data byte ', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [12H]
@@ -1353,8 +984,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message number', $datum ] );
                     $datum = $msgb[2];
-                    push( @msgdata,
-                        [ '2:', 'User Number (1=user 1)', $datum ] );
+                    push( @msgdata, [ '2:', 'User Number (1=user 1)', $datum ] );
                     $datum = $msgb[3];
                     push( @msgdata, [ '3:', 'PIN digits 1 & 2', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[3], '0-3' );
@@ -1370,32 +1000,17 @@
                     $datum = $msgb[5];
                     push( @msgdata, [ '5:', 'PIN digits 5 & 6', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '0-3' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:0-3', 'PIN digit 5 (pad with 0 if 4 digit PIN)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:0-3', 'PIN digit 5 (pad with 0 if 4 digit PIN)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[5], '4-7' );
-                    push(
-                        @msgdata,
-                        [
-                            '5:4-7', 'PIN digit 6 (pad with 0 if 4 digit PIN)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '5:4-7', 'PIN digit 6 (pad with 0 if 4 digit PIN)', $datum ] );
                     $datum = $msgb[6];
-                    push( @msgdata,
-                        [ '6:', 'Authority flags (if bit 7 is clear)', $datum ]
-                    );
+                    push( @msgdata, [ '6:', 'Authority flags (if bit 7 is clear)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '0' );
                     push( @msgdata, [ '6:0', 'Reserved', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '1' );
                     push( @msgdata, [ '6:1', 'Arm only', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '2' );
-                    push( @msgdata,
-                        [ '6:2', 'Arm only (during close window) ', $datum ] );
+                    push( @msgdata, [ '6:2', 'Arm only (during close window) ', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '3' );
                     push( @msgdata, [ '6:3', 'Master / program ', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '4' );
@@ -1403,13 +1018,11 @@
                     $datum = &caddx::parse::getbits( $msgb[6], '5' );
                     push( @msgdata, [ '6:5', 'Bypass enable', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '6' );
-                    push( @msgdata,
-                        [ '6:6', 'Open / close report enable', $datum ] );
+                    push( @msgdata, [ '6:6', 'Open / close report enable', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
                     push( @msgdata, [ '6:7', 'Must be a 0', $datum ] );
                     $datum = $msgb[6];
-                    push( @msgdata,
-                        [ '6:', 'Authority flags (if bit 7 is set)', $datum ] );
+                    push( @msgdata, [ '6:', 'Authority flags (if bit 7 is set)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '0' );
                     push( @msgdata, [ '6:0', 'Output 1 enable', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '1' );
@@ -1423,39 +1036,29 @@
                     $datum = &caddx::parse::getbits( $msgb[6], '5' );
                     push( @msgdata, [ '6:5', 'Bypass enable', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '6' );
-                    push( @msgdata,
-                        [ '6:6', 'Open / close report enable', $datum ] );
+                    push( @msgdata, [ '6:6', 'Open / close report enable', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[6], '7' );
                     push( @msgdata, [ '6:7', 'Must be a 1', $datum ] );
                     $datum = $msgb[7];
-                    push( @msgdata,
-                        [ '7:', 'Authorized partition(s) mask', $datum ] );
+                    push( @msgdata, [ '7:', 'Authorized partition(s) mask', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '0' );
-                    push( @msgdata,
-                        [ '7:0', 'Authorized for partition 1', $datum ] );
+                    push( @msgdata, [ '7:0', 'Authorized for partition 1', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '1' );
-                    push( @msgdata,
-                        [ '7:1', 'Authorized for partition 2', $datum ] );
+                    push( @msgdata, [ '7:1', 'Authorized for partition 2', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '2' );
-                    push( @msgdata,
-                        [ '7:2', 'Authorized for partition 3', $datum ] );
+                    push( @msgdata, [ '7:2', 'Authorized for partition 3', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '3' );
-                    push( @msgdata,
-                        [ '7:3', 'Authorized for partition 4', $datum ] );
+                    push( @msgdata, [ '7:3', 'Authorized for partition 4', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '4' );
-                    push( @msgdata,
-                        [ '7:4', 'Authorized for partition 5', $datum ] );
+                    push( @msgdata, [ '7:4', 'Authorized for partition 5', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '5' );
-                    push( @msgdata,
-                        [ '7:5', 'Authorized for partition 6', $datum ] );
+                    push( @msgdata, [ '7:5', 'Authorized for partition 6', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '6' );
-                    push( @msgdata,
-                        [ '7:6', 'Authorized for partition 7', $datum ] );
+                    push( @msgdata, [ '7:6', 'Authorized for partition 7', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[7], '7' );
-                    push( @msgdata,
-                        [ '7:7', 'Authorized for partition 8', $datum ] );
+                    push( @msgdata, [ '7:7', 'Authorized for partition 8', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [1CH]
@@ -1475,7 +1078,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message Number', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [1DH]
@@ -1495,7 +1098,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message Number', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [1EH]
@@ -1515,7 +1118,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message Number', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [1FH]
@@ -1535,7 +1138,7 @@
                     $datum = $msgb[1];
                     push( @msgdata, [ '1:', 'Message Number', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [PSNAP]
@@ -1553,16 +1156,9 @@
                     }
                     print "\n";
                     $datum = $msgb[1];
-                    push(
-                        @msgdata,
-                        [
-                            '1:', 'Partition snapshot layout (msg 07h detail)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '1:', 'Partition snapshot layout (msg 07h detail)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[1], '0' );
-                    push( @msgdata,
-                        [ '1:0', 'Partition {valid} partition', $datum ] );
+                    push( @msgdata, [ '1:0', 'Partition {valid} partition', $datum ] );
                     $msghash{valid} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '1' );
                     push( @msgdata, [ '1:1', 'Partition {ready}', $datum ] );
@@ -1571,24 +1167,19 @@
                     push( @msgdata, [ '1:2', 'Partition {armed}', $datum ] );
                     $msghash{armed} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '3' );
-                    push( @msgdata,
-                        [ '1:3', 'Partition {stay} mode', $datum ] );
+                    push( @msgdata, [ '1:3', 'Partition {stay} mode', $datum ] );
                     $msghash{stay} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '4' );
-                    push( @msgdata,
-                        [ '1:4', 'Partition {chime} mode', $datum ] );
+                    push( @msgdata, [ '1:4', 'Partition {chime} mode', $datum ] );
                     $msghash{chime} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '5' );
-                    push( @msgdata,
-                        [ '1:5', 'Partition  {any entry} delay', $datum ] );
+                    push( @msgdata, [ '1:5', 'Partition  {any entry} delay', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[1], '6' );
-                    push( @msgdata,
-                        [ '1:6', 'Partition {any exit} delay', $datum ] );
+                    push( @msgdata, [ '1:6', 'Partition {any exit} delay', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[1], '7' );
-                    push( @msgdata,
-                        [ '1:7', 'Partition {previous alarm}', $datum ] );
+                    push( @msgdata, [ '1:7', 'Partition {previous alarm}', $datum ] );
                     $msghash{_parsed_} = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                  # send back a hash ref to all
                 }
                 ##################################################
                 ##  Dynamically generated code to parse layout [ZSNAP]
@@ -1606,36 +1197,21 @@
                     }
                     print "\n";
                     $datum = $msgb[1];
-                    push(
-                        @msgdata,
-                        [
-                            '1:', 'Zone snapshot nibble (msg 05h detail)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '1:', 'Zone snapshot nibble (msg 05h detail)', $datum ] );
                     $datum = &caddx::parse::getbits( $msgb[1], '0' );
-                    push( @msgdata,
-                        [ '1:0', 'Zone {faulted} (or delayed trip)', $datum ] );
+                    push( @msgdata, [ '1:0', 'Zone {faulted} (or delayed trip)', $datum ] );
                     $msghash{faulted} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '1' );
-                    push( @msgdata,
-                        [ '1:1', 'Zone {bypassed} (or inhibited)', $datum ] );
+                    push( @msgdata, [ '1:1', 'Zone {bypassed} (or inhibited)', $datum ] );
                     $msghash{bypassed} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '2' );
-                    push(
-                        @msgdata,
-                        [
-                            '1:2',
-                            'Zone {trouble} (tamper, low battery, or lost)',
-                            $datum
-                        ]
-                    );
+                    push( @msgdata, [ '1:2', 'Zone {trouble} (tamper, low battery, or lost)', $datum ] );
                     $msghash{trouble} = $datum;
                     $datum = &caddx::parse::getbits( $msgb[1], '3' );
                     push( @msgdata, [ '1:3', 'Zone {alarm_memory}', $datum ] );
                     $msghash{alarm_memory} = $datum;
                     $msghash{_parsed_}     = \@msgdata;    # stash verbose parse
-                    return \%msghash;    # send back a hash ref to all
+                    return \%msghash;                      # send back a hash ref to all
                 }
 
                 sub BEGIN {
@@ -1680,9 +1256,7 @@
                         }
                         my $rc = ( $msg & $mask );
                         $debug
-                          && printf(
-                            "getbits msg:[%02x] bits:[%s], gave:[%s]\n",
-                            $orig_msg, $bits, $rc );
+                          && printf( "getbits msg:[%02x] bits:[%s], gave:[%s]\n", $orig_msg, $bits, $rc );
                         return ($rc);
                     }
                     return (-1);
diff --git a/code/public/callerid_doug.pl b/code/public/callerid_doug.pl
index 417d4218a..4dc0e22be 100644
--- a/code/public/callerid_doug.pl
+++ b/code/public/callerid_doug.pl
@@ -32,16 +32,13 @@
     my $caller_id_data = ' ' . $PhoneModemString;
 
     if ( $PhoneModemString =~ /NMBR/ ) {
-        my ($dbh) =
-          DBI->connect( "DBI:mysql:callerid:localhost", "USER", "PASS" );
-        my ( $caller, $cid_number, $cid_name, $cid_time ) =
-          &Caller_ID::make_speakable( $caller_id_data, 2 );
+        my ($dbh) = DBI->connect( "DBI:mysql:callerid:localhost", "USER", "PASS" );
+        my ( $caller, $cid_number, $cid_name, $cid_time ) = &Caller_ID::make_speakable( $caller_id_data, 2 );
 
         my $number = $cid_number;
         $number =~ tr/\-//d;
 
-        my $query_search =
-          "SELECT name FROM calls WHERE number = \"$number\" LIMIT 1;";
+        my $query_search = "SELECT name FROM calls WHERE number = \"$number\" LIMIT 1;";
 
         my $sth = $dbh->prepare($query_search);
         $sth->execute();
diff --git a/code/public/callerid_ncid.pl b/code/public/callerid_ncid.pl
index 7bb26006c..3310fcf15 100644
--- a/code/public/callerid_ncid.pl
+++ b/code/public/callerid_ncid.pl
@@ -21,15 +21,11 @@
 set_watch $NCID;
 
 if ( my $caller_id_data = said $NCID ) {
-    my ( $caller, $cid_number, $cid_name, $time ) =
-      &Caller_ID::make_speakable( $caller_id_data, 5 );
+    my ( $caller, $cid_number, $cid_name, $time ) = &Caller_ID::make_speakable( $caller_id_data, 5 );
 
     print_log "NCID data=$caller_id_data";
     print "phone number=$cid_number name=$cid_name\n";
 
-    &::logit(
-        "$::config_parms{data_dir}/phone/logs/callerid.$::Year_Month_Now.log",
-        "$cid_number name=$cid_name line=1 type=in" );
-    &::logit_dbm( "$::config_parms{data_dir}/phone/callerid.dbm",
-        $cid_number, "$::Time_Now $::Date_Now $::Year name=$cid_name" );
+    &::logit( "$::config_parms{data_dir}/phone/logs/callerid.$::Year_Month_Now.log", "$cid_number name=$cid_name line=1 type=in" );
+    &::logit_dbm( "$::config_parms{data_dir}/phone/callerid.dbm", $cid_number, "$::Time_Now $::Date_Now $::Year name=$cid_name" );
 }
diff --git a/code/public/callerisdn.pl b/code/public/callerisdn.pl
index f7dac499c..c6bfa5513 100644
--- a/code/public/callerisdn.pl
+++ b/code/public/callerisdn.pl
@@ -30,14 +30,12 @@
         my $cid_name       = "Unknown";
         my $caller_id_data = "Unknown";
 
-        print_log
-          "Callerid data: number=$cid_number name=$cid_name time=$Time to=$to";
+        print_log "Callerid data: number=$cid_number name=$cid_name time=$Time to=$to";
         logit(
             "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
             "$cid_number name=$cid_name data=$caller_id_data line=$to"
         );
-        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-            $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
+        logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $cid_number, "$Time_Now $Date_Now $Year name=$cid_name" );
         speak("Incoming call from $cid_number");
     }
 }
diff --git a/code/public/calllog.pl b/code/public/calllog.pl
index c226524af..cfefb3766 100644
--- a/code/public/calllog.pl
+++ b/code/public/calllog.pl
@@ -21,11 +21,10 @@
 my ( $PhoneModemString, $NameDone,   $NumberDone, $i,        $j );
 my ( @rejloglines,      $NumofCalls, $callerba,   $callerbn, $PhoneNumberz );
 my ( @callloglines, $CallLogTempLine, $RejLogTempLine );
-my ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog );
-my ( $last, $first, $middle, $areacode, $local_number, $caller );
+my ( $PhoneDateLog, $PhoneTimeLog,    $PhoneNameLog, $PhoneNumberLog );
+my ( $last,         $first,           $middle, $areacode, $local_number, $caller );
 
-$phone_modem =
-  new Serial_Item( 'ATE1V1X4&C1&D2S0=0+VCID=1', 'init', 'serial3' );
+$phone_modem = new Serial_Item( 'ATE1V1X4&C1&D2S0=0+VCID=1', 'init', 'serial3' );
 $timer_hangup = new Timer;
 
 #-----> Provide PalmPad Controller Access for some Items
@@ -34,8 +33,7 @@
 # Web Interface Commands
 
 $v_phone_lastcaller = new Voice_Cmd('Show Recent Call Log');
-if ( ( said $v_phone_lastcaller) || ( state_now $request_phone_stuff eq 'on' ) )
-{
+if ( ( said $v_phone_lastcaller) || ( state_now $request_phone_stuff eq 'on' ) ) {
     open( CALLLOG, "$config_parms{data_dir}/calllog.log" );    # Open for input
     @callloglines = <CALLLOG>;                                 # Open array and
                                                                # read in data
@@ -49,32 +47,24 @@
         $NumofCalls = $NumofCalls + 1;
         ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog ) =
           ( split( '`', $CallLogTempLine ) )[ 0, 1, 2, 3 ];
-        if ( $PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now )
-        {
-            speak
-              "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
+        if ( $PhoneNameLog eq 'Out of the Area' and $PhoneDateLog ne $Date_Now ) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
         }
-        if ( $PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now )
-        {
+        if ( $PhoneNameLog eq 'Out of the Area' and $PhoneDateLog eq $Date_Now ) {
             speak "At $PhoneTimeLog, an unidentified party called.";
         }
-        if ( $PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now )
-        {
-            speak
-              "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        if ( $PhoneNameLog ne 'Out of the Area' and $PhoneDateLog ne $Date_Now ) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
         }
-        if ( $PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now )
-        {
-            speak
-              "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        if ( $PhoneNameLog ne 'Out of the Area' and $PhoneDateLog eq $Date_Now ) {
+            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
         }
     }
     speak "$NumofCalls total calls.";
 }
 
 $v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
-if ( ( said $v_phone_clearlog) || ( state_now $request_phone_stuff eq 'off' ) )
-{
+if ( ( said $v_phone_clearlog) || ( state_now $request_phone_stuff eq 'off' ) ) {
     open( CALLLOG, ">$config_parms{data_dir}/calllog.log" );    # CLEAR Log
     close CALLLOG;
     print_log "Call Log Cleared.";
@@ -175,10 +165,8 @@
 
         # Log the data for use by display_callers
 
-        logit( "$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log",
-            "$PhoneNumber $PhoneName" );
-        logit_dbm( "$Pgm_Path/../data/phone/callerid.dbm",
-            $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
+        logit( "$Pgm_Path/../data/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName" );
+        logit_dbm( "$Pgm_Path/../data/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
 
         # Check to see if callers phone number is in reject table.  If so,
         # let them have it.
@@ -202,14 +190,10 @@
         # announce reasons
 
         if ( length( $PhoneNumber == 7 ) ) {
-            $PhoneNumber =
-              substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
+            $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
         }
         if ( length( $PhoneNumber == 10 ) ) {
-            $PhoneNumber =
-                substr( $PhoneNumber, 0, 3 ) . "."
-              . substr( $PhoneNumber, 3, 3 ) . "."
-              . substr( $PhoneNumber, 6, 4 );
+            $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 3 ) . "." . substr( $PhoneNumber, 6, 4 );
         }
 
         # Put Spaces in the Phone Number for Announce Reasons
diff --git a/code/public/cbus.pl b/code/public/cbus.pl
index 5153c651c..642982f23 100755
--- a/code/public/cbus.pl
+++ b/code/public/cbus.pl
@@ -217,8 +217,7 @@
 my $cbus_unit_idx;
 
 # Voice Commands
-$v_cbus_builder =
-  new Voice_Cmd( "CBus Builder " . "[Test,Run,Scan CGate,List Devices]" );
+$v_cbus_builder = new Voice_Cmd( "CBus Builder " . "[Test,Run,Scan CGate,List Devices]" );
 $v_cbus_speak   = new Voice_Cmd('CBus Monitor Speak [on,off]');
 $v_cbus_monitor = new Voice_Cmd("CBus Monitor [Start,Stop,Status]");
 $v_cbus_talker  = new Voice_Cmd("CBus Talker [Start,Stop,Status]");
@@ -242,12 +241,10 @@ sub cbus_configure {
     $cbus_project_name = $config_parms{cbus_project_name};
 
     # Open the IP port to the C-Gate Server Status Port
-    $cbus_monitor =
-      new Socket_Item( undef, undef, $config_parms{cgate_mon_address} );
+    $cbus_monitor = new Socket_Item( undef, undef, $config_parms{cgate_mon_address} );
 
     # Open the IP port to the C-Gate Server Control Port
-    $cbus_talker =
-      new Socket_Item( undef, undef, $config_parms{cgate_talk_address} );
+    $cbus_talker = new Socket_Item( undef, undef, $config_parms{cgate_talk_address} );
 
     if ( $config_parms{cbus_system_state} eq "DEBUG" ) {
         $cbus_system_debug = 1;
@@ -342,16 +339,13 @@ sub load_def_file {
     undef $cbus_def;
 
     # Load in the CBus definitiions file
-    $cbus_def_filename =
-      $config_parms{code_dir} . "/" . $config_parms{cbus_dat_file};
+    $cbus_def_filename = $config_parms{code_dir} . "/" . $config_parms{cbus_dat_file};
     if ( not -e $cbus_def_filename ) {
-        print_log
-          "CBus: load_def_file() XML definition file $cbus_def_filename does not exist";
+        print_log "CBus: load_def_file() XML definition file $cbus_def_filename does not exist";
         return;
     }
 
-    print_log "CBus: load_def_file () Loading CBus config from XML file "
-      . $cbus_def_filename;
+    print_log "CBus: load_def_file () Loading CBus config from XML file " . $cbus_def_filename;
     $cbus_def = XMLin(
         $cbus_def_filename,
         ForceArray => [ 'mh_group', 'note' ],
@@ -404,8 +398,7 @@ sub scan_cgate {
     if ( defined $cbus_project_name ) {
         set $cbus_talker "project load " . $cbus_project_name;
         set $cbus_talker "project use " . $cbus_project_name;
-        print_log "CBus: scan_cgate() Command - project start "
-          . $cbus_project_name;
+        print_log "CBus: scan_cgate() Command - project start " . $cbus_project_name;
         set $cbus_talker "project start " . $cbus_project_name;
     }
 
@@ -458,8 +451,7 @@ sub write_def_file {
     );
 
     # Write the file to disk
-    print_log
-      "CBus: write_def_file() Writing XML definition to $cbus_def_filename,";
+    print_log "CBus: write_def_file() Writing XML definition to $cbus_def_filename,";
     $xml_file->XMLout( $cbus_def, OutputFile => $cbus_def_filename, );
 }
 
@@ -502,7 +494,7 @@ sub build_cbus_file {
         'relay'    => 'on,off',
         'watchdog' => 'on,off',
         'dimmer'   => 'on,off,5%,10%,20%,30%,40%,50%,60%,70%,80%,90%',
-        'oneshot' => 'on'    # FIXME check with RichardM
+        'oneshot'  => 'on'                                               # FIXME check with RichardM
     );
 
     # If $cbus_build_debug is true, run in debug mode, otherwise run as normal
@@ -527,11 +519,9 @@ sub build_cbus_file {
       or print_log "CBus: build_cbus_file() Could not open $cbus_file: $!";
 
     print CF "# Category=CBus_Items\n#\n#\n";
-    print CF
-      "# Created: $Time_Now, from cbus.xml file: \"$config_parms{cbus_dat_file}\"\n";
+    print CF "# Created: $Time_Now, from cbus.xml file: \"$config_parms{cbus_dat_file}\"\n";
     print CF "#\n";
-    print CF
-      "# This file is automatically created with the CBus command RUN_BUILDER\n";
+    print CF "# This file is automatically created with the CBus command RUN_BUILDER\n";
     print CF "#\n";
     print CF "#\n";
     print CF "# -------------- DO NOT EDIT --------------\n";
@@ -634,8 +624,7 @@ sub build_cbus_file {
         }
         else {
             # Relay, Dimmer, or OneShot
-            print CF "tie_event \$$item \n   \'cbus_set(\"$address\", "
-              . "\$state, $rstring)\';\n";
+            print CF "tie_event \$$item \n   \'cbus_set(\"$address\", " . "\$state, $rstring)\';\n";
         }
 
         # Extract groups and store for group creation phase
@@ -670,12 +659,9 @@ sub build_cbus_file {
 
     print CF "#\n# Create Master CBus Status Subroutine\n#\n";
     print CF "sub cbus_update {\n\n";
-    print CF "\t# *****************************************"
-      . "****************************\n";
-    print CF "\t# This subroutine is automatically generated by cbus.pl, "
-      . "do not edit !\n";
-    print CF "\t# *****************************************"
-      . "****************************\n";
+    print CF "\t# *****************************************" . "****************************\n";
+    print CF "\t# This subroutine is automatically generated by cbus.pl, " . "do not edit !\n";
+    print CF "\t# *****************************************" . "****************************\n";
     print CF "\tmy \$addr = \$_[0];\n";
     print CF "\tmy \$newstate = \$_[1];\n";
     print CF "\tmy \$requestor = \$_[2];\n";
@@ -918,8 +904,7 @@ sub cbus_monitor_status {
 
         }
         elsif ( not defined $cbus_label ) {
-            print_log "CBus: UNKNOWN Address $cg_addr $state_speak "
-              . "by \"$source\"";
+            print_log "CBus: UNKNOWN Address $cg_addr $state_speak " . "by \"$source\"";
 
         }
         elsif ($ramping) {
@@ -936,8 +921,7 @@ sub cbus_monitor_status {
                 if ( $config_parms{cbus_log_oneshot} ) {
                     ### FIXME RichardM to test
                     # Device is a one-shot and logging is on
-                    print_log "CBus: ONESHOT device $cbus_label "
-                      . "set $state_speak by $source";
+                    print_log "CBus: ONESHOT device $cbus_label " . "set $state_speak by $source";
                 }
 
             }
@@ -1016,10 +1000,8 @@ sub cbus_talker_status {
     # Returns the status of the CBus command driver (Talker)
 
     if ( active $cbus_talker) {
-        print_log "CBus: Talker is active. "
-          . "Last command sent was: $last_talk_state";
-        speak(  "C-Bus Talker is active. "
-              . "Last command sent was $last_talk_state" );
+        print_log "CBus: Talker is active. " . "Last command sent was: $last_talk_state";
+        speak( "C-Bus Talker is active. " . "Last command sent was $last_talk_state" );
     }
     else {
         print_log "CBus: Talker is not running";
@@ -1080,12 +1062,11 @@ sub cbus_set {
 
     if ( active $cbus_talker) {
         print_log "CBus: $cmd_log_string";
-        my $ramp_command =
-          "[MisterHouse$cmd_counter] RAMP $addr $level $speed\n";
+        my $ramp_command = "[MisterHouse$cmd_counter] RAMP $addr $level $speed\n";
         set $cbus_talker $ramp_command;
-        $last_talk_state = "Ramp unit $addr to level $level, speed $speed";
+        $last_talk_state        = "Ramp unit $addr to level $level, speed $speed";
         $cmd_list[$cmd_counter] = $ramp_command;
-        $cmd_counter = 0 if ( ++$cmd_counter > $MAX_CMD_COUNT );
+        $cmd_counter            = 0 if ( ++$cmd_counter > $MAX_CMD_COUNT );
     }
     else {
         print_log "CBus: Talker not active, unable to '$cmd_log_string'";
@@ -1158,14 +1139,12 @@ sub add_address_to_hash {
         $addr_type = 'group';
     }
 
-    print_log
-      "CBus: add_address_to_hash() Addr $addr is $name of type $addr_type";
+    print_log "CBus: add_address_to_hash() Addr $addr is $name of type $addr_type";
 
     # Store the CBus name and address in the cbus_def hash
     if ( $addr_type eq 'group' ) {
         if ( not exists $cbus_def->{group}{$addr} ) {
-            print_log "CBus: add_address_to_hash() group not defined yet, "
-              . "adding $addr, $name";
+            print_log "CBus: add_address_to_hash() group not defined yet, " . "adding $addr, $name";
             $cbus_def->{group}{$addr} = {
                 name     => $name,
                 note     => ["Added by MisterHouse $Date_Now $Time_Now"],
@@ -1178,8 +1157,7 @@ sub add_address_to_hash {
     }
     elsif ( $addr_type eq 'unit' ) {
         if ( not exists $cbus_def->{unit}{$addr} ) {
-            print_log "CBus: add_address_to_hash() unit not defined yet, "
-              . "adding $addr, $name";
+            print_log "CBus: add_address_to_hash() unit not defined yet, " . "adding $addr, $name";
             $cbus_def->{unit}{$addr} = {
                 name => $name,
                 note => ["Added by MisterHouse $Date_Now $Time_Now"]
@@ -1258,8 +1236,8 @@ sub add_address_to_hash {
                 add_address_to_hash( $addr, $name );
 
             }
-            elsif ( $cbus_data =~ /(\/\/.+\/\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/ )
-            {
+            elsif ( $cbus_data =~ /(\/\/.+\/\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/ ) {
+
                 #response matched against "old" format, i.e. //project/network/app/group
                 my ( $addr, $name ) = ( $1, $2 );
 
@@ -1295,9 +1273,7 @@ sub add_address_to_hash {
             my $network_state = $1;
             print_log "CBus: CGate Status - $cbus_data";
             if ( $network_state ne "ok" ) {
-                eval_with_timer 'set $cbus_talker "get '
-                  . $cbus_net_list[0]
-                  . ' state"', 2;
+                eval_with_timer 'set $cbus_talker "get ' . $cbus_net_list[0] . ' state"', 2;
             }
             else {
                 if ($request_cgate_scan) {
@@ -1452,9 +1428,8 @@ sub add_address_to_hash {
 
         }
         else {
-            if (
-                $cbus_scan_last_addr_seen eq $cbus_unit_list[$#cbus_unit_list] )
-            {
+            if ( $cbus_scan_last_addr_seen eq $cbus_unit_list[$#cbus_unit_list] ) {
+
                 # Tree Scan complete - set tree completion flag
                 print_log "Cbus: leaving scanning mode" if $Debug{cbus};
                 $cbus_scanning_tree = 0;
diff --git a/code/public/cd_player.pl b/code/public/cd_player.pl
index 4c5591f24..9b85cc5fb 100644
--- a/code/public/cd_player.pl
+++ b/code/public/cd_player.pl
@@ -45,8 +45,7 @@
 # Since we don't really need to know when the cda program finishes, we could
 # use the run function instead of Process_Item, like this:
 
-$v_cd_player = new Voice_Cmd
-  'cd player [on,off,load,eject,next,prev,play,stop,pause,volume up,volume down]';
+$v_cd_player = new Voice_Cmd 'cd player [on,off,load,eject,next,prev,play,stop,pause,volume up,volume down]';
 
 if ( $state = said $v_cd_player) {
     my %cmd_table = (
diff --git a/code/public/chart_xl.pl b/code/public/chart_xl.pl
index 518136645..499704b55 100644
--- a/code/public/chart_xl.pl
+++ b/code/public/chart_xl.pl
@@ -35,13 +35,11 @@
     my $today = substr( $Year, 2 ) . sprintf( "%02d%02d", $Month, $Mday );
 
     #  List of variables follows here:
-    my $chart_file = "$config_parms{html_dir}/chart_xl.html";
-    my $chart_source_file =
-      "$Pgm_Path/$config_parms{data_dir}/logs/temps$today.csv";
-    my $chart_caption = "18 CLONCURRY STREET TEMPERATURE CHART";
-    my $chart_source =
-      "Source: </b>I-button temperature data (recorded by Mr. House)";
-    my $chart_notes = qq[Note:<br>
+    my $chart_file        = "$config_parms{html_dir}/chart_xl.html";
+    my $chart_source_file = "$Pgm_Path/$config_parms{data_dir}/logs/temps$today.csv";
+    my $chart_caption     = "18 CLONCURRY STREET TEMPERATURE CHART";
+    my $chart_source      = "Source: </b>I-button temperature data (recorded by Mr. House)";
+    my $chart_notes       = qq[Note:<br>
    10&deg;C = 50&deg;F<br>
    15&deg;C = 59&deg;F<br>
    20&deg;C = 68&deg;F<br>
@@ -55,19 +53,11 @@
     foreach my $item (@chart_headers) {
         $count = "0" if $count == 0;
         $col = uc( chr( $count + 66 ) );
-        $chart_headers .=
-          "ac.Cells(1, " . ( $count + 2 ) . ").Value = " . qq["$item"] . "\n";
-        $chart_items .=
-            "  ac.Cells(i, "
-          . ( $count + 2 )
-          . ").Value = Data("
-          . ( $count + 1 ) . ")\n";
-        $chart_collections .=
-          qq[cs0.SeriesCollection($count).SetData c.chDimSeriesNames, 0, "${col}1"\n];
-        $chart_collections .=
-          qq[cs0.SeriesCollection($count).SetData c.chDimCategories, 0, "A2:A" + Num\n];
-        $chart_collections .=
-          qq[cs0.SeriesCollection($count).SetData c.chDimValues, 0, "${col}2:$col" + Num\n];
+        $chart_headers .= "ac.Cells(1, " . ( $count + 2 ) . ").Value = " . qq["$item"] . "\n";
+        $chart_items .= "  ac.Cells(i, " . ( $count + 2 ) . ").Value = Data(" . ( $count + 1 ) . ")\n";
+        $chart_collections .= qq[cs0.SeriesCollection($count).SetData c.chDimSeriesNames, 0, "${col}1"\n];
+        $chart_collections .= qq[cs0.SeriesCollection($count).SetData c.chDimCategories, 0, "A2:A" + Num\n];
+        $chart_collections .= qq[cs0.SeriesCollection($count).SetData c.chDimValues, 0, "${col}2:$col" + Num\n];
         $count++;
     }
 
diff --git a/code/public/concept.pl b/code/public/concept.pl
index 43ac9ceeb..19147d4f9 100644
--- a/code/public/concept.pl
+++ b/code/public/concept.pl
@@ -27,9 +27,8 @@
 # Voice Commands
 $v_concept_builder = new Voice_Cmd("Concept Builder [RUN_BUILDER,DUMP_DATA]");
 $v_concept_speak   = new Voice_Cmd('Concept Pannel Monitor Speak [on,off]');
-$v_concept_monitor =
-  new Voice_Cmd("Concept Pannel Monitor [START,STOP,STATUS]");
-$v_concept_talker = new Voice_Cmd("Concept Pannel Talker [START,STOP,STATUS]");
+$v_concept_monitor = new Voice_Cmd("Concept Pannel Monitor [START,STOP,STATUS]");
+$v_concept_talker  = new Voice_Cmd("Concept Pannel Talker [START,STOP,STATUS]");
 $v_concept_speak->tie_event('speak "Concept Panel Speak is now $state"');
 
 if ($Reread) {
@@ -39,8 +38,7 @@
 if ($Startup) {
 
     # Open the IP port to the C-Gate Server Status Port
-    $concept_monitor =
-      new Socket_Item( undef, undef, $config_parms{concept_mon_address} );
+    $concept_monitor = new Socket_Item( undef, undef, $config_parms{concept_mon_address} );
 
     if ( $config_parms{system_state} eq "PROD" ) {
         print_log "concept_monitor: STARTING";
@@ -50,8 +48,7 @@
         print_log "concept_monitor: DISABLED, as we are in DEV mode";
     }
 
-    $concept_talker =
-      new Socket_Item( undef, undef, $config_parms{concept_talk_address} );
+    $concept_talker = new Socket_Item( undef, undef, $config_parms{concept_talk_address} );
 
     if ( $config_parms{system_state} eq "PROD" ) {
         print_log "concept_talker: STARTING";
@@ -147,8 +144,7 @@ sub load_concept_data {
     @concept_categories = ();
 
     # Load in the Concept definitiions file
-    my $filename =
-      $config_parms{code_dir} . "/" . $config_parms{concept_dat_file};
+    my $filename = $config_parms{code_dir} . "/" . $config_parms{concept_dat_file};
     print_log "concept_Builder: Loading Concept Data from file $filename";
     open( CF, "<$filename" )
       or print_log "concept_Builder: Could not open $filename: $!";
@@ -259,10 +255,8 @@ sub build_concept_file {
       or print_log "Could not open $concept_file: $!";
 
     print CF "# Category=Concept_Items\n#\n#\n";
-    print CF
-      "# Created: $Time_Now, from concept_dat file: \"$config_parms{concept_dat_file}\"\n";
-    print CF
-      "# This file is automatically created with the Concept command RUN_BUILDER  -- DO NOT EDIT\n";
+    print CF "# Created: $Time_Now, from concept_dat file: \"$config_parms{concept_dat_file}\"\n";
+    print CF "# This file is automatically created with the Concept command RUN_BUILDER  -- DO NOT EDIT\n";
     print CF "#\n# -- DO NOT EDIT --\n";
     print CF "#\n#\n#\n";
 
@@ -273,8 +267,7 @@ sub build_concept_file {
         $item =~ s/ /_/g;
         $item = '$' . $item;
 
-        printf CF ( "# %-30s  Address: %-7s\tObject is: %s\n", $name, $address,
-            $item );
+        printf CF ( "# %-30s  Address: %-7s\tObject is: %s\n", $name, $address, $item );
         $rows++;
     }
 
@@ -300,9 +293,7 @@ sub build_concept_file {
         }
 
         print CF "#\n# Create Concept Voice_Cmds for Category: $category\n#\n";
-        print CF "# Category="
-          . $config_parms{concept_category_prefix}
-          . "$category\n#\n";
+        print CF "# Category=" . $config_parms{concept_category_prefix} . "$category\n#\n";
 
         foreach my $address (@cat_list) {
 
@@ -315,8 +306,7 @@ sub build_concept_file {
 
                 $opts = $cmd_opts[ $concept_data{$address}{'type'} ];
 
-                printf CF ( "%-40s= new Voice_Cmd \'%s %s\';\n", $item, $name,
-                    $opts );
+                printf CF ( "%-40s= new Voice_Cmd \'%s %s\';\n", $item, $name, $opts );
                 $rows++;
             }
         }
@@ -373,8 +363,7 @@ sub build_concept_file {
 
     print CF "#\n# Create Event Ties\n#\n";
     foreach my $address ( sort num_sort keys %concept_data ) {
-        if ( $concept_data{$address}{'type'} !=
-            1 )    # Don't set a tie for Zone inputs, they are input only
+        if ( $concept_data{$address}{'type'} != 1 )    # Don't set a tie for Zone inputs, they are input only
         {
             $item = $concept_data{$address}{'label'};
             $item =~ s/ /_/g;
@@ -382,10 +371,7 @@ sub build_concept_file {
             #		$item = '$v_' . $item;
             $item = '$' . $item;
             my $rstring = $item . '->{set_by}';
-            printf CF (
-                "tie_event %-29s \'concept_set( \"%s\", \$state, $rstring)\';\n",
-                $item, $address
-            );
+            printf CF ( "tie_event %-29s \'concept_set( \"%s\", \$state, $rstring)\';\n", $item, $address );
             $rows++;
         }
     }
@@ -440,12 +426,9 @@ sub build_concept_file {
 
     print CF "#\n# Create Master Concept Status Subroutine\n#\n";
     print CF "sub concept_update {\n\n";
-    print CF
-      "\t# *****************************************************************************************\n";
-    print CF
-      "\t# This subroutine is automatically generated by concept_builder.pl, do not edit !\n";
-    print CF
-      "\t# *****************************************************************************************\n\n";
+    print CF "\t# *****************************************************************************************\n";
+    print CF "\t# This subroutine is automatically generated by concept_builder.pl, do not edit !\n";
+    print CF "\t# *****************************************************************************************\n\n";
     print CF "\tmy \$addr = \$_[0];\n";
     print CF "\tmy \$newstate = \$_[1];\n";
     print CF "\tmy \$requestor = \$_[2];\n\n";
@@ -519,11 +502,8 @@ sub concept_monitor_status {
     # Return the status of the concept listener (monitor)
 
     if ( active $concept_monitor) {
-        print_log
-          "Concept_Monitor: is active. Last event received was: $last_concept_event_state";
-        speak(
-            "Concept Monitor is active. Last event received was $last_concept_event_state"
-        );
+        print_log "Concept_Monitor: is active. Last event received was: $last_concept_event_state";
+        speak( "Concept Monitor is active. Last event received was $last_concept_event_state" );
     }
     else {
         print_log "Concept Monitor: is not running";
@@ -536,12 +516,12 @@ sub concept_monitor_status {
 
 if ( my $concept_msg = said $concept_monitor)    # See if any data has arrived
 {
-    my @cg = split / /, $concept_msg;   # Seperate the data so that,
-                                        # $cg[0] - Time stamp
-                                        # $cg[1] - activity code. 201,202 or 203
-          # $cg[2] - What is effected, ie: Zone=C01:01 or Area=01 etc
-          # $cg[3] - The nodes state. ie: state=0 etc
-          # $cg[4] - The setby if an AUX. ie: by=C1 etc
+    my @cg = split / /, $concept_msg;            # Seperate the data so that,
+                                                 # $cg[0] - Time stamp
+                                                 # $cg[1] - activity code. 201,202 or 203
+                                                 # $cg[2] - What is effected, ie: Zone=C01:01 or Area=01 etc
+                                                 # $cg[3] - The nodes state. ie: state=0 etc
+                                                 # $cg[4] - The setby if an AUX. ie: by=C1 etc
     my $cg_time = $cg[0];
     my $cg_code = $cg[1];
 
@@ -550,29 +530,28 @@ sub concept_monitor_status {
     my $cg_state = 0;
     my $cg_type  = 0;
     my $co_setby = "Panel";
-    if ( $cg_code == 201 )    # Zone update
+    if ( $cg_code == 201 )                       # Zone update
     {
         $cg_type  = 1;
         $cg_state = $cg[3];
         @cd       = split /=/, $cg[2];
         $cg_unit  = 'Z' . $cd[1];
     }
-    if ( $cg_code == 203 )    # Auxilary update
+    if ( $cg_code == 203 )                       # Auxilary update
     {
         $cg_type  = 2;
         $cg_state = $cg[3];
         @cd       = split /=/, $cg[2];
         $cg_unit  = 'X' . $cd[1];
 
-        @cd = split /=/, $cg[4];    # Seperate the setby out
+        @cd = split /=/, $cg[4];                 # Seperate the setby out
         $co_setby = $cd[1];
-        if (
-            $co_setby eq $config_parms{concept_interface} ) # Comms task 1 is MH
+        if ( $co_setby eq $config_parms{concept_interface} )    # Comms task 1 is MH
         {
             $co_setby = "MH";
         }
     }
-    if ( $cg_code == 202 )                                  # Area change
+    if ( $cg_code == 202 )                                      # Area change
     {
         $cg_type  = 3;
         $cg_state = $cg[3];
@@ -624,14 +603,12 @@ sub concept_monitor_status {
 
             # This is a response to MH sending a event so just ignore it
             # otherwise we would just keep setting and setting and setting
-            print_log
-              "Concept_Monitor: Recieved recursive instruction $concept_label $state_speak, ignored ";
+            print_log "Concept_Monitor: Recieved recursive instruction $concept_label $state_speak, ignored ";
         }
         else {
-            concept_update( $cg_unit, $concept_state, 'concept' )
-              ;    # The 'concept' is picked up
-                   # by the talker to stop the
-                   # signal going straight back out
+            concept_update( $cg_unit, $concept_state, 'concept' );    # The 'concept' is picked up
+                                                                      # by the talker to stop the
+                                                                      # signal going straight back out
             print_log "Concept_Monitor: $concept_label $state_speak";
         }
     }
@@ -679,8 +656,7 @@ sub concept_set {
 
     }
     else {
-        print_log
-          "Concept Talker: Unkown level \'$level\' passed to concept_set()";
+        print_log "Concept Talker: Unkown level \'$level\' passed to concept_set()";
         return;
     }
 
@@ -689,8 +665,7 @@ sub concept_set {
     my $unit     = "unknown";
     if ( $dev_type eq 'Z' )    # can't set a zone
     {
-        print_log
-          "Concept Talker: Tryed to change state on a zone $device in concept_set()";
+        print_log "Concept Talker: Tryed to change state on a zone $device in concept_set()";
         return;
     }
     elsif ( $dev_type eq 'X' )    # An auxilary
@@ -766,11 +741,8 @@ sub concept_talker_status {
     # Returns the status of the concept command driver (Talker)
 
     if ( active $concept_talker) {
-        print_log
-          "Concept_Talker: is active. Last command sent was: $last_concept_control_state";
-        speak(
-            "Concept Talker is active. Last command sent was $last_concept_control_state"
-        );
+        print_log "Concept_Talker: is active. Last command sent was: $last_concept_control_state";
+        speak( "Concept Talker is active. Last command sent was $last_concept_control_state" );
     }
     else {
         print_log "Concept_Talker: is not running";
diff --git a/code/public/copycode.pl b/code/public/copycode.pl
index bdc097a28..297849cf5 100644
--- a/code/public/copycode.pl
+++ b/code/public/copycode.pl
@@ -81,11 +81,7 @@ sub copycode {
     my @filestocopy = ();
     my @computers   = ();
     my @lines       = ();
-    my (
-        $file,            $line,         $computer,
-        $variable_phrase, $phrase_start, $phrase_length,
-        $var_end_pos,     $count,        $outline
-    );
+    my ( $file, $line, $computer, $variable_phrase, $phrase_start, $phrase_length, $var_end_pos, $count, $outline );
 
     #                                            Find the files in the master/code directory that
     #                                            we want to copy
@@ -112,16 +108,11 @@ sub copycode {
                 foreach $line (@lines) {
                     if ( substr( $line, 0, 10 ) eq '# Category' ) {
                         print TEMPOUT "$line\n\n";
-                        print TEMPOUT
-                          "# This file is automatically created by running the copycode\n";
-                        print TEMPOUT
-                          "# program in the master code directory.  Any changes made to\n";
-                        print TEMPOUT
-                          "# this file will be overwritten the next time it is run.\n";
-                        print TEMPOUT
-                          "# You should make changes to the appropiate file in the master\n";
-                        print TEMPOUT
-                          "# code directory then re-run the copycode program.\n\n";
+                        print TEMPOUT "# This file is automatically created by running the copycode\n";
+                        print TEMPOUT "# program in the master code directory.  Any changes made to\n";
+                        print TEMPOUT "# this file will be overwritten the next time it is run.\n";
+                        print TEMPOUT "# You should make changes to the appropiate file in the master\n";
+                        print TEMPOUT "# code directory then re-run the copycode program.\n\n";
                     }
                     elsif ( substr( $line, 1, 2 ) eq 'v_' ) {
                         $phrase_start    = 0;
@@ -156,17 +147,15 @@ sub copycode {
                             print TEMPOUT "$line\n";
                             if ( $variable_phrase eq "yes" ) {
                                 $outline =
-                                  "run \"mhsend -host $maincomputer -run \'"
-                                  . substr( $line, $phrase_start,
-                                    $phrase_length )
+                                    "run \"mhsend -host $maincomputer -run \'"
+                                  . substr( $line, $phrase_start, $phrase_length )
                                   . "\$state\'\" if \$state = said "
                                   . substr( $line, 0, $var_end_pos ) . "\;";
                             }
                             else {
                                 $outline =
-                                  "run \"mhsend -host $maincomputer -run \'"
-                                  . substr( $line, $phrase_start,
-                                    $phrase_length )
+                                    "run \"mhsend -host $maincomputer -run \'"
+                                  . substr( $line, $phrase_start, $phrase_length )
                                   . "\'\" if \$state = said "
                                   . substr( $line, 0, $var_end_pos ) . "\;";
                             }
diff --git a/code/public/csv2rrd_weather.pl b/code/public/csv2rrd_weather.pl
index 6de4c5a5e..dc8afa436 100644
--- a/code/public/csv2rrd_weather.pl
+++ b/code/public/csv2rrd_weather.pl
@@ -296,8 +296,7 @@ sub file_read_dir {
     my @dirs = @_;
     for my $dir (@dirs) {
         opendir( DIR, $dir )
-          or print
-          "\nError in file_dir_read, can not open directory:  $dir. $!\n";
+          or print "\nError in file_dir_read, can not open directory:  $dir. $!\n";
         my @files = readdir(DIR);
         close DIR;
 
diff --git a/code/public/cwitte/tar_cvs_sync.pl b/code/public/cwitte/tar_cvs_sync.pl
index 6db95b9a4..18ee33837 100644
--- a/code/public/cwitte/tar_cvs_sync.pl
+++ b/code/public/cwitte/tar_cvs_sync.pl
@@ -72,8 +72,7 @@ sub for_each_cvsnode {
         }
     }
     else {
-        die
-          "illogic:  can't change cvs_dir [$cvs_dir] to tar_dir [$tar_dir] for file: [$tar_test]\n";
+        die "illogic:  can't change cvs_dir [$cvs_dir] to tar_dir [$tar_dir] for file: [$tar_test]\n";
     }
 }
 
@@ -125,8 +124,7 @@ sub for_each_tarnode {
         }
     }
     else {
-        die
-          "illogic:  can't change tar_dir [$tar_dir] to cvs_dir [$cvs_dir] for file: [$cvs_test]\n";
+        die "illogic:  can't change tar_dir [$tar_dir] to cvs_dir [$cvs_dir] for file: [$cvs_test]\n";
     }
     $tar_log{$relative_base}++;
 ### 	print "$File::Find::dir\n" if (! $dir{$File::Find::dir}++);
diff --git a/code/public/date_functions.pl b/code/public/date_functions.pl
index e966319fa..823652f01 100644
--- a/code/public/date_functions.pl
+++ b/code/public/date_functions.pl
@@ -35,16 +35,10 @@ sub dayofweek {
         return ("Invalid Date - $month\/$day\/$year");
     }
     else {
-        $a = int( ( 14 - $month ) / 12 );
-        $y = $year - $a;
-        $m = $month + ( 12 * $a ) - 2;
-        $dow =
-          ( $day + $y +
-              int( $y / 4 ) -
-              int( $y / 100 ) +
-              int( $y / 400 ) +
-              int( ( 31 * $m ) / 12 ) )
-          % 7;
+        $a   = int( ( 14 - $month ) / 12 );
+        $y   = $year - $a;
+        $m   = $month + ( 12 * $a ) - 2;
+        $dow = ( $day + $y + int( $y / 4 ) - int( $y / 100 ) + int( $y / 400 ) + int( ( 31 * $m ) / 12 ) ) % 7;
         return ($dow);
     }
 }
@@ -67,10 +61,7 @@ sub dayofmonth {
     my $day;
     $which =~ tr/A-Z/a-z/;
     $dow_name =~ tr/A-Z/a-z/;
-    my %daysofweek = (
-        "sunday",   0, "monday", 1, "tuesday",  2, "wednesday", 3,
-        "thursday", 4, "friday", 5, "saturday", 6
-    );
+    my %daysofweek = ( "sunday", 0, "monday", 1, "tuesday", 2, "wednesday", 3, "thursday", 4, "friday", 5, "saturday", 6 );
     my $dow = $daysofweek{$dow_name};
 
     if (   $which ne "first"
@@ -89,13 +80,11 @@ sub dayofmonth {
     }
     else {
         if ( $which eq "last" ) {
-            ( $month, $day, $year ) =
-              &lastnameddayofmonth( $dow, $month, $year );
+            ( $month, $day, $year ) = &lastnameddayofmonth( $dow, $month, $year );
             return ( $month, $day, $year );
         }
         else {
-            ( $month, $day, $year ) =
-              &firstnameddayofmonth( $dow, $month, $year );
+            ( $month, $day, $year ) = &firstnameddayofmonth( $dow, $month, $year );
             if ( $which eq "first" ) {
                 return ( $month, $day, $year );
             }
@@ -138,8 +127,7 @@ sub firstnameddayofmonth {
     }
     else {
         while ( $dayofweek != $dow ) {
-            ( $dayofweek, $month, $day, $year ) =
-              &addday( $dayofweek, $month, $day, $year );
+            ( $dayofweek, $month, $day, $year ) = &addday( $dayofweek, $month, $day, $year );
         }
         return ( $month, $day, $year );
     }
@@ -214,8 +202,7 @@ sub lastnameddayofmonth {
     }
     else {
         while ( $dayofweek != $dow ) {
-            ( $dayofweek, $month, $day, $year ) =
-              &subtractday( $dayofweek, $month, $day, $year );
+            ( $dayofweek, $month, $day, $year ) = &subtractday( $dayofweek, $month, $day, $year );
         }
         return ( $month, $day, $year );
     }
diff --git a/code/public/dialup_unix.pl b/code/public/dialup_unix.pl
index 436a50508..491c41073 100644
--- a/code/public/dialup_unix.pl
+++ b/code/public/dialup_unix.pl
@@ -141,13 +141,11 @@ sub start_dialup {
     unless (&net_connect_check) {
         my $IFUP = "down";
         my $INET;
-        my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-          localtime(time);
+        my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
         $year += 1900;
         $mon  += 1;
 
-        my $LogFile =
-          join( ".", "\/tmp\/wvdial.error", $year, $mon, $mday, $hour, $min );
+        my $LogFile = join( ".", "\/tmp\/wvdial.error", $year, $mon, $mday, $hour, $min );
         print_log "Starting Internet connection";
 
         # we use nohup call to disconnect from the parent process, so if
@@ -155,9 +153,7 @@ sub start_dialup {
         # keep the connection attach to MH, just remove nohup
         # the "&" detach the process and put in background, so
         # we could get control back to MH
-        system(
-            "cd \/tmp ; $config_parms{net_connect_up} >$LogFile  2>$LogFile & "
-        );
+        system( "cd \/tmp ; $config_parms{net_connect_up} >$LogFile  2>$LogFile & " );
         my $count = 0;
 
         # we have to validate if the interface come up
@@ -176,10 +172,8 @@ sub start_dialup {
                 return 1;
             }
         }
-        print_log
-          "Can't start Internet, $config_parms{net_connect_time} sec. exceeded";
-        print_log
-          "The status of the interface $config_parms{net_connect_if} was $IFUP";
+        print_log "Can't start Internet, $config_parms{net_connect_time} sec. exceeded";
+        print_log "The status of the interface $config_parms{net_connect_if} was $IFUP";
         print_log "Log file can be found in $LogFile";
         print_log "Trying to stop internet";
         &stop_dialup;
diff --git a/code/public/dsc_pc5401.pl b/code/public/dsc_pc5401.pl
index 477e9bc87..ff3faf3f6 100644
--- a/code/public/dsc_pc5401.pl
+++ b/code/public/dsc_pc5401.pl
@@ -73,8 +73,7 @@
         $LongHour = "$Hour";
     }
     &mh2dsc5401("010$LongHour$Minute$Month$Mday$ShortYear");
-    print_log
-      "MH ---> DSC PC5401 - Clock Adjust $LongHour:$Minute $Month/$Mday/$Year";
+    print_log "MH ---> DSC PC5401 - Clock Adjust $LongHour:$Minute $Month/$Mday/$Year";
 }    # END of new day
 
 #-----------------------------#
@@ -114,11 +113,9 @@ ($)
     $dsc_rx_info =~ s/\s+$//;    # Remove endding spaces
     $dsc_tmp_length = length $dsc_rx_info;    # Calculate the string length
 
-    $dsc_tmp_code = substr( $dsc_rx_info, 0, 3 );  # Separation Command Code and
-    $dsc_tmp_data =
-      substr( $dsc_rx_info, 3, ( $dsc_tmp_length - 5 ) );    # data information
-    $dsc_tmp_cks =
-      substr( $dsc_rx_info, ( $dsc_tmp_length - 2 ), 2 );    # and Checksum
+    $dsc_tmp_code = substr( $dsc_rx_info, 0, 3 );    # Separation Command Code and
+    $dsc_tmp_data = substr( $dsc_rx_info, 3, ( $dsc_tmp_length - 5 ) );    # data information
+    $dsc_tmp_cks = substr( $dsc_rx_info, ( $dsc_tmp_length - 2 ), 2 );     # and Checksum
 
     #
     #- TODO: Add here verify received checksum before to processing information
@@ -131,8 +128,7 @@ ($)
         $dsc_rx_out = "($dsc_tmp_code) Zone Open: $dsc_tmp_data";
     }
     elsif ( $dsc_tmp_code eq "500" ) {
-        $dsc_rx_out =
-          "($dsc_tmp_code) OK Last command received is : $dsc_tmp_data";
+        $dsc_rx_out = "($dsc_tmp_code) OK Last command received is : $dsc_tmp_data";
     }
     elsif ( $dsc_tmp_code eq "501" ) {
         $dsc_rx_out = "($dsc_tmp_code) Error! : Receive Bad CheckSum";
diff --git a/code/public/dss_interface.pl b/code/public/dss_interface.pl
index bb0090d1d..3b4ede658 100644
--- a/code/public/dss_interface.pl
+++ b/code/public/dss_interface.pl
@@ -54,9 +54,7 @@
 
 my $state_test;
 my $said_dss;
-$test = new Voice_Cmd(
-    "dss to [GetTime,GetChannel,FoxE,FoxW,COM,SetChannel 284,SetChannel 382,SetChannel 383]"
-);
+$test = new Voice_Cmd( "dss to [GetTime,GetChannel,FoxE,FoxW,COM,SetChannel 284,SetChannel 382,SetChannel 383]" );
 
 $dss = new dss_interface( undef, undef, 'dss' );
 $dss->add( "SetChannel 388", "FoxE" );
diff --git a/code/public/eio1.pl b/code/public/eio1.pl
index 45887bf8d..557f51f59 100644
--- a/code/public/eio1.pl
+++ b/code/public/eio1.pl
@@ -30,13 +30,12 @@
 
 # modify the following items and code for more than one board in the system
 # misterhouse is installed in /opt/misterhouse as suggested in faq's
-my $eio1DataLog = '/opt/misterhouse/data/logs/eio1data';
-my $client1_address = '192.168.36.61:5000';    # my EIO board address and port
+my $eio1DataLog     = '/opt/misterhouse/data/logs/eio1data';
+my $client1_address = '192.168.36.61:5000';                    # my EIO board address and port
 
 # set up the output states for the socket port
-$eio1 = new Socket_Item( "SEND INFORMATION NOW\n",
-    "status", $client1_address, "EIO-1", 'udp', 'rawout' );
-$eio1->add( pack( 'v*', @R1on ), "E1R1 on" );    # relay control commands
+$eio1 = new Socket_Item( "SEND INFORMATION NOW\n", "status", $client1_address, "EIO-1", 'udp', 'rawout' );
+$eio1->add( pack( 'v*', @R1on ), "E1R1 on" );                  # relay control commands
 $eio1->add( pack( 'v*', @R2on ), "E1R2 on" );
 $eio1->add( pack( 'v*', @R3on ), "E1R3 on" );
 $eio1->add( pack( 'v*', @R4on ), "E1R4 on" );
@@ -84,19 +83,15 @@
 # re-evaluate the data on each reply in order to set the flags on the web page.
 # do this if the board hasn't timed out, if it has, reset the relays to last state
 if ( my $eio1data = said $eio1) {    # first check to see if the board responds
-    if ( $loop1count > $loop1timeout )
-    {                                # the board previously timed out - its back
-        &reload_board1;              # reload the last known state
+    if ( $loop1count > $loop1timeout ) {    # the board previously timed out - its back
+        &reload_board1;                     # reload the last known state
     }
-    elsif ( $eio1data ne $eio1last )
-    {                                # (no timeout) new data since last response
-        $eio1last = $eio1data;       # save the new data for next pass thru
-        my $eio1out =
-          substr( $eio1data, 0, -10 );    # parse the reply of extra characters
-        logit( $eio1DataLog, $eio1out, 12 );    # append change to the logfile
-              #	update the changed status icons on the web page
-        if ( ( state $eio1I4 == OFF ) && ( substr( $eio1data, 1, 1 ) eq "0" ) )
-        {
+    elsif ( $eio1data ne $eio1last ) {      # (no timeout) new data since last response
+        $eio1last = $eio1data;              # save the new data for next pass thru
+        my $eio1out = substr( $eio1data, 0, -10 );    # parse the reply of extra characters
+        logit( $eio1DataLog, $eio1out, 12 );          # append change to the logfile
+                                                      #	update the changed status icons on the web page
+        if ( ( state $eio1I4 == OFF ) && ( substr( $eio1data, 1, 1 ) eq "0" ) ) {
             set $eio1I4 ON;
         }
         elsif (( state $eio1I4 == ON )
@@ -104,8 +99,7 @@
         {
             set $eio1I4 OFF;
         }
-        if ( ( state $eio1I3 == OFF ) && ( substr( $eio1data, 2, 1 ) eq "0" ) )
-        {
+        if ( ( state $eio1I3 == OFF ) && ( substr( $eio1data, 2, 1 ) eq "0" ) ) {
             set $eio1I3 ON;
         }
         elsif (( state $eio1I3 == ON )
@@ -113,8 +107,7 @@
         {
             set $eio1I3 OFF;
         }
-        if ( ( state $eio1I2 == OFF ) && ( substr( $eio1data, 3, 1 ) eq "0" ) )
-        {
+        if ( ( state $eio1I2 == OFF ) && ( substr( $eio1data, 3, 1 ) eq "0" ) ) {
             set $eio1I2 ON;
         }
         elsif (( state $eio1I2 == ON )
@@ -122,8 +115,7 @@
         {
             set $eio1I2 OFF;
         }
-        if ( ( state $eio1I1 == OFF ) && ( substr( $eio1data, 4, 1 ) eq "0" ) )
-        {
+        if ( ( state $eio1I1 == OFF ) && ( substr( $eio1data, 4, 1 ) eq "0" ) ) {
             set $eio1I1 ON;
         }
         elsif (( state $eio1I1 == ON )
@@ -131,8 +123,7 @@
         {
             set $eio1I1 OFF;
         }
-        if ( ( state $eio1R4 == OFF ) && ( substr( $eio1data, 6, 1 ) eq "1" ) )
-        {
+        if ( ( state $eio1R4 == OFF ) && ( substr( $eio1data, 6, 1 ) eq "1" ) ) {
             set $eio1R4 ON;
         }
         elsif (( state $eio1R4 == ON )
@@ -140,8 +131,7 @@
         {
             set $eio1R4 OFF;
         }
-        if ( ( state $eio1R3 == OFF ) && ( substr( $eio1data, 7, 1 ) eq "1" ) )
-        {
+        if ( ( state $eio1R3 == OFF ) && ( substr( $eio1data, 7, 1 ) eq "1" ) ) {
             set $eio1R3 ON;
         }
         elsif (( state $eio1R3 == ON )
@@ -149,8 +139,7 @@
         {
             set $eio1R3 OFF;
         }
-        if ( ( state $eio1R2 == OFF ) && ( substr( $eio1data, 8, 1 ) eq "1" ) )
-        {
+        if ( ( state $eio1R2 == OFF ) && ( substr( $eio1data, 8, 1 ) eq "1" ) ) {
             set $eio1R2 ON;
         }
         elsif (( state $eio1R2 == ON )
@@ -158,8 +147,7 @@
         {
             set $eio1R2 OFF;
         }
-        if ( ( state $eio1R1 == OFF ) && ( substr( $eio1data, 9, 1 ) eq "1" ) )
-        {
+        if ( ( state $eio1R1 == OFF ) && ( substr( $eio1data, 9, 1 ) eq "1" ) ) {
             set $eio1R1 ON;
         }
         elsif (( state $eio1R1 == ON )
@@ -225,8 +213,7 @@
 }
 
 sub reload_board1 {
-    my $log1file =
-      $eio1DataLog;    #determine the last used datafile (log rotation)
+    my $log1file = $eio1DataLog;    #determine the last used datafile (log rotation)
     if ( file_size($log1file) == 0 ) {
         $log1file .= ".1";
     }                                           #in case logs have rotated
diff --git a/code/public/games_chess.pl b/code/public/games_chess.pl
index 37ed6fdac..05df621d0 100644
--- a/code/public/games_chess.pl
+++ b/code/public/games_chess.pl
@@ -101,8 +101,7 @@
 }
 
 #Chess movement variables part_numerical:
-$chess_moveto2 = new Voice_Cmd
-  '[rank one,rank two,rank three,rank four,rank five,rank six,rank seven,rank eight]';
+$chess_moveto2 = new Voice_Cmd '[rank one,rank two,rank three,rank four,rank five,rank six,rank seven,rank eight]';
 
 if ( $state = said $chess_moveto2) {
 
diff --git a/code/public/garage_door_code.pl b/code/public/garage_door_code.pl
index 965eee7ec..50c31b382 100644
--- a/code/public/garage_door_code.pl
+++ b/code/public/garage_door_code.pl
@@ -49,8 +49,7 @@
 # Overhead Garage Doors
 #
 if ( state_now $WB_IB_NorthOHDoor eq OPEN ) {
-    if ( time_greater_than("$Time_Sunset") or time_less_than("$Time_Sunrise") )
-    {
+    if ( time_greater_than("$Time_Sunset") or time_less_than("$Time_Sunrise") ) {
         set_with_timer $Garage_North_Lights ON, 60;
         set_with_timer $Coach_Lights ON,        90;
 
@@ -67,8 +66,7 @@
 }
 
 if ( state_now $WB_IC_SouthOHDoor eq OPEN ) {
-    if ( time_greater_than("$Time_Sunset") or time_less_than("$Time_Sunrise") )
-    {
+    if ( time_greater_than("$Time_Sunset") or time_less_than("$Time_Sunrise") ) {
         set $Garage_South_Lights ON;
         set_with_timer $Coach_Lights ON, 90;
         set $TimerGarageSLights 60, '&GarageSLightsExpired';
diff --git a/code/public/gas_prices.pl b/code/public/gas_prices.pl
index 814fa8435..85fc9f3aa 100644
--- a/code/public/gas_prices.pl
+++ b/code/public/gas_prices.pl
@@ -13,12 +13,10 @@
 # 2. Replace the URL below with the generated URL for your search
 # 3. Change $v_gas to your desired voice command
 
-my $Gas_URL =
-  'http://www.fortworthgasprices.com/index.aspx?s=Y\&fuel=A\&area=Fort%20Worth%20-%20West\&tme_limit=84';
+my $Gas_URL = 'http://www.fortworthgasprices.com/index.aspx?s=Y\&fuel=A\&area=Fort%20Worth%20-%20West\&tme_limit=84';
 
 $p_gas = new Process_Item("perl get_url  $Gas_URL $f_gas_html");
-$v_gas =
-  new Voice_Cmd('[Get,Read,Show] the Lowest West Fort Worth Gas Stations');
+$v_gas = new Voice_Cmd('[Get,Read,Show] the Lowest West Fort Worth Gas Stations');
 
 speak($f_gas_summary) if said $v_gas eq 'Read';
 
diff --git a/code/public/hvac_brian.pl b/code/public/hvac_brian.pl
index 5129512c4..e31f6ab94 100644
--- a/code/public/hvac_brian.pl
+++ b/code/public/hvac_brian.pl
@@ -131,12 +131,9 @@ sub check_for_triggers {
 
             if ( lc($status) eq "sleeping" || lc($status) eq "occupied" ) {
                 next
-                  if ( $i->{Occupied} - $temperature ) *
-                  $i->{TimeToHeat} *
-                  60 < $nexttime - time;
+                  if ( $i->{Occupied} - $temperature ) * $i->{TimeToHeat} * 60 < $nexttime - time;
                 set $roomobj "Occupied";
-                print_log
-                  "$i->{ Name } set to Occupied to prepare for $eventname";
+                print_log "$i->{ Name } set to Occupied to prepare for $eventname";
             }
         }
     }
@@ -268,8 +265,7 @@ sub control_hvac {
 
             if ( lc($currentstate) ne lc($desiredState) ) {
                 if ( lc($desiredState) eq "on" ) {
-                    $Save{hvac_statistics}->[0]->{heatcycle}
-                      ->{ $zone->{Name} }++;
+                    $Save{hvac_statistics}->[0]->{heatcycle}->{ $zone->{Name} }++;
                 }
                 set $controller $desiredState;
                 select undef, undef, undef, 0.025;
@@ -309,18 +305,13 @@ sub time_to_trigger_fire {
             $interval = 1 if !$interval || $interval < 1;
             $interval = 59 if $interval && $interval > 59;
 
-            $t =
-              time - $Second + 60 * ( $interval - ( $Minute % $interval ) ) - 1;
+            $t = time - $Second + 60 * ( $interval - ( $Minute % $interval ) ) - 1;
         }
         if ( $type eq "hour" ) {
             $interval = 1 if !$interval || $interval < 1;
             $interval = 23 if $interval && $interval > 23;
 
-            $t =
-              time -
-              $Second -
-              60 * $Minute +
-              3600 * ( $interval - ( $Hour % $interval ) ) - 1;
+            $t = time - $Second - 60 * $Minute + 3600 * ( $interval - ( $Hour % $interval ) ) - 1;
         }
     }
     else {
diff --git a/code/public/hvac_brian_newhvac.pl b/code/public/hvac_brian_newhvac.pl
index b99cbe990..4e71d2af6 100644
--- a/code/public/hvac_brian_newhvac.pl
+++ b/code/public/hvac_brian_newhvac.pl
@@ -75,9 +75,7 @@
             }
         }
 
-        foreach
-          my $j (qw( Name Controller Unoccupied Occupied Sleeping Maximum ))
-        {
+        foreach my $j (qw( Name Controller Unoccupied Occupied Sleeping Maximum )) {
             if ( $i =~ /Heating_Zone_${j}_(\d+)/ ) {
                 my $num = $1;
                 $hvac->{heatingzones}->[ $num - 1 ]->{$j} = $ARGS{$i};
@@ -98,21 +96,18 @@
             }
         }
 
-        foreach my $j (
-            qw( Name Unoccupied Occupied Sleeping Maximum Sensor TimeToHeat ))
-        {
+        foreach my $j (qw( Name Unoccupied Occupied Sleeping Maximum Sensor TimeToHeat )) {
             if ( $i =~ /Heating_Room_${j}_(\d+)_(\d+)/ ) {
                 my ( $zone, $num ) = ( $1, $2 );
-                $hvac->{heatingzones}->[ $zone - 1 ]->{Rooms}->[ $num - 1 ]
-                  ->{$j} = $ARGS{$i};
+                $hvac->{heatingzones}->[ $zone - 1 ]->{Rooms}->[ $num - 1 ]->{$j} = $ARGS{$i};
             }
         }
 
         foreach my $j (qw( Room State Item Value )) {
             if ( $i =~ /Heating_Tie_${j}_(\d+)_(\d+)/ ) {
                 my ( $zone, $num ) = ( $1, $2 );
-                $hvac->{heatingzones}->[ $zone - 1 ]->{Ties}->[ $num - 1 ]->{$j}
-                  = $ARGS{$i};
+                $hvac->{heatingzones}->[ $zone - 1 ]->{Ties}->[ $num - 1 ]->{$j} =
+                  $ARGS{$i};
             }
         }
     }
@@ -188,8 +183,7 @@
 print "Content-Type: text/html\n\n";
 print "<html>\n<body>\n";
 print "<link REL=\"STYLESHEET\" HREF=\"/default.css\" TYPE=\"text/css\" />\n";
-print
-  "<div ID=\"overDiv\" STYLE=\"position:absolute; visibility:hide; z-index:1;\" />\n";
+print "<div ID=\"overDiv\" STYLE=\"position:absolute; visibility:hide; z-index:1;\" />\n";
 
 #print "<script LANGUAGE=\"JavaScript\" SRC=\"/lib/overlib.js\" />\n";
 #print "<base TARGET='speech' />\n";
@@ -231,18 +225,15 @@ sub setupHeatingZone {
 
     my $name = $hvac->{heatingzones}->[$zone]->{Name};
 
-    my $str =
-      "<a href=\"$scriptname?SETUP=1\">Return to Main Setup Page</a><br /><br />\n";
+    my $str = "<a href=\"$scriptname?SETUP=1\">Return to Main Setup Page</a><br /><br />\n";
 
     $str .= "<form>\n";
-    $str .=
-      "<input type=\"hidden\" name=\"SETUP\" value=\"Heating_$setup\" />\n";
+    $str .= "<input type=\"hidden\" name=\"SETUP\" value=\"Heating_$setup\" />\n";
 
     my $select;
     my $selected =
       $hvac->{heatingzones}->[$zone]->{Controller} || "No Controller";
-    $select =
-      "<select name=\"Heating_Zone_Controller_${setup}\" onchange=\"submit()\">\n";
+    $select = "<select name=\"Heating_Zone_Controller_${setup}\" onchange=\"submit()\">\n";
     $select .= "<option ";
     $select .= "selected " if "No Controller" eq $selected;
     $select .= "value=\"No Controller\">No Controller</option>\n";
@@ -260,8 +251,7 @@ sub setupHeatingZone {
     $str    .= "<b>Zone Heating Controller: </b> $select <br />\n";
 
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\">\n";
-    $str .=
-      "<tr><th bgcolor=\"$bgcolor\">$name (for Heating) Defaults</th></tr>\n";
+    $str .= "<tr><th bgcolor=\"$bgcolor\">$name (for Heating) Defaults</th></tr>\n";
     $str .= "<tr><td>\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
     $str .= "<tr>";
@@ -276,8 +266,7 @@ sub setupHeatingZone {
 
     $str .= "<tr>\n";
     $selected = $hvac->{heatingzones}->[$zone]->{Unoccupied} || 50;
-    $select =
-      "<select name=\"Heating_Zone_Unoccupied_${setup}\" onchange=\"submit()\">\n";
+    $select = "<select name=\"Heating_Zone_Unoccupied_${setup}\" onchange=\"submit()\">\n";
     foreach my $temp ( 45 .. 75 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -287,8 +276,7 @@ sub setupHeatingZone {
     $str    .= "<td>$select</td>\n";
 
     $selected = $hvac->{heatingzones}->[$zone]->{Occupied} || 71;
-    $select =
-      "<select name=\"Heating_Zone_Occupied_${setup}\" onchange=\"submit()\">\n";
+    $select = "<select name=\"Heating_Zone_Occupied_${setup}\" onchange=\"submit()\">\n";
     for ( my $temp = 65; $temp <= 75; $temp += 0.5 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -298,8 +286,7 @@ sub setupHeatingZone {
     $str    .= "<td>$select</td>\n";
 
     $selected = $hvac->{heatingzones}->[$zone]->{Sleeping} || 68;
-    $select =
-      "<select name=\"Heating_Zone_Sleeping_${setup}\" onchange=\"submit()\">\n";
+    $select = "<select name=\"Heating_Zone_Sleeping_${setup}\" onchange=\"submit()\">\n";
     for ( my $temp = 45; $temp <= 75; $temp += 0.5 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -309,8 +296,7 @@ sub setupHeatingZone {
     $str    .= "<td>$select</td>\n";
 
     $selected = $hvac->{heatingzones}->[$zone]->{Maximum} || 75;
-    $select =
-      "<select name=\"Heating_Zone_Maximum_${setup}\" onchange=\"submit()\">\n";
+    $select = "<select name=\"Heating_Zone_Maximum_${setup}\" onchange=\"submit()\">\n";
     foreach my $temp ( 60 .. 85 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -321,8 +307,7 @@ sub setupHeatingZone {
     $str    .= "</tr></table></td></tr></table><br />\n";
 
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\">\n";
-    $str .=
-      "<tr><th bgcolor=\"$bgcolor\">Rooms in $name (for Heating)</th></tr>\n";
+    $str .= "<tr><th bgcolor=\"$bgcolor\">Rooms in $name (for Heating)</th></tr>\n";
     $str .= "<tr><td>\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
 
@@ -353,8 +338,7 @@ sub setupHeatingZone {
 
         my $select;
         my $selected = $i->{Sensor} || "No Sensor";
-        $select =
-          "<select name=\"Heating_Room_Sensor_${setup}_$count\" onchange=\"submit()\">\n";
+        $select = "<select name=\"Heating_Room_Sensor_${setup}_$count\" onchange=\"submit()\">\n";
         $select .= "<option ";
         $select .= "selected " if "No Sensor" eq $selected;
         $select .= "value=\"No Sensor\">No Sensor</option>\n";
@@ -372,8 +356,7 @@ sub setupHeatingZone {
         $str    .= "<td align=\"center\">$select</td>\n";
 
         $selected = $i->{Unoccupied};
-        $select =
-          "<select name=\"Heating_Room_Unoccupied_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Room_Unoccupied_${setup}_$count\" onchange=\"submit()\">\n";
         foreach my $temp ( 45 .. 75 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $selected;
@@ -383,8 +366,7 @@ sub setupHeatingZone {
         $str    .= "<td align=\"center\">$select</td>\n";
 
         $selected = $i->{Occupied};
-        $select =
-          "<select name=\"Heating_Room_Occupied_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Room_Occupied_${setup}_$count\" onchange=\"submit()\">\n";
         for ( my $temp = 65; $temp <= 75; $temp += 0.5 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $selected;
@@ -394,8 +376,7 @@ sub setupHeatingZone {
         $str    .= "<td align=\"center\">$select</td>\n";
 
         $selected = $i->{Sleeping};
-        $select =
-          "<select name=\"Heating_Room_Sleeping_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Room_Sleeping_${setup}_$count\" onchange=\"submit()\">\n";
         for ( my $temp = 45; $temp <= 75; $temp += 0.5 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $selected;
@@ -405,8 +386,7 @@ sub setupHeatingZone {
         $str    .= "<td align=\"center\">$select</td>\n";
 
         $selected = $i->{Maximum};
-        $select =
-          "<select name=\"Heating_Room_Maximum_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Room_Maximum_${setup}_$count\" onchange=\"submit()\">\n";
         foreach my $temp ( 60 .. 85 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $selected;
@@ -416,8 +396,7 @@ sub setupHeatingZone {
         $str    .= "<td align=\"center\">$select</td>\n";
 
         $selected = $i->{TimeToHeat};
-        $select =
-          "<select name=\"Heating_Room_TimeToHeat_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Room_TimeToHeat_${setup}_$count\" onchange=\"submit()\">\n";
         foreach my $temp ( 1 .. 90 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $selected;
@@ -435,16 +414,14 @@ sub setupHeatingZone {
     my $offset = 8;
     $str .=
       "<tr height=\"$offset\"><td height=\"$offset\"><img src=\"/graphics/1pixel.gif\" border=\"0\" height=\"$offset\" /></td></tr>\n";
-    $str .=
-      "<tr><td colspan=\"5\">&nbsp;<a href=\"$scriptname?SETUP=Heating_$setup&AddNewRoom=1\">Add a New Room</a></td>\n";
+    $str .= "<tr><td colspan=\"5\">&nbsp;<a href=\"$scriptname?SETUP=Heating_$setup&AddNewRoom=1\">Add a New Room</a></td>\n";
 
     $str .= "</table>";
     $str .= "</tr></td></table>\n";
 
     $str .= "<br />\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\">\n";
-    $str .=
-      "<tr><th bgcolor=\"$bgcolor\">Tie Temperature States to Items</th></tr>\n";
+    $str .= "<tr><th bgcolor=\"$bgcolor\">Tie Temperature States to Items</th></tr>\n";
     $str .= "<tr><td>\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
 
@@ -455,8 +432,7 @@ sub setupHeatingZone {
     foreach my $i ( @{ $hvac->{heatingzones}->[$zone]->{Ties} } ) {
         $str .= "<tr>";
 
-        my $select =
-          "<select name=\"Heating_Tie_Room_${setup}_$count\" onchange=\"submit()\">\n";
+        my $select   = "<select name=\"Heating_Tie_Room_${setup}_$count\" onchange=\"submit()\">\n";
         my $selected = $i->{Room};
         foreach my $room ( @{ $hvac->{heatingzones}->[$zone]->{Rooms} } ) {
             $select .= "<option ";
@@ -466,8 +442,7 @@ sub setupHeatingZone {
         $select .= "</select>\n";
         $str    .= "<td>&nbsp;Set $select to&nbsp;</td>\n";
 
-        $select =
-          "<select name=\"Heating_Tie_State_${setup}_$count\" onchange=\"submit()\">\n";
+        $select   = "<select name=\"Heating_Tie_State_${setup}_$count\" onchange=\"submit()\">\n";
         $selected = $i->{State};
         foreach my $state (qw (Unoccupied Occupied Sleeping)) {
             $select .= "<option ";
@@ -477,8 +452,7 @@ sub setupHeatingZone {
         $select .= "</select>\n";
         $str    .= "<td>$select if&nbsp;</td>\n";
 
-        $select =
-          "<select name=\"Heating_Tie_Item_${setup}_$count\" onchange=\"submit()\">\n";
+        $select = "<select name=\"Heating_Tie_Item_${setup}_$count\" onchange=\"submit()\">\n";
         $selected = $i->{Item} || "Choose an Item";
         $select .= "<option ";
         $select .= "selected " if "Choose an Item" eq $selected;
@@ -508,8 +482,7 @@ sub setupHeatingZone {
 
     $str .=
       "<tr height=\"$offset\"><td height=\"$offset\"><img src=\"/graphics/1pixel.gif\" border=\"0\" height=\"$offset\" /></td></tr>\n";
-    $str .=
-      "<tr><td colspan=\"5\">&nbsp;<a href=\"$scriptname?SETUP=Heating_$setup&AddNewTie=1\">Add a New Rule</a></td>\n";
+    $str .= "<tr><td colspan=\"5\">&nbsp;<a href=\"$scriptname?SETUP=Heating_$setup&AddNewTie=1\">Add a New Rule</a></td>\n";
 
     $str .= "</table>";
     $str .= "</tr></td></table>\n";
@@ -520,8 +493,7 @@ sub setupHeatingZone {
 
     $str .= "<br />\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\">\n";
-    $str .=
-      "<tr><th bgcolor=\"$bgcolor\">Triggers That Match Rules from Tied Section</th></tr>\n";
+    $str .= "<tr><th bgcolor=\"$bgcolor\">Triggers That Match Rules from Tied Section</th></tr>\n";
     $str .= "<tr><td>\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
 
@@ -570,10 +542,8 @@ sub showSetup {
 
     if ( @{ $hvac->{heatingzones} } > 0 ) {
         $str .= "<tr><td><b>#</b></td>";
-        $str .=
-          "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
-        $str .=
-          "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"20\" /></td>";
+        $str .= "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
+        $str .= "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"20\" /></td>";
         $str .= "<td><b>Name</b></td><td /></tr>\n";
     }
 
@@ -586,8 +556,7 @@ sub showSetup {
               "<td><a href=\"$scriptname?SETUP=1&MoveHeatingZoneUp_$count\"><img src=\"/graphics/a1+.gif\" border=\"0\"></a></td>";
         }
         else {
-            $str .=
-              "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
+            $str .= "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
         }
 
         if ( $count < @{ $hvac->{heatingzones} } ) {
@@ -595,31 +564,26 @@ sub showSetup {
               "<td><a href=\"$scriptname?SETUP=1&MoveHeatingZoneDown_$count\"><img src=\"/graphics/a1-.gif\" border=\"0\"></a></td>";
         }
         else {
-            $str .=
-              "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
+            $str .= "<td><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>";
         }
         $str .=
           "<td><input name=\"Heating_Zone_Name_$count\" value=\"$i->{ Name }\" / onchange=\"submit()\">&nbsp;&nbsp;&nbsp;</td>\n";
-        $str .=
-          "<td><a href=\"$scriptname?SETUP=Heating_$count\">Setup</a>&nbsp;&nbsp;&nbsp;</td>\n";
-        $str .=
-          "<td><a href=\"$scriptname?SETUP=1&DeleteHeatingZone=$count\">Delete</a>&nbsp;&nbsp;&nbsp;</td>\n";
+        $str .= "<td><a href=\"$scriptname?SETUP=Heating_$count\">Setup</a>&nbsp;&nbsp;&nbsp;</td>\n";
+        $str .= "<td><a href=\"$scriptname?SETUP=1&DeleteHeatingZone=$count\">Delete</a>&nbsp;&nbsp;&nbsp;</td>\n";
         $str .= "</tr>\n";
         $count++;
     }
     my $offset = 8;
     $str .=
       "<tr height=\"$offset\"><td height=\"$offset\"><img src=\"/graphics/1pixel.gif\" border=\"0\" height=\"$offset\" /></td></tr>\n";
-    $str .=
-      "<tr><td colspan=\"5\"><a href=\"$scriptname?SETUP=1&AddHeatingZone=1\">Add a New Zone</a></td>\n";
+    $str .= "<tr><td colspan=\"5\"><a href=\"$scriptname?SETUP=1&AddHeatingZone=1\">Add a New Zone</a></td>\n";
 
     $str .= "</table>";
     $str .= "</tr></td></table>\n";
 
     $str .= "<br />\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\">\n";
-    $str .=
-      "<tr><th bgcolor=\"$bgcolor\">Heating Temperature Defaults</th></tr>\n";
+    $str .= "<tr><th bgcolor=\"$bgcolor\">Heating Temperature Defaults</th></tr>\n";
     $str .= "<tr><td>\n";
     $str .= "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n";
     $str .= "<tr>";
@@ -632,8 +596,7 @@ sub showSetup {
 
     $str .= "<td><b>Temperatures&nbsp;&nbsp;</b></td>\n";
     my $selected = $hvac->{HeatingDefaults}->{Unoccupied} || 50;
-    my $select =
-      "<select name=\"HeatingDefaults_Unoccupied\" onchange=\"submit()\">\n";
+    my $select = "<select name=\"HeatingDefaults_Unoccupied\" onchange=\"submit()\">\n";
     foreach my $temp ( 45 .. 75 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -643,8 +606,7 @@ sub showSetup {
     $str    .= "<td align=\"right\">$select&nbsp;&nbsp;</td>\n";
 
     $selected = $hvac->{HeatingDefaults}->{Occupied} || 71;
-    $select =
-      "<select name=\"HeatingDefaults_Occupied\" onchange=\"submit()\">\n";
+    $select = "<select name=\"HeatingDefaults_Occupied\" onchange=\"submit()\">\n";
     for ( my $temp = 65; $temp <= 75; $temp += 0.5 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -654,8 +616,7 @@ sub showSetup {
     $str    .= "<td align=\"right\">$select&nbsp;&nbsp;</td>\n";
 
     $selected = $hvac->{HeatingDefaults}->{Sleeping} || 68;
-    $select =
-      "<select name=\"HeatingDefaults_Sleeping\" onchange=\"submit()\">\n";
+    $select = "<select name=\"HeatingDefaults_Sleeping\" onchange=\"submit()\">\n";
     for ( my $temp = 45; $temp <= 75; $temp += 0.5 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -665,8 +626,7 @@ sub showSetup {
     $str    .= "<td align=\"right\">$select&nbsp;&nbsp;</td>\n";
 
     $selected = $hvac->{HeatingDefaults}->{Maximum} || 75;
-    $select =
-      "<select name=\"HeatingDefaults_Maximum\" onchange=\"submit()\">\n";
+    $select = "<select name=\"HeatingDefaults_Maximum\" onchange=\"submit()\">\n";
     foreach my $temp ( 60 .. 85 ) {
         $select .= "<option ";
         $select .= "selected " if $temp == $selected;
@@ -726,19 +686,13 @@ sub showSetup {
     $str .= "<br />\n";
 
     if (0) {
-        $str .=
-          "The temperature range settings allow you to specify when heat turns on and off.<br />\n";
-        $str .=
-          "For example, if you set the thermostat at 70 degrees, the heat may come on at 69 degrees<br />";
+        $str .= "The temperature range settings allow you to specify when heat turns on and off.<br />\n";
+        $str .= "For example, if you set the thermostat at 70 degrees, the heat may come on at 69 degrees<br />";
         $str .= "and turn off at 71 degrees.<br />\n";
-        $str .=
-          "The point where the heat turns on, I call the 'low offset' (in this example, the low offset<br />";
-        $str .=
-          "is -1 degrees)  I call the point where the heat turns off the 'high offset' (+1 degree in<br />";
-        $str .=
-          "this example)  I added another setting called 'low offset2'.  If the heat is already on, the<br />";
-        $str .=
-          "low offset changes to this number.  This encourages multiple zones to be heating at the same time.<br />";
+        $str .= "The point where the heat turns on, I call the 'low offset' (in this example, the low offset<br />";
+        $str .= "is -1 degrees)  I call the point where the heat turns off the 'high offset' (+1 degree in<br />";
+        $str .= "this example)  I added another setting called 'low offset2'.  If the heat is already on, the<br />";
+        $str .= "low offset changes to this number.  This encourages multiple zones to be heating at the same time.<br />";
     }
 
     $str .= "</form>";
@@ -749,16 +703,14 @@ sub generateTabs {
     my $ARGS = shift;
     my $hvac = shift;
 
-    my $tabs =
-      "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n<tr>\n";
+    my $tabs = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n<tr>\n";
 
     foreach my $i ( @{ $hvac->{heatingzones} } ) {
         my $name = $i->{Name};
         my $text = "<a href=\"$scriptname?ZONE=$name\">$name</a>";
         $text = "<b>$name</b>" if $ARGS->{ZONE} eq $name;
         $tabs .= "<td bgcolor=\"$bgcolor\" nowrap>&nbsp;$text&nbsp;</td>";
-        $tabs .=
-          "<td width=\"1\"><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>\n";
+        $tabs .= "<td width=\"1\"><img src=\"/graphics/1pixel.gif\" border=\"0\" width=\"1\" /></td>\n";
     }
 
     #    my $text = $Authorized ? "<a href=\"$scriptname?SETUP=1\">Setup</a>" : "";
@@ -766,8 +718,7 @@ sub generateTabs {
     if ( $ARGS{SETUP} ) {
         $text = "<b>Setup</b>";
     }
-    $tabs .=
-      "<td width=\"100%\" bgcolor=\"$bgcolor\" align=\"right\">$text&nbsp;</td></tr>\n";
+    $tabs .= "<td width=\"100%\" bgcolor=\"$bgcolor\" align=\"right\">$text&nbsp;</td></tr>\n";
 
     my $offset = 5;
     $tabs .=
@@ -840,8 +791,7 @@ sub showZone {
         }
         $zonenum++;
     }
-    my $hidden =
-      "<input type=\"hidden\" name=\"ZONE\" value=\"$zonename\" />\n";
+    my $hidden = "<input type=\"hidden\" name=\"ZONE\" value=\"$zonename\" />\n";
     if ( $ARGS->{SHOWALL} ) {
         $hidden .= "<input type=\"hidden\" name=\"SHOWALL\" value=\"1\" />\n";
     }
@@ -855,24 +805,19 @@ sub showZone {
             if ( $Save{hvac_statistics} && $Save{hvac_statistics}->[0] ) {
                 my $info = "";
                 if (   $Save{hvac_statistics}->[0]->{heattime}
-                    && $Save{hvac_statistics}->[0]->{heattime}
-                    ->{ $zone->{Name} } )
+                    && $Save{hvac_statistics}->[0]->{heattime}->{ $zone->{Name} } )
                 {
-                    my $time = showTime( $Save{hvac_statistics}->[0]->{heattime}
-                          ->{ $zone->{Name} } );
+                    my $time = showTime( $Save{hvac_statistics}->[0]->{heattime}->{ $zone->{Name} } );
                     $info .= "Zone was heated for $time today";
                 }
                 if (   $Save{hvac_statistics}->[0]->{heatcycle}
-                    && $Save{hvac_statistics}->[0]->{heatcycle}
-                    ->{ $zone->{Name} } )
+                    && $Save{hvac_statistics}->[0]->{heatcycle}->{ $zone->{Name} } )
                 {
                     if ($info) {
-                        $info .=
-                          " and cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ $zone->{ Name } } times";
+                        $info .= " and cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ $zone->{ Name } } times";
                     }
                     else {
-                        $info .=
-                          "Zone cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ $zone->{ Name } } times today";
+                        $info .= "Zone cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ $zone->{ Name } } times today";
                     }
                 }
                 if ($info) {
@@ -896,8 +841,7 @@ sub showZone {
     $str .= "<tr>\n";
     $str .= "  <td colspan=\"2\">&nbsp;</td>\n";
     $str .= "  <td colspan=\"2\" align=\"center\"><b>Temperatures</b></td>\n";
-    $str .=
-      "  <td colspan=\"2\" align=\"center\" nowrap><b>Upcoming Changes</b></td>\n";
+    $str .= "  <td colspan=\"2\" align=\"center\" nowrap><b>Upcoming Changes</b></td>\n";
     $str .= "</tr>\n";
     $str .= "<tr>\n";
     $str .= "  <td><b>Name&nbsp;&nbsp;</b></td>\n";
@@ -927,16 +871,14 @@ sub showZone {
         $str .= "  <td nowrap>$i->{Name}&nbsp&nbsp;</td>\n";
 
         if ($roomobj) {
-            my $select =
-              "<select name=\"set_heat_\$hvac_$room\" onchange=\"submit()\">\n";
+            my $select = "<select name=\"set_heat_\$hvac_$room\" onchange=\"submit()\">\n";
             foreach my $val (qw (Unoccupied Occupied Sleeping)) {
                 $select .= "<option ";
                 $select .= "selected " if lc($val) eq lc($state);
                 $select .= "value=\"$val\">$val</option>\n";
             }
             $select .= "</select>\n";
-            $str .=
-              "  <form>$hidden<td nowrap>$select&nbsp;&nbsp;</td></form>\n";
+            $str    .= "  <form>$hidden<td nowrap>$select&nbsp;&nbsp;</td></form>\n";
         }
         else {
             $str .= "  <td>&nbsp;&nbsp;</td>\n";
@@ -957,8 +899,7 @@ sub showZone {
 
         my $des = state_next_pass($desiredobj);
 
-        my $select =
-          "<select name=\"set_desired_heat_\$hvac_${room}_desired\" onchange=\"submit()\">\n";
+        my $select = "<select name=\"set_desired_heat_\$hvac_${room}_desired\" onchange=\"submit()\">\n";
         for ( my $temp = 45; $temp <= 75; $temp += 0.5 ) {
             $select .= "<option ";
             $select .= "selected " if $temp == $des;
@@ -1013,12 +954,10 @@ sub showAllHeatingZones {
             && $Save{hvac_statistics}->[0]->{heatcycle}->{furnace} )
         {
             if ($info) {
-                $info .=
-                  " and cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ furnace } times";
+                $info .= " and cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ furnace } times";
             }
             else {
-                $info .=
-                  "Furnace cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ furnace } times today";
+                $info .= "Furnace cycled $Save{ hvac_statistics }->[0]->{ heatcycle }->{ furnace } times today";
             }
         }
         if ($info) {
@@ -1030,10 +969,7 @@ sub showAllHeatingZones {
     my $object = get_object_by_name("\$furnace");
     if ($object) {
         $str .=
-            "Furnace is currently "
-          . $object->state
-          . " and has been since "
-          . scalar( localtime( $Time - $object->get_idle_time ) );
+          "Furnace is currently " . $object->state . " and has been since " . scalar( localtime( $Time - $object->get_idle_time ) );
         $str .= "<br />\n";
     }
 
@@ -1048,8 +984,7 @@ sub showAllHeatingZones {
 sub writeHvacCode {
     my $hvac = shift;
 
-    my $code =
-      'my $hvac = $Save{ hvac_system } if $Save{ hvac_system };' . "\n";
+    my $code = 'my $hvac = $Save{ hvac_system } if $Save{ hvac_system };' . "\n";
 
     my $zonenum = 0;
     foreach my $i ( @{ $hvac->{heatingzones} } ) {
@@ -1061,8 +996,7 @@ sub writeHvacCode {
             $name =~ s/\W/_/g;
             $code .= "\$hvac_${name}_desired = new Generic_Item;\n";
             $code .= "\$hvac_$name = new Generic_Item;\n";
-            $code .=
-              "\$hvac_$name->set_states qw( Unoccupied Occupied Sleeping );\n";
+            $code .= "\$hvac_$name->set_states qw( Unoccupied Occupied Sleeping );\n";
 
             #	    $code .= "if ( 0 && !state \$hvac_$name ) {\n";
             #	    $code .= "    set \$hvac_$name 'Occupied';\n";
@@ -1071,10 +1005,7 @@ sub writeHvacCode {
             $code .= "\n";
 
             foreach my $k qw( Unoccupied Occupied Sleeping ) {
-                $code .=
-                    "if ( lc( state_changed \$hvac_$name ) eq '"
-                  . lc($k)
-                  . "' ) {\n";
+                $code .= "if ( lc( state_changed \$hvac_$name ) eq '" . lc($k) . "' ) {\n";
 
                 #		$code .= "   set \$hvac_${name}_desired $j->{ $k };\n";
                 $code .=
@@ -1115,13 +1046,9 @@ sub writeHvacCode {
                 }
             }
 
-            $code .=
-                "if ( lc( state_changed $j->{Item} ) eq '"
-              . lc($value)
-              . "' ) {\n";
+            $code .= "if ( lc( state_changed $j->{Item} ) eq '" . lc($value) . "' ) {\n";
             $code .= "   set \$hvac_$room '$state';\n";
-            $code .=
-              "   set \$hvac_${room}_desired $roompointer->{ $state };\n";
+            $code .= "   set \$hvac_${room}_desired $roompointer->{ $state };\n";
             $code .= "   print_log 'ok $j->{Room} changed to $j->{State}';\n";
             $code .= "}\n";
             $code .= "\n";
@@ -1165,18 +1092,13 @@ sub time_to_trigger_fire {
             $interval = 1 if !$interval || $interval < 1;
             $interval = 59 if $interval && $interval > 59;
 
-            $t =
-              time - $Second + 60 * ( $interval - ( $Minute % $interval ) ) - 1;
+            $t = time - $Second + 60 * ( $interval - ( $Minute % $interval ) ) - 1;
         }
         if ( $type eq "hour" ) {
             $interval = 1 if !$interval || $interval < 1;
             $interval = 23 if $interval && $interval > 23;
 
-            $t =
-              time -
-              $Second -
-              60 * $Minute +
-              3600 * ( $interval - ( $Hour % $interval ) ) - 1;
+            $t = time - $Second - 60 * $Minute + 3600 * ( $interval - ( $Hour % $interval ) ) - 1;
         }
     }
     else {
diff --git a/code/public/hvac_craig.pl b/code/public/hvac_craig.pl
index 6adcc42cd..7c22f57bc 100644
--- a/code/public/hvac_craig.pl
+++ b/code/public/hvac_craig.pl
@@ -26,27 +26,27 @@
 
 sub calcSetbackDelta {
 
-    my $inside_temp  = convert_k2f( state $temp_inside/ 10 );
-    my $outside_temp = convert_k2f( state $temp_outside/ 10 );
-    my $minutes_per_degree = 8;     #default for heating
-    my $delta              = 10;    #give it some kind of default
+    my $inside_temp        = convert_k2f( state $temp_inside/ 10 );
+    my $outside_temp       = convert_k2f( state $temp_outside/ 10 );
+    my $minutes_per_degree = 8;                                        #default for heating
+    my $delta              = 10;                                       #give it some kind of default
 
     if ( $TX10->{mode} eq 'Heat' ) {
         $minutes_per_degree++ if $outside_temp < 40;
         $minutes_per_degree++ if $outside_temp < 30;
         $delta = int( $minutes_per_degree * ( 68 - $inside_temp ) );
-        $delta = 10 if $delta < 10;    #sanity checks
+        $delta = 10 if $delta < 10;                                    #sanity checks
         $delta = 90 if $delta > 90;
     }
     elsif ( $TX10->{mode} eq 'Cool' ) {
-        $minutes_per_degree = 25;      #takes a lot longer to cool than heat
+        $minutes_per_degree = 25;                                      #takes a lot longer to cool than heat
         $minutes_per_degree += 2 if $outside_temp >;
         80;
         $minutes_per_degree += 3 if $outside_temp >;
         85;
         $delta = int( $minutes_per_degree * ( $inside_temp - 78 ) );
         $delta = 10  if $delta < 10;
-        $delta = 120 if $delta > 120;   #never start earlier than 2 hours before
+        $delta = 120 if $delta > 120;                                  #never start earlier than 2 hours before
     }
     else {
         print_log "Thermostat mode is neither Heat nor Cool";
diff --git a/code/public/hvac_david.pl b/code/public/hvac_david.pl
index 5a8085c5c..9606c4ae6 100644
--- a/code/public/hvac_david.pl
+++ b/code/public/hvac_david.pl
@@ -48,12 +48,8 @@
 #$TempIndoor   		= new Weather_Item 'TempIndoor';    	# The average temp to use as whole house temp
 #
 # Category=HVAC_Auto
-$v_heat_onoff_temp =
-  new Voice_Cmd('Set HVAC heat auto on off temp [50,55,60,65,70]');
-$v_heat_onoff_temp->set_info(
-    'What temperature will Misterhouse automatically turn off the HVAC heat control',
-    undef, 1
-);
+$v_heat_onoff_temp = new Voice_Cmd('Set HVAC heat auto on off temp [50,55,60,65,70]');
+$v_heat_onoff_temp->set_info( 'What temperature will Misterhouse automatically turn off the HVAC heat control', undef, 1 );
 if ( $state = said $v_heat_onoff_temp) {
     $Save{hvac_heat_auto_onoff_temp} = $state;
     speak(
@@ -64,13 +60,8 @@
     &check_auto_onoff;
 }
 
-$v_ac_onoff_temp = new Voice_Cmd(
-    'Set HVAC AC auto on off temp [70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85]'
-);
-$v_ac_onoff_temp->set_info(
-    'What temperature will Misterhouse automatically turn off the HVAC AC control',
-    undef, 1
-);
+$v_ac_onoff_temp = new Voice_Cmd( 'Set HVAC AC auto on off temp [70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85]' );
+$v_ac_onoff_temp->set_info( 'What temperature will Misterhouse automatically turn off the HVAC AC control', undef, 1 );
 if ( $state = said $v_ac_onoff_temp) {
     $Save{hvac_ac_auto_onoff_temp} = $state;
     speak(
@@ -81,11 +72,8 @@
     &check_auto_onoff;
 }
 
-$v_hvac_auto_onoff =
-  new Voice_Cmd( 'HVAC auto on/off control [heat,ac,off]', undef, 1 );
-$v_hvac_auto_onoff->set_info(
-    'Sets whether misterhouse will turn off HVAC modes automatically',
-    undef, 1 );
+$v_hvac_auto_onoff = new Voice_Cmd( 'HVAC auto on/off control [heat,ac,off]', undef, 1 );
+$v_hvac_auto_onoff->set_info( 'Sets whether misterhouse will turn off HVAC modes automatically', undef, 1 );
 if ( $state = said $v_hvac_auto_onoff) {
     print_log "HVAC auto on/off is now $state";
     speak( play => "hvac", text => "HVAC auto on and off is now $state" );
@@ -97,9 +85,7 @@
 # Category=HVAC_Control
 
 $v_hvac_control = new Voice_Cmd( 'HVAC control [on,off]', undef, 1 );
-$v_hvac_control->set_info(
-    'Sets whether misterhouse will control the HVAC system',
-    undef, 1 );
+$v_hvac_control->set_info( 'Sets whether misterhouse will control the HVAC system', undef, 1 );
 if ( $state = said $v_hvac_control) {
     if ( $state eq 'off' ) {
         &hvac_on_off(OFF);
@@ -112,8 +98,7 @@
 $v_hvac_mode = new Voice_Cmd( 'HVAC mode [heat,AC,off]', undef, 1 );
 $v_hvac_mode->set_info(
     'Manually set the misterhouse thermostat to heat, AC or off. Misterhouse may decide to change it to something else though.',
-    undef, 1
-);
+    undef, 1 );
 if ( $state = said $v_hvac_mode) {
     if ( $state eq 'off' ) {
         &hvac_on_off(OFF);
@@ -122,11 +107,8 @@
     print_log "HVAC mode has been set to $state";
 }
 
-$v_thermo_temp = new Voice_Cmd(
-    'Set daytime thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]'
-);
-$v_thermo_temp->set_info(
-    'Misterhouse thermostat setting during the day (home and awake).');
+$v_thermo_temp = new Voice_Cmd( 'Set daytime thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]' );
+$v_thermo_temp->set_info('Misterhouse thermostat setting during the day (home and awake).');
 if ( $state = said $v_thermo_temp) {
     $Save{daytime_temp} = $state;
     speak(
@@ -137,9 +119,7 @@
     &set_thermostat;
 }
 
-$v_travel_temp = new Voice_Cmd(
-    'Set travel thermostat to [60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]'
-);
+$v_travel_temp = new Voice_Cmd( 'Set travel thermostat to [60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]' );
 $v_thermo_temp->set_info('Misterhouse thermostat setting when traveling.');
 if ( $state = said $v_travel_temp) {
     $Save{travel_temp} = $state;
@@ -151,9 +131,7 @@
     &set_thermostat;
 }
 
-$v_away_thermo_temp = new Voice_Cmd(
-    'Set away thermostat to [60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]'
-);
+$v_away_thermo_temp = new Voice_Cmd( 'Set away thermostat to [60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]' );
 if ( $state = said $v_away_thermo_temp) {
     $Save{away_temp} = $state;
     speak(
@@ -164,9 +142,7 @@
     &set_thermostat;
 }
 
-$v_sleep_thermo_temp = new Voice_Cmd(
-    'Set sleep thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]'
-);
+$v_sleep_thermo_temp = new Voice_Cmd( 'Set sleep thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]' );
 if ( $state = said $v_sleep_thermo_temp) {
     $Save{sleep_temp} = $state;
     speak(
@@ -179,9 +155,7 @@
 
 $hvac_recycle_timer = new Timer();
 
-$v_hvac_recycle =
-  new Voice_Cmd( 'HVAC time before recycle [30,60,90,120,150,180,210,240]',
-    undef, 1 );
+$v_hvac_recycle = new Voice_Cmd( 'HVAC time before recycle [30,60,90,120,150,180,210,240]', undef, 1 );
 if ( $state = said $v_hvac_recycle) {
     speak(
         play => "hvac",
@@ -190,8 +164,7 @@
     $Save{hvac_recycle_min} = $state;
 }
 
-$v_hvac_recycle_time =
-  new Voice_Cmd( 'HVAC recycle time [5,10,15,20,30,40,50,60]', undef, 1 );
+$v_hvac_recycle_time = new Voice_Cmd( 'HVAC recycle time [5,10,15,20,30,40,50,60]', undef, 1 );
 if ( $state = said $v_hvac_recycle_time) {
     speak( play => "hvac", text => "HVAC recycle time is now $state minutes." );
     $Save{hvac_recycle_time_min} = $state;
@@ -205,8 +178,7 @@
 }
 
 # just remind the house that misterhouse will not control the HVAC system.
-if ( ( time_cron '0 8,11,14,17,22 * * *' ) and ( $Save{hvac_control} ne 'on' ) )
-{
+if ( ( time_cron '0 8,11,14,17,22 * * *' ) and ( $Save{hvac_control} ne 'on' ) ) {
     $Save{hvac_control} = 'off';    # if not on, then it should be off.
     speak( play => "hvac", text => "HVAC control is off." );
 }
@@ -285,8 +257,7 @@
     {
         speak(
             play => "hvac",
-            text =>
-              "Whoaa dude! The indoor temperature is $Weather{TempIndoor} degrees. Yikes!"
+            text => "Whoaa dude! The indoor temperature is $Weather{TempIndoor} degrees. Yikes!"
         );
         &hvac_on_off(OFF);
     }
@@ -339,8 +310,7 @@
             my $too_cold = 65;
             if ( $state eq OFF ) {
                 if (    $Weather{TempIndoor}
-                    and $Weather{TempIndoor} >=
-                    ( $Save{thermostat} + $hyster ) )
+                    and $Weather{TempIndoor} >= ( $Save{thermostat} + $hyster ) )
                 {
                     if ( active $hvac_recycle_timer) {
                         print_log("HVAC recycle timer active, waiting.");
@@ -352,8 +322,7 @@
             }
             elsif ( $state eq ON ) {
                 if (    $Weather{TempIndoor}
-                    and $Weather{TempIndoor} <=
-                    ( $Save{thermostat} - $hyster ) )
+                    and $Weather{TempIndoor} <= ( $Save{thermostat} - $hyster ) )
                 {
                     &hvac_on_off(OFF);
                 }
@@ -374,8 +343,7 @@
             my $too_hot = 75;
             if ( $state eq OFF ) {
                 if (    $Weather{TempIndoor}
-                    and $Weather{TempIndoor} <=
-                    ( $Save{thermostat} - $hyster ) )
+                    and $Weather{TempIndoor} <= ( $Save{thermostat} - $hyster ) )
                 {
                     if ( active $hvac_recycle_timer) {
                         print_log("HVAC recycle timer active, waiting.");
@@ -387,8 +355,7 @@
             }
             elsif ( $state eq ON ) {
                 if (    $Weather{TempIndoor}
-                    and $Weather{TempIndoor} >=
-                    ( $Save{thermostat} + $hyster ) )
+                    and $Weather{TempIndoor} >= ( $Save{thermostat} + $hyster ) )
                 {
                     &hvac_on_off(OFF);
                 }
@@ -417,8 +384,7 @@ sub check_for_recycle {
         #print_log ("nice_hvac_time_diff = $nice_hvac_time_diff");
         speak(
             play => "hvac",
-            text =>
-              "The HVAC has been running for $nice_hvac_time_diff. Turning off for recycle."
+            text => "The HVAC has been running for $nice_hvac_time_diff. Turning off for recycle."
         );
         set $hvac_recycle_timer ( $Save{hvac_recycle_time_min} * 60 );
         &hvac_on_off(OFF);
@@ -440,14 +406,12 @@ sub check_auto_onoff {
             # should the HVAC be on?
             if ( $Save{hvac_auto_onoff} eq 'heat' ) {
                 if (    $Weather{TempOutdoor}
-                    and $Weather{TempOutdoor} <=
-                    $Save{hvac_heat_auto_onoff_temp} )
+                    and $Weather{TempOutdoor} <= $Save{hvac_heat_auto_onoff_temp} )
                 {
                     if (    $Weather{TempIndoor}
                         and $Weather{TempIndoor} <= $Save{thermostat} - 1 )
                     {    # it's cold outside
-                        if ( $Save{house_occupied} eq 'on' )
-                        {    # it's hot outside
+                        if ( $Save{house_occupied} eq 'on' ) {    # it's hot outside
                             speak(
                                 play => "hvac",
                                 text =>
@@ -457,32 +421,25 @@ sub check_auto_onoff {
                             &update_hvac_state("Thermostat controlled cycle");
                         }
                         else {
-                            &update_hvac_state(
-                                "Ready to switch to heat, but waiting for occupancy"
-                            );
+                            &update_hvac_state( "Ready to switch to heat, but waiting for occupancy" );
                         }
                     }
                     else {
-                        &update_hvac_state(
-                            "Ready to switch to heat, but waiting for inside temp to go below thermostat."
-                        );
+                        &update_hvac_state( "Ready to switch to heat, but waiting for inside temp to go below thermostat." );
                     }
                 }
                 else {
-                    &update_hvac_state(
-                        "Outside temp warmer than heat auto onoff temp");
+                    &update_hvac_state("Outside temp warmer than heat auto onoff temp");
                 }
             }
             elsif ( $Save{hvac_auto_onoff} eq 'ac' ) {
                 if (    $Weather{TempOutdoor}
-                    and $Weather{TempOutdoor} >=
-                    $Save{hvac_ac_auto_onoff_temp} )
+                    and $Weather{TempOutdoor} >= $Save{hvac_ac_auto_onoff_temp} )
                 {
                     if (    $Weather{TempIndoor}
                         and $Weather{TempIndoor} >= $Save{thermostat} + 1 )
                     {
-                        if ( $Save{house_occupied} eq 'on' )
-                        {    # it's hot outside
+                        if ( $Save{house_occupied} eq 'on' ) {    # it's hot outside
                             speak(
                                 play => "hvac",
                                 text =>
@@ -492,20 +449,15 @@ sub check_auto_onoff {
                             &update_hvac_state("Thermostat controlled cycle");
                         }
                         else {
-                            &update_hvac_state(
-                                "Ready to switch to AC, but waiting for occupancy"
-                            );
+                            &update_hvac_state( "Ready to switch to AC, but waiting for occupancy" );
                         }
                     }
                     else {
-                        &update_hvac_state(
-                            "Ready to switch to AC, but waiting for inside temp to exceed thermostat."
-                        );
+                        &update_hvac_state( "Ready to switch to AC, but waiting for inside temp to exceed thermostat." );
                     }
                 }
                 else {
-                    &update_hvac_state(
-                        "Outside temp colder than AC auto onoff temp");
+                    &update_hvac_state("Outside temp colder than AC auto onoff temp");
                 }
 
             }
@@ -524,8 +476,7 @@ sub check_auto_onoff {
                 );
                 &hvac_on_off(OFF);
                 run_voice_cmd 'HVAC mode off';
-                &update_hvac_state(
-                    "Outside temp more than HEAT auto onoff setting.");
+                &update_hvac_state("Outside temp more than HEAT auto onoff setting.");
             }
         }
         elsif ( $Save{hvac_mode} eq 'AC' ) {
@@ -541,8 +492,7 @@ sub check_auto_onoff {
                 );
                 &hvac_on_off(OFF);
                 run_voice_cmd 'HVAC mode off';
-                &update_hvac_state(
-                    "Outside temp less than AC auto onoff setting.");
+                &update_hvac_state("Outside temp less than AC auto onoff setting.");
             }
         }
     }
@@ -615,8 +565,7 @@ sub set_thermostat {
       "Attic/Outside/Inside Temp Check: A:$Weather{TempAttic}, O:$Weather{TempOutdoor},  I:$Weather{TempIndoor},  G:$gradient, mode:$mode, current_state="
       . state $roof_vent_fan;
 
-    if ( ( $Weather{TempIndoor} < $Weather{TempOutdoor} && $gradient > 20 ) )
-    {    # dont want the attic heating
+    if ( ( $Weather{TempIndoor} < $Weather{TempOutdoor} && $gradient > 20 ) ) {    # dont want the attic heating
         $mode = 1;
         set $roof_vent_fan ON;
     }
@@ -655,9 +604,7 @@ sub set_thermostat {
     }
 }
 
-$v_hvac_filter_maxuse = new Voice_Cmd(
-    'Remind HVAC filter change every [200,250,300,350,400,450,500] hours',
-    undef, 1 );
+$v_hvac_filter_maxuse = new Voice_Cmd( 'Remind HVAC filter change every [200,250,300,350,400,450,500] hours', undef, 1 );
 if ( $state = said $v_hvac_filter_maxuse) {
     $Save{hvac_filter_maxuse_hr} = $state;
     print(
@@ -666,8 +613,7 @@ sub set_thermostat {
     );
 }
 
-$v_hvac_filter_changed =
-  new Voice_Cmd( 'HVAC filter has been changed', undef, 1 );
+$v_hvac_filter_changed = new Voice_Cmd( 'HVAC filter has been changed', undef, 1 );
 if ( $state = said $v_hvac_filter_changed) {
     print_log "HVAC filter has been changed, Resetting timer.";
     speak(
@@ -688,11 +634,9 @@ sub hvac_on_off {
     return unless $Save{hvac_mode} eq 'heat' or $Save{hvac_mode} eq 'AC';
 
     speak( play => "hvac_" . $state );
-    print_log
-      "HVAC $Save{hvac_mode} has been turned $state temp=$Weather{TempIndoor} time=$hvac_time_diff";
+    print_log "HVAC $Save{hvac_mode} has been turned $state temp=$Weather{TempIndoor} time=$hvac_time_diff";
     logit( "$config_parms{data_dir}/logs/hvac.$Year_Month_Now.log",
-        "state=$state  mode=$Save{hvac_mode}  temp=$Weather{TempIndoor}  time=$hvac_time_diff  "
-    );
+        "state=$state  mode=$Save{hvac_mode}  temp=$Weather{TempIndoor}  time=$hvac_time_diff  " );
 
     if ( $Save{hvac_mode} eq 'heat' ) {
         set $hvac_heat_relay $state;
@@ -736,14 +680,12 @@ sub hvac_on_off {
 sub filter_check {
 
     # check the life of the furnace filter.
-    my $used = round &Timer::query($hvac_filter_timer) / 60 / 60,
-      2;    # hvac_filter_timer is in seconds, we track by hours
+    my $used = round &Timer::query($hvac_filter_timer) / 60 / 60, 2;    # hvac_filter_timer is in seconds, we track by hours
     if ( !$Save{hvac_filter_maxuse_hr} ) {
         speak( play => "hvac", text => "HVAC filter max use is not set." );
         return;
     }
-    print_log
-      "HVAC filter has been used $used hrs. (Max: $Save{hvac_filter_maxuse_hr} hrs.)";
+    print_log "HVAC filter has been used $used hrs. (Max: $Save{hvac_filter_maxuse_hr} hrs.)";
     if ( $used >= $Save{hvac_filter_maxuse_hr} ) {
         speak( play => "hvac", text => "The HVAC filter needs to be changed." );
     }
@@ -773,16 +715,13 @@ sub web_hvac_vars {
     my @hvac_duct_temp    = &fetch_rrd_hilo("hvac_out");
     my @office_temp       = &fetch_rrd_hilo("office");
 
-    $Weather{TempDiningVault} = round $dining_vault_temp[1],
-      2;    # round with 2 digits
-    $Weather{TempMasterVault} = round $master_vault_temp[1],
-      2;    # round with 2 digits
-    $Weather{TempPlayRoom} = round $play_room_temp[1], 2;  # round with 2 digits
-    $Weather{TempGarage}   = round $garage_temp[1],    2;  # round with 2 digits
-    $Weather{TempHVACDuct} = round $hvac_duct_temp[1], 2;  # round with 2 digits
-    $Weather{TempHVACReturn} = round $hvac_return_temp[1],
-      2;                                                   # round with 2 digits
-    $Weather{TempOffice} = round $office_temp[1], 2;       # round with 2 digits
+    $Weather{TempDiningVault} = round $dining_vault_temp[1], 2;    # round with 2 digits
+    $Weather{TempMasterVault} = round $master_vault_temp[1], 2;    # round with 2 digits
+    $Weather{TempPlayRoom}    = round $play_room_temp[1],    2;    # round with 2 digits
+    $Weather{TempGarage}      = round $garage_temp[1],       2;    # round with 2 digits
+    $Weather{TempHVACDuct}    = round $hvac_duct_temp[1],    2;    # round with 2 digits
+    $Weather{TempHVACReturn}  = round $hvac_return_temp[1],  2;    # round with 2 digits
+    $Weather{TempOffice}      = round $office_temp[1],       2;    # round with 2 digits
     return;
 }
 
diff --git a/code/public/hvac_upb_thermostat.pl b/code/public/hvac_upb_thermostat.pl
index 72706d5b5..e3c55693d 100644
--- a/code/public/hvac_upb_thermostat.pl
+++ b/code/public/hvac_upb_thermostat.pl
@@ -34,8 +34,7 @@
     }
 }
 
-$v_Livingroom_Thermostat_mode = new Voice_Cmd(
-    "Set the Livingroom Thermostat mode to [off, heat, cool, auto]");
+$v_Livingroom_Thermostat_mode = new Voice_Cmd("Set the Livingroom Thermostat mode to [off, heat, cool, auto]");
 $Livingroom_Thermostat->mode( $v_Livingroom_Thermostat_mode->{state} )
   if ( said $v_Livingroom_Thermostat_mode);
 
diff --git a/code/public/iButton_DS2450.pl b/code/public/iButton_DS2450.pl
index e10690220..2b4b27c96 100644
--- a/code/public/iButton_DS2450.pl
+++ b/code/public/iButton_DS2450.pl
@@ -15,8 +15,7 @@
 $v_iButton_DS2450_setup->set_info('Setup a specific DS2450');
 
 $v_iButton_DS2450_convert = new Voice_Cmd "Convert [A,B,C,D,all,BDA]";
-$v_iButton_DS2450_convert->set_info(
-    'Start conversion on the selected AD channel of a specific DS2450');
+$v_iButton_DS2450_convert->set_info('Start conversion on the selected AD channel of a specific DS2450');
 
 $v_iButton_DS2450_read = new Voice_Cmd "Read [A,B,C,D,all]";
 $v_iButton_DS2450_read->set_info('Read the conversion results from memory');
@@ -29,8 +28,7 @@
     my @ib_2450_family_list = &iButton::scan('20');
     speak $#ib_2450_family_list + 1 . " DS2450 found";
     for my $ib (@ib_2450_family_list) {
-        print_log "ID:" . $ib->serial . "  CRC:" . $ib->crc,
-          ": " . $ib->model();
+        print_log "ID:" . $ib->serial . "  CRC:" . $ib->crc, ": " . $ib->model();
     }
 }
 
@@ -56,12 +54,7 @@
     $D{resolution} = 12;
     $D{range}      = 5.12;
 
-    if (
-        $ib_test->Hardware::iButton::Device::DS2450::setup(
-            $VCC, \%A, \%B, \%C, \%D
-        )
-      )
-    {
+    if ( $ib_test->Hardware::iButton::Device::DS2450::setup( $VCC, \%A, \%B, \%C, \%D ) ) {
         print_log "Success!";
     }
     else {
@@ -80,8 +73,7 @@
 
 if ( $state = said $v_iButton_DS2450_read) {
     if ( $state =~ m/all/i ) {
-        my ( $A, $B, $C, $D ) =
-          $ib_test->Hardware::iButton::Device::DS2450::readAD($state);
+        my ( $A, $B, $C, $D ) = $ib_test->Hardware::iButton::Device::DS2450::readAD($state);
         if ( defined $A ) {
             print_log "---Results---";
             print_log "A=$A V.";
@@ -94,8 +86,7 @@
         }
     }
     else {
-        my $result =
-          $ib_test->Hardware::iButton::Device::DS2450::readAD($state);
+        my $result = $ib_test->Hardware::iButton::Device::DS2450::readAD($state);
         if ( defined $result ) {
             print_log "---Results---";
             print_log $state . "=" . $result . " V";
@@ -108,12 +99,7 @@
 
 if ( $state = said $v_iButton_DS2450_setswitch) {
     my $channel = "A";
-    if (
-        $ib_test->Hardware::iButton::Device::DS2450::set_switch(
-            $channel, $state
-        )
-      )
-    {
+    if ( $ib_test->Hardware::iButton::Device::DS2450::set_switch( $channel, $state ) ) {
         print_log "Success!";
     }
     else {
diff --git a/code/public/iButton_locks.pl b/code/public/iButton_locks.pl
index 4497997dc..ca357361a 100644
--- a/code/public/iButton_locks.pl
+++ b/code/public/iButton_locks.pl
@@ -12,10 +12,8 @@
 
 # Define the keys and create the iButton objects
 
-my %ib_keys = (
-    '010000081exxxxxx', 'nigel', '010000081exxxxxx', 'stephan',
-    '010000081exxxxxx', 'tim',   '010000081exxxxxx', 'benedicte'
-);
+my %ib_keys =
+  ( '010000081exxxxxx', 'nigel', '010000081exxxxxx', 'stephan', '010000081exxxxxx', 'tim', '010000081exxxxxx', 'benedicte' );
 
 # Define the lock solenoid
 $front_lock = new Serial_Item( 'AHD', 'on', 'weeder' );
diff --git a/code/public/iButton_temps.pl b/code/public/iButton_temps.pl
index cbaa60e46..45e41b99c 100644
--- a/code/public/iButton_temps.pl
+++ b/code/public/iButton_temps.pl
@@ -5,8 +5,7 @@
 #@ Download linux or windows digitemp from: http://www.digitemp.com
 
 $v_iButton_readtemps = new Voice_Cmd "Read the iButton temperature buttons";
-$v_iButton_readtemps->set_info(
-    'This reads all all iButton temperature devices.');
+$v_iButton_readtemps->set_info('This reads all all iButton temperature devices.');
 $ibutton_read = new Process_Item('digitemp.exe -c/bin/digitemp.cfg -a');
 
 if ( new_minute 1 or said $v_iButton_readtemps) {
diff --git a/code/public/iButton_ws.pl b/code/public/iButton_ws.pl
index 16b7e1c3f..46c95d2a9 100644
--- a/code/public/iButton_ws.pl
+++ b/code/public/iButton_ws.pl
@@ -2,8 +2,7 @@
 use iButton;
 
 $v_iButton_list = new Voice_Cmd "List all the iButton buttons";
-$v_iButton_list->set_info(
-    'Lists the family and ID codes of all the buttons on the bus');
+$v_iButton_list->set_info('Lists the family and ID codes of all the buttons on the bus');
 $v_iButton_connect = new Voice_Cmd "[Connect,Disconnect] to the iButton bus";
 
 sub usleep {
@@ -19,11 +18,7 @@ sub usleep {
     my @ib_list = &iButton::scan;
     speak $#ib_list + 1 . " iButtons found";
     for my $ib (@ib_list) {
-        print_log "Device type:"
-          . $ib->family . "  ID:"
-          . $ib->serial
-          . "  CRC:"
-          . $ib->crc, ": " . $ib->model();
+        print_log "Device type:" . $ib->family . "  ID:" . $ib->serial . "  CRC:" . $ib->crc, ": " . $ib->model();
     }
 }
 
@@ -86,16 +81,12 @@ sub iButton_wind_read {
     #wind speed
 
     my $wind_time1 = &get_tickcount;
-    my $count =
-      $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
+    my $count      = $ib_wind_speed->Hardware::iButton::Device::DS2423::read_counter();
     print "wind: $count\n";
 
     if ($wind_time2) {
-        my $revolution_sec =
-          ( ( $count - $last_wind_count ) * 1000 ) /
-          ( $wind_time1 - $wind_time2 ) / 2.0;
-        print "rev/sec:$revolution_sec speed:"
-          . sprintf( "%3.2f", $revolution_sec * 2.453 ) . "\n"
+        my $revolution_sec = ( ( $count - $last_wind_count ) * 1000 ) / ( $wind_time1 - $wind_time2 ) / 2.0;
+        print "rev/sec:$revolution_sec speed:" . sprintf( "%3.2f", $revolution_sec * 2.453 ) . "\n"
           if $config_parms{debug} eq 'iButton';
         set $ib_wind_speed sprintf( "%3.2f", $revolution_sec * 2.453 );
     }
@@ -138,9 +129,7 @@ sub iButton_wind_read {
     my $dir = 0;
     for my $ib (@ib_list) {
         $dir += $wind_dir{ $ib->serial };
-        print "Wind ID:"
-          . $ib->serial() . " dir="
-          . $wind_dir{ $ib->serial } . "\n";
+        print "Wind ID:" . $ib->serial() . " dir=" . $wind_dir{ $ib->serial } . "\n";
     }
     $weather{wind_dir} = sprintf( "%3.1f", $dir / ( $#ib_list + 1 ) * 45 )
       if $#ib_list > -1;
@@ -164,8 +153,7 @@ sub iButton_wind_read {
     $raintotal_prev = $weather{RainTotal} if $raintotal_prev eq '';
     $weather{RainRecent} =
       round( ( $weather{RainTotal} - $raintotal_prev ), 2 );
-    print
-      "raincount:$count, rt=$weather{RainTotal}, raintotal_prev:$raintotal_prev\n"
+    print "raincount:$count, rt=$weather{RainTotal}, raintotal_prev:$raintotal_prev\n"
       if $config_parms{debug} eq 'iButton';
 
     if ( $weather{RainRecent} > 0 ) {
@@ -210,11 +198,8 @@ sub iButton_wind_read {
     #          "freezer: $weather{Temp_freezer} " . sprintf("[%3.2f]", $delta{freezer}/$delta_i);
 
     $weather{Temp_inside} -= 0.60;
-    logit(
-        "$config_parms{data_dir}/logs/iButton_temps.log",
-        "$weather{Temp_inside} $weather{Temp_outside} $weather{Temp_freezer} 0",
-        12
-    );
+    logit( "$config_parms{data_dir}/logs/iButton_temps.log",
+        "$weather{Temp_inside} $weather{Temp_outside} $weather{Temp_freezer} 0", 12 );
 
     $weather{WindSpeed}     = state $ib_wind_speed;
     $weather{WindGustSpeed} = $weather{WindSpeed}
@@ -222,17 +207,14 @@ sub iButton_wind_read {
     $weather{WindAvgSpeed} =
       ( $weather{WindSpeed} + $weather{WindGustSpeed} ) / 2;
 
-    $weather{Summary} = sprintf( "In/out/freezer: %3.1f/%3.1f/%3.1f ",
-        $weather{Temp_inside}, $weather{Temp_outside}, $weather{Temp_freezer} );
-    $weather{SummaryWind} =
-      sprintf( "WindSpeed/WindGustSpeed/WindAvgSpeed: %3.1f/%3.1f/%3.1f ",
+    $weather{Summary} =
+      sprintf( "In/out/freezer: %3.1f/%3.1f/%3.1f ", $weather{Temp_inside}, $weather{Temp_outside}, $weather{Temp_freezer} );
+    $weather{SummaryWind} = sprintf( "WindSpeed/WindGustSpeed/WindAvgSpeed: %3.1f/%3.1f/%3.1f ",
         $weather{WindSpeed}, $weather{WindGustSpeed}, $weather{WindAvgSpeed} );
     $weather{SummaryRain} =
-      sprintf( "RainTotal/RainRecent/IsRaining: %3.2f/%3.2f/%d ",
-        $weather{RainTotal}, $weather{RainRecent}, $weather{IsRaining} );
+      sprintf( "RainTotal/RainRecent/IsRaining: %3.2f/%3.2f/%d ", $weather{RainTotal}, $weather{RainRecent}, $weather{IsRaining} );
 
-    print_log
-      "wind speed: $weather{WindSpeed} wind dir: $weather{wind_dir} rain:$weather{RainTotal}";
+    print_log "wind speed: $weather{WindSpeed} wind dir: $weather{wind_dir} rain:$weather{RainTotal}";
 }
 
 my %iButton_data_avg_data;
diff --git a/code/public/iButton_ws_client.pl b/code/public/iButton_ws_client.pl
index 4784d02c9..f34fced12 100644
--- a/code/public/iButton_ws_client.pl
+++ b/code/public/iButton_ws_client.pl
@@ -40,8 +40,7 @@
 $ibws_v = new Voice_Cmd "[Start,Stop,Speak] the ibutton weather station client";
 $ibws_v->set_info('Connects to the ibutton weather station server');
 
-my @weather_vars =
-  qw(TempOutdoor TempOutdoorHigh TempOutdoorLow WindSpeed WindSpeedPeak WindSpeedHigh WindDir WindDirAvg
+my @weather_vars = qw(TempOutdoor TempOutdoorHigh TempOutdoorLow WindSpeed WindSpeedPeak WindSpeedHigh WindDir WindDirAvg
   RainRate RainToday RainWeek RainMonth);
 
 my $freezing = new Weather_Item 'TempOutdoor', '<', 32;
diff --git a/code/public/iButton_ws_ernie.pl b/code/public/iButton_ws_ernie.pl
index 8c35a0344..a2969071e 100644
--- a/code/public/iButton_ws_ernie.pl
+++ b/code/public/iButton_ws_ernie.pl
@@ -48,27 +48,24 @@
     $DS2438_tempC = $humsensor->Get_Temp_2438;    #read DS2438 temp in Celsius
     $DS2438_Vad   = $humsensor->Get_Vad_2438;     #read DS2438 Vad
     $DS2438_Vdd   = $humsensor->Get_Vdd_2438;     #read DS2438 Vdd
-      # $DS2438_Vsens = $humsensor->Get_Vsens_2438; #read DS2438 Vsens - not useful here, but other models use it
-      #   David Bray says...
-      # Here is a snipit of C code that computes dew point:
-      # I don't know which units you want so here is both -- outTemp is in F
-      #       // compute the dewpoint from relative humidity
-      #    outTempC = (outTempF - 32)/9*5;
-      #       // evp is the environmental vapor pressure
-      #    evp = (humid/100) * 0.611 * exp(17.27 * outTempC/(outTempC + 237.3));
-      #       // yes there are 2 different numbers 237.3 and 273.15
-      #    dewpointC = (116.9 + 237.3 * log(evp))/(16.78 - log(evp));
-      #    dewpointF = dewpointC * 9/5+32;
+         # $DS2438_Vsens = $humsensor->Get_Vsens_2438; #read DS2438 Vsens - not useful here, but other models use it
+         #   David Bray says...
+         # Here is a snipit of C code that computes dew point:
+         # I don't know which units you want so here is both -- outTemp is in F
+         #       // compute the dewpoint from relative humidity
+         #    outTempC = (outTempF - 32)/9*5;
+         #       // evp is the environmental vapor pressure
+         #    evp = (humid/100) * 0.611 * exp(17.27 * outTempC/(outTempC + 237.3));
+         #       // yes there are 2 different numbers 237.3 and 273.15
+         #    dewpointC = (116.9 + 237.3 * log(evp))/(16.78 - log(evp));
+         #    dewpointF = dewpointC * 9/5+32;
 
     # Relative Humidity
     if ( ( defined $DS2438_Vad ) && ( defined $DS2438_Vdd ) ) {
-        $RH =
-          ( ( ( $DS2438_Vad / $DS2438_Vdd ) - 0.16 ) / 0.0062 ) *
-          ( 1.0546 - 0.00216 * $DS2438_tempC );
+        $RH = ( ( ( $DS2438_Vad / $DS2438_Vdd ) - 0.16 ) / 0.0062 ) * ( 1.0546 - 0.00216 * $DS2438_tempC );
 
         # Saturation Vapor over water
-        my $evp = ( $RH / 100 ) * 0.611 *
-          exp( 17.27 * $DS2438_tempC / ( $DS2438_tempC + 237.3 ) );
+        my $evp = ( $RH / 100 ) * 0.611 * exp( 17.27 * $DS2438_tempC / ( $DS2438_tempC + 237.3 ) );
 
         # temperature to which air must be cooled in order to have condensation
         my $dewpointC = ( 116.9 + 237.3 * log($evp) ) / ( 16.78 - log($evp) );
@@ -80,21 +77,13 @@
         #print_log "DS2438: Vad=". $DS2438_Vad . " Vdd=" . $DS2438_Vdd . " Temp2=" . $DS2438_tempF . " RH=" . sprintf ("%3.2f",$RH); # for debugging
     }
     else {
-        print_log "DS2438: Vad="
-          . $DS2438_Vad . " Vdd="
-          . $DS2438_Vdd
-          . " Null Vals Temp2="
-          . $DS2438_tempF
-          . " Temp="
-          . $temp;
+        print_log "DS2438: Vad=" . $DS2438_Vad . " Vdd=" . $DS2438_Vdd . " Null Vals Temp2=" . $DS2438_tempF . " Temp=" . $temp;
     }
 
     if ( $Minute % 5 ) {
         #
-        RRDs::update(
-            "$plotdir/temp.rrd", "N:$temp",
-            "N:$DS2438_tempF",   "N:$dewpointF"
-        ) if ( defined $temp && defined $DS2438_tempF && defined $dewpointF );
+        RRDs::update( "$plotdir/temp.rrd", "N:$temp", "N:$DS2438_tempF", "N:$dewpointF" )
+          if ( defined $temp && defined $DS2438_tempF && defined $dewpointF );
         RRDs::update( "$plotdir/humid.rrd", "N:$RH" ) if defined $RH;
     }
     if ( ( $Minute == 50 ) && ( $Second == 0 ) ) {
@@ -117,86 +106,54 @@
 
         #Plot temp,temp2,dewpoint
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/temp.gif",
-            "--title=Temperature",
-            "--vertical-label=degrees F",
-            "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
-            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE",
-            "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
-            "LINE2:mytemp#ff0000:weather station",
-            "LINE2:mytemp2#0000ff:humsensor",
-            "LINE2:mytemp3#00ff00:dewpoint",
-            "--start=1025144197"
+            "$plotdir/temp.gif",                           "--title=Temperature",
+            "--vertical-label=degrees F",                  "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
+            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE", "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
+            "LINE2:mytemp#ff0000:weather station",         "LINE2:mytemp2#0000ff:humsensor",
+            "LINE2:mytemp3#00ff00:dewpoint",               "--start=1025144197"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/temphr.gif",
-            "--title=Temperature",
-            "--vertical-label=degrees F",
-            "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
-            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE",
-            "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
-            "LINE2:mytemp#ff0000:weather station",
-            "LINE2:mytemp2#0000ff:humsensor",
-            "LINE2:mytemp3#00ff00:dewpoint",
-            "--start=$timehr"
+            "$plotdir/temphr.gif",                         "--title=Temperature",
+            "--vertical-label=degrees F",                  "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
+            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE", "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
+            "LINE2:mytemp#ff0000:weather station",         "LINE2:mytemp2#0000ff:humsensor",
+            "LINE2:mytemp3#00ff00:dewpoint",               "--start=$timehr"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/tempday.gif",
-            "--title=Temperature",
-            "--vertical-label=degrees F",
-            "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
-            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE",
-            "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
-            "LINE2:mytemp#ff0000:weather station",
-            "LINE2:mytemp2#0000ff:humsensor",
-            "LINE2:mytemp3#00ff00:dewpoint",
-            "--start=$timeday"
+            "$plotdir/tempday.gif",                        "--title=Temperature",
+            "--vertical-label=degrees F",                  "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
+            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE", "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
+            "LINE2:mytemp#ff0000:weather station",         "LINE2:mytemp2#0000ff:humsensor",
+            "LINE2:mytemp3#00ff00:dewpoint",               "--start=$timeday"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/tempwk.gif",
-            "--title=Temperature",
-            "--vertical-label=degrees F",
-            "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
-            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE",
-            "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
-            "LINE2:mytemp#ff0000:weather station",
-            "LINE2:mytemp2#0000ff:humsensor",
-            "LINE2:mytemp3#00ff00:dewpoint",
-            "--start=$timewk"
+            "$plotdir/tempwk.gif",                         "--title=Temperature",
+            "--vertical-label=degrees F",                  "DEF:mytemp=$plotdir/temp.rrd:temp:AVERAGE",
+            "DEF:mytemp2=$plotdir/temp.rrd:temp2:AVERAGE", "DEF:mytemp3=$plotdir/temp.rrd:temp3:AVERAGE",
+            "LINE2:mytemp#ff0000:weather station",         "LINE2:mytemp2#0000ff:humsensor",
+            "LINE2:mytemp3#00ff00:dewpoint",               "--start=$timewk"
         );
 
         #Plot humidity
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/humid.gif",
-            "--title=Humidity",
-            "--vertical-label=%",
-            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
-            "LINE2:myhumid#ff0000:humidity",
-            "--start=1025144197"
+            "$plotdir/humid.gif",            "--title=Humidity",
+            "--vertical-label=%",            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
+            "LINE2:myhumid#ff0000:humidity", "--start=1025144197"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/humidhr.gif",
-            "--title=Humidity",
-            "--vertical-label=%",
-            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
-            "LINE2:myhumid#ff0000:humidity",
-            "--start=$timehr"
+            "$plotdir/humidhr.gif",          "--title=Humidity",
+            "--vertical-label=%",            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
+            "LINE2:myhumid#ff0000:humidity", "--start=$timehr"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/humidday.gif",
-            "--title=Humidity",
-            "--vertical-label=%",
-            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
-            "LINE2:myhumid#ff0000:humidity",
-            "--start=$timeday"
+            "$plotdir/humidday.gif",         "--title=Humidity",
+            "--vertical-label=%",            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
+            "LINE2:myhumid#ff0000:humidity", "--start=$timeday"
         );
         ( my $junk1, my $junk2, my $junk3 ) = RRDs::graph(
-            "$plotdir/humidwk.gif",
-            "--title=Humidity",
-            "--vertical-label=%",
-            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
-            "LINE2:myhumid#ff0000:humidity",
-            "--start=$timewk"
+            "$plotdir/humidwk.gif",          "--title=Humidity",
+            "--vertical-label=%",            "DEF:myhumid=$plotdir/humid.rrd:humid:AVERAGE",
+            "LINE2:myhumid#ff0000:humidity", "--start=$timewk"
         );
     }
 }
diff --git a/code/public/ical.pl b/code/public/ical.pl
index fbd418c92..03b7c2f0a 100644
--- a/code/public/ical.pl
+++ b/code/public/ical.pl
@@ -1,9 +1,7 @@
 # Category=Timed Events
 
 my $ical_out_file = "$config_parms{code_dir}/ical_programing.pl";
-$p_ical_read = new Process_Item(
-    "ical_load -days 1 -calendar $config_parms{calendar_file} -pl_file $ical_out_file"
-);
+$p_ical_read = new Process_Item( "ical_load -days 1 -calendar $config_parms{calendar_file} -pl_file $ical_out_file" );
 
 $f_ical_data = new File_Item( $config_parms{calendar_file} );
 set_watch $f_ical_data if $Reload;
@@ -11,8 +9,7 @@
 # Run ical_read if we asked for it or if
 # the calendar file has changed.
 $v_ical_read = new Voice_Cmd 'Load the ical calendar';
-$v_ical_read->set_info(
-    'This will check create mh events to announce calendar entries');
+$v_ical_read->set_info('This will check create mh events to announce calendar entries');
 if ( said $v_ical_read
     or ( $New_Minute and !( $Minute % 5 ) and changed $f_ical_data) )
 {
diff --git a/code/public/internet_ip_update.pl b/code/public/internet_ip_update.pl
index ae612fb05..d1fc9e1c5 100644
--- a/code/public/internet_ip_update.pl
+++ b/code/public/internet_ip_update.pl
@@ -24,8 +24,7 @@
 # Global variables
 #
 my $f_ip_update_html = "$config_parms{data_dir}/web/ipupdate.html";
-my $p_ip_update_url =
-  new Process_Item("get_url $config_parms{ip_update_url} $f_ip_update_html");
+my $p_ip_update_url  = new Process_Item("get_url $config_parms{ip_update_url} $f_ip_update_html");
 
 #
 # Add a hook before user mode code runs
@@ -78,8 +77,7 @@ sub TkIpAddressLabel {
         # This format is for www.ipid.net
         /your ip is ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/im
           && do { $ip_update_address = $1; last SWITCH; };
-        print_log
-          "DeriveIpAccess unable to parse returned HTML, ip address NOT updated";
+        print_log "DeriveIpAccess unable to parse returned HTML, ip address NOT updated";
     }
     TkIpAddressLabel;
 }
@@ -117,8 +115,7 @@ sub TkIpAddressLabel {
 
             if ( $config_parms{net_www_server} ) {
 
-                my $file =
-                  "$config_parms{data_dir}/web/internet_ip_update.html";
+                my $file = "$config_parms{data_dir}/web/internet_ip_update.html";
                 if ( my $data = file_read($file) ) {
 
                     my $DateTime = time_date_stamp(2);
@@ -161,12 +158,10 @@ sub TkIpAddressLabel {
             $Save{ip_address_server} = $ip_address;
 
             if ( $config_parms{dips_password} ) {
-                print_log
-                  "Updating DIPS with dynamic ip address of $ip_address";
+                print_log "Updating DIPS with dynamic ip address of $ip_address";
 
                 my $url = 'http://postmodem.com/dips-admin/update.cgi?';
-                $url .=
-                  "pwd=$config_parms{dips_password}&ip=$ip_address&topic=Home_Automation";
+                $url .= "pwd=$config_parms{dips_password}&ip=$ip_address&topic=Home_Automation";
 
                 my $rc = get $url;
                 if ( $rc =~ /successfull/ ) {
@@ -194,8 +189,7 @@ sub TkIpAddressLabel {
             }
 
             if ( $config_parms{tzo_key} ) {
-                print_log
-                  "Updating tzo.com with dynamic ip address of $ip_address";
+                print_log "Updating tzo.com with dynamic ip address of $ip_address";
 
                 my $url = "http://cgi.tzo.com/webclient/signedon.html?";
                 $url .= "TZOName=$config_parms{tzo_name}";
@@ -206,7 +200,7 @@ sub TkIpAddressLabel {
                 if ( $rc =~ /successfull/ ) {
                     speak "T Z O updated" unless $Save{sleeping_parents};
                 }
-                elsif ( $rc =~ /TZO Error/ ) {   #   TZO Error!  Invalid TZO Key
+                elsif ( $rc =~ /TZO Error/ ) {    #   TZO Error!  Invalid TZO Key
                     speak "Error, TZO key is in valid";
                 }
                 else {
@@ -239,8 +233,7 @@ sub TkIpAddressLabel {
             $Save{ip_address_email} = $ip_address;
 
             if ( $config_parms{ip_update_email} ) {
-                print_log
-                  "Sending address update email message with dynamic ip address of $ip_address";
+                print_log "Sending address update email message with dynamic ip address of $ip_address";
                 &net_mail_send(
                     to      => $config_parms{ip_update_email},
                     subject => "MH IP address now $ip_address"
diff --git a/code/public/internet_ip_update_craig.pl b/code/public/internet_ip_update_craig.pl
index 4590c24ea..af3cdcbba 100644
--- a/code/public/internet_ip_update_craig.pl
+++ b/code/public/internet_ip_update_craig.pl
@@ -12,8 +12,7 @@
 
 =cut
 
-$f_internet_ip_update =
-  new File_Item("$config_parms{data_dir}/web/internet_ip_update.html");
+$f_internet_ip_update = new File_Item("$config_parms{data_dir}/web/internet_ip_update.html");
 set_watch $f_internet_ip_update if $Reload;
 $v_send_ip_address1 = new Voice_Cmd('Send ip address to the web page');
 if ( said $v_send_ip_address1) {
diff --git a/code/public/internet_ip_update_hn.pl b/code/public/internet_ip_update_hn.pl
index d63c1b2b8..658c1efb1 100644
--- a/code/public/internet_ip_update_hn.pl
+++ b/code/public/internet_ip_update_hn.pl
@@ -30,7 +30,7 @@
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib'";   # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
@@ -71,7 +71,7 @@ BEGIN
 use MIME::Base64 ();
 use IO::Socket;
 
-if ( $config_parms_startup{update} ) {  # If account in cmd line arg, compare it
+if ( $config_parms_startup{update} ) {    # If account in cmd line arg, compare it
     $myip = $config_parms_startup{update};
 }
 
@@ -122,9 +122,7 @@ BEGIN
     print("(UPDATE_IP) Success. Hammernode DNS dynamic IP set to $myip.\n");
 }
 elsif ( $code == 201 ) {
-    print(
-        "(UPDATE_IP) Failed. Previous update occured less than 300 seconds ago.\n"
-    );
+    print( "(UPDATE_IP) Failed. Previous update occured less than 300 seconds ago.\n" );
 }
 elsif ( $code == 202 ) {
     print("(UPDATE_IP) Failed. Server error.\n");
diff --git a/code/public/internet_ip_update_larry.pl b/code/public/internet_ip_update_larry.pl
index c7525ece5..eb638173c 100644
--- a/code/public/internet_ip_update_larry.pl
+++ b/code/public/internet_ip_update_larry.pl
@@ -5,8 +5,7 @@
 #Larry Roudebush
 my $f_get_external_ip = "$config_parms{data_dir}/web/externalip.html";
 $v_get_external_ip = new Voice_Cmd 'Check external IP address';
-$p_get_external_ip =
-  new Process_Item "get_url http://www.whatismyip.com $f_get_external_ip";
+$p_get_external_ip = new Process_Item "get_url http://www.whatismyip.com $f_get_external_ip";
 
 if ( said $v_get_external_ip or $New_Hour ) {
     unlink $f_get_external_ip;
@@ -44,8 +43,7 @@
 # Shared funtion to update the label
 sub TkIpAddressLabel {
     if (&net_connect_check) {
-        $Tk_objects{ip_address} =
-          "External IP address: $Save{ip_address_server}";
+        $Tk_objects{ip_address} = "External IP address: $Save{ip_address_server}";
     }
     else {
         $Tk_objects{ip_address} = "Not Connected";
diff --git a/code/public/internet_speed_check.pl b/code/public/internet_speed_check.pl
index 3fcd10418..2bbced79b 100644
--- a/code/public/internet_speed_check.pl
+++ b/code/public/internet_speed_check.pl
@@ -13,15 +13,12 @@
 
 =cut    
 
-my $getspeedcheckfile = 'c:\mh\larry\data\ftp\ftptestfile.doc'
-  ;    #these are just the name and location of the files
-my $getremotespeedcheck = 'ftptestfile.doc'; #you want to get off the ftp server
-my $putspeedcheckfile = 'c:\mh\larry\data\ftptestfile.doc'
-  ;    #these are the name and location of the files
-my $putremotespeedcheck = 'ftptestfile.doc';  #you want to put on the ftp server
-my $speedcheckuser = '__userid__';    #this is your user id for the ftp server
-my $speedcheckpassword =
-  '__password__';                     #this is your password for the ftp server
+my $getspeedcheckfile   = 'c:\mh\larry\data\ftp\ftptestfile.doc';    #these are just the name and location of the files
+my $getremotespeedcheck = 'ftptestfile.doc';                         #you want to get off the ftp server
+my $putspeedcheckfile   = 'c:\mh\larry\data\ftptestfile.doc';        #these are the name and location of the files
+my $putremotespeedcheck = 'ftptestfile.doc';                         #you want to put on the ftp server
+my $speedcheckuser      = '__userid__';                              #this is your user id for the ftp server
+my $speedcheckpassword  = '__password__';                            #this is your password for the ftp server
 
 # This is the download speed check
 $getspeedcheck        = new Process_Item;
@@ -30,22 +27,19 @@
     unlink $getspeedcheckfile;
     $Save{get_time_before_start} = $Time;
     print_log "checking internet download speed";
-    set $getspeedcheck
-      "net_ftp -file $getspeedcheckfile -file_remote $getremotespeedcheck "
+    set $getspeedcheck "net_ftp -file $getspeedcheckfile -file_remote $getremotespeedcheck "
       . "-command get -server ftp.geocities.com -user $speedcheckuser -password $speedcheckpassword";
     start $getspeedcheck;
 }
 
 if ( done_now $getspeedcheck) {
     $Save{get_time_after_start} = $Time;
-    my $get_time_diff =
-      $Save{get_time_after_start} - $Save{get_time_before_start};
+    my $get_time_diff = $Save{get_time_after_start} - $Save{get_time_before_start};
     print_log "Ftp command done";
     my $getfilesize       = ( -s $putspeedcheckfile );
     my $get_speed_time    = $getfilesize / $get_time_diff;
     my $get_KB_speed_time = $get_speed_time / 1024;
-    speak
-      "Your download took $get_time_diff seconds with a speed of $get_KB_speed_time kilobytes per second";
+    speak "Your download took $get_time_diff seconds with a speed of $get_KB_speed_time kilobytes per second";
     logit "$config_parms{data_dir}/logs/get_internet_speed.txt",
       "Your download took $get_time_diff seconds with a speed of $get_KB_speed_time";
 }
@@ -62,22 +56,19 @@
 if ( done_now $deletespeedcheck) {
     $Save{put_time_before_start} = $Time;
     print_log "checking internet upload speed";
-    set $putspeedcheck
-      "net_ftp -file $putspeedcheckfile -file_remote $putremotespeedcheck "
+    set $putspeedcheck "net_ftp -file $putspeedcheckfile -file_remote $putremotespeedcheck "
       . "-command put -server ftp.geocities.com -user $speedcheckuser -password $speedcheckpassword";
     start $putspeedcheck;
 }
 
 if ( done_now $putspeedcheck) {
     $Save{put_time_after_start} = $Time;
-    my $put_time_diff =
-      $Save{put_time_after_start} - $Save{put_time_before_start};
+    my $put_time_diff = $Save{put_time_after_start} - $Save{put_time_before_start};
     print_log "Ftp command done";
     my $putfilesize       = ( -s $putspeedcheckfile );
     my $put_speed_time    = $putfilesize / $put_time_diff;
     my $put_KB_speed_time = $put_speed_time / 1024;
-    speak
-      "Your upload took $put_time_diff seconds with a speed of $put_KB_speed_time kilobytes per second";
+    speak "Your upload took $put_time_diff seconds with a speed of $put_KB_speed_time kilobytes per second";
     logit "$config_parms{data_dir}/logs/put_internet_speed.txt",
       "Your upload took $put_time_diff seconds with a speed of $put_KB_speed_time";
 }
diff --git a/code/public/internet_usgs.pl b/code/public/internet_usgs.pl
index 070cc9d8d..0cc9e134a 100644
--- a/code/public/internet_usgs.pl
+++ b/code/public/internet_usgs.pl
@@ -32,8 +32,7 @@
 my %USGS_Level;     # The current River Level
 my %USGS_Name;      # The River Name/Location
 
-my @MH_Rivers = split( / /, $config_parms{USGS_Monitor} )
-  ;                 # The River IDs and Notification level
+my @MH_Rivers = split( / /, $config_parms{USGS_Monitor} );    # The River IDs and Notification level
 
 my $f_USGS_list = "$config_parms{data_dir}/web/USGS.txt";
 my $f_USGS_html = "$config_parms{data_dir}/web/USGS.html";
@@ -50,8 +49,7 @@
 }
 
 #More of the general URL
-$USGS_URL .=
-  "&search_site_no_match_type=exact&index_pmcode_STATION_NM=1&index_pmcode_DATETIME=2";
+$USGS_URL .= "&search_site_no_match_type=exact&index_pmcode_STATION_NM=1&index_pmcode_DATETIME=2";
 
 # Add whether CFS or Level
 if   ( $config_parms{USGS_Rate} ) { $USGS_URL .= "&index_pmcode_00065=3"; }
@@ -75,8 +73,8 @@
 #Check to see if there's anything in the file before speaking
 #speak    (text => $f_USGS_list, display => 0) if ($state eq 'Read' && file_size $f_USGS_list);
 if ( $state eq 'Read' ) {
-    if ( file_size $f_USGS_list) { speak text => "app=usgs $f_USGS_list"; }
-    else { speak text => 'app=usgs No water anywhere!'; }
+    if   ( file_size $f_USGS_list) { speak text => "app=usgs $f_USGS_list"; }
+    else                           { speak text => 'app=usgs No water anywhere!'; }
 }
 elsif ( $state eq 'Show' ) {
     if ( file_size $f_USGS_list) {
@@ -108,8 +106,7 @@
 
         # fixed 100219 looks like it spoke, then set things to read, and then read it again.
         #speak text => "app=usgs $f_USGS_list" if file_size $f_USGS_list;
-        start $p_USGS_list 'do_nothing'
-          ; # Fire the process with no-op, so we can still run the parsing code for debug
+        start $p_USGS_list 'do_nothing';    # Fire the process with no-op, so we can still run the parsing code for debug
     }
     else {
         if (&net_connect_check) {
@@ -120,7 +117,7 @@
         }
         else { speak "app=usgs Sorry, you must be logged onto the net"; }
     }
-    &respond_wait;    # Tell web browser to wait for respond
+    &respond_wait;                          # Tell web browser to wait for respond
 }
 
 if ( done_now $p_USGS_list) {
@@ -143,21 +140,11 @@
         @USGS_RiverValues = split( "\t", $USGS_River );
         $USGS_Level{"@USGS_RiverValues[1]"} = @USGS_RiverValues[7];
         $USGS_Name{"@USGS_RiverValues[1]"}  = @USGS_RiverValues[2];
-        print "Result: "
-          . $USGS_Level{"@USGS_RiverValues[1]"}
-          . $USGS_Name{"@USGS_RiverValues[1]"} . "\n";
-        if (
-            (
-                $USGS_Level{"@USGS_RiverValues[1]"} >=
-                $USGS_Notify{"@USGS_RiverValues[1]"}
-            )
-            && $USGS_Level{"@USGS_RiverValues[1]"} ne ""
-          )
+        print "Result: " . $USGS_Level{"@USGS_RiverValues[1]"} . $USGS_Name{"@USGS_RiverValues[1]"} . "\n";
+        if ( ( $USGS_Level{"@USGS_RiverValues[1]"} >= $USGS_Notify{"@USGS_RiverValues[1]"} )
+            && $USGS_Level{"@USGS_RiverValues[1]"} ne "" )
         {
-            $USGS_Message .=
-                $USGS_Name{"@USGS_RiverValues[1]"}
-              . " is at "
-              . $USGS_Level{"@USGS_RiverValues[1]"} . ".\n";
+            $USGS_Message .= $USGS_Name{"@USGS_RiverValues[1]"} . " is at " . $USGS_Level{"@USGS_RiverValues[1]"} . ".\n";
         }
     }
 
@@ -177,8 +164,7 @@
             );
         }
         else {    # Email me anyway even if it's too cold
-            $USGS_Message .=
-              "Current temp is " . $Weather{TempOutdoor} . " degrees.\n";
+            $USGS_Message .= "Current temp is " . $Weather{TempOutdoor} . " degrees.\n";
             &net_mail_send(
                 subject => "Woohoo! Rivers are up",
                 text    => $USGS_Message
diff --git a/code/public/iphone.pl b/code/public/iphone.pl
index 7c9369fe4..4ca1aca98 100644
--- a/code/public/iphone.pl
+++ b/code/public/iphone.pl
@@ -124,18 +124,14 @@ sub iphoneWebApp {
               if ( $icon ne "" );
             if ( $object->isa('EIB1_Item') || $object->isa('xPL_Plugwise') ) {
                 $html .= "                <li>";
-                $html .=
-                    '<input type="checkbox" id="'
-                  . $item2
-                  . '" class="iToggle" title="I|O"';
+                $html .= '<input type="checkbox" id="' . $item2 . '" class="iToggle" title="I|O"';
                 if ( $state eq 'on' ) { $html .= ' checked="checked" '; }
                 if ( $name =~ s/^:// ) {
                 }
                 else {
                     $html .= " onclick=\"ChangeState('../SET?$item2=toggle')\"";
                 }
-                $html .=
-                  '/>' . $icon . '<label>' . $name . ' </label></a></li>';
+                $html .= '/>' . $icon . '<label>' . $name . ' </label></a></li>';
             }
             elsif ( $object->isa('EIB2_Item') ) {
                 $html .= "
@@ -153,33 +149,21 @@ sub iphoneWebApp {
             }
             elsif ( $object->isa('EIB5_Item') || $object->isa('EIB6_Item') ) {
                 $name =~ s/^://;
-                $html .=
-                    "                <li><span>"
-                  . sprintf( $unit, $state )
-                  . "</span>$icon$name</li>";
+                $html .= "                <li><span>" . sprintf( $unit, $state ) . "</span>$icon$name</li>";
             }
             elsif ( $object->isa('EIB3_Item') ) {
                 $name =~ s/^://;
                 $state =~ s/.*([0-9]{2}):([0-9]{2}):[0-9]{2}/$1:$2h/;
-                $html .=
-                    "                <li><span>"
-                  . sprintf( $unit, $state )
-                  . "</span>$icon$name</li>";
+                $html .= "                <li><span>" . sprintf( $unit, $state ) . "</span>$icon$name</li>";
             }
             elsif ( $object->isa('EIB4_Item') ) {
                 $name =~ s/^://;
                 $state =~ s:([0-9]{2})/([0-9]{2})/([0-9]{2}):$2.$1.$3:;
-                $html .=
-                    "                <li><span>"
-                  . sprintf( $unit, $state )
-                  . "</span>$icon$name</li>";
+                $html .= "                <li><span>" . sprintf( $unit, $state ) . "</span>$icon$name</li>";
             }
             elsif ( $object->isa('EIB10_Item') || $object->isa('EIB11_Item') ) {
                 $name =~ s/^://;
-                $html .=
-                    "                <li><span>"
-                  . sprintf( $unit, $state )
-                  . "</span>$icon$name</li>";
+                $html .= "                <li><span>" . sprintf( $unit, $state ) . "</span>$icon$name</li>";
             }
             elsif ( $object->isa('Network_Item') ) {
                 $html .= "                <li";
@@ -209,19 +193,14 @@ sub iphoneWebApp {
                 $html .= ">$name<span>$temp</span></li> ";
             }
             elsif ( $object->isa('X10_Switchlinc') ) {
-                $html .=
-                  "                <li><a href='#_$item2'>$icon$name<span>$state</span></a></li> ";
+                $html .= "                <li><a href='#_$item2'>$icon$name<span>$state</span></a></li> ";
 
                 $html_groups = "                	<li>";
-                $html_groups .=
-                    '<input type="checkbox" id="'
-                  . $item2
-                  . '" class="iToggle" title="I|O"';
+                $html_groups .= '<input type="checkbox" id="' . $item2 . '" class="iToggle" title="I|O"';
                 if ( $state ne 'off' ) {
                     $html_groups .= ' checked="checked" ';
                 }
-                $html_groups .=
-                  " onclick=\"ChangeState('../SET?$item2=toggle')\"";
+                $html_groups .= " onclick=\"ChangeState('../SET?$item2=toggle')\"";
                 $html_groups .= '/><label>' . $name . ' </label></li>
 ';
 
@@ -243,24 +222,16 @@ sub iphoneWebApp {
                 #';
                 #  ------------------------------------------------
                 $html_groups .= "			<li>";
-                $html_groups .=
-                  "<form action=\"/SET;referer?\" method=\"get\">";
-                $html_groups .=
-                  "<INPUT type=\"hidden\" name=\"select_item\" value=\"$item\">";
+                $html_groups .= "<form action=\"/SET;referer?\" method=\"get\">";
+                $html_groups .= "<INPUT type=\"hidden\" name=\"select_item\" value=\"$item\">";
                 $html_groups .= "<label>Dim Level</label><span>";
-                $html_groups .=
-                  "<SELECT name=\"select_state\" onChange=\"form.submit()\">\n";
+                $html_groups .= "<SELECT name=\"select_state\" onChange=\"form.submit()\">\n";
                 my ($value) = $state =~ /(\d*)%/;
                 $html_groups .= "\t\t\t<option value=\"\" ";
                 $html_groups .= "SELECTED" if !$value;
                 $html_groups .= "></option>\n";
 
-                for (
-                    my $dim_level = 10;
-                    $dim_level < 100;
-                    $dim_level = $dim_level + 10
-                  )
-                {
+                for ( my $dim_level = 10; $dim_level < 100; $dim_level = $dim_level + 10 ) {
                     $html_groups .= "\t\t\t<option value=\"$dim_level%\"";
                     $html_groups .= " SELECTED"
                       if ( $value
@@ -270,10 +241,7 @@ sub iphoneWebApp {
                 }
                 $html_groups .= "\t\t\t</SELECT></form></span></li>\n";
 
-                $html_groups .=
-                    "			</ul><ul class=\"iArrow\"><li><a href='#_"
-                  . $item2
-                  . "_advanced'>Advanced</a></li>";
+                $html_groups .= "			</ul><ul class=\"iArrow\"><li><a href='#_" . $item2 . "_advanced'>Advanced</a></li>";
                 my $html_groups1    = "";
                 my @advanced_states = @{ $object->{states} };
                 for my $s1 (@advanced_states) {
@@ -313,10 +281,7 @@ sub iphoneWebApp {
                 $state = "gekippt" if ( $state eq "tilt" );
                 $state = "offen" if ( $state eq "open" );
                 $state = "zu" if ( $state eq "closed" );
-                $html .=
-                    "                <li><span>"
-                  . sprintf( $unit, $state )
-                  . "</span>$icon$name</li>";
+                $html .= "                <li><span>" . sprintf( $unit, $state ) . "</span>$icon$name</li>";
             }
             elsif ( $object->isa('EIBRB_Item') ) {
                 $unit = "%i%%" if ( $unit eq "%s" || $unit eq "" );
@@ -338,8 +303,7 @@ sub iphoneWebApp {
             }
             elsif ( $object->isa('Group') ) {
                 $name =~ s/^://;
-                $html .=
-                  "                <li><a href='#_$item2'>$icon$name</a></li>";
+                $html .= "                <li><a href='#_$item2'>$icon$name</a></li>";
                 $html_group = "";
                 for my $o ( &list_objects_by_group( $list_name, 1 ) ) {
                     next unless $o;
@@ -351,12 +315,10 @@ sub iphoneWebApp {
                 @item_states = @{ $object->{states} }
                   if ( defined $object->{states} );
                 if ( $name =~ s/^:// || !@item_states ) {
-                    $html .=
-                      "                <li>$icon$name<span>$state</span></li> ";
+                    $html .= "                <li>$icon$name<span>$state</span></li> ";
                 }
                 else {
-                    $html .=
-                      "                <li><a href='#_$item2'>$icon$name<span>$state</span></a></li> ";
+                    $html .= "                <li><a href='#_$item2'>$icon$name<span>$state</span></a></li> ";
                     $html_groups = "";
                     my @item_states = @{ $object->{states} };
                     for my $s (@item_states) {
diff --git a/code/public/irman.pl b/code/public/irman.pl
index 4ebd6d2b8..22acedc9a 100644
--- a/code/public/irman.pl
+++ b/code/public/irman.pl
@@ -37,10 +37,8 @@
     my $dbm_file = "$config_parms{data_dir}/irman.dbm";
     print_log "Opening irman database $dbm_file";
 
-    my $tie_code =
-      qq[tie (%DBM_IR, 'DB_File', '$dbm_file', O_RDWR|O_CREAT, 0666) or ];
-    $tie_code .=
-      qq[print "\n\nError, can not open irman dbm file $dbm_file: $!"];
+    my $tie_code = qq[tie (%DBM_IR, 'DB_File', '$dbm_file', O_RDWR|O_CREAT, 0666) or ];
+    $tie_code .= qq[print "\n\nError, can not open irman dbm file $dbm_file: $!"];
 
     eval $tie_code;
     if ($@) {
@@ -63,8 +61,7 @@
 
 # Start/stop programming mode
 $v_irman_program = new Voice_Cmd("[Start,Stop] programming IRman codes");
-$v_irman_program->set_info(
-    'To program, enter the key key into test_input2, then press the ir button');
+$v_irman_program->set_info('To program, enter the key key into test_input2, then press the ir button');
 
 speak "${state}ing irmain programming" if $state = said $v_irman_program;
 
@@ -80,8 +77,7 @@
             print "irman program data: $data...\n";
         }
         else {
-            logit( "$config_parms{data_dir}/logs/tv_ir.$Year_Month_Now.log",
-                $data );
+            logit( "$config_parms{data_dir}/logs/tv_ir.$Year_Month_Now.log", $data );
             print "IR man data: ", unpack( 'H*', $data );
 
             if ( $DBM_IR{$data} ) {
diff --git a/code/public/irvs b/code/public/irvs
index d3f80e9cc..0e586aa6d 100644
--- a/code/public/irvs
+++ b/code/public/irvs
@@ -64,8 +64,7 @@ MAINMENU: while ( 1 == 1 ) {
                         $iv->addmsg("1");
                         $iv->addmsg("moment");
                         $iv->playfile || &closeall;
-                        &send_ivr_socket("lamp bedroom on")
-                          ;    #put in valid voicecommand
+                        &send_ivr_socket("lamp bedroom on");    #put in valid voicecommand
                         $iv->addmsg("lamp");
                         $iv->addmsg("is");
                         $iv->addmsg("on");
@@ -75,8 +74,7 @@ MAINMENU: while ( 1 == 1 ) {
                         $iv->addmsg("1");
                         $iv->addmsg("moment");
                         $iv->playfile || &closeall;
-                        &send_ivr_socket("lamp bedroom off")
-                          ;    #put in valid voicecommand
+                        &send_ivr_socket("lamp bedroom off");    #put in valid voicecommand
                         $iv->addmsg("lamp");
                         $iv->addmsg("is");
                         $iv->addmsg("off");
@@ -102,8 +100,7 @@ MAINMENU: while ( 1 == 1 ) {
                         $iv->addmsg("1");
                         $iv->addmsg("moment");
                         $iv->playfile || &closeall;
-                        &send_ivr_socket("testlamp on")
-                          ;    #put in valid voicecommand
+                        &send_ivr_socket("testlamp on");    #put in valid voicecommand
                         $iv->addmsg("lamp");
                         $iv->addmsg("is");
                         $iv->addmsg("on");
@@ -113,8 +110,7 @@ MAINMENU: while ( 1 == 1 ) {
                         $iv->addmsg("1");
                         $iv->addmsg("moment");
                         $iv->playfile || &closeall;
-                        &send_ivr_socket("testlamp off")
-                          ;    #put in valid voicecommand
+                        &send_ivr_socket("testlamp off");    #put in valid voicecommand
                         $iv->addmsg("lamp");
                         $iv->addmsg("is");
                         $iv->addmsg("off");
@@ -174,8 +170,7 @@ MAINMENU: while ( 1 == 1 ) {
                 $iv->addmsg("1");
                 $iv->addmsg("moment");
                 $iv->playfile || &closeall;
-                &send_ivr_socket("HEATING BEDROOM $dtmfin")
-                  ;    #put in valid voicecommand
+                &send_ivr_socket("HEATING BEDROOM $dtmfin");    #put in valid voicecommand
                 $iv->addmsg("bedroom");
                 $iv->addmsg("heating");
                 $iv->addmsg("set");
diff --git a/code/public/lcd_ian_test.pl b/code/public/lcd_ian_test.pl
index 28e430017..f7dde3023 100644
--- a/code/public/lcd_ian_test.pl
+++ b/code/public/lcd_ian_test.pl
@@ -116,8 +116,7 @@
 }
 
 # Displayed delayed last response text
-if ( $Menus{last_response_loop} and $Menus{last_response_loop} <= $Loop_Count )
-{
+if ( $Menus{last_response_loop} and $Menus{last_response_loop} <= $Loop_Count ) {
     $Menus{last_response_loop} = 0;
     &menu_lcd_display( &last_response, $Menus{last_response_menu} );
 }
diff --git a/code/public/mirror_directory.pl b/code/public/mirror_directory.pl
index 90a94b9c2..8a08ce598 100644
--- a/code/public/mirror_directory.pl
+++ b/code/public/mirror_directory.pl
@@ -7,8 +7,7 @@
 if ( said $do_mirror_directory_v) {
     speak "Starting mirror directory";
     my $pgm = 'do_mirror_directory';
-    set $do_mirror_directory $pgm
-      . ' -directory //Mrlarry/quickenw/backup //bushserv/d/backup/larry/quicken';
+    set $do_mirror_directory $pgm . ' -directory //Mrlarry/quickenw/backup //bushserv/d/backup/larry/quicken';
 
     start $do_mirror_directory;
 }
diff --git a/code/public/monitor_dj.pl b/code/public/monitor_dj.pl
index 95a49a97c..5737fcc91 100644
--- a/code/public/monitor_dj.pl
+++ b/code/public/monitor_dj.pl
@@ -14,8 +14,7 @@
         my $cmd   = ($is_dj_speaking) ? 'VOLUMEDOWN' : 'VOLUMEUP';
         my $count = ($is_dj_speaking) ? '35'         : '37';
         for ( 1 .. $count ) {
-            get
-              "http://localhost:4800/$cmd?p=$config_parms{mp3_program_password}";
+            get "http://localhost:4800/$cmd?p=$config_parms{mp3_program_password}";
         }
         print "db dj set to $cmd: $temp\n";
 
@@ -49,9 +48,8 @@
 $winamp_prod = new Voice_Cmd 'Restore Winamp';
 
 if ( said $winamp_prod) {
-    if ( my $window =
-        &sendkeys_find_window( 'winamp', $config_parms{mp3_program} ) )
-    {
+    if ( my $window = &sendkeys_find_window( 'winamp', $config_parms{mp3_program} ) ) {
+
         # None of this works to resotr a window :(
         #       my $keys = '\\alt\\te\\ret\\';
         #       my $keys = '\\CTRLp';
diff --git a/code/public/monitor_im_status.pl b/code/public/monitor_im_status.pl
index 7f3e2c3a0..3a8b210a8 100644
--- a/code/public/monitor_im_status.pl
+++ b/code/public/monitor_im_status.pl
@@ -12,14 +12,12 @@ sub im_status {
         if ( $status eq 'on' and $Save{steve_at_work} == 0 ) {
             $Save{steve_at_work} = 1;
             &im_status_steve_changed
-              unless
-              active $timer_steve_leave_work; #Don't notify if I login within 5 minutes
+              unless active $timer_steve_leave_work;    #Don't notify if I login within 5 minutes
             unset $timer_steve_leave_work;
         }
         if ( $status eq 'off' and $Save{steve_at_work} == 1 ) {
             $Save{steve_at_work} = 0;
-            set $timer_steve_leave_work 300
-              ;    #make sure I logoff for at least 5 minutes
+            set $timer_steve_leave_work 300;            #make sure I logoff for at least 5 minutes
         }
     }
 }
diff --git a/code/public/monitor_ipchainlog.pl b/code/public/monitor_ipchainlog.pl
index 93d927380..c7fff631d 100644
--- a/code/public/monitor_ipchainlog.pl
+++ b/code/public/monitor_ipchainlog.pl
@@ -10,10 +10,8 @@
 
 my $ipchain_file = '//misterhouse/projects/logs/ipchains.log';
 
-$check_ip_log = new Voice_Cmd "{Check the ip log,Check Nicks computer time}",
-  "Ok, checking";
-$check_ip_log->set_info(
-    'Check to see if Nick has spent too much time gaming for today');
+$check_ip_log = new Voice_Cmd "{Check the ip log,Check Nicks computer time}", "Ok, checking";
+$check_ip_log->set_info('Check to see if Nick has spent too much time gaming for today');
 
 #Sun Dec  5 14:00:01 CST 1999 :: 200.200.200.2    TCP:110 24.2.1.70
 #Sun Dec  5 14:00:01 CST 1999 :: 200.200.200.4   UDP:1034 192.215.33.68
@@ -47,9 +45,7 @@
         or said $check_ip_log)
     {
         $Save{nick_computer_time} = $time_nick;
-        my $msg = sprintf(
-            "Notice, Nick has been on the computer for %2.1f hours today",
-            $time_nick / 60 );
+        my $msg = sprintf( "Notice, Nick has been on the computer for %2.1f hours today", $time_nick / 60 );
 
         #       run "mhsend -host house -speak rooms=all $msg";
         run "mhsend -host dm -speak $msg" unless $Save{sleeping_kids};
diff --git a/code/public/monitor_mbm.pl b/code/public/monitor_mbm.pl
index 83301397e..f580034b6 100644
--- a/code/public/monitor_mbm.pl
+++ b/code/public/monitor_mbm.pl
@@ -13,16 +13,11 @@
 use Win32::API;
 
 # noloop=start
-my $OpenFileMapping =
-  new Win32::API( "kernel32", "OpenFileMapping", [ 'N', 'N', 'P' ], 'N' );
+my $OpenFileMapping = new Win32::API( "kernel32", "OpenFileMapping", [ 'N', 'N', 'P' ], 'N' );
 my $CloseHandle = new Win32::API( "kernel32", "CloseHandle", ['N'], 'N' );
-my $MapViewOfFile =
-  new Win32::API( "kernel32", "MapViewOfFile", [ 'N', 'N', 'N', 'N', 'N' ],
-    'N' );
-my $UnmapViewOfFile =
-  new Win32::API( "kernel32", "UnmapViewOfFile", ['N'], 'N' );
-my $CopyMemoryX =
-  new Win32::API( "kernel32", "RtlMoveMemory", [ 'P', 'N', 'N' ], 'N' );
+my $MapViewOfFile = new Win32::API( "kernel32", "MapViewOfFile", [ 'N', 'N', 'N', 'N', 'N' ], 'N' );
+my $UnmapViewOfFile = new Win32::API( "kernel32", "UnmapViewOfFile", ['N'], 'N' );
+my $CopyMemoryX = new Win32::API( "kernel32", "RtlMoveMemory", [ 'P', 'N', 'N' ], 'N' );
 
 # noloop=stop
 
diff --git a/code/public/monitor_mbm2.pl b/code/public/monitor_mbm2.pl
index ca648ca14..7d7ece400 100644
--- a/code/public/monitor_mbm2.pl
+++ b/code/public/monitor_mbm2.pl
@@ -21,8 +21,7 @@
 #
 
 # mh.ini parm "MBM_module=MBM_mh" required.
-$config_parms{MBM_module}
-  ;    # Use in void context, just so web interface will show it.
+$config_parms{MBM_module};    # Use in void context, just so web interface will show it.
 
 # Most motherboards have 1 or 2 temp, 6 voltage, 1 or 2 fans... let's demo more than enough
 
@@ -50,20 +49,19 @@
 $v_MBM_sensors = new Voice_Cmd("Show MBM Sensors");
 if ( my $state = said $v_MBM_sensors) {
     my $line = '<pre>';
-    $line .= sprintf( "MBM Timestamp for %d total readings is %s<br>",
-        $MBM_t1->count, $MBM_t1->time );
-    $line .= sprintf( "Temp 1 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t1->name, $MBM_t1->state, $MBM_t1->high, $MBM_t1->low );
-    $line .= sprintf( "Temp 2 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t2->name, $MBM_t2->state, $MBM_t2->high, $MBM_t2->low );
-    $line .= sprintf( "Temp 3 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t3->name, $MBM_t3->state, $MBM_t3->high, $MBM_t3->low );
-    $line .= sprintf( "Temp 4 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t4->name, $MBM_t4->state, $MBM_t4->high, $MBM_t4->low );
-    $line .= sprintf( "Temp 5 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t5->name, $MBM_t5->state, $MBM_t5->high, $MBM_t5->low );
-    $line .= sprintf( "Temp 6 name %-12.12s is %3d max %3d min %3d<br>",
-        $MBM_t6->name, $MBM_t6->state, $MBM_t6->high, $MBM_t6->low );
+    $line .= sprintf( "MBM Timestamp for %d total readings is %s<br>", $MBM_t1->count, $MBM_t1->time );
+    $line .=
+      sprintf( "Temp 1 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t1->name, $MBM_t1->state, $MBM_t1->high, $MBM_t1->low );
+    $line .=
+      sprintf( "Temp 2 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t2->name, $MBM_t2->state, $MBM_t2->high, $MBM_t2->low );
+    $line .=
+      sprintf( "Temp 3 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t3->name, $MBM_t3->state, $MBM_t3->high, $MBM_t3->low );
+    $line .=
+      sprintf( "Temp 4 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t4->name, $MBM_t4->state, $MBM_t4->high, $MBM_t4->low );
+    $line .=
+      sprintf( "Temp 5 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t5->name, $MBM_t5->state, $MBM_t5->high, $MBM_t5->low );
+    $line .=
+      sprintf( "Temp 6 name %-12.12s is %3d max %3d min %3d<br>", $MBM_t6->name, $MBM_t6->state, $MBM_t6->high, $MBM_t6->low );
     $line .= sprintf( "Volt 1 name %-12.12s is %7.3f max %7.3f min %7.3f<br>",
         $MBM_v1->name, $MBM_v1->state, $MBM_v1->high, $MBM_v1->low );
     $line .= sprintf( "Volt 2 name %-12.12s is %7.3f max %7.3f min %7.3f<br>",
@@ -80,14 +78,14 @@
         $MBM_v7->name, $MBM_v7->state, $MBM_v7->high, $MBM_v7->low );
     $line .= sprintf( "Volt 8 name %-12.12s is %7.3f max %7.3f min %7.3f<br>",
         $MBM_v8->name, $MBM_v8->state, $MBM_v8->high, $MBM_v8->low );
-    $line .= sprintf( "Fan 1  name %-12.12s is %4d max %4d min %4d<br>",
-        $MBM_f1->name, $MBM_f1->state, $MBM_f1->high, $MBM_f1->low );
-    $line .= sprintf( "Fan 2  name %-12.12s is %4d max %4d min %4d<br>",
-        $MBM_f2->name, $MBM_f2->state, $MBM_f2->high, $MBM_f2->low );
-    $line .= sprintf( "Fan 3  name %-12.12s is %4d max %4d min %4d<br>",
-        $MBM_f3->name, $MBM_f3->state, $MBM_f3->high, $MBM_f3->low );
-    $line .= sprintf( "Fan 4  name %-12.12s is %4d max %4d min %4d<br>",
-        $MBM_f4->name, $MBM_f4->state, $MBM_f4->high, $MBM_f4->low );
+    $line .=
+      sprintf( "Fan 1  name %-12.12s is %4d max %4d min %4d<br>", $MBM_f1->name, $MBM_f1->state, $MBM_f1->high, $MBM_f1->low );
+    $line .=
+      sprintf( "Fan 2  name %-12.12s is %4d max %4d min %4d<br>", $MBM_f2->name, $MBM_f2->state, $MBM_f2->high, $MBM_f2->low );
+    $line .=
+      sprintf( "Fan 3  name %-12.12s is %4d max %4d min %4d<br>", $MBM_f3->name, $MBM_f3->state, $MBM_f3->high, $MBM_f3->low );
+    $line .=
+      sprintf( "Fan 4  name %-12.12s is %4d max %4d min %4d<br>", $MBM_f4->name, $MBM_f4->state, $MBM_f4->high, $MBM_f4->low );
     respond "$line";
 }
 ##
diff --git a/code/public/monitor_mh.pl b/code/public/monitor_mh.pl
index 5a7725535..03e4df28d 100644
--- a/code/public/monitor_mh.pl
+++ b/code/public/monitor_mh.pl
@@ -48,8 +48,7 @@
         if ( $reboot_flag++ > 2 ) {
 
             # This does not work ... access denied
-            run
-              qq|SHUTDOWN -f -m \\\\house -t 600 -r -c "C1 detected MisterHouse on house stopped, so requested a reboot"|;
+            run qq|SHUTDOWN -f -m \\\\house -t 600 -r -c "C1 detected MisterHouse on house stopped, so requested a reboot"|;
         }
 
         #        set $watchdog_light ON;
diff --git a/code/public/monitor_occupancy_brian.pl b/code/public/monitor_occupancy_brian.pl
index a95e5d62b..6b7a23320 100644
--- a/code/public/monitor_occupancy_brian.pl
+++ b/code/public/monitor_occupancy_brian.pl
@@ -91,9 +91,8 @@
 $back_door_motion   = new X10_Sensor('BB');
 
 $Motion = new Group(
-    $work_room_motion,   $kitchen_motion,     $kitchenette_motion,
-    $dining_room_motion, $living_room_motion, $bed_room_motion,
-    $bath_room_motion,   $front_door_motion,  $back_door_motion
+    $work_room_motion, $kitchen_motion,   $kitchenette_motion, $dining_room_motion, $living_room_motion,
+    $bed_room_motion,  $bath_room_motion, $front_door_motion,  $back_door_motion
 );
 
 # Light sensor definitions
@@ -108,9 +107,8 @@
 $back_door_dark   = new X10_Sensor('BC');
 
 $Dark = new Group(
-    $work_room_brightness, $kitchen_dark,     $kitchenette_dark,
-    $dining_room_dark,     $living_room_dark, $bed_room_dark,
-    $bath_room_dark,       $front_door_dark,  $back_door_dark
+    $work_room_brightness, $kitchen_dark,   $kitchenette_dark, $dining_room_dark, $living_room_dark,
+    $bed_room_dark,        $bath_room_dark, $front_door_dark,  $back_door_dark
 );
 
 # Timer definitions
@@ -223,13 +221,9 @@
 
 # Cooking
 if (
-    (
-           ( $location{Current} eq 'kitchen' )
-        && ( calc_delta( $location{kitchen_occupancy_tds} ) >= ( 5 * 60 ) )
-    )
+    ( ( $location{Current} eq 'kitchen' ) && ( calc_delta( $location{kitchen_occupancy_tds} ) >= ( 5 * 60 ) ) )
     || (   ( $location{Current} eq 'kitchenette' )
-        && ( calc_delta( $location{kitchenette_occupancy_tds} ) >= ( 5 * 60 ) )
-    )
+        && ( calc_delta( $location{kitchenette_occupancy_tds} ) >= ( 5 * 60 ) ) )
   )
 {
     if ( ($New_Minute) && ( $context{Current} ne 'cooking' ) ) {
@@ -260,9 +254,8 @@
 
 if ( $all_is_quiet && $New_Minute ) {
     print_log "All is quiet: {";
-    print_log "        work_room_motion state: ", state $work_room_motion;
-    print_log "        work_room_brightness state: ",
-      state $work_room_brightness;
+    print_log "        work_room_motion state: ",     state $work_room_motion;
+    print_log "        work_room_brightness state: ", state $work_room_brightness;
     print_log "}";
 }
 else {
@@ -316,8 +309,7 @@
 
         # print "$temptext_b\n";
         my $howlong = &calc_delta( $location{$temptext_a} );
-        speak
-          "Piet's last known location is in $temptext, $howlong seconds ago.";
+        speak "Piet's last known location is in $temptext, $howlong seconds ago.";
     }
 }
 
@@ -354,8 +346,7 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $work_room_monitors_timer) {
-        print_log
-          "Setting monitors timer to $work_room_monitors_timeout minutes.";
+        print_log "Setting monitors timer to $work_room_monitors_timeout minutes.";
     }
     set $work_room_monitors_timer ( $work_room_monitors_timeout * 60 );
 
@@ -364,13 +355,8 @@ sub calc_delta {
     }
     set $work_room_light_timer ( $work_room_light_timeout * 60 );
 
-    if (
-        (
-               ( state $work_room_brightness eq "dark" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $workrm_light ne ON )
-      )
+    if (   ( ( state $work_room_brightness eq "dark" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $workrm_light ne ON ) )
     {
         print_log "Work Room is Dark.  Turning on light.";
         set $workrm_light ON;
@@ -404,8 +390,7 @@ sub calc_delta {
     #  else
     {
         set $workrm_light OFF;
-        print_log
-          "No movement in Work Room for $work_room_light_timeout minutes";
+        print_log "No movement in Work Room for $work_room_light_timeout minutes";
         print_log "Turning off Work Room Light.";
         set $work_room_light_timer ( $work_room_light_timeout * 60 );
     }
@@ -421,8 +406,7 @@ sub calc_delta {
     #  }
     #  else
     {
-        print_log
-          "No movement in Work Room for $work_room_monitors_timeout minutes";
+        print_log "No movement in Work Room for $work_room_monitors_timeout minutes";
         print_log "Turning Off Work Room Monitors.";
         set $workrm_monitors OFF;
         set $work_room_light_timer ( $work_room_light_timeout * 60 );
@@ -450,21 +434,15 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $kitchen_timer) {
-        print_log
-          "Movement sensed in Kitchen.  Setting timer to $kitchen_timeout minutes.";
+        print_log "Movement sensed in Kitchen.  Setting timer to $kitchen_timeout minutes.";
     }
 
     #else {
     #  print_log "Movement sensed in Kitchen.";
     #}
     set $kitchen_timer ( $kitchen_timeout * 60 );
-    if (
-        (
-               ( state $kitchen_dark ne "kitchen_dark_stopped" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $kitchen_light ne ON )
-      )
+    if (   ( ( state $kitchen_dark ne "kitchen_dark_stopped" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $kitchen_light ne ON ) )
     {
         print_log "Kitchen is Dark.  Turning on light.";
         set $kitchen_light ON;
@@ -480,8 +458,7 @@ sub calc_delta {
     if ( $location{Current} eq 'kitchen' ) {
 
         # Reset timer if the room is still occupied
-        print_log
-          "Timer expired but Kitchen still occupied. Resetting timer...";
+        print_log "Timer expired but Kitchen still occupied. Resetting timer...";
         set $kitchen_timer ( $kitchen_timeout * 60 );
     }
     else {
@@ -512,21 +489,15 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $living_room_timer) {
-        print_log
-          "Movement sensed in Living Room.  Setting timer to $living_room_timeout minutes.";
+        print_log "Movement sensed in Living Room.  Setting timer to $living_room_timeout minutes.";
     }
 
     #else {
     #  print_log "Movement sensed in Living Room.";
     #}
     set $living_room_timer ( $living_room_timeout * 60 );
-    if (
-        (
-               ( state $living_room_dark ne "living_room_dark_stopped" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $livingrm_light1 ne ON )
-      )
+    if (   ( ( state $living_room_dark ne "living_room_dark_stopped" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $livingrm_light1 ne ON ) )
     {
         print_log "Living Room is Dark.  Turning on light.";
         set $livingrm_light1 ON;
@@ -542,8 +513,7 @@ sub calc_delta {
     if ( $location{Current} eq 'living_room' ) {
 
         # Reset timer if the room is still occupied
-        print_log
-          "Timer expired but Living Room still occupied. Resetting timer...";
+        print_log "Timer expired but Living Room still occupied. Resetting timer...";
         set $living_room_timer ( $living_room_timeout * 60 );
     }
     else {
@@ -574,21 +544,15 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $dining_room_timer) {
-        print_log
-          "Movement sensed in Dining Room.  Setting timer to $dining_room_timeout minutes.";
+        print_log "Movement sensed in Dining Room.  Setting timer to $dining_room_timeout minutes.";
     }
 
     #else {
     #  print_log "Movement sensed in Dining Room.";
     #}
     set $dining_room_timer ( $dining_room_timeout * 60 );
-    if (
-        (
-               ( state $dining_room_dark ne "dining_room_dark_stopped" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $diningrm_light ne ON )
-      )
+    if (   ( ( state $dining_room_dark ne "dining_room_dark_stopped" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $diningrm_light ne ON ) )
     {
         print_log "Dining Room is Dark.  Turning on light.";
         set $diningrm_light ON;
@@ -604,8 +568,7 @@ sub calc_delta {
     if ( $location{Current} eq 'dining_room' ) {
 
         # Reset timer if the room is still occupied
-        print_log
-          "Timer expired but Dining Room still occupied. Resetting timer...";
+        print_log "Timer expired but Dining Room still occupied. Resetting timer...";
         set $dining_room_timer ( $dining_room_timeout * 60 );
     }
     else {
@@ -637,20 +600,14 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $bed_room_timer) {
-        print_log
-          "Movement sensed in Bed Room.  Setting timer to $bed_room_timeout minutes.";
+        print_log "Movement sensed in Bed Room.  Setting timer to $bed_room_timeout minutes.";
     }
 
     #else {
     #  print_log "Movement sensed in Bed Room.";
     #}
-    if (
-        (
-               ( state $bed_room_dark ne "bed_room_dark_stopped" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $bedrm_light ne ON )
-      )
+    if (   ( ( state $bed_room_dark ne "bed_room_dark_stopped" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $bedrm_light ne ON ) )
     {
         if ( !$indoors_is_quiet ) {
             set $bed_room_timer ( $bed_room_timeout * 60 );
@@ -692,21 +649,15 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $bath_room_timer) {
-        print_log
-          "Movement sensed in Bath Room.  Setting timer to $bath_room_timeout minutes.";
+        print_log "Movement sensed in Bath Room.  Setting timer to $bath_room_timeout minutes.";
     }
 
     #else {
     #  print_log "Movement sensed in Bath Room.";
     #}
     set $bath_room_timer ( $bath_room_timeout * 60 );
-    if (
-        (
-               ( state $bath_room_dark ne "bath_room_dark_stopped" )
-            || ( time_greater_than("$Time_Sunset") )
-        )
-        && ( state $bathrm_light ne ON )
-      )
+    if (   ( ( state $bath_room_dark ne "bath_room_dark_stopped" ) || ( time_greater_than("$Time_Sunset") ) )
+        && ( state $bathrm_light ne ON ) )
     {
         print_log "Bath Room is Dark.  Turning on light.";
         set $bathrm_light ON;
@@ -722,8 +673,7 @@ sub calc_delta {
     if ( $location{Current} eq 'bath_room' ) {
 
         # Reset timer if the room is still occupied
-        print_log
-          "Timer expired but Bath Room still occupied. Resetting timer...";
+        print_log "Timer expired but Bath Room still occupied. Resetting timer...";
         set $bath_room_timer ( $bath_room_timeout * 60 );
     }
     else {
@@ -755,8 +705,7 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $kitchenette_timer) {
-        print_log
-          "Movement sensed in Kitchenette.  Setting timer to $kitchenette_timeout minutes.";
+        print_log "Movement sensed in Kitchenette.  Setting timer to $kitchenette_timeout minutes.";
     }
 
     #else {
@@ -802,8 +751,7 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $front_door_timer) {
-        print_log
-          "Movement sensed at Front Door.  Setting timer to $front_door_timeout minutes.";
+        print_log "Movement sensed at Front Door.  Setting timer to $front_door_timeout minutes.";
     }
     else {
         print_log "Movement sensed at the Front Door.";
@@ -849,8 +797,7 @@ sub calc_delta {
 
     # If we haven't already reported the movement, do so now.
     if ( inactive $back_door_timer) {
-        print_log
-          "Movement sensed at the Back Door.  Setting timer to $back_door_timeout minutes.";
+        print_log "Movement sensed at the Back Door.  Setting timer to $back_door_timeout minutes.";
     }
     else {
         print_log "Movement sensed at the Back Door.";
diff --git a/code/public/monitor_occupancy_jason.pl b/code/public/monitor_occupancy_jason.pl
index ed01687bb..afd713b1e 100644
--- a/code/public/monitor_occupancy_jason.pl
+++ b/code/public/monitor_occupancy_jason.pl
@@ -69,8 +69,7 @@
 elsif ( ( state $status_occupied_house ne ON )
     and ( state_now $sensors) )
 {
-    print_log
-      "MODE: House is now occupied state=$status_occupied_house->{state}";
+    print_log "MODE: House is now occupied state=$status_occupied_house->{state}";
     speak "Hello";
     set $status_occupied_house ON;
 }
diff --git a/code/public/mp3_control_GQmpeg.pl b/code/public/mp3_control_GQmpeg.pl
index 8ab8050e4..75c7971a8 100644
--- a/code/public/mp3_control_GQmpeg.pl
+++ b/code/public/mp3_control_GQmpeg.pl
@@ -36,8 +36,7 @@
     speak "MP3 control now $state.";
 }
 
-$v_mp3_control_cmd = new Voice_Cmd(
-    "Set mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song]");
+$v_mp3_control_cmd = new Voice_Cmd("Set mp3 player to [Play,Stop,Pause,Restart,Next Song,Previous Song]");
 if ( $state = said $v_mp3_control_cmd) {
     run "$config_parms{mp3_program} $gqmpeg_arguments{$state}";
     $state = $gqmpeg_arguments{$state} if $gqmpeg_arguments{$state};
@@ -52,8 +51,7 @@
 }
 
 # noloop=start      This directive allows this code to be run on startup/reload
-my $mp3playlist = &load_mp3_file_list( $config_parms{mp3_playlist_dir},
-    $config_parms{mp3_playlist_ext} );
+my $mp3playlist = &load_mp3_file_list( $config_parms{mp3_playlist_dir}, $config_parms{mp3_playlist_ext} );
 
 # noloop=stop
 
diff --git a/code/public/mp3_control_mrMP3.pl b/code/public/mp3_control_mrMP3.pl
index 00383c2d0..2327ba7be 100644
--- a/code/public/mp3_control_mrMP3.pl
+++ b/code/public/mp3_control_mrMP3.pl
@@ -44,12 +44,8 @@
 # You will need to use the datapath parm to point it to your mh.ini data_dir directory
 #
 
-$v_mp3_control = new Voice_Cmd(
-    "music [Play,Stop,Pause,Next Song,"
-      . "Previous Song,Volume up,Volume down,"
-      . "Randomize on,Randomize off]",
-    ""
-);
+$v_mp3_control =
+  new Voice_Cmd( "music [Play,Stop,Pause,Next Song," . "Previous Song,Volume up,Volume down," . "Randomize on,Randomize off]", "" );
 
 if ( $state = said $v_mp3_control) {
 
diff --git a/code/public/mp3_control_xmms.pl b/code/public/mp3_control_xmms.pl
index 0790be020..4dce56bcf 100644
--- a/code/public/mp3_control_xmms.pl
+++ b/code/public/mp3_control_xmms.pl
@@ -156,8 +156,7 @@
 }
 
 # noloop=start      This directive allows this code to be run on startup/reload
-my $mp3playlist = &load_mp3_file_list( $config_parms{mp3_playlist_dir},
-    $config_parms{mp3_playlist_ext} );
+my $mp3playlist = &load_mp3_file_list( $config_parms{mp3_playlist_dir}, $config_parms{mp3_playlist_ext} );
 
 # noloop=stop
 
@@ -169,13 +168,7 @@
     speak("Added MP3 playlist $playlist.");
     $remote->playlist_clear;
     Xmms::sleep(0.25);
-    $remote->playlist(
-        [
-                $config_parms{mp3_playlist_dir} . "/"
-              . "$playlist" . "."
-              . $config_parms{mp3_playlist_ext}
-        ]
-    );
+    $remote->playlist( [ $config_parms{mp3_playlist_dir} . "/" . "$playlist" . "." . $config_parms{mp3_playlist_ext} ] );
 
     #$Save{mp3_playlist} = $playlist;
     print_log "mp3 player set to playlist $playlist";
@@ -199,13 +192,11 @@ sub load_mp3_file_list {
 my $remote  = Xmms::Remote->new($session);
 $v_what_playing = new Voice_Cmd('What is now playing');
 if ( $state = said $v_what_playing) {
-    my $mp3playing =
-      ${ $remote->get_playlist_titles }[ $remote->get_playlist_pos ];
+    my $mp3playing = ${ $remote->get_playlist_titles }[ $remote->get_playlist_pos ];
     speak $mp3playing;
 }
 
-$Save{NowPlaying} =
-  ${ $remote->get_playlist_titles }[ $remote->get_playlist_pos ]
+$Save{NowPlaying} = ${ $remote->get_playlist_titles }[ $remote->get_playlist_pos ]
   if new_second 30;
 
 #$v_what_playlist = new Voice_Cmd('Show playlist');
diff --git a/code/public/mp3_playlist_xmms.pl b/code/public/mp3_playlist_xmms.pl
index 5789642a2..ce41560ef 100644
--- a/code/public/mp3_playlist_xmms.pl
+++ b/code/public/mp3_playlist_xmms.pl
@@ -6,9 +6,7 @@
 
 # Build the mp3 database
 $v_mp3_build_list = new Voice_Cmd '[Build,Load] the {mp3,m p 3} database', '';
-$v_mp3_build_list->set_info(
-    "Builds/loads an mp3 database for these directories: $config_parms{mp3_dir}"
-);
+$v_mp3_build_list->set_info( "Builds/loads an mp3 database for these directories: $config_parms{mp3_dir}" );
 
 $p_mp3_build_list = new Process_Item;
 
@@ -44,12 +42,10 @@
     undef $Tk_results{'MP3 Genre'};
     my ( $results1, $results2, $count1, $count2 ) =
       &mp3_search( quotemeta $Save{mp3_search}, quotemeta $Save{mp3_Genre} );
-    print_log
-      "$count2 out of $count1 songs for search=$Save{mp3_search}, genre=$Save{mp3_Genre}";
+    print_log "$count2 out of $count1 songs for search=$Save{mp3_search}, genre=$Save{mp3_Genre}";
     if ($results1) {
         speak "Found $count2 songs";
-        display "Found $count2 (out of $count1) songs\n" . $results1, 30,
-          'MP3 Search Results', 'fixed';
+        display "Found $count2 (out of $count1) songs\n" . $results1, 30, 'MP3 Search Results', 'fixed';
         my $file = "$config_parms{data_dir}/search.m3u";
         file_write $file, $results2;
         run "$config_parms{mp3_program} -e $file";
@@ -93,8 +89,7 @@ sub mp3_search {
             $count2++;
             my $file = $files[$i];
             $results2 .= "$file\n";
-            $results1 .=
-              "Title: $titles[$i]   Album: $albums[$i]  Year: $years[$i]  Genre: $genres[$i]\n";
+            $results1 .= "Title: $titles[$i]   Album: $albums[$i]  Year: $years[$i]  Genre: $genres[$i]\n";
             $results1 .= "  - Artist: $artists[$i]  Comments:$comments[$i]\n";
             $results1 .= "  - File: $file\n\n";
         }
@@ -105,8 +100,7 @@ sub mp3_search {
 sub mp3_playlists {
     unless (%mp3_dbm) {
         print_log "Now Tieing to $mp3_file";
-        my $tie_code =
-          qq[tie %mp3_dbm, 'DB_File', "$mp3_file", O_RDWR|O_CREAT, 0666 or print_log "Error in tieing to $mp3_file"];
+        my $tie_code = qq[tie %mp3_dbm, 'DB_File', "$mp3_file", O_RDWR|O_CREAT, 0666 or print_log "Error in tieing to $mp3_file"];
         eval $tie_code;
         if ($@) {
             print_log "\n\nError in tieing to $mp3_file:\n  $@";
@@ -132,8 +126,7 @@ sub mp3_playlists {
     return $mp3names, %mp3files;
 }
 
-$v_mp3_playlist1 =
-  new Voice_Cmd("Set house mp3 player to playlist [$mp3names]");
+$v_mp3_playlist1 = new Voice_Cmd("Set house mp3 player to playlist [$mp3names]");
 
 #set_icon $v_mp3_playlist1 'playlist';
 
diff --git a/code/public/mr26_vdr.pl b/code/public/mr26_vdr.pl
index 153fda685..208b02a8c 100644
--- a/code/public/mr26_vdr.pl
+++ b/code/public/mr26_vdr.pl
@@ -50,8 +50,7 @@
 
 my $vdr_backend = 'localhost:2001';
 
-$vdr =
-  new Socket_Item( undef, undef, $vdr_backend, 'vdr', 'tcp', 'rawout', "\r\n" );
+$vdr = new Socket_Item( undef, undef, $vdr_backend, 'vdr', 'tcp', 'rawout', "\r\n" );
 
 $Remote = new X10_MR26;
 
diff --git a/code/public/news_drudge_report.pl b/code/public/news_drudge_report.pl
index 6883f1c7c..f02ac2cb9 100644
--- a/code/public/news_drudge_report.pl
+++ b/code/public/news_drudge_report.pl
@@ -2,8 +2,7 @@
 my $f_drudge_report      = "$config_parms{data_dir}/web/drudge_report.txt";
 my $f_drudge_report_html = "$config_parms{data_dir}/web/drudge_report.html";
 
-$p_drudge_report =
-  new Process_Item("get_url http://www.drudgereport.com $f_drudge_report_html");
+$p_drudge_report = new Process_Item("get_url http://www.drudgereport.com $f_drudge_report_html");
 $v_drudge_report = new Voice_Cmd('[Get,Read,Show] the drudge report');
 
 speak($f_drudge_report)   if said $v_drudge_report eq 'Read';
diff --git a/code/public/news_onion.pl b/code/public/news_onion.pl
index 3cd1faadb..e6f9f8de8 100644
--- a/code/public/news_onion.pl
+++ b/code/public/news_onion.pl
@@ -9,8 +9,7 @@
 
 #$f_star_local_html2 = new File_Item($f_star_local_html); # Needed if we use run instead of process_item
 
-$p_onion = new Process_Item(
-    "get_url http://mobile.theonion.com/nibs.html $f_onion_html");
+$p_onion = new Process_Item("get_url http://mobile.theonion.com/nibs.html $f_onion_html");
 $v_onion = new Voice_Cmd('[Get,Read,Show] the Onion');
 
 speak($f_onion_summary)   if said $v_onion eq 'Read';
diff --git a/code/public/news_star_telegram.pl b/code/public/news_star_telegram.pl
index 3aa0e17c3..a0a7793b3 100644
--- a/code/public/news_star_telegram.pl
+++ b/code/public/news_star_telegram.pl
@@ -7,8 +7,7 @@
 my $f_telegram_summary = "$config_parms{data_dir}/web/telegram_summary.txt";
 my $f_telegram_html    = "$config_parms{data_dir}/web/telegram.html";
 
-$p_telegram = new Process_Item(
-    "get_url http://www.dfw.com/mld/dfw/news/local $f_telegram_html");
+$p_telegram = new Process_Item("get_url http://www.dfw.com/mld/dfw/news/local $f_telegram_html");
 $v_telegram = new Voice_Cmd('[Get,Read,Show] the local news');
 
 speak($f_telegram_summary)   if said $v_telegram eq 'Read';
diff --git a/code/public/news_starnews.pl b/code/public/news_starnews.pl
index 516c415e4..0877cdcf2 100644
--- a/code/public/news_starnews.pl
+++ b/code/public/news_starnews.pl
@@ -5,9 +5,7 @@
 
 #$f_star_local_html2 = new File_Item($f_star_local_html); # Needed if we use run instead of process_item
 
-$p_star_citystate = new Process_Item(
-    "get_url http://www.starnews.com/news/citystate/index.html $f_star_local_html"
-);
+$p_star_citystate = new Process_Item( "get_url http://www.starnews.com/news/citystate/index.html $f_star_local_html" );
 $v_star_citystate = new Voice_Cmd('[Get,Read,Show] the Star Local news');
 
 speak($f_star_citystate)   if said $v_star_citystate eq 'Read';
diff --git a/code/public/news_starnews2.pl b/code/public/news_starnews2.pl
index 17662c753..0f250163a 100644
--- a/code/public/news_starnews2.pl
+++ b/code/public/news_starnews2.pl
@@ -5,8 +5,7 @@
 
 #$f_star_local_html2 = new File_Item($f_star_local_html); # Needed if we use run instead of process_item
 
-$p_star_citystate = new Process_Item(
-    "get_url http://www.starnews.com/digest/citystate.html $f_star_local_html");
+$p_star_citystate = new Process_Item("get_url http://www.starnews.com/digest/citystate.html $f_star_local_html");
 $v_star_citystate = new Voice_Cmd('[Get,Read,Show] the Star Local news');
 
 speak($f_star_citystate)   if said $v_star_citystate eq 'Read';
diff --git a/code/public/news_starnews4.pl b/code/public/news_starnews4.pl
index 1240237d9..2a3b6b032 100644
--- a/code/public/news_starnews4.pl
+++ b/code/public/news_starnews4.pl
@@ -5,9 +5,7 @@
 
 #$f_star_local_html2 = new File_Item($f_star_local_html); # Needed if we use run instead of process_item
 
-$p_star_citystate = new Process_Item(
-    "get_url http://www.starnews.com/news/citystate/index.html $f_star_local_html"
-);
+$p_star_citystate = new Process_Item( "get_url http://www.starnews.com/news/citystate/index.html $f_star_local_html" );
 $v_star_citystate = new Voice_Cmd('[Get,Read,Show] the Star Local news');
 
 speak($f_star_citystate)   if said $v_star_citystate eq 'Read';
diff --git a/code/public/old/NetCallerID.pl b/code/public/old/NetCallerID.pl
index 02c1ed82e..a7ae53d9f 100644
--- a/code/public/old/NetCallerID.pl
+++ b/code/public/old/NetCallerID.pl
@@ -30,37 +30,29 @@
 
 # define variables
 use vars qw($PhoneName $PhoneNumber $PhoneTime $PhoneDate);
-my ( $NameDone, $NumberDone );
-my ( $callerbn, $PhoneNumberz );
-my (
-    $PhoneDateLog,   $PhoneTimeLog, $PhoneNameLog,
-    $PhoneNumberLog, @callloglines, $CallLogTempLine
-);
-my ( $last, $first, $middle, $areacode, $local_number, $caller );
+my ( $NameDone,     $NumberDone );
+my ( $callerbn,     $PhoneNumberz );
+my ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog, @callloglines, $CallLogTempLine );
+my ( $last,         $first, $middle, $areacode, $local_number, $caller );
 my $Num_Of_Calls = 0;
 
 $NetCallerID = new Serial_Item( undef, undef, 'serial5' );
 if ( my $NetCaller = said $NetCallerID) {
     print "$NetCaller\n";
-    ( $PhoneNumber, $PhoneName ) =
-      $NetCaller =~ /^.+\.NMBR(\d+)\.{3}NAME(.+)\+{3}$/;
-    print "Name = $PhoneName, Number = $PhoneNumber\n"
-      ;    # make sure I am getting what I think I want.
+    ( $PhoneNumber, $PhoneName ) = $NetCaller =~ /^.+\.NMBR(\d+)\.{3}NAME(.+)\+{3}$/;
+    print "Name = $PhoneName, Number = $PhoneNumber\n";    # make sure I am getting what I think I want.
     $NumberDone = "yes";
     $NameDone   = "yes";
 
     ( $last, $first, $middle ) = ( split( ' ', $PhoneName ) )[ 0, 1, 2 ];
     $first = ucfirst( lc($first) );
     $first = ucfirst( lc($middle) )
-      if length($first) == 1;    # Last M First format
+      if length($first) == 1;                              # Last M First format
     $last = ucfirst( lc($last) );
 
     $areacode     = ( substr( $PhoneNumber, 0, 3 ) );
     $local_number = ( substr( $PhoneNumber, 3, 7 ) );
-    $PhoneNumberz =
-        substr( $PhoneNumber, 0, 3 ) . "-"
-      . substr( $PhoneNumber, 3, 3 ) . "-"
-      . substr( $PhoneNumber, 6, 4 );
+    $PhoneNumberz = substr( $PhoneNumber, 0, 3 ) . "-" . substr( $PhoneNumber, 3, 3 ) . "-" . substr( $PhoneNumber, 6, 4 );
 
     # if there is no caller id info, you get the following data from the NetCallerID
     # I don't know what shows up if teh caller is a private number
@@ -93,16 +85,14 @@
     }
     else {
         #      $caller = "$first $last";
-        $caller = "$last"
-          ; #The last name is typically the only complete  name you will get, depending on the length of the person's name
-            # print_msg "caller name = $caller, last name = $last";
+        $caller =
+          "$last";    #The last name is typically the only complete  name you will get, depending on the length of the person's name
+                      # print_msg "caller name = $caller, last name = $last";
     }
 
     # Log the data for use by display_callers
-    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-        "$PhoneNumber $PhoneName" );
-    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
+    logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$PhoneNumber $PhoneName" );
+    logit_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $PhoneNumber, "$Time_Now $Date_Now $Year name=$PhoneName" );
 
     # If the incoming area code is the same, drop it from being spoken.
     if ( $areacode eq $config_parms{local_area_code} ) {
@@ -112,14 +102,10 @@
     # Put pauses in between area code, exchange, and number for
     # announce reasons
     if ( length($PhoneNumber) == 7 ) {
-        $PhoneNumber =
-          substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
+        $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 4 );
     }
     if ( length($PhoneNumber) == 10 ) {
-        $PhoneNumber =
-            substr( $PhoneNumber, 0, 3 ) . "."
-          . substr( $PhoneNumber, 3, 3 ) . "."
-          . substr( $PhoneNumber, 6, 4 );
+        $PhoneNumber = substr( $PhoneNumber, 0, 3 ) . "." . substr( $PhoneNumber, 3, 3 ) . "." . substr( $PhoneNumber, 6, 4 );
     }
 
     # Log the data in a special file to announce from Palmpad
diff --git a/code/public/omnistat.pl b/code/public/omnistat.pl
index a656f4468..8cbba1a0e 100644
--- a/code/public/omnistat.pl
+++ b/code/public/omnistat.pl
@@ -50,14 +50,12 @@
 if ( $state = said $v_omnistat_mode) {
     $omnistat->mode($state);
 }
-$v_omnistat_cool_sp =
-  new Voice_Cmd("Set Thermostat cool setpoint to [$omnistat_temperatures]");
+$v_omnistat_cool_sp = new Voice_Cmd("Set Thermostat cool setpoint to [$omnistat_temperatures]");
 if ( $state = said $v_omnistat_cool_sp) {
     $omnistat->cool_setpoint($state);
 }
 
-$v_omnistat_heat_sp =
-  new Voice_Cmd("Set Thermostat heat setpoint to [$omnistat_temperatures]");
+$v_omnistat_heat_sp = new Voice_Cmd("Set Thermostat heat setpoint to [$omnistat_temperatures]");
 if ( $state = said $v_omnistat_heat_sp) {
     $omnistat->heat_setpoint($state);
 }
diff --git a/code/public/organizer_axel.pl b/code/public/organizer_axel.pl
index 35d7b2be1..db7afc9e6 100644
--- a/code/public/organizer_axel.pl
+++ b/code/public/organizer_axel.pl
@@ -16,8 +16,7 @@
 set_watch $organizer_file if $Reload;
 
 $organizer_check = new Voice_Cmd 'Check for new calendar events';
-$organizer_check->set_info(
-    'Creates MisterHouse events based on organizer calendar events');
+$organizer_check->set_info('Creates MisterHouse events based on organizer calendar events');
 
 if ( said $organizer_check or ( $New_Minute and changed $organizer_file) ) {
     print_log 'Reading calendar file';
@@ -52,7 +51,7 @@ sub updateOrganizer {
 
         #	$time ||= "00:00";
         my $time_date = "$date/$date[0]";
-        next if time_greater_than( $time_date . " 00:00" );   # Skip past events
+        next if time_greater_than( $time_date . " 00:00" );    # Skip past events
         $who = "for $who" if $who;
         $event = &make_event_speakable($event);
         $event =~ s/'/\\'/g;
@@ -61,11 +60,9 @@ sub updateOrganizer {
         if ($time) {
             $time_date .= " $time";
             $time = "at " . time_to_ampm($time);
-            print MYCODE
-              "if (time_now '$time_date - $alarm') {speak 'rooms=all Calendar notice $who.  In $speakalarm, $event'}\n"
+            print MYCODE "if (time_now '$time_date - $alarm') {speak 'rooms=all Calendar notice $who.  In $speakalarm, $event'}\n"
               if $alarm;
-            print MYCODE
-              "if (time_now '$time_date') {speak 'rooms=all Calendar notice $who $time: $event'}\n";
+            print MYCODE "if (time_now '$time_date') {speak 'rooms=all Calendar notice $who $time: $event'}\n";
         }
         else {
             print MYCODE
@@ -88,8 +85,7 @@ sub getCalendarEvents {
 
     if ( scalar @calendarEvents == 0 ) {
 
-        my ($objDB) =
-          new vsDB( file => $organizer_file->name, delimiter => '\t' );
+        my ($objDB) = new vsDB( file => $organizer_file->name, delimiter => '\t' );
         if ( $objDB->Open ) {
 
             $objDB->RemoveFilter;
@@ -127,22 +123,19 @@ sub getCalendarEvents {
             }
         }
         else {
-            speak "Unable to read from calendar data file. "
-              . $objDB->LastError;
+            speak "Unable to read from calendar data file. " . $objDB->LastError;
         }
     }
 }
 
-$v_todaysevents =
-  new Voice_Cmd( "What {are,is} [Debbie,Axel,we] doing today", "" );
+$v_todaysevents = new Voice_Cmd( "What {are,is} [Debbie,Axel,we] doing today", "" );
 
 if ( $state = said $v_todaysevents) {
     my $thisDate = "$Year.$Month.$Mday";
     getCalendarEvents( $state, $thisDate, "Today" );
 }
 
-$v_tomorrowsevents =
-  new Voice_Cmd( "What {are,is} [Debbie,Axel,we] doing tomorrow", "" );
+$v_tomorrowsevents = new Voice_Cmd( "What {are,is} [Debbie,Axel,we] doing tomorrow", "" );
 if ( $state = said $v_tomorrowsevents) {
     my $now = time + ( 60 * 60 * 24 );
     my @ndate = localtime($now);
diff --git a/code/public/owfs.pl b/code/public/owfs.pl
index 6849e1e16..065a60c1b 100755
--- a/code/public/owfs.pl
+++ b/code/public/owfs.pl
@@ -83,10 +83,8 @@
 }
 
 # I use some latching sensors to detect doorbell activity.
-my $frontDoorBell =
-  new Owfs_Item( "12.487344000000", "Front DoorBell", undef, "A" );
-my $backDoorBell =
-  new Owfs_Item( "12.487344000000", "Back DoorBell", undef, "B" );
+my $frontDoorBell = new Owfs_Item( "12.487344000000", "Front DoorBell", undef, "A" );
+my $backDoorBell  = new Owfs_Item( "12.487344000000", "Back DoorBell",  undef, "B" );
 
 if ( new_second 1 ) {
     if ( $frontDoorBell->get("latch.A") ) {
diff --git a/code/public/pa_control_evan.pl b/code/public/pa_control_evan.pl
index 1ce039a2f..aab29276c 100644
--- a/code/public/pa_control_evan.pl
+++ b/code/public/pa_control_evan.pl
@@ -1,10 +1,8 @@
 # Category=Music
 
 my @speakers;
-my $weeder_address =
-  'A';    # edit to match weeder dip switch setting (new weeder only)
-my $port_name =
-  'weeder';    # edit to match weeder serial port name from mh.private.ini
+my $weeder_address = 'A';         # edit to match weeder dip switch setting (new weeder only)
+my $port_name      = 'weeder';    # edit to match weeder serial port name from mh.private.ini
 
 ## EDIT THE FOLLOWING LINE WITH YOUR ROOM NAMES.
 ## MUST MATCH SERIAL ITEM DEFINITIONS IN PA_ITEMS.PL
@@ -69,8 +67,7 @@ sub set_weeder {
     }
     print "db byte string: $byte_string\n";
 
-    my $send = $weeder_address . "W"
-      . sprintf( "%0.2x", unpack( 'C', pack( 'B8', $byte_string ) ) );
+    my $send = $weeder_address . "W" . sprintf( "%0.2x", unpack( 'C', pack( 'B8', $byte_string ) ) );
     print "sending $send to the weeder card\n";    # uncomment for debugging
 
     &Serial_Item::send_serial_data( $port_name, $send . "\r" )
@@ -116,12 +113,12 @@ sub pa_stub {
     for $ref (@speakers) {
         if ( $ref->{while_speaking} ) {
             $pa_action_flag = 1;
-            print "On: " . $ref->{object_name} . "\n"; # uncomment for debugging
+            print "On: " . $ref->{object_name} . "\n";    # uncomment for debugging
             $ref->{state} = ON unless $ref->{sleeping};
         }
     }
     &set_weeder;
-    select undef, undef, undef, 0.2; # adjust to delay sound until relays are on
+    select undef, undef, undef, 0.2;                      # adjust to delay sound until relays are on
 ##################
 }
 
diff --git a/code/public/pa_control_vv_tts.pl b/code/public/pa_control_vv_tts.pl
index 21a75079d..942e8fbf0 100644
--- a/code/public/pa_control_vv_tts.pl
+++ b/code/public/pa_control_vv_tts.pl
@@ -31,14 +31,12 @@
 
 =cut
 
-my $speakers =
-  "default,garage,dining,office,master,all,outside,all_in_and_out,all_parents_asleep,off";
+my $speakers = "default,garage,dining,office,master,all,outside,all_in_and_out,all_parents_asleep,off";
 $v_pa_control = new Voice_Cmd("Set pa speaker to [$speakers]");
 if ( $state = said $v_pa_control) {
     my $room = $state;
     if ( $state eq 'default' ) {
-        $room = "all"
-          ; # add more code here to determine default according to outside occupation.
+        $room = "all";    # add more code here to determine default according to outside occupation.
     }
     set $pa_speaker $room;
     print_log "setting pa_speaker to $room";
diff --git a/code/public/palm_calendar.pl b/code/public/palm_calendar.pl
index cecd3bbe3..994bd8dca 100644
--- a/code/public/palm_calendar.pl
+++ b/code/public/palm_calendar.pl
@@ -5,12 +5,9 @@
 
 my $debug = 0;
 
-my @Month = (
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-);
-my @Day = ( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" );
-my @Date = localtime();
+my @Month = ( "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" );
+my @Day   = ( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" );
+my @Date  = localtime();
 $Date[5] += 1900;
 
 sub GetCstring {
@@ -782,10 +779,7 @@ sub writeOutCalendar {
         my $j = 0;
         @NowDate = localtime();
         $NowDate[5] += 1900;
-        $nowepoch = timelocal(
-            $NowDate[0], $NowDate[1], $NowDate[2],
-            $NowDate[3], $NowDate[4], $NowDate[5]
-        );
+        $nowepoch = timelocal( $NowDate[0], $NowDate[1], $NowDate[2], $NowDate[3], $NowDate[4], $NowDate[5] );
 
         for ( $i = 0; $i < $idx; $i++ ) {
 
@@ -873,9 +867,7 @@ sub writeOutCalendar {
                     $StartDate[5] += 1900;
 
                     if ( $sinceepoch >= $nowepoch ) {
-                        $startDate = sprintf( "%d.%d.%d",
-                            $StartDate[5], $StartDate[4] + 1,
-                            $StartDate[3] );
+                        $startDate = sprintf( "%d.%d.%d", $StartDate[5], $StartDate[4] + 1, $StartDate[3] );
                         print CTAB
                           "$j\t$startDate\t$startTime\t$db_description[$i]\t\t$db_note[$i]\t$alarm_set\t$db_record_who[$i]\n";
                         $j++;
@@ -893,10 +885,8 @@ sub writeOutCalendar {
                             $StartDate[4] -= 12;
                             $StartDate[5]++;
                         }
-                        $sinceepoch = timelocal(
-                            $StartDate[0], $StartDate[1], $StartDate[2],
-                            $StartDate[3], $StartDate[4], $StartDate[5]
-                        );
+                        $sinceepoch =
+                          timelocal( $StartDate[0], $StartDate[1], $StartDate[2], $StartDate[3], $StartDate[4], $StartDate[5] );
                     }
                     elsif ( $reType == 4 ) {    # Monthly By Day
                         $StartDate[4] += ( 1 * $reInterval );
@@ -904,17 +894,13 @@ sub writeOutCalendar {
                             $StartDate[4] -= 12;
                             $StartDate[5]++;
                         }
-                        $sinceepoch = timelocal(
-                            $StartDate[0], $StartDate[1], $StartDate[2],
-                            $StartDate[3], $StartDate[4], $StartDate[5]
-                        );
+                        $sinceepoch =
+                          timelocal( $StartDate[0], $StartDate[1], $StartDate[2], $StartDate[3], $StartDate[4], $StartDate[5] );
                     }
                     elsif ( $reType == 5 ) {    # Yearly By Date
                         $StartDate[5]++;
-                        $sinceepoch = timelocal(
-                            $StartDate[0], $StartDate[1], $StartDate[2],
-                            $StartDate[3], $StartDate[4], $StartDate[5]
-                        );
+                        $sinceepoch =
+                          timelocal( $StartDate[0], $StartDate[1], $StartDate[2], $StartDate[3], $StartDate[4], $StartDate[5] );
                     }
                     elsif ( $reType == 6 ) {    # Yearly By Day
                     }
@@ -923,11 +909,8 @@ sub writeOutCalendar {
             else {
                 next if ( $NowDate[5] > $StartDate[5] );
 
-                $startDate = sprintf( "%d.%d.%d",
-                    $StartDate[5], $StartDate[4] + 1,
-                    $StartDate[3] );
-                print CTAB
-                  "$j\t$startDate\t$startTime\t$db_description[$i]\t\t$db_note[$i]\t$alarm_set\t$db_record_who[$i]\n";
+                $startDate = sprintf( "%d.%d.%d", $StartDate[5], $StartDate[4] + 1, $StartDate[3] );
+                print CTAB "$j\t$startDate\t$startTime\t$db_description[$i]\t\t$db_note[$i]\t$alarm_set\t$db_record_who[$i]\n";
                 $j++;
             }
         }
diff --git a/code/public/palm_calendar_monitor.pl b/code/public/palm_calendar_monitor.pl
index 51c06c73d..67d0548d4 100644
--- a/code/public/palm_calendar_monitor.pl
+++ b/code/public/palm_calendar_monitor.pl
@@ -2,12 +2,10 @@
 
 # Watch for changes made to a Palm datebook.dat file
 
-$axel_datebook_file =
-  new File_Item "/home/axel/Palm/BrownA/datebook/datebook.dat";
+$axel_datebook_file = new File_Item "/home/axel/Palm/BrownA/datebook/datebook.dat";
 set_watch $axel_datebook_file if $Reload;
 
-$debbie_datebook_file =
-  new File_Item "/home/debbie/Palm/Debbie/datebook/datebook.dat";
+$debbie_datebook_file = new File_Item "/home/debbie/Palm/Debbie/datebook/datebook.dat";
 set_watch $debbie_datebook_file if $Reload;
 
 my $calendarScript = "palm_calendar";
diff --git a/code/public/pha_k256.pl b/code/public/pha_k256.pl
index 02db9e490..2dfa1b3df 100644
--- a/code/public/pha_k256.pl
+++ b/code/public/pha_k256.pl
@@ -37,36 +37,35 @@
         #print_log "port is: $port\n";
         if ( $port =~ /T000/ ) {
             print_log "Emptying out outData array to accept new cycle of obs";
-            $#outData = -1;    #empty array to get fresh data;
-            $prntFlg  = 1;
-            $temp =
-              round( $temp * 9 / 5 + 32, 2 );    #DS1820 one wire temp sensor;
+            $#outData   = -1;                                #empty array to get fresh data;
+            $prntFlg    = 1;
+            $temp       = round( $temp * 9 / 5 + 32, 2 );    #DS1820 one wire temp sensor;
             @outData[0] = $temp;
 
             #print_log "Serial data T000 received from array outData[0] as $outData[0]";
         }
         elsif ( $port =~ /A0/ ) {
-            $temp = round( $temp / 4096 * 5 * 2, 2 );    #board vdc supply
+            $temp = round( $temp / 4096 * 5 * 2, 2 );        #board vdc supply
             @outData[1] = $temp;
         }
         elsif ( $port =~ /A1/ ) {
-            $temp = round( $temp / 4096 * 5, 2 );        # CdS voltage;
+            $temp = round( $temp / 4096 * 5, 2 );            # CdS voltage;
             @outData[2] = $temp;
         }
         elsif ( $port =~ /A2/ ) {
-            $temp = round( $temp / 4096 * 5 * 100, 2 );   # LM34 Temp sensor oF;
+            $temp = round( $temp / 4096 * 5 * 100, 2 );      # LM34 Temp sensor oF;
             @outData[3] = $temp;
         }
         elsif ( $port =~ /A3/ ) {
-            $temp = round( $temp / 4096 * 5 * 100, 2 );   # LM34 Temp sensor oF;
+            $temp = round( $temp / 4096 * 5 * 100, 2 );      # LM34 Temp sensor oF;
             @outData[4] = $temp;
         }
         elsif ( $port =~ /A4/ ) {
-            $temp = round( $temp / 4096 * 5 * 100, 2 );   # LM34 Temp sensor oF;
+            $temp = round( $temp / 4096 * 5 * 100, 2 );      # LM34 Temp sensor oF;
             @outData[5] = $temp;
         }
         elsif ( $port =~ /A5/ ) {
-            $temp = round( $temp / 4096 * 5 * 100, 2 );   # LM34 Temp sensor oF;
+            $temp = round( $temp / 4096 * 5 * 100, 2 );      # LM34 Temp sensor oF;
             @outData[6] = $temp;
         }
 
@@ -78,9 +77,7 @@
 
 if ( $#outData + 1 == 7 && $prntFlg == 1 ) {
     print_log "Printing all observations to file seria1_Obs";
-    logit( "c:/misterhouse/mh/data/logs/serial1_Obs.$Year_Month_Now.log",
-        "$Year_Month_Now @outData" );
-    $prntFlg =
-      0;   # prevents multiple writes to file with same array contents (a hack);
+    logit( "c:/misterhouse/mh/data/logs/serial1_Obs.$Year_Month_Now.log", "$Year_Month_Now @outData" );
+    $prntFlg = 0;    # prevents multiple writes to file with same array contents (a hack);
 }
 
diff --git a/code/public/phone_identifier.pl b/code/public/phone_identifier.pl
index b615ff541..2a2d79694 100644
--- a/code/public/phone_identifier.pl
+++ b/code/public/phone_identifier.pl
@@ -6,13 +6,11 @@
 use CID_Announce;
 use Telephony_Identifier;
 
-my $identifier =
-  new Telephony_Identifier( 'Identifier', $config_parms{identifier_port} );
+my $identifier = new Telephony_Identifier( 'Identifier', $config_parms{identifier_port} );
 
-$cid_lookup = new CID_Lookup($identifier);
-$cid_log    = new CID_Log($cid_lookup);
-$cid_announce =
-  new CID_Announce( $cid_lookup, 'Call from $name. Phone call is from $name' );
+$cid_lookup   = new CID_Lookup($identifier);
+$cid_log      = new CID_Log($cid_lookup);
+$cid_announce = new CID_Announce( $cid_lookup, 'Call from $name. Phone call is from $name' );
 
 #$dtmf_item      = new Telephony_DTMF($identifier);
 
@@ -23,16 +21,15 @@
 
 # for testing
 if (0) {
-    $cid_interface_test =
-      new Voice_Cmd('Test callerid [onhook,ring,answer,offhook,cid,o,o2]');
+    $cid_interface_test = new Voice_Cmd('Test callerid [onhook,ring,answer,offhook,cid,o,o2]');
     if ( defined( $state = state_now $cid_interface_test) ) {
         set_test $identifier '+2,0,001'
           if $state eq 'onhook';    #On Hook, idle  (hangup)
         set_test $identifier '+2,1,001' if $state eq 'ring';    #ring start
         set_test $identifier '+2,3,001'
-          if $state eq 'answer';    #Incoming call answered on line 1
+          if $state eq 'answer';                                #Incoming call answered on line 1
         set_test $identifier '+2,4,001'
-          if $state eq 'offhook';    #offhook outgoing
+          if $state eq 'offhook';                               #offhook outgoing
         set_test $identifier '+1,5851234567,Identifier test,001'
           if $state eq 'cid';
         set_test $identifier '+1,9543441234,O,001' if $state eq 'o';
@@ -51,9 +48,7 @@ sub cid_handler {
 
     return unless $p_state eq 'cid';
 
-    print_log "CID handler: "
-      . $p_setby->cid_name() . ' '
-      . $p_setby->cid_number();
+    print_log "CID handler: " . $p_setby->cid_name() . ' ' . $p_setby->cid_number();
 
     my_cid_handler();
 
@@ -134,8 +129,7 @@ sub my_cid_handler {
 
         #set_test $identifier 'ATA';
         set $timer_hangup 5, sub {
-            &Serial_Item::send_serial_data( $config_parms{callerid_name},
-                'ATH' );
+            &Serial_Item::send_serial_data( $config_parms{callerid_name}, 'ATH' );
         };
     }
     elsif (!$Save{at_home}
@@ -147,32 +141,25 @@ sub my_cid_handler {
         my $msg = "mh:$cid_name ($fnumber)";
         send_alpha_page($msg);
 
-        open( CID, ">$config_parms{html_dir}/mh_craig/cid.html" ); # web display
+        open( CID, ">$config_parms{html_dir}/mh_craig/cid.html" );    # web display
         print CID
           "<html><META HTTP-EQUIV='refresh' content='60;URL=/mh_craig/index.html'> <body bgcolor=black><br><br><br><br><br><br>";
         print CID "<center><table><TR><TD><font face=arial size=7 color=lime>";
-        print CID
-          "$caller <br>$cid_name <br>$fnumber <br>$Date_Now <br>$Time_Now <br>";
+        print CID "$caller <br>$cid_name <br>$fnumber <br>$Date_Now <br>$Time_Now <br>";
         print CID "</td></tr></table></center>  </body></html>";
         close CID;
 
-        open( CID, ">$config_parms{html_dir}/mh_craig/cidsmall.html" )
-          ;                                                        # web display
+        open( CID, ">$config_parms{html_dir}/mh_craig/cidsmall.html" );    # web display
         print CID "<html><body bgcolor=black><br>";
-        print CID
-          "<center><table><TR><TD><font face=arial size=5 color=lime><b>";
-        print CID
-          "$caller <br>$cid_name $fnumber <br><br>$Date_Now at $Time_Now <br>";
+        print CID "<center><table><TR><TD><font face=arial size=5 color=lime><b>";
+        print CID "$caller <br>$cid_name $fnumber <br><br>$Date_Now at $Time_Now <br>";
         print CID "</td></tr></table></center>  </body></html>";
         close CID;
     }
 
     $phone_count++;
-    open( CALL_LOG, ">>$config_parms{data_dir}/phone/recentcalls.log" )
-      ;                                                            # Log it
-    print CALL_LOG "$Date_Now`$Time_Now`"
-      . $cid_lookup->cid_name() . "`"
-      . $identifier->cid_number() . "\n";
+    open( CALL_LOG, ">>$config_parms{data_dir}/phone/recentcalls.log" );    # Log it
+    print CALL_LOG "$Date_Now`$Time_Now`" . $cid_lookup->cid_name() . "`" . $identifier->cid_number() . "\n";
     close CALL_LOG;
 }
 
@@ -212,11 +199,10 @@ sub hook_handler {
     my ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog );
     my ( $last, $first, $middle, $areacode, $local_number, $caller );
 
-    open( CALL_LOG, "$config_parms{data_dir}/phone/recentcalls.log" )
-      ;    # Open for input
-    @CALL_LOGlines = <CALL_LOG>;    # Open array and
-                                    # read in data
-    close CALL_LOG;                 # Close the file
+    open( CALL_LOG, "$config_parms{data_dir}/phone/recentcalls.log" );    # Open for input
+    @CALL_LOGlines = <CALL_LOG>;                                          # Open array and
+                                                                          # read in data
+    close CALL_LOG;                                                       # Close the file
 
     print_log "Announced Recent Callers.";
 
@@ -240,8 +226,7 @@ sub hook_handler {
             and $PhoneDateLog ne $Date_Now
             and $PhoneNumberLog eq '' )
         {
-            speak
-              "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
+            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called.";
         }
         elsif ( $PhoneNameLog eq 'OUT OF AREA'
             and $PhoneDateLog eq $Date_Now
@@ -253,15 +238,13 @@ sub hook_handler {
             and $PhoneDateLog ne $Date_Now
             and $PhoneNumberLog ne '' )
         {
-            speak
-              "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called. Call back at $PhoneNumberLog.";
+            speak "At $PhoneTimeLog on $PhoneDateLog, an unidentified party called. Call back at $PhoneNumberLog.";
         }
         elsif ( $PhoneNameLog eq 'OUT OF AREA'
             and $PhoneDateLog eq $Date_Now
             and $PhoneNumberLog ne '' )
         {
-            speak
-              "At $PhoneTimeLog, an unidentified party called. Call back at $PhoneNumberLog.";
+            speak "At $PhoneTimeLog, an unidentified party called. Call back at $PhoneNumberLog.";
         }
         elsif ( $PhoneNameLog eq 'PRIVATE'
             and $PhoneDateLog ne $Date_Now
@@ -275,15 +258,11 @@ sub hook_handler {
         {
             speak "At $PhoneTimeLog, a private party called.";
         }
-        elsif ( $PhoneNameLog ne 'OUT OF AREA' and $PhoneDateLog ne $Date_Now )
-        {
-            speak
-              "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        elsif ( $PhoneNameLog ne 'OUT OF AREA' and $PhoneDateLog ne $Date_Now ) {
+            speak "At $PhoneTimeLog on $PhoneDateLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
         }
-        elsif ( $PhoneNameLog ne 'OUT OF AREA' and $PhoneDateLog eq $Date_Now )
-        {
-            speak
-              "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
+        elsif ( $PhoneNameLog ne 'OUT OF AREA' and $PhoneDateLog eq $Date_Now ) {
+            speak "At $PhoneTimeLog, $PhoneNameLog called. Call back at $PhoneNumberLog.";
         }
     }
     speak "$NumofCalls total calls." if $NumofCalls;
@@ -293,8 +272,7 @@ sub hook_handler {
 
 $v_phone_clearlog = new Voice_Cmd('Clear Recent Call Log');
 if ( said $v_phone_clearlog) {
-    open( CALL_LOG, ">$config_parms{data_dir}/phone/recentcalls.log" )
-      ;    # CLEAR Log
+    open( CALL_LOG, ">$config_parms{data_dir}/phone/recentcalls.log" );    # CLEAR Log
     close CALL_LOG;
     print_log "Recent Call Log Cleared.";
 
@@ -305,37 +283,30 @@ sub hook_handler {
     print_log "Searching for $Tk_results{'Phone Search'}";
 
     # Search data logged from incoming caller id data.
-    my ( $count1, $count2, %results ) =
-      &search_dbm( "$config_parms{data_dir}/phone/callerid.dbm",
-        $Save{phone_search} );
+    my ( $count1, $count2, %results ) = &search_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $Save{phone_search} );
 
     # Also search in array created from mh.ini caller_id_file data
     while ( my ( $key, $value ) = each %Caller_ID::name_by_number ) {
         if (   $key =~ /$Save{phone_search}/i
             or $value =~ /$Save{phone_search}/i )
         {
-            $value =
-              &read_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $key )
-              ;    # Use dbm data for consistency
+            $value = &read_dbm( "$config_parms{data_dir}/phone/callerid.dbm", $key );    # Use dbm data for consistency
             $results{$key} = $value;
         }
     }
-    $count2 = keys %results;   # Reset count, in case Caller_ID search found any
+    $count2 = keys %results;    # Reset count, in case Caller_ID search found any
 
     if ($count2) {
         my $results;
         for ( sort keys %results ) {
-            my ( $cid_number, $cid_date, $cid_name ) =
-              $results{$_} =~ /(\S+) (.+) name=(.+)/;
+            my ( $cid_number, $cid_date, $cid_name ) = $results{$_} =~ /(\S+) (.+) name=(.+)/;
             $cid_name = $Caller_ID::name_by_number{$_}
               if $Caller_ID::name_by_number{$_};
-            $results .= sprintf( "%13s calls=%3s last=%26s %s\n",
-                $_, $cid_number, $cid_date, $cid_name );
+            $results .= sprintf( "%13s calls=%3s last=%26s %s\n", $_, $cid_number, $cid_date, $cid_name );
         }
 
         #       map {$results .= "   $_: $results{$_}\n\n"} sort keys %results;
-        display "Results:  $count2 out of $count1 records matched\n\n"
-          . $results, 120, 'Phone Search Results', 'systemfixed';
+        display "Results:  $count2 out of $count1 records matched\n\n" . $results, 120, 'Phone Search Results', 'systemfixed';
     }
     else {
         display "\n      No match found\n", 5, 'Phone Search Results';
diff --git a/code/public/phone_logs_kieran.pl b/code/public/phone_logs_kieran.pl
index a0fd7d23a..d1c4cc71e 100644
--- a/code/public/phone_logs_kieran.pl
+++ b/code/public/phone_logs_kieran.pl
@@ -1,13 +1,11 @@
 
 $v_phone_summarize = new Voice_Cmd('[Summarize,Itemize] Recent Call Log');
 if ( $state = said $v_phone_summarize) {
-    open( CALLLOG, "$config_parms{code_dir}/data/phone/logs/calllog.log" )
-      ;    # Open for input
-    @callloglines = <CALLLOG>;    # Open array and
-                                  # read in data
-    close CALLLOG;                # Close the file
-    my ( $FirstPhoneLogDate, $LastPhoneLogDate, %CallerKeys, $Summary_Message,
-        $key );
+    open( CALLLOG, "$config_parms{code_dir}/data/phone/logs/calllog.log" );    # Open for input
+    @callloglines = <CALLLOG>;                                                 # Open array and
+                                                                               # read in data
+    close CALLLOG;                                                             # Close the file
+    my ( $FirstPhoneLogDate, $LastPhoneLogDate, %CallerKeys, $Summary_Message, $key );
 
     $NumofCalls = 0;
 
@@ -32,12 +30,10 @@
             $CallerKeys{$PhoneNameLog} = 1;
         }
     }
-    $Summary_Message =
-      "The Recent Call Log contains $NumofCalls entries between $FirstPhoneLogDate and $LastPhoneLogDate.\n\n";
+    $Summary_Message = "The Recent Call Log contains $NumofCalls entries between $FirstPhoneLogDate and $LastPhoneLogDate.\n\n";
 
     foreach $key ( sort keys %CallerKeys ) {
-        $Summary_Message .=
-          plural( $CallerKeys{$key}, 'call' ) . " from $key.\n"
+        $Summary_Message .= plural( $CallerKeys{$key}, 'call' ) . " from $key.\n"
           if ( $state eq 'Itemize' );
     }
 
diff --git a/code/public/phone_merlin.pl b/code/public/phone_merlin.pl
index 11d98f599..23f775651 100644
--- a/code/public/phone_merlin.pl
+++ b/code/public/phone_merlin.pl
@@ -5,25 +5,18 @@
 # Pete Flaherty 7-17-2004 (or thereabouts)
 
 $merlin_data = new Serial_Item( undef, undef, 'serial1' );
-my (
-    $ph_id,   $ph_date, $ph_time,    $cid_number, $ph_duration,
-    $ph_line, $ph_extn, $ph_account, $ph_type
-);
+my ( $ph_id, $ph_date, $ph_time, $cid_number, $ph_duration, $ph_line, $ph_extn, $ph_account, $ph_type );
 
 # get the data if it's there
 if ( my $data = said $merlin_data) {
 
     # Split it up into it's parts
-    (
-        $ph_id, $ph_date, $ph_time, $cid_number, $ph_duration, $ph_line,
-        $ph_extn, $ph_account
-    ) = split( /\s+/, $data );
+    ( $ph_id, $ph_date, $ph_time, $cid_number, $ph_duration, $ph_line, $ph_extn, $ph_account ) = split( /\s+/, $data );
 
     # All the outgoing calls are Id'd wit a C
     if ( $ph_id eq "C" and $cid_number ne "IN" ) {
         $cid_number = substr( $cid_number, 0, 11 );
-        my $ph_nm =
-          "Ln " + $ph_line + " ext " + $ph_extn + " for " + $ph_duration;
+        my $ph_nm = "Ln " + $ph_line + " ext " + $ph_extn + " for " + $ph_duration;
         $cid_number = "O$cid_number";    #Starts With a cap 'o' not 0 zero
 
         #	print_log "Serial data received ",$data;
@@ -38,7 +31,8 @@
         # We're gaurenteed only one string at a time, without duplicates
         # So log it
         # Tue 04/27/04 08:15:41 O1234567
-        logit( "$config_parms{data_dir}/phone/logs/phone.$Year_Month_Now.log",
+        logit(
+            "$config_parms{data_dir}/phone/logs/phone.$Year_Month_Now.log",
             "$cid_number name=$ph_duration ext=$ph_extn line=$ph_line type=$ph_type"
         );
 
diff --git a/code/public/pictures_files1.pl b/code/public/pictures_files1.pl
index be6460fd2..f2ab453d4 100644
--- a/code/public/pictures_files1.pl
+++ b/code/public/pictures_files1.pl
@@ -41,16 +41,14 @@
 %picturesfiles = ();
 ( $picturesnames, %picturesfiles ) = &pictures_files;
 
-use vars '@tk_photos';  # This will be persistent across passes and code reloads
+use vars '@tk_photos';    # This will be persistent across passes and code reloads
 
 # noloop=stop
 
 # Build and search an Video database.
 # Build the pictures database
 $v_pictures_build_list = new Voice_Cmd '[Build,Load] the pictures database', '';
-$v_pictures_build_list->set_info(
-    "Builds/loads an pictures database for these directories: $config_parms{pictures_playlist_dir}"
-);
+$v_pictures_build_list->set_info( "Builds/loads an pictures database for these directories: $config_parms{pictures_playlist_dir}" );
 
 $p_pictures_build_list = new Process_Item;
 
@@ -129,8 +127,7 @@ sub pictures_files {
     return $picturesnames1, %picturesfiles1;
 }
 
-$v_pictures_playlist1 =
-  new Voice_Cmd("Set house picture player to file [$picturesnames]");
+$v_pictures_playlist1 = new Voice_Cmd("Set house picture player to file [$picturesnames]");
 set_icon $v_pictures_playlist1 'playlist';
 
 if ( $state = said $v_pictures_playlist1 ) {
diff --git a/code/public/printer_control.pl b/code/public/printer_control.pl
index a74b2fb52..1ecbea86b 100644
--- a/code/public/printer_control.pl
+++ b/code/public/printer_control.pl
@@ -13,7 +13,7 @@
 =cut
 
 $ptimer  = new Timer;
-$printer = new X10_ITEM('A3')   # Change to suit your printer's appliance module
+$printer = new X10_ITEM('A3')    # Change to suit your printer's appliance module
 
   #The name of your printer status file
   #NOTE: This file is typically only readable by daemon & lp
@@ -24,7 +24,6 @@
 if ( file_changed($pstatus) ) {
     print "Printer On for print job\n";
     set $printer "on";
-    set $ptimer 5 * 60,
-      'print "Printer off after 5mins.\n"; set $printer "off"';
+    set $ptimer 5 * 60, 'print "Printer off after 5mins.\n"; set $printer "off"';
 
 }
diff --git a/code/public/process_weather1.pl b/code/public/process_weather1.pl
index 6028a476d..2b723a2e5 100644
--- a/code/public/process_weather1.pl
+++ b/code/public/process_weather1.pl
@@ -78,12 +78,9 @@
 
 if ( time_cron '30 7 * * *' ) {
 
-    my $weather_file = "$config_parms{data_dir}/weather.txt";
-    my @days         = (
-        'Sunday',   'Monday', 'Tuesday', 'Wednesday',
-        'Thursday', 'Friday', 'Saturday'
-    );
-    my @rain_probability   = ( '1',  '.8',  '.6',  '.4',  '.2',  '0', '0' );
+    my $weather_file       = "$config_parms{data_dir}/weather.txt";
+    my @days               = ( 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' );
+    my @rain_probability   = ( '1', '.8', '.6', '.4', '.2', '0', '0' );
     my @sunny_probability  = ( '-1', '-.8', '-.6', '-.4', '-.2', '0', '0' );
     my @cloudy_probability = ( '.2', '.05', '.05', '.05', '.05', '0', '0' );
     my $high_cnt           = 0;
@@ -127,8 +124,7 @@
 
     open( WEATHER, "$weather_file" )     || die "Cannot open $weather_file";
     open( RESULTS, ">$weather_results" ) || die "Cannot open $weather_results";
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
 
     undef($/);
@@ -168,8 +164,7 @@
         $index = $wday + 1;
     }
 
-    $query =
-      "insert into history_forecast (water_date, forecast) values (now(), \"$weather\")";
+    $query = "insert into history_forecast (water_date, forecast) values (now(), \"$weather\")";
 
     $sth = $dbh->prepare($query) || die $dbh->errstr;
     $sth->execute || die $dbh->errstr;
@@ -214,19 +209,15 @@
 
         $tempreg1  = "\\s*($days[$index]\[^ \].*)$days[$tindex1]\[^ \].*";
         $tempreg11 = "\\s*($days[$index]\[^ \].*)$days[$tindex1].*";
-        $tempreg2 =
-          "\\s*($days[$index]\[^ \].*)$days[$tindex1] and $days[$tindex2].*";
-        $tempreg3 =
-          "\\s*($days[$index] and $days[$tindex1].*)$days[$tindex2]\[^ \].*";
-        $tempreg4 =
-          "\\s*($days[$index] and $days[$tindex1].*)$days[$tindex2] and $days[$tindex3].*";
+        $tempreg2  = "\\s*($days[$index]\[^ \].*)$days[$tindex1] and $days[$tindex2].*";
+        $tempreg3  = "\\s*($days[$index] and $days[$tindex1].*)$days[$tindex2]\[^ \].*";
+        $tempreg4  = "\\s*($days[$index] and $days[$tindex1].*)$days[$tindex2] and $days[$tindex3].*";
         $tempreg5  = "\\s*($days[$index] and $days[$tindex1].*)";
         $tempreg12 = "\\s*($days[$index].*)$days[$tindex1].*";
-        $tempreg6 =
-          "\\s*($days[$index]\[^ \].*)$days[$tindex1] through $days[$tindex3].*";
-        $tempreg7 = "\\s*($days[$index] through $days[$tindex2].*)";
-        $tempreg8 = "\\s*($days[$index] through $days[$tindex3].*)";
-        $tempreg9 = "\\s*($days[$index].*)";
+        $tempreg6  = "\\s*($days[$index]\[^ \].*)$days[$tindex1] through $days[$tindex3].*";
+        $tempreg7  = "\\s*($days[$index] through $days[$tindex2].*)";
+        $tempreg8  = "\\s*($days[$index] through $days[$tindex3].*)";
+        $tempreg9  = "\\s*($days[$index].*)";
 
         if ( $weather =~ /$tempreg4$/is ) {
             $forecast[$i] = $1;
@@ -303,9 +294,7 @@
         $high           = 0;
         $low            = 0;
 
-        if ( $forecast[$i] =~
-            /.*Chance+\s+of+\s+[rain|showers|thunderstorms]+\s+(\d+\d*).+$/is )
-        {
+        if ( $forecast[$i] =~ /.*Chance+\s+of+\s+[rain|showers|thunderstorms]+\s+(\d+\d*).+$/is ) {
             $percent_chance = $1;
         }
 
@@ -332,21 +321,14 @@
         }
 
         if ( $forecast[$i] =~
-            /.*((High|Highs)+\s+(in\s+the|near|around)+\s+(upper|lower|mid)+\s+(to)+\s*(mid|upper|lower)+\s+)(\d+\d*)s*.*$/is
-          )
+            /.*((High|Highs)+\s+(in\s+the|near|around)+\s+(upper|lower|mid)+\s+(to)+\s*(mid|upper|lower)+\s+)(\d+\d*)s*.*$/is )
         {
             $high = $7 + 5;
         }
-        elsif ( $forecast[$i] =~
-            /.*((High|Highs)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+)(\d+\d*)s*.*$/is
-          )
-        {
+        elsif ( $forecast[$i] =~ /.*((High|Highs)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+)(\d+\d*)s*.*$/is ) {
             $high = $5 + 5;
         }
-        elsif ( $forecast[$i] =~
-            /.*((High|Highs)+\s+(near|in\s+the|around|from)+\s*(upper|lower|mid)*\s+)(\d+\d*)s*.*$/is
-          )
-        {
+        elsif ( $forecast[$i] =~ /.*((High|Highs)+\s+(near|in\s+the|around|from)+\s*(upper|lower|mid)*\s+)(\d+\d*)s*.*$/is ) {
             $high = $5 + 5;
         }
         elsif ( $forecast[$i] =~ /.*High (\d+\d*)s*.*$/is ) {
@@ -354,21 +336,14 @@
         }
 
         if ( $forecast[$i] =~
-            /.*((Low|Lows)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+(to)+\s*(mid|upper|lower)+\s+)(\d+\d*)s*.*$/is
-          )
+            /.*((Low|Lows)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+(to)+\s*(mid|upper|lower)+\s+)(\d+\d*)s*.*$/is )
         {
             $low = $7;
         }
-        elsif ( $forecast[$i] =~
-            /.*((Low|Lows)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+)(\d+\d*)s*.*$/is
-          )
-        {
+        elsif ( $forecast[$i] =~ /.*((Low|Lows)+\s+(near|in\s+the|around)+\s+(upper|lower|mid)+\s+)(\d+\d*)s*.*$/is ) {
             $low = $5;
         }
-        elsif ( $forecast[$i] =~
-            /.*((Low|Lows)+\s+(near|in\s+the|around)+\s*(upper|lower|mid)*\s+)(\d+\d*)s*/is
-          )
-        {
+        elsif ( $forecast[$i] =~ /.*((Low|Lows)+\s+(near|in\s+the|around)+\s*(upper|lower|mid)*\s+)(\d+\d*)s*/is ) {
             $low = $5;
         }
         elsif ( $forecast[$i] =~ /.*Low (\d+\d*)s*/is ) {
@@ -393,8 +368,7 @@
         $probability += $cloudy_probability[$i] if ($cloudy);
         $probability += $sunny_probability[$i]  if ($sunny);
 
-        print RESULTS
-          "<High = $high, Low = $low, Probability = $probability, Percent = $percent_chance\n $forecast[$i]>\n";
+        print RESULTS "<High = $high, Low = $low, Probability = $probability, Percent = $percent_chance\n $forecast[$i]>\n";
     }
 
     $high_avg /= $high_cnt if ( $high_cnt > 0 );
@@ -530,13 +504,11 @@
     set $Irr_Front_Yard 'OFF';
 }
 
-if ( ( state_now $Irr_Manual_Start eq ON ) || ( state_now $Irr_Remote eq ON ) )
-{
+if ( ( state_now $Irr_Manual_Start eq ON ) || ( state_now $Irr_Remote eq ON ) ) {
 
     $duration  = $default_duration;
     $irr_state = "Manual";
-    $dbh       = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh       = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Front_Garage', $irr_zone1_percent, $duration, \"$irr_state\", 'ON')";
@@ -563,8 +535,7 @@
 }
 
 if ( expired $irr_zone1_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Front_Garage', $irr_zone1_percent, $duration, \"$irr_state\", 'OFF')";
@@ -588,8 +559,7 @@
 }
 
 if ( expired $irr_zone2_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Deck_Steps', $irr_zone2_percent, $duration, \"$irr_state\", 'OFF')";
@@ -613,8 +583,7 @@
 }
 
 if ( expired $irr_zone3_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Along_Fence', $irr_zone3_percent, $duration, \"$irr_state\", 'OFF')";
@@ -637,8 +606,7 @@
 }
 
 if ( expired $irr_zone4_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Right_Of_Deck', $irr_zone4_percent, $duration, \"$irr_state\", 'OFF')";
@@ -661,8 +629,7 @@
 }
 
 if ( expired $irr_zone5_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Back_Right', $irr_zone5_percent, $duration, \"$irr_state\", 'OFF')";
@@ -685,8 +652,7 @@
 }
 
 if ( expired $irr_zone6_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Middle_Right_Bvld', $irr_zone6_percent, $duration, \"$irr_state\", 'OFF')";
@@ -709,8 +675,7 @@
 }
 
 if ( expired $irr_zone7_timer) {
-    $dbh = DBI->connect( "DBI:mysql:database=$database:$host",
-        $dbuser, $dbpass, { PrintError => 0 } )
+    $dbh = DBI->connect( "DBI:mysql:database=$database:$host", $dbuser, $dbpass, { PrintError => 0 } )
       || die $DBI::errstr;
     $query =
       "insert into history_detail (water_date, zone, zone_percent, duration, start_type, irr_state) values (now(), 'Irr_Front_Yard', $irr_zone7_percent, $duration, \"$irr_state\", 'OFF')";
diff --git a/code/public/rcs.pl b/code/public/rcs.pl
index bdcc66979..d04cd2e0b 100644
--- a/code/public/rcs.pl
+++ b/code/public/rcs.pl
@@ -40,11 +40,7 @@
 
     # build the 'send setpoint' menu
     $Tk_objects{Send_setpoint}{$TX10} = $Tk_objects{menu_RCS_items}->menu->Menu;
-    &tk_cascade_entry(
-        'Send setpoint',
-        $Tk_objects{menu_RCS_items},
-        $Tk_objects{Send_setpoint}{$TX10}
-    );
+    &tk_cascade_entry( 'Send setpoint', $Tk_objects{menu_RCS_items}, $Tk_objects{Send_setpoint}{$TX10} );
 
     for my $cmd ( list_by_type $TX10 'setpoint' ) {
         $Tk_objects{Send_setpoint}{$TX10}->add(
@@ -56,11 +52,7 @@
 
     # build the 'send command' menu
     $Tk_objects{Send_command}{$TX10} = $Tk_objects{menu_RCS_items}->menu->Menu;
-    &tk_cascade_entry(
-        'Send commmand',
-        $Tk_objects{menu_RCS_items},
-        $Tk_objects{Send_command}{$TX10}
-    );
+    &tk_cascade_entry( 'Send commmand', $Tk_objects{menu_RCS_items}, $Tk_objects{Send_command}{$TX10} );
 
     for my $cmd ( list_by_type $TX10 'cmd' ) {
         $Tk_objects{Send_command}{$TX10}->add(
@@ -73,11 +65,7 @@
     # build the 'request status' menu
     $Tk_objects{request_status}{$TX10} =
       $Tk_objects{menu_RCS_items}->menu->Menu;
-    &tk_cascade_entry(
-        'Request status',
-        $Tk_objects{menu_RCS_items},
-        $Tk_objects{request_status}{$TX10}
-    );
+    &tk_cascade_entry( 'Request status', $Tk_objects{menu_RCS_items}, $Tk_objects{request_status}{$TX10} );
 
     for my $cmd ( list_by_type $TX10 'request' ) {
         $Tk_objects{request_status}{$TX10}->add(
diff --git a/code/public/rcstx15_old.pl b/code/public/rcstx15_old.pl
index 05fceb094..62463ada7 100644
--- a/code/public/rcstx15_old.pl
+++ b/code/public/rcstx15_old.pl
@@ -17,10 +17,8 @@
 # Set Item codes
 my $TX15_hc = 'A';
 
-my @TX15_table_p_on =
-  qw(65 66 67 68 69 70 71 72 heat_on cool_on auto_on fan_on sb_on sb_6 sb_8 sb_10);
-my @TX15_table_p_off =
-  qw(73 74 75 76 77 78 79 80 heat_off cool_off auto_off fan_off sb_off sb_12 sb_14 sb_16);
+my @TX15_table_p_on  = qw(65 66 67 68 69 70 71 72 heat_on cool_on auto_on fan_on sb_on sb_6 sb_8 sb_10);
+my @TX15_table_p_off = qw(73 74 75 76 77 78 79 80 heat_off cool_off auto_off fan_off sb_off sb_12 sb_14 sb_16);
 
 my $thermostat = new Serial_Item( 'X' . $TX15_hc );
 
@@ -28,10 +26,8 @@
 # noloop=start
 my $i = 0;
 for my $device_code (qw(1 2 3 4 5 6 7 8 9 A B C D E F G)) {
-    $thermostat->add( 'X' . $TX15_hc . $device_code . $TX15_hc . 'J',
-        $TX15_table_p_on[$i] );
-    $thermostat->add( 'X' . $TX15_hc . $device_code . $TX15_hc . 'K',
-        $TX15_table_p_off[ $i++ ] );
+    $thermostat->add( 'X' . $TX15_hc . $device_code . $TX15_hc . 'J', $TX15_table_p_on[$i] );
+    $thermostat->add( 'X' . $TX15_hc . $device_code . $TX15_hc . 'K', $TX15_table_p_off[ $i++ ] );
 }
 
 # noloop=stop
@@ -47,13 +43,10 @@
 $v_thermostat_setback = new Voice_Cmd('Thermostat setback [on,off]');
 set $thermostat 'sb_' . $state if $state = said $v_thermostat_setback;
 
-$v_thermostat_sp = new Voice_Cmd(
-    'Set the thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80] degrees'
-);
+$v_thermostat_sp = new Voice_Cmd( 'Set the thermostat to [65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80] degrees' );
 set $thermostat $state if $state = said $v_thermostat_sp;
 
-$v_thermostat_sb =
-  new Voice_Cmd('Set the thermostat setback to [6,8,10,12,14,16] degrees');
+$v_thermostat_sb = new Voice_Cmd('Set the thermostat setback to [6,8,10,12,14,16] degrees');
 set $thermostat 'sb_' . $state if $state = said $v_thermostat_sb;
 
 if ( $Month > 10 and $Month < 3 ) {
diff --git a/code/public/redrat.pl b/code/public/redrat.pl
index 12daca09a..fb595c2aa 100644
--- a/code/public/redrat.pl
+++ b/code/public/redrat.pl
@@ -4,194 +4,110 @@
 #Category=AV
 $ir_dvd = new RedRat;
 $ir_dvd->add( "power",
-    "[PF62L2503095B1257CEB9X4204080010248010020E8408100020490020041D0810200040920040083A1020400081240080106300P1FFFR00]"
-);
-$ir_dvd->add( "play",
-    "[PF62L2504095A1256CEB8X4020048010248010020E8040090020490020041D0080120040920040083180P1FFFR00]"
-);
-$ir_dvd->add( "stop",
-    "[PF62L2504095A1256CEB9X4000248010248010020E8000490020490020041D0000920040920040083180P1FFFR00]"
-);
+    "[PF62L2503095B1257CEB9X4204080010248010020E8408100020490020041D0810200040920040083A1020400081240080106300P1FFFR00]" );
+$ir_dvd->add( "play", "[PF62L2504095A1256CEB8X4020048010248010020E8040090020490020041D0080120040920040083180P1FFFR00]" );
+$ir_dvd->add( "stop", "[PF62L2504095A1256CEB9X4000248010248010020E8000490020490020041D0000920040920040083180P1FFFR00]" );
 $ir_dvd->add( "pause",
-    "[PF62L2502095A1256C562X4200490020490020041D08012400812400801074200490020490020041D080124008124008010630P1FFFR00]"
-);
-$ir_dvd->add( "menu",
-    "[PF62L2504095A1256C561X4240900020490020041D090240008124008010742409000204900200418C00P1FFFR00]"
-);
+    "[PF62L2502095A1256C562X4200490020490020041D08012400812400801074200490020490020041D080124008124008010630P1FFFR00]" );
+$ir_dvd->add( "menu", "[PF62L2504095A1256C561X4240900020490020041D090240008124008010742409000204900200418C00P1FFFR00]" );
 $ir_dvd->add( "right",
-    "[PF62L2502095A1256C562X4200490020490020041D08012400812400801074200490020490020041D080124008124008010630P1FFFR00]"
-);
+    "[PF62L2502095A1256C562X4200490020490020041D08012400812400801074200490020490020041D080124008124008010630P1FFFR00]" );
 $ir_dvd->add( "left",
-    "[PF62L2503095A1253B2B4X424092408124008010742409240812400801074240924081240080107424092408124008010630P1FFFR00]"
-);
-$ir_dvd->add( "up",
-    "[PF62L2504095A1255BC0BX4200492040920040083A100249020490020041D080124810248010020C60P1FFFR00]"
-);
-$ir_dvd->add( "down",
-    "[PF62L2506095A1253BC0CX4020492040920040083A010249020490020041D008124810248010020C60P1FFFR00]"
-);
-$ir_dvd->add( "enter",
-    "[PF62L2505095A1257CEBAX4240800010248010020E8481000020490020041D0902000040920040083180P1FFFR00]"
-);
-$ir_dvd->add( "next track",
-    "[PF62L2506095A1257CEBAX4200048010248010020E8400090020490020041D0800120040920040083180P1FFFR00]"
-);
-$ir_dvd->add( "previous track",
-    "[PF62L2505095A1257D813X40000240081240080107400002400812400801074000024008124008010630P1FFFR00]"
-);
+    "[PF62L2503095A1253B2B4X424092408124008010742409240812400801074240924081240080107424092408124008010630P1FFFR00]" );
+$ir_dvd->add( "up",             "[PF62L2504095A1255BC0BX4200492040920040083A100249020490020041D080124810248010020C60P1FFFR00]" );
+$ir_dvd->add( "down",           "[PF62L2506095A1253BC0CX4020492040920040083A010249020490020041D008124810248010020C60P1FFFR00]" );
+$ir_dvd->add( "enter",          "[PF62L2505095A1257CEBAX4240800010248010020E8481000020490020041D0902000040920040083180P1FFFR00]" );
+$ir_dvd->add( "next track",     "[PF62L2506095A1257CEBAX4200048010248010020E8400090020490020041D0800120040920040083180P1FFFR00]" );
+$ir_dvd->add( "previous track", "[PF62L2505095A1257D813X40000240081240080107400002400812400801074000024008124008010630P1FFFR00]" );
 
 $ir_receiver = new RedRat;
-$ir_receiver->add( "power off",
-    "[PF62L24EA0934124DX42481200040000188490240008000030P29C1R17]" );
-$ir_receiver->add( "tv",
-    "[PF62L24E6094A124AX402040900002C402040900002C00P31E2R0E]" );
-$ir_receiver->add( "video1",
-    "[PF62L24E50949124FX402000400000B1008001000002C0P3431R0E]" );
-$ir_receiver->add( "ld",
-    "[PF62L24E7094A124DX424081200005884810240000B0P30BCR0E]" );
-$ir_receiver->add( "volume up",
-    "[PF62L24E6094A124DX402004000000B1008010000002C0P343BR01]" );
-$ir_receiver->add( "volume down",
-    "[PF62L24E809491256X4240080000016212004000000B00P331CR01]" );
-$ir_receiver->add( "sound field",
-    "[PF62L24EA094F1247X42492400090621249200048300P2E62R02]" );
+$ir_receiver->add( "power off",   "[PF62L24EA0934124DX42481200040000188490240008000030P29C1R17]" );
+$ir_receiver->add( "tv",          "[PF62L24E6094A124AX402040900002C402040900002C00P31E2R0E]" );
+$ir_receiver->add( "video1",      "[PF62L24E50949124FX402000400000B1008001000002C0P3431R0E]" );
+$ir_receiver->add( "ld",          "[PF62L24E7094A124DX424081200005884810240000B0P30BCR0E]" );
+$ir_receiver->add( "volume up",   "[PF62L24E6094A124DX402004000000B1008010000002C0P343BR01]" );
+$ir_receiver->add( "volume down", "[PF62L24E809491256X4240080000016212004000000B00P331CR01]" );
+$ir_receiver->add( "sound field", "[PF62L24EA094F1247X42492400090621249200048300P2E62R02]" );
 
 $ir_vcr = new RedRat;
-$ir_vcr->add( "power",
-    "[PF6FL0DEF1BE0X4411110011044111888222200220882230PB0FER02]" );
-$ir_vcr->add( "menu",
-    "[PF6FL0DE31BFAX4411110004444046220888800222202300PAF45R02]" );
-$ir_vcr->add( "fast forward",
-    "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
-$ir_vcr->add( "down",
-    "[PF6FL0DFF1BDFX4411110044440441888222200888808830PB0FDR02]" );
-$ir_vcr->add( "up",
-    "[PF6FL0DE41BF9X4444110044440046222208802222002300PAF40R02]" );
-$ir_vcr->add( "right",
-    "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
-$ir_vcr->add( "left",
-    "[PF6FL0DF21BDDX4411110044441101888222200888822030PB0FAR02]" );
-$ir_vcr->add( "exit",
-    "[PF6FL0DE71BF9X4411110011044444446220888800882222222300PAF45R02]" );
-$ir_vcr->add( "status",
-    "[PF6FL0DE71BF9X4411110011044444446220888800882222222300PAF45R02]" );
-$ir_vcr->add( "1",
-    "[PF6FL0DD51BF9X4411110011111111046220888800888888882300PAF40R02]" );
-$ir_vcr->add( "2",
-    "[PF6FL0DE81BDFX4411110011111101888222200222222030PB0F8R02]" );
-$ir_vcr->add( "3",
-    "[PF6FL0DDF1BF8X4444110011111104446222208800888888222300PAF3FR03]" );
-$ir_vcr->add( "4",
-    "[PF6FL0DE81BDEX4411110011110111888222200222202230PB0F7R02]" );
-$ir_vcr->add( "5",
-    "[PF6FL0DD51BF9X4444110011110046222208800888802300PAF3FR02]" );
-$ir_vcr->add( "6",
-    "[PF6FL0DF41BE0X4411110011110441888222200222208830PB0F8R02]" );
-$ir_vcr->add( "7",
-    "[PF6FL0DE31BF7X4444110011110444446222208800888822222300PAF3FR02]" );
-$ir_vcr->add( "8",
-    "[PF6FL0DE71BDEX4411110011011111888222200220222230PB0F8R02]" );
-$ir_vcr->add( "9",
-    "[PF6FL0DD51BF8X4444110011011046222208800880882300PAF3FR02]" );
-$ir_vcr->add( "0",
-    "[PF6FL0DE61BDBX4411110011111111111888222200222222222230PB0F9R02]" );
-$ir_vcr->add( "channel up",
-    "[PF6FL0DE71BDBX4444110044111111111888882200882222222230PB0F8R02]" );
-$ir_vcr->add( "channel down",
-    "[PF6FL0DD51BF9X4411110044111111046220888802208888882300PAF42R02]" );
-$ir_vcr->add( "play",
-    "[PF6FL0DE41BF9X4444110044440046222208802222002300PAF40R02]" );
-$ir_vcr->add( "stop",
-    "[PF6FL0DFF1BDFX4411110044440441888222200888808830PB0FDR02]" );
-$ir_vcr->add( "fast forward",
-    "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
-$ir_vcr->add( "rewind",
-    "[PF6FL0DF21BDDX4411110044441101888222200888822030PB0FAR02]" );
-$ir_vcr->add( "eject",
-    "[PF6FL0DE31BFAX4444110044044046222208802202202300PAF41R01]" );
-$ir_vcr->add( "pause",
-    "[PF6FL0DD91BF8X4411110044011046220888802200882300PAF42R02]" );
+$ir_vcr->add( "power",        "[PF6FL0DEF1BE0X4411110011044111888222200220882230PB0FER02]" );
+$ir_vcr->add( "menu",         "[PF6FL0DE31BFAX4411110004444046220888800222202300PAF45R02]" );
+$ir_vcr->add( "fast forward", "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
+$ir_vcr->add( "down",         "[PF6FL0DFF1BDFX4411110044440441888222200888808830PB0FDR02]" );
+$ir_vcr->add( "up",           "[PF6FL0DE41BF9X4444110044440046222208802222002300PAF40R02]" );
+$ir_vcr->add( "right",        "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
+$ir_vcr->add( "left",         "[PF6FL0DF21BDDX4411110044441101888222200888822030PB0FAR02]" );
+$ir_vcr->add( "exit",         "[PF6FL0DE71BF9X4411110011044444446220888800882222222300PAF45R02]" );
+$ir_vcr->add( "status",       "[PF6FL0DE71BF9X4411110011044444446220888800882222222300PAF45R02]" );
+$ir_vcr->add( "1",            "[PF6FL0DD51BF9X4411110011111111046220888800888888882300PAF40R02]" );
+$ir_vcr->add( "2",            "[PF6FL0DE81BDFX4411110011111101888222200222222030PB0F8R02]" );
+$ir_vcr->add( "3",            "[PF6FL0DDF1BF8X4444110011111104446222208800888888222300PAF3FR03]" );
+$ir_vcr->add( "4",            "[PF6FL0DE81BDEX4411110011110111888222200222202230PB0F7R02]" );
+$ir_vcr->add( "5",            "[PF6FL0DD51BF9X4444110011110046222208800888802300PAF3FR02]" );
+$ir_vcr->add( "6",            "[PF6FL0DF41BE0X4411110011110441888222200222208830PB0F8R02]" );
+$ir_vcr->add( "7",            "[PF6FL0DE31BF7X4444110011110444446222208800888822222300PAF3FR02]" );
+$ir_vcr->add( "8",            "[PF6FL0DE71BDEX4411110011011111888222200220222230PB0F8R02]" );
+$ir_vcr->add( "9",            "[PF6FL0DD51BF8X4444110011011046222208800880882300PAF3FR02]" );
+$ir_vcr->add( "0",            "[PF6FL0DE61BDBX4411110011111111111888222200222222222230PB0F9R02]" );
+$ir_vcr->add( "channel up",   "[PF6FL0DE71BDBX4444110044111111111888882200882222222230PB0F8R02]" );
+$ir_vcr->add( "channel down", "[PF6FL0DD51BF9X4411110044111111046220888802208888882300PAF42R02]" );
+$ir_vcr->add( "play",         "[PF6FL0DE41BF9X4444110044440046222208802222002300PAF40R02]" );
+$ir_vcr->add( "stop",         "[PF6FL0DFF1BDFX4411110044440441888222200888808830PB0FDR02]" );
+$ir_vcr->add( "fast forward", "[PF6FL0DF21BDFX4411110044440111888222200888802230PB0FCR01]" );
+$ir_vcr->add( "rewind",       "[PF6FL0DF21BDDX4411110044441101888222200888822030PB0FAR02]" );
+$ir_vcr->add( "eject",        "[PF6FL0DE31BFAX4444110044044046222208802202202300PAF41R01]" );
+$ir_vcr->add( "pause",        "[PF6FL0DD91BF8X4411110044011046220888802200882300PAF42R02]" );
 
 $ir_projector = new RedRat;
-$ir_projector->add( "power",
-    "[PF62L24FF096F1259X42040800010204188408100002040830P2A7FR02]" );
-$ir_projector->add( "power off",
-    "[PF62L24FF096F1259X42040800010204188408100002040830P2A7FR18]" );
+$ir_projector->add( "power",     "[PF62L24FF096F1259X42040800010204188408100002040830P2A7FR02]" );
+$ir_projector->add( "power off", "[PF62L24FF096F1259X42040800010204188408100002040830P2A7FR18]" );
 
 $ir_satellite = new RedRat;
-$ir_satellite->add( "power",
-    "[PF62L256A097F12B2X42040801240902C42040801240902C00P2582R02]" );
-$ir_satellite->add( "guide",
-    "[PF62L256A098012B0X4024812490240B10092049240902C0P2321R03]" );
-$ir_satellite->add( "select",
-    "[PF62L256A097F12B0X4024092490240B10090249240902C0P2323R02]" );
-$ir_satellite->add( "enter",
-    "[PF62L2568097E12B1X42408001240902C42408001240902C00P2580R02]" );
-$ir_satellite->add( "up",
-    "[PF62L2569097F12B0X4020049248120588040092490240B0P2452R03]" );
-$ir_satellite->add( "down",
-    "[PF62L256A097F12B0X4240092490240B10900249240902C0P2323R02]" );
-$ir_satellite->add( "exit",
-    "[PF62L2569097E12B0X4240009248120588480012490240B0P2450R03]" );
-$ir_satellite->add( "left",
-    "[PF62L2567097F12AEX4204092490240B10810249240902C0P2321R02]" );
-$ir_satellite->add( "right",
-    "[PF62L2567097F12AFX4002049248120588004092490240B0P2450R03]" );
-$ir_satellite->add( "channel up",
-    "[PF62L2567097E12B0X40000200490240B100000801240902C0P27D5R02]" );
-$ir_satellite->add( "channel down",
-    "[PF62L2568097D12B1X42000400920481621000200490240B00P26B0R02]" );
-$ir_satellite->add( "display",
-    "[PF62L2568097F12B0X4020490248120588040920490240B0P2449R03]" );
-$ir_satellite->add( "1",
-    "[PF62L256A097E12B2X400000002481205880000000490240B0P2907R02]" );
-$ir_satellite->add( "2",
-    "[PF62L256C097E12B4X42000000490240B108000001240902C0P27D9R02]" );
-$ir_satellite->add( "3",
-    "[PF62L256B097E12B2X40200000490240B100800001240902C0P27D8R02]" );
-$ir_satellite->add( "4",
-    "[PF62L256B097E12B3X42400000920481621200000490240B00P26A8R02]" );
-$ir_satellite->add( "5",
-    "[PF62L256A097E12B2X40020000490240B100080001240902C0P27D8R02]" );
-$ir_satellite->add( "6",
-    "[PF62L256C097F12B3X42040000920481621020000490240B00P26A9R02]" );
-$ir_satellite->add( "7",
-    "[PF62L256B097F12B2X40240000920481620120000490240B00P26A7R02]" );
-$ir_satellite->add( "8",
-    "[PF62L256B097E12B3X42480001240902C42480001240902C00P2583R02]" );
-$ir_satellite->add( "9",
-    "[PF62L256B097F12B2X40002000490240B100008001240902C0P27E1R02]" );
-$ir_satellite->add( "0",
-    "[PF62L256C097E12B3X42004000920481621002000490240B00P26B1R02]" );
+$ir_satellite->add( "power",        "[PF62L256A097F12B2X42040801240902C42040801240902C00P2582R02]" );
+$ir_satellite->add( "guide",        "[PF62L256A098012B0X4024812490240B10092049240902C0P2321R03]" );
+$ir_satellite->add( "select",       "[PF62L256A097F12B0X4024092490240B10090249240902C0P2323R02]" );
+$ir_satellite->add( "enter",        "[PF62L2568097E12B1X42408001240902C42408001240902C00P2580R02]" );
+$ir_satellite->add( "up",           "[PF62L2569097F12B0X4020049248120588040092490240B0P2452R03]" );
+$ir_satellite->add( "down",         "[PF62L256A097F12B0X4240092490240B10900249240902C0P2323R02]" );
+$ir_satellite->add( "exit",         "[PF62L2569097E12B0X4240009248120588480012490240B0P2450R03]" );
+$ir_satellite->add( "left",         "[PF62L2567097F12AEX4204092490240B10810249240902C0P2321R02]" );
+$ir_satellite->add( "right",        "[PF62L2567097F12AFX4002049248120588004092490240B0P2450R03]" );
+$ir_satellite->add( "channel up",   "[PF62L2567097E12B0X40000200490240B100000801240902C0P27D5R02]" );
+$ir_satellite->add( "channel down", "[PF62L2568097D12B1X42000400920481621000200490240B00P26B0R02]" );
+$ir_satellite->add( "display",      "[PF62L2568097F12B0X4020490248120588040920490240B0P2449R03]" );
+$ir_satellite->add( "1",            "[PF62L256A097E12B2X400000002481205880000000490240B0P2907R02]" );
+$ir_satellite->add( "2",            "[PF62L256C097E12B4X42000000490240B108000001240902C0P27D9R02]" );
+$ir_satellite->add( "3",            "[PF62L256B097E12B2X40200000490240B100800001240902C0P27D8R02]" );
+$ir_satellite->add( "4",            "[PF62L256B097E12B3X42400000920481621200000490240B00P26A8R02]" );
+$ir_satellite->add( "5",            "[PF62L256A097E12B2X40020000490240B100080001240902C0P27D8R02]" );
+$ir_satellite->add( "6",            "[PF62L256C097F12B3X42040000920481621020000490240B00P26A9R02]" );
+$ir_satellite->add( "7",            "[PF62L256B097F12B2X40240000920481620120000490240B00P26A7R02]" );
+$ir_satellite->add( "8",            "[PF62L256B097E12B3X42480001240902C42480001240902C00P2583R02]" );
+$ir_satellite->add( "9",            "[PF62L256B097F12B2X40002000490240B100008001240902C0P27E1R02]" );
+$ir_satellite->add( "0",            "[PF62L256C097E12B3X42004000920481621002000490240B00P26B1R02]" );
 
 $v_ir_projector = new Voice_Cmd('Press [power,power off] button on Projector');
 if ( $state = said $v_ir_projector) {
     $ir_projector->set($state);
 }
 
-$v_ir_dvd = new Voice_Cmd(
-    'Press [power,play,stop,pause,up,down,left,right,enter,menu,next track,previous track] button on DVD'
-);
+$v_ir_dvd = new Voice_Cmd( 'Press [power,play,stop,pause,up,down,left,right,enter,menu,next track,previous track] button on DVD' );
 if ( $state = said $v_ir_dvd) {
     $ir_dvd->set($state);
 }
 
-$v_ir_receiver = new Voice_Cmd(
-    'Press [power off,tv,video1,ld,volume up,volume down] button on Receiver');
+$v_ir_receiver = new Voice_Cmd('Press [power off,tv,video1,ld,volume up,volume down] button on Receiver');
 if ( $state = said $v_ir_receiver) {
     $ir_receiver->set($state);
 }
 
-$v_ir_vcr = new Voice_Cmd(
-    'Press [power,1,2,3,4,5,6,7,8,9,0,play,stop,channel up, channel down] button on VCR'
-);
+$v_ir_vcr = new Voice_Cmd( 'Press [power,1,2,3,4,5,6,7,8,9,0,play,stop,channel up, channel down] button on VCR' );
 if ( $state = said $v_ir_vcr) {
     $ir_vcr->set($state);
 }
 
 $v_ir_satellite = new Voice_Cmd(
-    'Press [power,guide,enter,up,down,right,left,select,channel up,channel down,1,2,3,4,5,6,7,8,9,0] button on Satellite'
-);
+    'Press [power,guide,enter,up,down,right,left,select,channel up,channel down,1,2,3,4,5,6,7,8,9,0] button on Satellite' );
 if ( $state = said $v_ir_satellite) {
     $ir_satellite->set($state);
 }
diff --git a/code/public/robot_er1.pl b/code/public/robot_er1.pl
index cb6485345..ad61037f2 100644
--- a/code/public/robot_er1.pl
+++ b/code/public/robot_er1.pl
@@ -417,69 +417,68 @@
 use Math::Trig;
 
 my @moves
-  ; #this is set by strabo path call. used to hold values of @dir and @dis in order that the should be executed.... s,4,n,6....
+  ;    #this is set by strabo path call. used to hold values of @dir and @dis in order that the should be executed.... s,4,n,6....
 
 set $er1_moving 'stopped' if ($Reread);
 set $er1_direction 360
-  if ($Reread)
-  ; #not always true but gets me started   !!!!!!! need more work here!!!!!!! maybe put initial dir in ini
+  if ($Reread);    #not always true but gets me started   !!!!!!! need more work here!!!!!!! maybe put initial dir in ini
 set $er1_playing 'stopped' if ($Reread);
 
 ###############    items    #############
 
-$er1client           = new Socket_Item( undef, undef, $er1client_address );
-$er1_checkangle      = new ER1_Item;
-$digital_input_1     = new ER1_Item;
-$digital_input_2     = new ER1_Item;
-$digital_input_3     = new ER1_Item;
-$digital_input_4     = new ER1_Item;
-$digital_input_5     = new ER1_Item;
-$digital_input_6     = new ER1_Item;
-$digital_input_7     = new ER1_Item;
-$digital_input_8     = new ER1_Item;
-$digital_out_1       = new ER1_Item;
-$digital_out_2       = new ER1_Item;
-$digital_out_3       = new ER1_Item;
-$digital_out_4       = new ER1_Item;
-$digital_out_5       = new ER1_Item;
-$digital_out_6       = new ER1_Item;
-$digital_out_7       = new ER1_Item;
-$digital_out_8       = new ER1_Item;
-$soundlevel          = new ER1_Item;
-$speech_text         = new ER1_Item;
-$er1_object          = new ER1_Item;
-$features_matched    = new ER1_Item;
-$total_features      = new ER1_Item;
-$object_x            = new ER1_Item;
-$object_y            = new ER1_Item;
-$object_distance     = new ER1_Item;
-$coordinates_x       = new ER1_Item;
-$coordinates_y       = new ER1_Item;
-$analog_input_1      = new ER1_Item;
-$analog_input_2      = new ER1_Item;
-$analog_input_3      = new ER1_Item;
-$analog_input_4      = new ER1_Item;
-$analog_input_5      = new ER1_Item;
-$analog_input_6      = new ER1_Item;
-$analog_input_7      = new ER1_Item;
-$analog_input_8      = new ER1_Item;
-$analog_input_9      = new ER1_Item;
-$analog_input_10     = new ER1_Item;
-$analog_input_11     = new ER1_Item;
-$analog_input_12     = new ER1_Item;
-$analog_input_13     = new ER1_Item;
-$analog_input_14     = new ER1_Item;
-$analog_input_15     = new ER1_Item;
-$analog_input_16     = new ER1_Item;
-$battery_level       = new ER1_Item;
-$er1_moving          = new ER1_Item;
-$er1_playing         = new ER1_Item;
-$er1_direction       = new ER1_Item;
-$er1_move            = new ER1_Item;
-$ER1_speak           = new ER1_Item;
-$er1_stop_distance   = new ER1_Item;
-$er1_stop_percentage = new ER1_Item;
-$er1_turn            = new ER1_Item;
+$er1client                    = new Socket_Item( undef, undef, $er1client_address );
+$er1_checkangle               = new ER1_Item;
+$digital_input_1              = new ER1_Item;
+$digital_input_2              = new ER1_Item;
+$digital_input_3              = new ER1_Item;
+$digital_input_4              = new ER1_Item;
+$digital_input_5              = new ER1_Item;
+$digital_input_6              = new ER1_Item;
+$digital_input_7              = new ER1_Item;
+$digital_input_8              = new ER1_Item;
+$digital_out_1                = new ER1_Item;
+$digital_out_2                = new ER1_Item;
+$digital_out_3                = new ER1_Item;
+$digital_out_4                = new ER1_Item;
+$digital_out_5                = new ER1_Item;
+$digital_out_6                = new ER1_Item;
+$digital_out_7                = new ER1_Item;
+$digital_out_8                = new ER1_Item;
+$soundlevel                   = new ER1_Item;
+$speech_text                  = new ER1_Item;
+$er1_object                   = new ER1_Item;
+$features_matched             = new ER1_Item;
+$total_features               = new ER1_Item;
+$object_x                     = new ER1_Item;
+$object_y                     = new ER1_Item;
+$object_distance              = new ER1_Item;
+$coordinates_x                = new ER1_Item;
+$coordinates_y                = new ER1_Item;
+$analog_input_1               = new ER1_Item;
+$analog_input_2               = new ER1_Item;
+$analog_input_3               = new ER1_Item;
+$analog_input_4               = new ER1_Item;
+$analog_input_5               = new ER1_Item;
+$analog_input_6               = new ER1_Item;
+$analog_input_7               = new ER1_Item;
+$analog_input_8               = new ER1_Item;
+$analog_input_9               = new ER1_Item;
+$analog_input_10              = new ER1_Item;
+$analog_input_11              = new ER1_Item;
+$analog_input_12              = new ER1_Item;
+$analog_input_13              = new ER1_Item;
+$analog_input_14              = new ER1_Item;
+$analog_input_15              = new ER1_Item;
+$analog_input_16              = new ER1_Item;
+$battery_level                = new ER1_Item;
+$er1_moving                   = new ER1_Item;
+$er1_playing                  = new ER1_Item;
+$er1_direction                = new ER1_Item;
+$er1_move                     = new ER1_Item;
+$ER1_speak                    = new ER1_Item;
+$er1_stop_distance            = new ER1_Item;
+$er1_stop_percentage          = new ER1_Item;
+$er1_turn                     = new ER1_Item;
 $er1_collision_sensitivity    = new ER1_Item;
 $er1_ob_avoid_method          = new ER1_Item;
 $er1_ob_avoid_tolerance       = new ER1_Item;
@@ -502,21 +501,18 @@
         &er1_startup();
     }
 }
-if ( $state = state $v_er1_connection)
-{ #this will run every loop, if er1 is supposed to be connected and not, it will connect
-    if ( $state eq 'connect' ) {    #is er1 supposed to be connected?
+if ( $state = state $v_er1_connection) {    #this will run every loop, if er1 is supposed to be connected and not, it will connect
+    if ( $state eq 'connect' ) {            #is er1 supposed to be connected?
         &er1_startup()
-          if ( !$main::Socket_Ports{$er1client_address}{sock} )
-          ;                         #reconnect if not
+          if ( !$main::Socket_Ports{$er1client_address}{sock} );    #reconnect if not
     }
 }
 
 ## navigation
 
 #test moves
-$v_move_er1client = new Voice_Cmd(
-    "move: [forward 6 inches,forward 6 feet,backward 6 inches,backward 6 feet,turn left,turn left 45,turn right]"
-);
+$v_move_er1client =
+  new Voice_Cmd( "move: [forward 6 inches,forward 6 feet,backward 6 inches,backward 6 feet,turn left,turn left 45,turn right]" );
 if ( $state = said $v_move_er1client) {
     print_log "Running $state";
     send_er1_data('move 6 i')   if ( $state eq 'forward 6 inches' );
@@ -555,8 +551,7 @@
         my $stop = state $er1_stop_distance;
         print_log "driving toward $state";
         set $er1_moving "moving";
-        send_er1_data(
-            'move drive toward object "' . $state . '" stop ' . $stop . ' in' );
+        send_er1_data( 'move drive toward object "' . $state . '" stop ' . $stop . ' in' );
     }
 }
 
@@ -587,9 +582,7 @@
         my $stop = state $er1_stop_percentage;
         print_log "driving toward $state";
         set $er1_moving "moving";
-        send_er1_data(
-            "move drive toward color $colors{$state} stop $er1_stop_percentage"
-        );
+        send_er1_data( "move drive toward color $colors{$state} stop $er1_stop_percentage" );
     }
 }
 
@@ -684,20 +677,17 @@
 
 ## config
 
-$v_er1_stop_distance =
-  new Voice_Cmd("set stop distance [2,4,8,12,16,20,24,36] inches");
+$v_er1_stop_distance = new Voice_Cmd("set stop distance [2,4,8,12,16,20,24,36] inches");
 if ( $state = said $v_er1_stop_distance) {
     set $er1_stop_distance $state;
 }
 
-$v_er1_stop_percentage =
-  new Voice_Cmd("set stop percentage [10,20,30,40,50,60,70,80,90,100] %");
+$v_er1_stop_percentage = new Voice_Cmd("set stop percentage [10,20,30,40,50,60,70,80,90,100] %");
 if ( $state = said $v_er1_stop_percentage) {
     set $er1_stop_percentage $state;
 }
 
-$v_er1_collision_sensitivity =
-  new Voice_Cmd("set collision sensitivity [10,20,30,40,50,60,70,80,90,100]");
+$v_er1_collision_sensitivity = new Voice_Cmd("set collision sensitivity [10,20,30,40,50,60,70,80,90,100]");
 if ( $state = said $v_er1_collision_sensitivity) {
     set $er1_collision_sensitivity $state;
 }
@@ -714,55 +704,47 @@
     }
 }
 
-$v_er1_angular_velocity =
-  new Voice_Cmd("set angular velocity: [5,10,20,30,45] degrees/sec");
+$v_er1_angular_velocity = new Voice_Cmd("set angular velocity: [5,10,20,30,45] degrees/sec");
 set_web_style $v_er1_angular_velocity 'dropdown';
 if ( $state = said $v_er1_angular_velocity) {
     send_er1_data("set angular velocity $state");
 }
 
-$v_er1_linear_velocity =
-  new Voice_Cmd("set linear velocity: [5,10,20,30,40,50] cm/sec");
+$v_er1_linear_velocity = new Voice_Cmd("set linear velocity: [5,10,20,30,40,50] cm/sec");
 set_web_style $v_er1_linear_velocity 'dropdown';
 if ( $state = said $v_er1_linear_velocity) {
     send_er1_data("set linear velocity $state");
 }
 
-$v_er1_power_stopped =
-  new Voice_Cmd("set power stopped: [zero,10,20,30,40,50,60,70,80,90,100] %");
+$v_er1_power_stopped = new Voice_Cmd("set power stopped: [zero,10,20,30,40,50,60,70,80,90,100] %");
 set_web_style $v_er1_power_stopped 'dropdown';
 if ( $state = said $v_er1_power_stopped) {
     send_er1_data("set power stopped 0") if ( $state eq "zero" );
     send_er1_data("set power stopped $state") if ( $state ne "zero" );
 }
 
-$v_er1_power_moving =
-  new Voice_Cmd("set power moving: [0,10,20,30,40,50,60,70,80,90,100] %");
+$v_er1_power_moving = new Voice_Cmd("set power moving: [0,10,20,30,40,50,60,70,80,90,100] %");
 set_web_style $v_er1_power_moving 'dropdown';
 if ( $state = said $v_er1_power_moving) {
     send_er1_data("set power moving $state");
 }
 
-$v_er1_ob_avoid_method =
-  new Voice_Cmd("set advoidance method [color,intensity]");
+$v_er1_ob_avoid_method = new Voice_Cmd("set advoidance method [color,intensity]");
 if ( $state = said $v_er1_ob_avoid_method) {
     set $er1_ob_avoid_method $state;
 }
 
-$v_er1_ob_avoid_tolerance =
-  new Voice_Cmd("set advoidance tolerance [1,10,20,40,50,60,70,80,90,100]");
+$v_er1_ob_avoid_tolerance = new Voice_Cmd("set advoidance tolerance [1,10,20,40,50,60,70,80,90,100]");
 if ( $state = said $v_er1_ob_avoid_tolerance) {
     set $er1_ob_avoid_tolerance $state;
 }
 
-$v_er1_ob_avoid_disable_dis = new Voice_Cmd(
-    "set advoidance disable distance [4,10,20,40,50,60,70,80,90,100] cm");
+$v_er1_ob_avoid_disable_dis = new Voice_Cmd("set advoidance disable distance [4,10,20,40,50,60,70,80,90,100] cm");
 if ( $state = said $v_er1_ob_avoid_disable_dis) {
     set $er1_ob_avoid_disable_dis $state;
 }
 
-$v_er1_ob_avoid_disable_percent =
-  new Voice_Cmd("set advoidance disable % [1,10,20,40,50,60,70,80,90,100] %");
+$v_er1_ob_avoid_disable_percent = new Voice_Cmd("set advoidance disable % [1,10,20,40,50,60,70,80,90,100] %");
 if ( $state = said $v_er1_ob_avoid_disable_percent) {
     set $er1_ob_avoid_disable_percent $state;
 }
@@ -787,23 +769,19 @@
     }
 }
 
-$v_er1_recognition_threshold =
-  new Voice_Cmd("set recognition threshold [1,10,20,40,50,60,70,80,90,100] %");
+$v_er1_recognition_threshold = new Voice_Cmd("set recognition threshold [1,10,20,40,50,60,70,80,90,100] %");
 send_er1_data("set confidence threshold $state")
   if ( $state = said $v_er1_recognition_threshold);
 
-$v_er1_color_tolerance =
-  new Voice_Cmd("set color tolerance [1,10,20,40,50,60,70,80,90,100]");
+$v_er1_color_tolerance = new Voice_Cmd("set color tolerance [1,10,20,40,50,60,70,80,90,100]");
 send_er1_data("set color tolerance $state")
   if ( $state = said $v_er1_color_tolerance);
 
-$v_er1_color_percent =
-  new Voice_Cmd("set color percent [1,10,20,40,50,60,70,80,90,100] %");
+$v_er1_color_percent = new Voice_Cmd("set color percent [1,10,20,40,50,60,70,80,90,100] %");
 send_er1_data("set color percentage $state")
   if ( $state = said $v_er1_color_percent);
 
-$v_er1_voice =
-  new Voice_Cmd("set voice [Microsoft Mary,Microsoft Mike,Microsoft Sam]");
+$v_er1_voice = new Voice_Cmd("set voice [Microsoft Mary,Microsoft Mike,Microsoft Sam]");
 if ( $state = said $v_er1_voice) {
     send_er1_data( 'set voice "' . $state . '"' );
 }
@@ -834,8 +812,7 @@
 $er1_move->tie_event('&er1_move($state)')   if $Reload;
 $er1_turn->tie_event('&er1_turn($state)')   if $Reload;
 eval('$cid_item -> tie_event(\'Er1_cid($state, $object)\', \'cid\')')
-  if ( $Reload && $Run_Members{'callerid'} )
-  ;    #will announce callerid if you have it setup in misterhouse
+  if ( $Reload && $Run_Members{'callerid'} );    #will announce callerid if you have it setup in misterhouse
 &handle_er1_data($state) if $state = said $er1client;
 
 #move if @moves has elements, maybe can move this into move sub then use tie event
@@ -846,8 +823,7 @@
 
 ###############    subs  ##############
 
-sub er1_startup
-{ #used to start all the things you need to have mh run er1, this will be called with "connect"
+sub er1_startup {    #used to start all the things you need to have mh run er1, this will be called with "connect"
     print_log "starting er1";
 
     #check Rcc running
@@ -868,8 +844,7 @@ sub er1_startup
             if ( $state eq 'ON' ) {
                 my $sensitivity;
                 $sensitivity = state $er1_collision_sensitivity;
-                send_er1_data(
-                    "set collision detection on sensitivity $sensitivity");
+                send_er1_data("set collision detection on sensitivity $sensitivity");
             }
         }
         send_er1_data("set angular velocity $state")
@@ -921,8 +896,7 @@ sub er1_startup
 
     }
     else {
-        print_log
-          "Can't find RCC, is it running and configured correctly? ...disconnecting";
+        print_log "Can't find RCC, is it running and configured correctly? ...disconnecting";
         set $v_er1_connection 'disconnect'
           ; #don't keep trying to connect if cant find rcc, since this routine will be called every loop if connect set and no connection
          #can start programs if running on local maching, but don't know how to start on another machine, for now just remind user that they are not running
@@ -933,28 +907,26 @@ sub er1_startup
 sub get_er1_sounds {
 
     #get wav files for er1 if changed
-    my @er1_sound_files = &file_read_dir($er1_sound_dir)
-      ;    #used to get wav files in er1 sound directory
+    my @er1_sound_files = &file_read_dir($er1_sound_dir);    #used to get wav files in er1 sound directory
     if (@er1_sound_files) {
-        my $er1_sounds = "";       #build from scratch
-        shift @er1_sound_files;    #get rid of . and ..
+        my $er1_sounds = "";                                 #build from scratch
+        shift @er1_sound_files;                              #get rid of . and ..
         shift @er1_sound_files;
         shift @er1_sound_files;
         shift @er1_sound_files;
         my $er1_sound_files;
-        foreach $er1_sound_files (@er1_sound_files) {    #clean up
+        foreach $er1_sound_files (@er1_sound_files) {        #clean up
             $_ = $er1_sound_files;
 
             #print "cleaning up sound file $_ \n";
             $er1_sounds = "$er1_sounds" . ",$er1_sound_files"
               if !(m#$er1_sound_dir#);
         }
-        $er1_sounds =~ s/,//;    # removes the first the leading comma
+        $er1_sounds =~ s/,//;                                # removes the first the leading comma
         if ( $er1_sounds ne $Save{er1_sounds} ) {
             $Save{er1_sounds} = $er1_sounds;
             print_log "er1 sound files have changed, restarting mh code";
-            &read_code_forced
-              ; # have to reload code here because voice commands are autogenerated on startup
+            &read_code_forced;    # have to reload code here because voice commands are autogenerated on startup
         }
         else {
             print_log "no change in sound files";
@@ -982,12 +954,11 @@ sub get_er1_visual_objects {
             $er1_objects =~ s/\|.*$//;
             $er1_object_items = "$er1_object_items" . ",$er1_objects";
         }
-        $er1_object_items =~ s/,//;    # removes the first the leading comma
+        $er1_object_items =~ s/,//;              # removes the first the leading comma
         if ( $er1_object_items ne $Save{er1_objects} ) {
             $Save{er1_objects} = $er1_object_items;
             print_log "er1 objects have changed, restarting mh code";
-            &read_code_forced
-              ; # have to reload code here because voice commands are autogenerated on startup
+            &read_code_forced;                   # have to reload code here because voice commands are autogenerated on startup
         }
         else {
             print_log "no change in visual objects";
@@ -1012,8 +983,7 @@ sub get_strabo_waypoints {
         if ( $waypoints ne $Save{waypoints} ) {
             $Save{waypoints} = $waypoints;
             print_log "waypoints have changed, restarting mh code";
-            &read_code_forced
-              ; # have to reload code here because voice commands are autogenerated on startup
+            &read_code_forced;    # have to reload code here because voice commands are autogenerated on startup
         }
         else {
             print_log "no change in waypoints";
@@ -1021,8 +991,7 @@ sub get_strabo_waypoints {
 
     }
     else {
-        print_log
-          "Can't find strabo, is it running and configured? waypoints not changed.";
+        print_log "Can't find strabo, is it running and configured? waypoints not changed.";
 
         #run 'X:\progra~1/strabo~1/strabo.exe'; # test start, starts it but on calling machine
     }
@@ -1031,7 +1000,7 @@ sub get_strabo_waypoints {
 sub send_er1_data {
     &er1_startup()
       if ( !$main::Socket_Ports{$er1client_address}{sock} )
-      ; #connect check, could not use regular net_connect_check. did funny things to rcc
+      ;    #connect check, could not use regular net_connect_check. did funny things to rcc
     my $data = @_[0];
     print_log "sending er1 data = $data";
 
@@ -1077,8 +1046,7 @@ sub checkangle
     print_log "calculated angle = $angle\n";
 }
 
-sub handle_er1_data
-{ # parse into mh items, (almost) no action taken on events here, data just gathered
+sub handle_er1_data {    # parse into mh items, (almost) no action taken on events here, data just gathered
     my ($er1data) = @_;
     my @er1data = split( / /, $er1data );
     print_log "er1 data: @_ ";
@@ -1092,7 +1060,7 @@ sub handle_er1_data
     elsif ( @er1data[0] eq 'speech' ) {
         shift @er1data;
         set $speech_text $state if $state = "@er1data";    #works
-              #will keep text until replaced, use state_now for current pass
+                                                           #will keep text until replaced, use state_now for current pass
         print_log "heard speach $state";
     }
     elsif ( @er1data[0] eq 'object' ) {
@@ -1111,9 +1079,8 @@ sub handle_er1_data
         print_log "er1 sees $state" if $state = state_now $er1_object;
 
     }
-    elsif ( @er1data[0] eq 'OK' )
-    { #for some reason this works (to get position), even when nothing follows the 'OK'
-            #print_log "er1 data: @_";
+    elsif ( @er1data[0] eq 'OK' ) {    #for some reason this works (to get position), even when nothing follows the 'OK'
+                                       #print_log "er1 data: @_";
         my @oksplit = split( / /, @er1data );
         if ( @er1data == 4 )
         { #true if position returned, !!! careful here, if you send a request for only 2 analog inputs, this will think they are x,y, really no need to do this
@@ -1124,38 +1091,32 @@ sub handle_er1_data
             set $coordinates_y $state if $state = $er1data[2];
             &checkangle( $er1data[1], $er1data[2], $old_x, $old_y );
             my $x;
-            $x = ( $er1data[2] ) / ( $strabo_units * .51 ) +
-              $strabo_home_x;    #convert to units use on strabo map
+            $x = ( $er1data[2] ) / ( $strabo_units * .51 ) + $strabo_home_x;    #convert to units use on strabo map
             $x = round $x, 1;
             set $strabo_x "$x";
             my $y;
-            $y = ( $er1data[1] ) / ( $strabo_units * .51 ) +
-              $strabo_home_y;    #convert to units use on strabo map
+            $y = ( $er1data[1] ) / ( $strabo_units * .51 ) + $strabo_home_y;    #convert to units use on strabo map
             $y = round $y, 1;
             set $strabo_y "$y";
 
             if ( &net_socket_check("$strabo_ip:$strabo_port") ) {
                 my $strabo_html =
-                    get "http://$strabo_ip:$strabo_port/Setposition?"
-                  . $x . ","
-                  . $y;          #tells strabo to update position
-                print_log
-                  "position: er1($er1data[1],$er1data[2]) strabo ($x,$y)";
+                  get "http://$strabo_ip:$strabo_port/Setposition?" . $x . "," . $y;    #tells strabo to update position
+                print_log "position: er1($er1data[1],$er1data[2]) strabo ($x,$y)";
             }
             else {
-                print_log
-                  "could not find strabo while trying to set strabo position";
+                print_log "could not find strabo while trying to set strabo position";
             }
         }
         if ( @er1data[0] eq 'Error:' ) {
             print_log "ER1 ERROR: @_";
         }
-        if ( @er1data == 2 ) {    #true if digital input
+        if ( @er1data == 2 ) {                                                          #true if digital input
             print_log "er1: digitals inputs are set to $er1data[1]";
             my $hex_digital = $er1data[1];
             &digital($hex_digital);
         }
-        if ( @er1data == 17 ) {    #true if analog input
+        if ( @er1data == 17 ) {                                                         #true if analog input
             set $analog_input_1 $state  if $state = $er1data[1];
             set $analog_input_2 $state  if $state = $er1data[2];
             set $analog_input_3 $state  if $state = $er1data[3];
@@ -1193,10 +1154,9 @@ sub handle_er1_data
     }
 }
 
-sub digital
-{ #this is to convert to binary, i am sure there is a better way, this is called from event handler
-        #digital input stuff done, not tested !!!!!!!!
-        #split $hex_digital and then convert, object for each pin
+sub digital {    #this is to convert to binary, i am sure there is a better way, this is called from event handler
+                 #digital input stuff done, not tested !!!!!!!!
+                 #split $hex_digital and then convert, object for each pin
     my $first_char;
     my $second_char;
     my $bin_1;
@@ -1294,8 +1254,7 @@ sub digital
     }
 }
 
-sub digout
-{ #all digital outs sent at same time, so this checks all states and makes into hex for sending
+sub digout {    #all digital outs sent at same time, so this checks all states and makes into hex for sending
     my $bin1;
     my $bin2;
     my $bin3;
@@ -1385,31 +1344,23 @@ sub get_strabo_path {
     my $y;
     $y = state $strabo_y;
     print_log "Getting strabo path to $waypoint";
-    if ( &net_socket_check("$strabo_ip:$strabo_port") && $x && $y )
-    {    #is strabo connected and x,y defined?
-        my $strabo_html =
-            get "http://$strabo_ip:$strabo_port/getpath?"
-          . $x . ","
-          . $y . ","
-          . $waypoint;    #get route
+    if ( &net_socket_check("$strabo_ip:$strabo_port") && $x && $y ) {    #is strabo connected and x,y defined?
+        my $strabo_html = get "http://$strabo_ip:$strabo_port/getpath?" . $x . "," . $y . "," . $waypoint;    #get route
         $_ = $strabo_html;
         if (m/ERROR/) {
-            print_log
-              "ERROR:could not find strabo waypoint ($waypoint). check: proper map, or refresh waypoints";
+            print_log "ERROR:could not find strabo waypoint ($waypoint). check: proper map, or refresh waypoints";
             return;
         }
-        my @strabo_html = split( /\n/, $strabo_html );    #split into lines
+        my @strabo_html = split( /\n/, $strabo_html );                                                        #split into lines
         $_ = $strabo_html[3];    #this line has cardinal directions
         s/\[//;                  # get rid of [
         s/\]//;                  # get rid of ]
-        my @dirs = split( /,/, $_ )
-          ;   #new array with elements = dir cardinal directions, without commas
+        my @dirs = split( /,/, $_ );    #new array with elements = dir cardinal directions, without commas
         print_log "strabo path = @dirs";
 
         #sort through "smooth" data (not path), gets two arrays with directions and distance in that direction
-        my @dir = ();    #new array with each direction only once
-        my @dis =
-          ();    #array with distances corresponding to each element of @dir
+        my @dir    = ();                #new array with each direction only once
+        my @dis    = ();                #array with distances corresponding to each element of @dir
         my $olddir = $dirs[0];
         push( @dir, $dirs[0] );
         push( @dis, 0 );
@@ -1522,15 +1473,13 @@ sub er1_move {
     }
 }
 
-sub er1_turn
-{  #called with html from web page, you could make voice command to control this
+sub er1_turn {    #called with html from web page, you could make voice command to control this
     my ($deg) = @_;
     send_er1_data("move $deg d");
 }
 
-sub ER1_speak
-{  #called with html from web page, you could make voice command to control this
-        #need condition to not do this if we are asleep
+sub ER1_speak {    #called with html from web page, you could make voice command to control this
+                   #need condition to not do this if we are asleep
     my ($er1_text) = @_;
     if ( state $er1_playing eq "playing" ) {
         print_log "er1 is busy playing a sound";
@@ -1543,8 +1492,8 @@ sub ER1_speak
     }
 }
 
-sub Er1_cid {    #have to have callerid stuff working in mh
-                 #need way to not do this if we are asleep
+sub Er1_cid {                              #have to have callerid stuff working in mh
+                                           #need way to not do this if we are asleep
     my ( $p_state, $p_setby ) = @_;
     my $er1_cid;
     $er1_cid = "you have a call from " . $p_setby->cid_name();
@@ -1552,7 +1501,7 @@ sub Er1_cid {    #have to have callerid stuff working in mh
 }
 
 sub web_icon_state
-{ #testing this, returns image to web pages that call it. this works if graphics are in the right place and named correctly
+{    #testing this, returns image to web pages that call it. this works if graphics are in the right place and named correctly
     my ($item) = @_;
     my $obj    = &get_object_by_name($item);
     my $state  = $obj->state;
@@ -1615,8 +1564,7 @@ sub get_er1_state {    #use this to return data to web pages
 my $er1_speech_text;
 $er1_speech_text = state $speech_text;
 my $er1_label_sound;
-$er1_label_sound =
-  "Sound: Soundlevel $er1_soundlevel | Speech $er1_speech_text";
+$er1_label_sound = "Sound: Soundlevel $er1_soundlevel | Speech $er1_speech_text";
 &tk_label( \$er1_label_sound );
 
 my $er1_battery;
@@ -1657,10 +1605,8 @@ sub get_er1_state {    #use this to return data to web pages
 $a15 = state $analog_input_15;
 my $er1_label_analog_a;
 my $er1_label_analog_b;
-$er1_label_analog_a =
-  "Anaolg Inputs:  A1:$a1  A2:$a2  A3:$a3  A4:$a4  A5:$a5  A6:$a6  A7:$a7  A8:$a8";
-$er1_label_analog_b =
-  "Anaolg Inputs:  A9:$a9  A10:$a10  A11:$a11  A12:$a12  A13:$a13  A14:$a14  A15:$a15";
+$er1_label_analog_a = "Anaolg Inputs:  A1:$a1  A2:$a2  A3:$a3  A4:$a4  A5:$a5  A6:$a6  A7:$a7  A8:$a8";
+$er1_label_analog_b = "Anaolg Inputs:  A9:$a9  A10:$a10  A11:$a11  A12:$a12  A13:$a13  A14:$a14  A15:$a15";
 &tk_label( \$er1_label_analog_a );
 &tk_label( \$er1_label_analog_b );
 
@@ -1682,6 +1628,5 @@ sub get_er1_state {    #use this to return data to web pages
 $d8 = state $digital_input_8;
 
 my $er1_label_digital;
-$er1_label_digital =
-  "Digital Inputs:  D1:$d1  D2:$d2  D3:$d3  D4:$d4  D5:$d5  D6:$d6  D7:$d7  D8:$d8";
+$er1_label_digital = "Digital Inputs:  D1:$d1  D2:$d2  D3:$d3  D4:$d4  D5:$d5  D6:$d6  D7:$d7  D8:$d8";
 &tk_label( \$er1_label_digital );
diff --git a/code/public/rrd.pl b/code/public/rrd.pl
index 58faa52c2..a8f0aaae6 100644
--- a/code/public/rrd.pl
+++ b/code/public/rrd.pl
@@ -19,8 +19,7 @@ sub dump_rrd_file {
     use RRDs;
 
     my $rrdfile = $config_parms{rrd_dir} . "/" . $sensor . ".rrd";
-    my ( $start, $step, $names, $array ) = RRDs::fetch $rrdfile, "AVERAGE",
-      -s $rrd_start, -e $rrd_end;
+    my ( $start, $step, $names, $array ) = RRDs::fetch $rrdfile, "AVERAGE", -s $rrd_start, -e $rrd_end;
     my $ERROR = RRDs::error;
     my @readings;
 
@@ -34,8 +33,7 @@ sub dump_rrd_file {
             #				print_log "Bad value -> $val <> $oval\n";
             #				$val = $oval if $oval - 5 > $val;
             #			}
-            my ( $Second, $Minute, $Hour, $Mday, $Month, $year_unix, $Wday ) =
-              localtime($start);
+            my ( $Second, $Minute, $Hour, $Mday, $Month, $year_unix, $Wday ) = localtime($start);
             push( @readings,
                 sprintf "%2.2d/%2.2d/%2.2d %2.2d:%2.2d:%2.2d %3.2f\n",
                 $Month + 1, $Mday, $year_unix + 1900,
@@ -54,8 +52,7 @@ sub fetch_rrd_hilo {
     use RRDs;
 
     my $rrdfile = $config_parms{rrd_dir} . "/" . $sensor . ".rrd";
-    my ( $start, $step, $names, $array ) = RRDs::fetch $rrdfile, "AVERAGE",
-      -s $rrd_start, -e $rrd_end;
+    my ( $start, $step, $names, $array ) = RRDs::fetch $rrdfile, "AVERAGE", -s $rrd_start, -e $rrd_end;
     my $ERROR = RRDs::error;
     print_log "RRD FETCH ERROR: $ERROR\n" if $ERROR;
 
@@ -123,9 +120,8 @@ sub plot_rrd {
     my $targetdir = "/home/www/html/automation/plots";
     my $curtime   = time;
     my $lastday   = ( $curtime - ( 24 * 60 * 60 ) );
-    my $plot_def =
-      "DEF:sensor=" . $config_parms{rrd_dir} . "/" . $sensor . ".rrd:temp:LAST";
-    my $probes = "
+    my $plot_def  = "DEF:sensor=" . $config_parms{rrd_dir} . "/" . $sensor . ".rrd:temp:LAST";
+    my $probes    = "
 		LINE1:sensor#ff000c:'$sensor'
 		GPRINT:sensor:LAST:'Cur\\:%3.2lf%s'
         	GPRINT:sensor:MIN:'Min\\:%3.2lf%s'
diff --git a/code/public/rrd_create_graph.pl b/code/public/rrd_create_graph.pl
index 75aedf4f8..4577645de 100644
--- a/code/public/rrd_create_graph.pl
+++ b/code/public/rrd_create_graph.pl
@@ -21,7 +21,7 @@
 my ( $rrd_name, $rrd, $img_dir, $t, $descr, $height, $width, $dt ) = @ARGV;
 
 my $timenow = localtime( time() );
-$timenow =~ s/:/\\:/g;   #RRD doesn't like colons, so put leading backslashes in
+$timenow =~ s/:/\\:/g;    #RRD doesn't like colons, so put leading backslashes in
 
 RRDs::graph "$img_dir/$rrd_name-temp-$t.png",
   "--start",          "-$t",
diff --git a/code/public/rrd_graph b/code/public/rrd_graph
index 2cd82f021..122be689b 100644
--- a/code/public/rrd_graph
+++ b/code/public/rrd_graph
@@ -28,8 +28,7 @@ my $curyest   = ( $curtime - ( 24 * 60 * 60 ) );
 my $lastweek  = ( $curtime - ( 7 * 24 * 60 * 60 ) );
 my $priorweek = ( $curtime - ( 14 * 24 * 60 * 60 ) );
 
-my @colors =
-  qw( ff000c 00ffee e804f4 ff6500 56ba43 a86212 0029f9 15ff00 a0a0a0 );
+my @colors = qw( ff000c 00ffee e804f4 ff6500 56ba43 a86212 0029f9 15ff00 a0a0a0 );
 
 my $graphtype = lc($GRAPHTYPE);
 my ( $plot_last, $plot_average, $probes );
@@ -59,12 +58,7 @@ RRDp::cmd
   "-h 400 -w 850",
 
   #	"-u 85",
-  "-l 60 -u 70",
-  "-y 5:1",
-  "-x HOUR:1:HOUR:1:HOUR:2:60:%H:%M",
-  "$plot_last",
-  "$probes",
-  "$comment";
+  "-l 60 -u 70", "-y 5:1", "-x HOUR:1:HOUR:1:HOUR:2:60:%H:%M", "$plot_last", "$probes", "$comment";
 
 my $answer = RRDp::read;
 print "$$answer";
@@ -77,12 +71,7 @@ RRDp::cmd
   "-h 400 -w 850",
 
   #	"-u 85",
-  "-l 60 -u 70",
-  "-y 5:1",
-  "-x HOUR:1:HOUR:1:HOUR:2:60:%H:%M",
-  "$plot_last",
-  "$probes",
-  "$comment";
+  "-l 60 -u 70", "-y 5:1", "-x HOUR:1:HOUR:1:HOUR:2:60:%H:%M", "$plot_last", "$probes", "$comment";
 my $answer = RRDp::read;
 print "$$answer";
 
diff --git a/code/public/rrd_graph_web.pl b/code/public/rrd_graph_web.pl
index cfe79172a..075f21eda 100644
--- a/code/public/rrd_graph_web.pl
+++ b/code/public/rrd_graph_web.pl
@@ -13,9 +13,8 @@
 
 use RRDs;
 
-my @rrd = ( "ib_temp2", "ib_kelder" );    # List of iButtons
-my @time = ( "1_Day", "1_Week", "1_Month", "3_Month", "1_Year" )
-  ;                                       # Graphs when you select 1 iButton
+my @rrd = ( "ib_temp2", "ib_kelder" );                               # List of iButtons
+my @time = ( "1_Day", "1_Week", "1_Month", "3_Month", "1_Year" );    # Graphs when you select 1 iButton
 my $rrd_name     = shift @ARGV;
 my $img_dir      = "/Misterhouse/mh/web/graphics";
 my $color        = $config_parms{html_color_header};
@@ -50,8 +49,7 @@ sub header {
     $html .= qq[<meta http-equiv='Refresh' content='$refresh_rate'>\n];
     $html .= qq[<meta http-equiv='Pragma' content='no-cache'>\n];
     $html .= qq[<meta http-equiv='Cache-Control' content='no-cache'>\n];
-    $html .=
-      qq[<link type='text/css' href='rrd_graph_web.css' rel='stylesheet'>\n];
+    $html .= qq[<link type='text/css' href='rrd_graph_web.css' rel='stylesheet'>\n];
     $html .= qq[</head>\n];
     $html .= qq[<body><base target ='output'>\n];
     $html .= qq[<table width=100% bgcolor='$color'>\n];
@@ -71,11 +69,9 @@ sub graph {
 
     my $lasttime = localtime($last);
     my $timenow  = localtime( time() );
-    $timenow =~
-      s/:/\\:/g;    # RRD doesn't like colons, so put leading backslashes in
+    $timenow =~ s/:/\\:/g;    # RRD doesn't like colons, so put leading backslashes in
 
-    my ( $start, $step, $names, $array ) = RRDs::fetch $rrd, "AVERAGE", "-s",
-      "$last-$t", "-e", $last;
+    my ( $start, $step, $names, $array ) = RRDs::fetch $rrd, "AVERAGE", "-s", "$last-$t", "-e", $last;
     my $ERROR = RRDs::error;
     print_log "RRDs::fetch ERROR: $ERROR\n" if $ERROR;
 
@@ -94,15 +90,11 @@ sub graph {
     my $max = sprintf( "%.1f", $oTemp[0] );
 
     # RRDs::graph leaks memory, so use a system call to create the graph.
-    system(
-        "perl $config_parms{html_dir}/bin/rrd_create_graph.pl $rrd_name $rrd $img_dir $t $descr $height $width $dt"
-    );
+    system( "perl $config_parms{html_dir}/bin/rrd_create_graph.pl $rrd_name $rrd $img_dir $t $descr $height $width $dt" );
 
     $html .= qq[  <tr>\n];
-    $html .=
-      qq[    <td  rowspan="3"><a href="/bin/graph.pl?$rrd_name" target="_self" >];
-    $html .=
-      qq[    <img src="/graphics/$rrd_name-temp-$t.png" width="595" height="192" border=0></td>\n];
+    $html .= qq[    <td  rowspan="3"><a href="/bin/graph.pl?$rrd_name" target="_self" >];
+    $html .= qq[    <img src="/graphics/$rrd_name-temp-$t.png" width="595" height="192" border=0></td>\n];
     $html .= qq[    <td  colspan="3" class="cur">$cur1&deg;$dt1</td>\n];
     $html .= qq[  </tr>\n];
     $html .= qq[  <tr> \n];
diff --git a/code/public/school_clock.pl b/code/public/school_clock.pl
index 3418b2394..91f6466a7 100644
--- a/code/public/school_clock.pl
+++ b/code/public/school_clock.pl
@@ -5,8 +5,7 @@
 unless ( $Save{sleeping_kids} ) {
 
     #   speak "The time is $Time_Now" if time_cron '40,44,46,48 6 * * 1-5';
-    speak "room=nick,zack $Time_Now. Kids leave in "
-      . plural( 48 - $Minute, 'minute' )
+    speak "room=nick,zack $Time_Now. Kids leave in " . plural( 48 - $Minute, 'minute' )
       if time_cron '30,35,40,44,46,48,50 6 * * 1-5';
 
     if ( time_cron '43,49,52 6 * * 1-5' ) {
diff --git a/code/public/school_closing.pl b/code/public/school_closing.pl
index a82249739..bc2b2700b 100644
--- a/code/public/school_closing.pl
+++ b/code/public/school_closing.pl
@@ -51,10 +51,8 @@
             $status =~ s/\.gif//;
         }
         if ( $status and $status !~ /on[ _]?time/ ) {
-            speak
-              "rooms=all Important school notice from K R O C. School status: $status";
-            speak
-              "rooms=all Important school notice from K R O C. School status: $status";
+            speak "rooms=all Important school notice from K R O C. School status: $status";
+            speak "rooms=all Important school notice from K R O C. School status: $status";
         }
         else {
             print_log "School status from KROC:  $image";
@@ -71,10 +69,8 @@
         my $status = $1;
         chomp $status;
         if ($status) {
-            speak
-              "rooms=all Important school notice from K T T C.  School status: $status";
-            speak
-              "rooms=all Important school notice from K T T C.  School status: $status";
+            speak "rooms=all Important school notice from K T T C.  School status: $status";
+            speak "rooms=all Important school notice from K T T C.  School status: $status";
         }
     }
 
diff --git a/code/public/schoolday.pl b/code/public/schoolday.pl
index 93549016c..7e0a59a5c 100644
--- a/code/public/schoolday.pl
+++ b/code/public/schoolday.pl
@@ -19,9 +19,8 @@
 
 my $date_format = "ddmmyy";    #config_parms{date_format};
 
-$v_is_school_day = new Voice_Cmd('Is today a school day [Churston,Chestnut]');
-$v_is_school_night =
-  new Voice_Cmd('Is tonight a school night [Churston,Chestnut]');
+$v_is_school_day   = new Voice_Cmd('Is today a school day [Churston,Chestnut]');
+$v_is_school_night = new Voice_Cmd('Is tonight a school night [Churston,Chestnut]');
 
 #---------------------------------------------
 sub Convert_To_ISO8601_Date {
@@ -115,11 +114,7 @@ sub LoadSchool {
     my $school;
 
     for $school ( keys %school_terms ) {
-        LoadSchool(
-            $school,
-            $school_terms{$school}[0],
-            $school_terms{$school}[1]
-        );
+        LoadSchool( $school, $school_terms{$school}[0], $school_terms{$school}[1] );
     }
 
 }
@@ -138,8 +133,7 @@ sub IsSchoolDay {
     #print "Test Date (Day) = $testdate\n";
 
     # No school at the weekend
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime($testdate);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime($testdate);
     if ( ( $wday == 6 ) || ( $wday == 0 ) ) {
         return 0;
     }
@@ -149,8 +143,7 @@ sub IsSchoolDay {
     print "$#{ $terms{$school}{terms}}\n";
 
     for $j ( 0 .. $#{ $terms{$school}{terms} } ) {
-        print
-          "$j $terms{$school}{terms}[$j][0]] $terms{$school}{terms}[$j][1]\n";
+        print "$j $terms{$school}{terms}[$j][0]] $terms{$school}{terms}[$j][1]\n";
         if (    ( $testdate >= $terms{$school}{terms}[$j][0] )
             and ( $testdate <= $terms{$school}{terms}[$j][1] ) )
         {
diff --git a/code/public/send_alpha_page.pl b/code/public/send_alpha_page.pl
index 91388355c..5dcc008ae 100644
--- a/code/public/send_alpha_page.pl
+++ b/code/public/send_alpha_page.pl
@@ -38,8 +38,7 @@
 &send_page("This is a test page from MisterHouse") if said $v_page_dave;
 
 sub send_page {
-    s/\'//
-      ;   # remove any escape backticks because everything is an argument to bip
+    s/\'//;    # remove any escape backticks because everything is an argument to bip
     my ( $pager_msg, $pager_name, $pager_service, $pager_pin ) = @_;
     my $print_msg;
 
diff --git a/code/public/send_numeric_page.pl b/code/public/send_numeric_page.pl
index 56b01d5ab..0c6d23d98 100644
--- a/code/public/send_numeric_page.pl
+++ b/code/public/send_numeric_page.pl
@@ -29,8 +29,7 @@
 ###########################################################
 
 # A timer and a state variable are needed to control the modem hang-up
-$serial_out = new Serial_Item( undef, undef, 'serial1' )
-  ;    # Needs to match setting in .ini file
+$serial_out = new Serial_Item( undef, undef, 'serial1' );    # Needs to match setting in .ini file
 $pager_timer = new Timer();
 my $modem_mode = "idle";
 
@@ -53,14 +52,12 @@ sub send_page {
           if $pager_msg eq "";    ### provide default message here
         $print_msg = "Paging " . $pager_num . " with " . $pager_msg
           if $print_msg eq "";
-        print_log
-          "Sending page to $pager_num with message $pager_msg, Print string is $print_msg\n";
+        print_log "Sending page to $pager_num with message $pager_msg, Print string is $print_msg\n";
         speak("$print_msg");
         $modem_mode = "paging";
         ### ensure that the correct key to send the page is specified below.  Most paging services use a "#"
         $pager_command = "ATDT" . $pager_num . ",," . $pager_msg . "#;";
-        set $pager_timer 20
-          ; ### 20 seconds works for local paging, 800 services may require more
+        set $pager_timer 20;      ### 20 seconds works for local paging, 800 services may require more
         set $serial_out $pager_command;
 
         #       print "Page command is $pager_command\n";  ### Uncomment line for debugging
diff --git a/code/public/siteplayer.pl b/code/public/siteplayer.pl
index 97e017f11..59775d7a9 100644
--- a/code/public/siteplayer.pl
+++ b/code/public/siteplayer.pl
@@ -51,9 +51,7 @@
 #Define the IP and UPD port for siteplayer #1
 #this is to allow sending data TO siteplayer
 my $siteplayer1_address = '192.168.0.60:26482';
-$to_siteplayer1 =
-  new Socket_Item( undef, undef, $siteplayer1_address, 'siteplay', 'udp',
-    'rawout' );
+$to_siteplayer1 = new Socket_Item( undef, undef, $siteplayer1_address, 'siteplay', 'udp', 'rawout' );
 
 # Check for data FROM siteplayer #1
 # Add this  mh.private.ini, so the server is created on startup:
diff --git a/code/public/slinke_build_IR_database.pl b/code/public/slinke_build_IR_database.pl
index 0ec7d01fd..344d01f8f 100644
--- a/code/public/slinke_build_IR_database.pl
+++ b/code/public/slinke_build_IR_database.pl
@@ -59,8 +59,7 @@
     if ( exists $COMMANDS{$ir} ) {
         my $val = "q";
         while ( $val ne "y" && $val ne "n" ) {
-            print "Received '" . join( " ", @{ $COMMANDS{$ir} }[ 0 .. 1 ] ),
-              "'\n";
+            print "Received '" . join( " ", @{ $COMMANDS{$ir} }[ 0 .. 1 ] ), "'\n";
             print "Is this correct? [Y/n] ";
             $val = lc(<STDIN>);
             chomp $val;
@@ -116,9 +115,7 @@
         if ( $code->{PAUSETIME} ) {
             if ( $COMPONENTS{$component}->{PAUSETIME} ) {
                 $COMPONENTS{$component}->{PAUSETIME} =
-                  ( $COMPONENTS{$component}->{PAUSETIME} * $count +
-                      $code->{PAUSETIME} ) /
-                  ( $count + 1 );
+                  ( $COMPONENTS{$component}->{PAUSETIME} * $count + $code->{PAUSETIME} ) / ( $count + 1 );
             }
             else {
                 $COMPONENTS{$component}->{PAUSETIME} = $code->{PAUSETIME};
@@ -128,43 +125,31 @@
         if ( $#{ $code->{HEAD} } == $#{ $COMPONENTS{$component}->{HEAD} } ) {
             for ( my $i = 0; $i <= $#{ $code->{HEAD} }; $i++ ) {
                 $COMPONENTS{$component}->{HEAD}->[$i] =
-                  ( $COMPONENTS{$component}->{HEAD}->[$i] * $count +
-                      $code->{HEAD}->[$i] ) /
-                  ( $count + 1 );
+                  ( $COMPONENTS{$component}->{HEAD}->[$i] * $count + $code->{HEAD}->[$i] ) / ( $count + 1 );
             }
         }
 
         if ( $#{ $code->{TAIL} } == $#{ $COMPONENTS{$component}->{TAIL} } ) {
             for ( my $i = 0; $i <= $#{ $code->{TAIL} }; $i++ ) {
                 $COMPONENTS{$component}->{TAIL}->[$i] =
-                  ( $COMPONENTS{$component}->{TAIL}->[$i] * $count +
-                      $code->{TAIL}->[$i] ) /
-                  ( $count + 1 );
+                  ( $COMPONENTS{$component}->{TAIL}->[$i] * $count + $code->{TAIL}->[$i] ) / ( $count + 1 );
             }
         }
         elsif ( $#{ $COMPONENTS{$component}->{TAIL} } < 0 ) {
             $COMPONENTS{$component}->{TAIL} = $code->{TAIL};
         }
 
-        if ( $#{ $code->{ENCODING}->[0] } ==
-            $#{ $COMPONENTS{$component}->{ZERO} } )
-        {
+        if ( $#{ $code->{ENCODING}->[0] } == $#{ $COMPONENTS{$component}->{ZERO} } ) {
             for ( my $i = 0; $i <= $#{ $code->{ENCODING}->[0] }; $i++ ) {
                 $COMPONENTS{$component}->{ZERO}->[$i] =
-                  ( $COMPONENTS{$component}->{ZERO}->[$i] * $count +
-                      $code->{ENCODING}->[0]->[$i] ) /
-                  ( $count + 1 );
+                  ( $COMPONENTS{$component}->{ZERO}->[$i] * $count + $code->{ENCODING}->[0]->[$i] ) / ( $count + 1 );
             }
         }
 
-        if ( $#{ $code->{ENCODING}->[1] } ==
-            $#{ $COMPONENTS{$component}->{ONE} } )
-        {
+        if ( $#{ $code->{ENCODING}->[1] } == $#{ $COMPONENTS{$component}->{ONE} } ) {
             for ( my $i = 0; $i <= $#{ $code->{ENCODING}->[1] }; $i++ ) {
                 $COMPONENTS{$component}->{ONE}->[$i] =
-                  ( $COMPONENTS{$component}->{ONE}->[$i] * $count +
-                      $code->{ENCODING}->[1]->[$i] ) /
-                  ( $count + 1 );
+                  ( $COMPONENTS{$component}->{ONE}->[$i] * $count + $code->{ENCODING}->[1]->[$i] ) / ( $count + 1 );
             }
         }
     }
@@ -178,8 +163,8 @@
         $COMPONENTS{$component}->{REPEAT} = $code->{REPEAT} if $code->{REPEAT};
     }
 
-    $COMMANDS{$ir} = [ $component, $command, $repeatable ];
-    $COMPONENT_LOOKUP{$componentBits} = $component;
+    $COMMANDS{$ir}                          = [ $component, $command, $repeatable ];
+    $COMPONENT_LOOKUP{$componentBits}       = $component;
     $COMMAND_LOOKUP{$component}->{$command} = $ir;
 
     if (0) {
diff --git a/code/public/slinke_play_IR_command.pl b/code/public/slinke_play_IR_command.pl
index 5400dfec9..d255ac169 100644
--- a/code/public/slinke_play_IR_command.pl
+++ b/code/public/slinke_play_IR_command.pl
@@ -49,8 +49,7 @@
     my @tmpSeq;
     push @tmpSeq, @{ $COMPONENTS{$component}->{HEAD} };
     foreach my $i ( split / */, $COMMAND_LOOKUP{$component}->{$command} ) {
-        push @tmpSeq,
-          @{ $COMPONENTS{$component}->{ $i == 0 ? "ZERO" : "ONE" } };
+        push @tmpSeq, @{ $COMPONENTS{$component}->{ $i == 0 ? "ZERO" : "ONE" } };
     }
 
     my @RLC;
@@ -59,14 +58,12 @@
         push @RLC, @tmpSeq;
         $repeat--;
         push @RLC, @{ $COMPONENTS{$component}->{TAIL} }
-          if ( $COMPONENTS{$component}->{ZERO}->[1] !=
-            $COMPONENTS{$component}->{ONE}->[1] );
+          if ( $COMPONENTS{$component}->{ZERO}->[1] != $COMPONENTS{$component}->{ONE}->[1] );
         push @RLC, $COMPONENTS{$component}->{PAUSETIME}
           if $COMPONENTS{$component}->{PAUSETIME} && $repeat >= 0;
     }
     push @RLC, @{ $COMPONENTS{$component}->{TAIL} }
-      if ( $COMPONENTS{$component}->{ZERO}->[1] ==
-        $COMPONENTS{$component}->{ONE}->[1] );
+      if ( $COMPONENTS{$component}->{ZERO}->[1] == $COMPONENTS{$component}->{ONE}->[1] );
 
     push @RLC, -100 * $TIMEOUT - 1000;
 
diff --git a/code/public/sms.pl b/code/public/sms.pl
index a201a6f16..9327197a3 100644
--- a/code/public/sms.pl
+++ b/code/public/sms.pl
@@ -43,12 +43,10 @@
 
 $timer_waitforanswer = new Timer;    # Timer that Waits for an Answer
 
-$gsm =
-  new Serial_Item( 'AT&FE1V1+CMGF=1;+CNMI=2,1,0,0,0', 'init', 'serial_gsm' )
-  ;                                  # GV-enabled phone's TE mode
+$gsm = new Serial_Item( 'AT&FE1V1+CMGF=1;+CNMI=2,1,0,0,0', 'init', 'serial_gsm' );    # GV-enabled phone's TE mode
 if ($Reload) {
     $gsm_mode = "init";
-    set $gsm 'init';                 # Initialize MODEM
+    set $gsm 'init';                                                                  # Initialize MODEM
 
     #    &wait_ok;
     #    print_log "GSM has been Initialized...";
@@ -84,7 +82,7 @@
 $v_sms_list = new Voice_Cmd('List SMS Messages');
 if ( said $v_sms_list) {
     $gsm_mode = "list";
-    set $gsm "AT+CMGL=\"REC UNREAD\"\r";   # GV-substituted =4 with "REC UNREAD"
+    set $gsm "AT+CMGL=\"REC UNREAD\"\r";    # GV-substituted =4 with "REC UNREAD"
     print_log "Reading SMS List" if $main::config_parms{debug} eq 'sms';
 }
 
@@ -98,8 +96,7 @@ sub read_all {
         elsif ( $gsm_in =~ /^OK/ and $gsm_mode eq "init" ) {
             print_log "GSM has been Initialized";
             $gsm_mode = "";
-            run_voice_cmd("List SMS Messages")
-              ;    # Read any pending messages at init
+            run_voice_cmd("List SMS Messages");    # Read any pending messages at init
         }
         elsif ( $gsm_in =~ /^OK/ and $gsm_mode eq "send" ) {
             print_log "SMS Message Sent (OK)"
@@ -118,9 +115,8 @@ sub read_all {
             $gsm_in =~ s/^\+CMGS: //g;
             print_log "SMS Message $gsm_in sent";
         }
-        elsif ( $gsm_in =~ /^\+CMTI/ ) {    # New message received
-            run_voice_cmd("List SMS Messages")
-              ;                             # Read any pending messages at init
+        elsif ( $gsm_in =~ /^\+CMTI/ ) {                           # New message received
+            run_voice_cmd("List SMS Messages");                    # Read any pending messages at init
         }
         elsif ( $gsm_in =~ /^\+CMGL/ ) {
             print_log "SMS Message Recieved: $gsm_in"
@@ -158,32 +154,29 @@ sub action_sms {
     print_log "SMS from $name: $message";
 
     #	if ($message =~ /^mh /i and $name =~ /Roger|Anna|MisterHouse/) {    # GV-Deleted
-    if ( $message =~ /^mh /i and $name =~ /Julie|Kostas|MisterHouse/ )
-    {    # GV-Added my numbers
+    if ( $message =~ /^mh /i and $name =~ /Julie|Kostas|MisterHouse/ ) {    # GV-Added my numbers
         $message =~ s/^mh //ig;
         print_log "SMS Command to mh received: $message";
         if ( $message eq "1" ) {
 
             # 			set $living_corner_light ON;    		# GV-deleted
-            print_log
-              "Received ON (1) Command";    # GV-added (your command(s) here)
+            print_log "Received ON (1) Command";                            # GV-added (your command(s) here)
         }
         elsif ( $message eq "2" ) {
 
             # 			set $living_corner_light OFF;  	 	# GV-deleted
-            print_log
-              "Received OFF (0) Command";    # GV-added (your command(s) here)
+            print_log "Received OFF (0) Command";                           # GV-added (your command(s) here)
         }
         elsif ( $message eq "T" ) {
-            print_log "Received TEST (T) Command"; # GV-added an auto-reply test
-            send_sms( $sms_from, "TEST OK" );      # GV-added an auto-reply test
+            print_log "Received TEST (T) Command";                          # GV-added an auto-reply test
+            send_sms( $sms_from, "TEST OK" );                               # GV-added an auto-reply test
         }
         else {
             print_log "SMS Command to mh received in Error";
         }
     }
     set $gsm "AT+CMGD=$sms_nbr\r";
-    print_log "deleting msg $sms_nbr";             #   GV-added
+    print_log "deleting msg $sms_nbr";                                      #   GV-added
 
     # 	print "AT+CMGD=$sms_nbr\n";
 }
@@ -191,10 +184,10 @@ sub action_sms {
 sub get_gsm {
     my ($number) = @_;
     my $name;
-    if ( $number eq "+391234567890" ) {            # GV-my numbers
+    if ( $number eq "+391234567890" ) {                                     # GV-my numbers
         $name = "Kostas";
     }
-    elsif ( $number eq "+393456789012" ) {         # GV-my numbers
+    elsif ( $number eq "+393456789012" ) {                                  # GV-my numbers
         $name = "Julie";
     }
     elsif ( $number eq "+391703809627" ) {
diff --git a/code/public/speak_mbrola.pl b/code/public/speak_mbrola.pl
index b1663127a..e54630ec2 100644
--- a/code/public/speak_mbrola.pl
+++ b/code/public/speak_mbrola.pl
@@ -9,12 +9,8 @@ sub speak_mbrola {
         print "Sending text to $parms{to_file}\n";
         file_write '/tmp/sp.pho', $parms{text};
         my $mpath = '/home/users/usto/eHouse/mbrola';
-        system(
-            "$mpath/txt2pho/txt2pho -p $mpath/txt2pho/data/ -f -o i /tmp/sp.pho >o /tmp/spOut.pho"
-        );
-        system(
-            "mbrola -v 0.7 -e $mpath/voices/de3/de3 /tmp/spOut.pho $parms{to_file}"
-        );
+        system( "$mpath/txt2pho/txt2pho -p $mpath/txt2pho/data/ -f -o i /tmp/sp.pho >o /tmp/spOut.pho" );
+        system( "mbrola -v 0.7 -e $mpath/voices/de3/de3 /tmp/spOut.pho $parms{to_file}" );
         sleep(6);
     }
     else {
diff --git a/code/public/speak_server.pl b/code/public/speak_server.pl
index a34a022b5..38fde3b12 100644
--- a/code/public/speak_server.pl
+++ b/code/public/speak_server.pl
@@ -47,8 +47,7 @@
 
     # Detect where the message is from
     #   my ($name, $name_short) = net_domain_name('server_speak');
-    net_domain_name_start 'server_speak',
-      'server_speak';    # Background DNS search
+    net_domain_name_start 'server_speak', 'server_speak';    # Background DNS search
 }
 
 # This will be true when the DNS search started above finishes
@@ -91,21 +90,16 @@
             $chatbot_rule = 'doctor' unless $chatbot_rule;
 
             #           $chatbot = new Chatbot::Eliza "Eliza", "$config_parms{data_dir}/eliza/$chatbot_rule.txt" unless $chatbot;
-            $chatbot = new Chatbot::Eliza "Eliza",
-              "../data/eliza/$chatbot_rule.txt"
+            $chatbot = new Chatbot::Eliza "Eliza", "../data/eliza/$chatbot_rule.txt"
               unless $chatbot;
             my $response = $chatbot->transform($msg);
 
-            $msg =
-              "$name_short said: " . &Voice_Text::set_voice( 'male2', $msg );
-            $msg .=
-              "  Eliza says: " . &Voice_Text::set_voice( 'female', $response );
+            $msg = "$name_short said: " . &Voice_Text::set_voice( 'male2', $msg );
+            $msg .= "  Eliza says: " . &Voice_Text::set_voice( 'female', $response );
         }
         else {
             #           $msg = "Internet message from $name_short: <voice required='gender=male'/>$msg" if $msg;
-            $msg =
-              "Internet message from $name_short: "
-              . &Voice_Text::set_voice( 'male2', $msg )
+            $msg = "Internet message from $name_short: " . &Voice_Text::set_voice( 'male2', $msg )
               if $msg;
         }
 
@@ -136,11 +130,9 @@
         $html =~ s/<\/?voice.*?>//g unless $OS_win;    # Drop XML speech tags
 
         # Must use http_port, not Host, which has speak_server port
-        my $wav =
-          "http://$Http{Host_address}:$config_parms{http_port}/speak_server.wav";
+        my $wav = "http://$Http{Host_address}:$config_parms{http_port}/speak_server.wav";
         $html .=
-            "\n<br><EMBED SRC='$wav' WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n"
-          . "<NOEMBED><BGSOUND SRC='$wav'></NOEMBED></EMBED>\n"
+          "\n<br><EMBED SRC='$wav' WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n" . "<NOEMBED><BGSOUND SRC='$wav'></NOEMBED></EMBED>\n"
           unless $webmute;
 
         #       display($html, 0);
@@ -150,18 +142,14 @@
         #        display($msg, 120, "Internet Message from $name") unless
         #            $msg =~ /^Internet light set/;
 
-        logit( "$config_parms{data_dir}/logs/speak_server.$Year_Month_Now.log",
-            "domain=$name text=$msg" );
+        logit( "$config_parms{data_dir}/logs/speak_server.$Year_Month_Now.log", "domain=$name text=$msg" );
 
     }
 
     # Allow for other program to post display/log data
     elsif ( $speak_server_data =~ /^DATA / ) {
         display( $speak_server_data, 0, "Internet data from $name" );
-        logit(
-            "$config_parms{data_dir}/logs/speak_server.$Year_Month_Now.data.log",
-            "domain=$name text=$msg"
-        );
+        logit( "$config_parms{data_dir}/logs/speak_server.$Year_Month_Now.data.log", "domain=$name text=$msg" );
     }
 
     # Allow for other programs to send speak socket
@@ -174,8 +162,7 @@
 
     $msg = substr $msg, 0, 600;
     if (   $config_parms{internet_speak_flag} eq 'all'
-        or $config_parms{internet_speak_flag} eq 'some'
-        and $speak_server_data =~ /^GET / )
+        or $config_parms{internet_speak_flag} eq 'some' and $speak_server_data =~ /^GET / )
     {
         speak voice => 'male', text => $msg;
     }
diff --git a/code/public/sports_scores_bball.pl b/code/public/sports_scores_bball.pl
index 99390f4fd..ec9d8789e 100644
--- a/code/public/sports_scores_bball.pl
+++ b/code/public/sports_scores_bball.pl
@@ -2,8 +2,7 @@
 
 my $f_bballscores_html = "$config_parms{data_dir}/web/bballScores.html";
 
-$p_bballscores = new Process_Item(
-    "get_url http://scores.nba.com/games/kings.html $f_bballscores_html");
+$p_bballscores = new Process_Item("get_url http://scores.nba.com/games/kings.html $f_bballscores_html");
 
 $v_get_bballscores = new Voice_Cmd('Get basketball scores');
 $v_get_bballscores->set_info("Report status of defined objects.");
@@ -42,14 +41,12 @@
 
 sub web_status_line {
     my $html;
-    $html .=
-      qq[&nbsp;<img src='/ia5/images/barometer.gif' border=0>&nbsp;$Save{BX24_Barometer}];
+    $html .= qq[&nbsp;<img src='/ia5/images/barometer.gif' border=0>&nbsp;$Save{BX24_Barometer}];
     my $CPU_Temp = sensor_output('temp1');
     if ( $CPU_Temp > 130 ) {
         $CPU_Temp = qq[<FONT color='red'><BLINK>$CPU_Temp</BLINK></FONT>];
     }
-    $html .=
-      qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;CPU:$CPU_Temp];
+    $html .= qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;CPU:$CPU_Temp];
     $html .= qq[&nbsp;&nbsp;$Save{BBallScores}];
     return $html;
 }
diff --git a/code/public/sprinklers_bill.pl b/code/public/sprinklers_bill.pl
index e4cc99f82..4658ecc02 100644
--- a/code/public/sprinklers_bill.pl
+++ b/code/public/sprinklers_bill.pl
@@ -33,12 +33,10 @@
 #noloop=start
 
 # Morning watering cycle
-$Sprinklers->tie_time( '30 05 * * *', 'on:5,5,2,5,5,2',
-    'log=irrigation.log Running first morning watering cycle' );
+$Sprinklers->tie_time( '30 05 * * *', 'on:5,5,2,5,5,2', 'log=irrigation.log Running first morning watering cycle' );
 
 # Re-enabled in late May for more lawn water
-$Sprinklers->tie_time( '30 06 * * *', 'on:5,5,2,5,5,2',
-    'log=irrigation.log Running second morning watering cycle' );
+$Sprinklers->tie_time( '30 06 * * *', 'on:5,5,2,5,5,2', 'log=irrigation.log Running second morning watering cycle' );
 
 #$Sprinklers->tie_time('30 07 * * *', 'on:5,5,0,5,5,0', 'log=irrigation.log Running third morning watering cycle');
 
@@ -50,20 +48,17 @@
 
 # When watering is finished, set the default watering times (one minute perzone)
 $Sprinklers->tie_event( '$Sprinklers->set_runtimes(1,1,1,1,1,1)',
-    'complete',
-    'log=irrigation.log Zone cascade complete, setting default run times' );
+    'complete', 'log=irrigation.log Zone cascade complete, setting default run times' );
 
 # Enable the sprinklers every day at midnight (in case they were disabled for the day due to rain/weather/manual/etc)
-$SprinkerEnable->tie_time( '00 00 * * *', 'on',
-    'log=irrigation.log Sending midnight sprinkler enable command' );
+$SprinkerEnable->tie_time( '00 00 * * *', 'on', 'log=irrigation.log Sending midnight sprinkler enable command' );
 
 # Link the sprinkler test item to the sprinkler on command
 $SprinklerTest->tie_items( $Sprinklers, "on", "on:1,1,1,1,1,1",
     'log=irrigation.log Sprinklers sent on due to sprinkler test command' );
 
 # Filter ON commands to the zone cascade if the cold weather flag is set
-$Sprinklers->tie_filter( '$Cold_outside->state() eq "1"',
-    'on', 'log=irrigation.log Sprinkler run overridden due to cold weather' );
+$Sprinklers->tie_filter( '$Cold_outside->state() eq "1"', 'on', 'log=irrigation.log Sprinkler run overridden due to cold weather' );
 
 #noloop=stop
 
diff --git a/code/public/sprinklers_brian.pl b/code/public/sprinklers_brian.pl
index c2e516b33..763ed34ed 100644
--- a/code/public/sprinklers_brian.pl
+++ b/code/public/sprinklers_brian.pl
@@ -125,17 +125,15 @@
     $start_minute_sprinkler_zone2 = $start_minute_sprinkler_zone2 - 60;
 }
 
-$start_hour_sprinkler_zone3 = $start_hour_sprinkler_zone2;
-$start_minute_sprinkler_zone3 =
-  $start_minute_sprinkler_zone2 + $sprinkler_zone2_timeout + 1;
+$start_hour_sprinkler_zone3   = $start_hour_sprinkler_zone2;
+$start_minute_sprinkler_zone3 = $start_minute_sprinkler_zone2 + $sprinkler_zone2_timeout + 1;
 while ( $start_minute_sprinkler_zone3 >= 60 ) {
     $start_hour_sprinkler_zone3++;
     $start_minute_sprinkler_zone3 = $start_minute_sprinkler_zone3 - 60;
 }
 
-$start_hour_drip_line = $start_hour_sprinkler_zone3;
-$start_minute_drip_line =
-  $start_minute_sprinkler_zone3 + $sprinkler_zone3_timeout + 1;
+$start_hour_drip_line   = $start_hour_sprinkler_zone3;
+$start_minute_drip_line = $start_minute_sprinkler_zone3 + $sprinkler_zone3_timeout + 1;
 while ( $start_minute_drip_line >= 60 ) {
     $start_hour_drip_line++;
     $start_minute_drip_line = $start_minute_drip_line - 60;
@@ -160,12 +158,7 @@
 }
 
 # Lawn zone 2 loop
-if (
-    time_cron(
-        "$start_minute_sprinkler_zone2 $start_hour_sprinkler_zone2 * * $lawn_watering_interval"
-    )
-  )
-{
+if ( time_cron( "$start_minute_sprinkler_zone2 $start_hour_sprinkler_zone2 * * $lawn_watering_interval" ) ) {
     print_log "Starting sprinklers in zone 2.";
     set $sprinkler_zone2_timer ( $sprinkler_zone2_timeout * 60 );
     set $sprinkler_zone2 ON;
@@ -176,12 +169,7 @@
 }
 
 # Lawn zone 3 loop
-if (
-    time_cron(
-        "$start_minute_sprinkler_zone3 $start_hour_sprinkler_zone3 * * $lawn_watering_interval"
-    )
-  )
-{
+if ( time_cron( "$start_minute_sprinkler_zone3 $start_hour_sprinkler_zone3 * * $lawn_watering_interval" ) ) {
     print_log "Starting sprinklers in zone 3.";
     set $sprinkler_zone3_timer ( $sprinkler_zone3_timeout * 60 );
     set $sprinkler_zone3 ON;
@@ -192,12 +180,7 @@
 }
 
 # Drip line loop
-if (
-    time_cron(
-        "$start_minute_drip_line $start_hour_drip_line * * $drip_watering_interval"
-    )
-  )
-{
+if ( time_cron( "$start_minute_drip_line $start_hour_drip_line * * $drip_watering_interval" ) ) {
     print_log "Starting drip line watering.";
     set $drip_line_timer ( $drip_line_timeout * 60 );
     set $drip_line ON;
@@ -208,12 +191,7 @@
 }
 
 # Soaker loop
-if (
-    time_cron(
-        "$start_minute_soaker_hose $start_hour_soaker_hose * * $soaker_watering_interval"
-    )
-  )
-{
+if ( time_cron( "$start_minute_soaker_hose $start_hour_soaker_hose * * $soaker_watering_interval" ) ) {
     print_log "Starting soaker hose watering.";
     set $soaker_hose_timer ( $soaker_hose_timeout * 60 );
     set $soaker_hose ON;
@@ -226,22 +204,8 @@
 # Voice command stuff
 if ( said $v_when_water) {
     speak("Sprinkler zone 1 will start at $watering_time:00.");
-    speak(
-        'Sprinkler zone 2 will start at '
-          . join( ':',
-            $start_hour_sprinkler_zone2, $start_minute_sprinkler_zone2 )
-          . '.'
-    );
-    speak(
-        'Sprinkler zone 3 will start at '
-          . join( ':',
-            $start_hour_sprinkler_zone3, $start_minute_sprinkler_zone3 )
-          . '.'
-    );
-    speak(  'Drip line will start at '
-          . join( ':', $start_hour_drip_line, $start_minute_drip_line )
-          . '.' );
-    speak(  'Soaker hose will start at '
-          . join( ':', $start_hour_soaker_hose, $start_minute_soaker_hose )
-          . '.' );
+    speak( 'Sprinkler zone 2 will start at ' . join( ':', $start_hour_sprinkler_zone2, $start_minute_sprinkler_zone2 ) . '.' );
+    speak( 'Sprinkler zone 3 will start at ' . join( ':', $start_hour_sprinkler_zone3, $start_minute_sprinkler_zone3 ) . '.' );
+    speak( 'Drip line will start at ' . join( ':', $start_hour_drip_line, $start_minute_drip_line ) . '.' );
+    speak( 'Soaker hose will start at ' . join( ':', $start_hour_soaker_hose, $start_minute_soaker_hose ) . '.' );
 }
diff --git a/code/public/sprinklers_kyle.pl b/code/public/sprinklers_kyle.pl
index ed33a2bed..be0ded676 100644
--- a/code/public/sprinklers_kyle.pl
+++ b/code/public/sprinklers_kyle.pl
@@ -48,13 +48,11 @@
         my $chance = $Weather{"Chance of rain $day"};
         if ( $chance >= 50 ) {
             $Save{sprinkler_skip} = 3;
-            print_log
-              "Chance of rain on $day is $chance.  Setting Save{sprinkler_skip} to: $Save{sprinkler_skip}";
+            print_log "Chance of rain on $day is $chance.  Setting Save{sprinkler_skip} to: $Save{sprinkler_skip}";
             last;
         }
         elsif ( $chance > 0 ) {
-            print_log
-              "Chance of rain on $day is only $chance.  Not skipping sprinklers.";
+            print_log "Chance of rain on $day is only $chance.  Not skipping sprinklers.";
         }
     }
 }
@@ -107,8 +105,7 @@
         print_log "Skipping sprinklers due to recent rain.";
     }
     else {
-        set $SprinklersFront
-          '1-on~600~1-off;2-on~600~2-off;3-on~600~3-off;4-on~600~4-off';
+        set $SprinklersFront '1-on~600~1-off;2-on~600~2-off;3-on~600~3-off;4-on~600~4-off';
         print_log "Starting front sprinkler cycle";
     }
 }
@@ -184,8 +181,7 @@
 
 if ( $Save{sprinkler_skip} and $New_Day ) {
     $Save{sprinkler_skip}--;
-    print_log
-      "!!!! DEBUG: New Save{sprinkler_skip} value: $Save{sprinkler_skip}";
+    print_log "!!!! DEBUG: New Save{sprinkler_skip} value: $Save{sprinkler_skip}";
 }
 
 =begin comment
diff --git a/code/public/test_homebase.pl b/code/public/test_homebase.pl
index 36cc4ca81..3e60531fa 100644
--- a/code/public/test_homebase.pl
+++ b/code/public/test_homebase.pl
@@ -2,9 +2,7 @@
 
 # Some simple events to debug new HomeBase subroutines
 
-$v_homebase_test = new Voice_Cmd(
-    'Test homebase [read_time,set_time,read_log,clear_log,read_flags,read_variables]'
-);
+$v_homebase_test = new Voice_Cmd( 'Test homebase [read_time,set_time,read_log,clear_log,read_flags,read_variables]' );
 
 # Put your flag names here
 my @hb_flag_names = (
@@ -21,9 +19,8 @@
 
 # Put your variable names here
 my @hb_var_names = (
-    'Rain Lately',     'empty',    'Front Lamp Dim', 'HVAC MSB',
-    'HVAC LSB',        'In_Temp',  'Out_Temp',       'Humidity',
-    'Wind_Speed',      'Wind_Avg', 'Rain_Today',     'House Timer',
+    'Rain Lately',     'empty',    'Front Lamp Dim', 'HVAC MSB', 'HVAC LSB',   'In_Temp',
+    'Out_Temp',        'Humidity', 'Wind_Speed',     'Wind_Avg', 'Rain_Today', 'House Timer',
     'House Timer Set', 'Doorbell Press'
 );
 my %hb_var_values;
@@ -54,8 +51,7 @@
         my $count = @log;
         print "Homebase event log: $count records\n";
         for my $data (@log) {
-            &logit( "$Pgm_Root/data/logs/HomeBase.$Year_Month_Now.log",
-                $data . "\n", 2 );
+            &logit( "$Pgm_Root/data/logs/HomeBase.$Year_Month_Now.log", $data . "\n", 2 );
         }
     }
     elsif ( $state eq 'clear_log' ) {
diff --git a/code/public/time_info_swiss.pl b/code/public/time_info_swiss.pl
index 1915b1bd7..e58c2ff4a 100644
--- a/code/public/time_info_swiss.pl
+++ b/code/public/time_info_swiss.pl
@@ -17,8 +17,7 @@
 
 if ( said $v_what_time) {
     my $temp = "Es ist $Holiday" if $Holiday;
-    speak
-      "voice=Whispering-Male Es ist $Time_Now on $Date_Now_Speakable. $temp";
+    speak "voice=Whispering-Male Es ist $Time_Now on $Date_Now_Speakable. $temp";
 }
 
 #$v_sun_set = new  Voice_Cmd('When will the sun set', 0);
@@ -26,13 +25,11 @@
 
 #$v_sun_set-> set_info("Calculates sunrise and sunset for latitude=$config_parms{latitude}, longitude=$config_parms{longitude}");
 $v_sun_set->set_info(
-    "Berechnet Sonnen-aufgang und -untergang f�r latitude=$config_parms{latitude}, longitude=$config_parms{longitude}"
-);
+    "Berechnet Sonnen-aufgang und -untergang f�r latitude=$config_parms{latitude}, longitude=$config_parms{longitude}" );
 $v_sun_set->set_authority('anyone');
 
 #speak "Sunrise today is at $Time_Sunrise, sunset is at $Time_Sunset." if said $v_sun_set;
-speak
-  "Gender=male Voice=8 Sonnenaufgang ist heute $Time_Sunrise, Sonnenuntergang ist $Time_Sunset."
+speak "Gender=male Voice=8 Sonnenaufgang ist heute $Time_Sunrise, Sonnenuntergang ist $Time_Sunset."
   if said $v_sun_set;
 
 #speak "Notice, the sun is now rising at $Time_Sunrise" if time_now $Time_Sunrise and !$Save{sleeping_parents};
@@ -40,8 +37,7 @@
   if time_now $Time_Sunrise and !$Save{sleeping_parents};
 
 #speak "rooms=all Notice, the sun is now seting at $Time_Sunset"  if time_now $Time_Sunset;
-speak
-  "rooms=all Gender=male Voice=3 Mitteilung, die Sonne geht jetzt unter $Time_Sunset"
+speak "rooms=all Gender=male Voice=3 Mitteilung, die Sonne geht jetzt unter $Time_Sunset"
   if time_now $Time_Sunset;
 
 #$v_moon_info1 = new Voice_Cmd "When is next [new,full] moon";
@@ -55,8 +51,7 @@
 
 #$v_moon_info3-> set_info('Phase will be: New, One-Quarter Waxing, Half Waxing, Three-Quarter Waxing, Full, etc for Waning');
 $v_moon_info3->set_info(
-    'Phase wird sein: Neu, Ein Viertel wachsend, H�lfte wachsend, Drei-Viertel wachsend, Voll, etc for Waning'
-);
+    'Phase wird sein: Neu, Ein Viertel wachsend, H�lfte wachsend, Drei-Viertel wachsend, Voll, etc for Waning' );
 $v_moon_info1->set_authority('anyone');
 $v_moon_info2->set_authority('anyone');
 $v_moon_info3->set_authority('anyone');
@@ -65,8 +60,7 @@
     my $days = &time_diff( $Moon{"time_$state"}, $Time );
 
     #    speak qq[The next $state moon is in $days, on $Moon{$state}];
-    speak
-      qq[Gender=female Voice=2  Der naechste $state Mond ist in $days, am $Moon{$state}];
+    speak qq[Gender=female Voice=2  Der naechste $state Mond ist in $days, am $Moon{$state}];
 }
 
 if ( $state = said $v_moon_info2) {
@@ -75,13 +69,11 @@
 }
 
 if ( $state = said $v_moon_info3) {
-    speak
-      qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old];
+    speak qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old];
 }
 
 $full_moon = new File_Item("$config_parms{data_dir}/remarks/full_moon.txt");
 if ( $Moon{phase} eq 'Full' and time_random( '* 8-22 * * *', 240 ) ) {
-    speak "rooms=all Notice, tonight is a full moon.  "
-      . ( read_next $full_moon);
+    speak "rooms=all Notice, tonight is a full moon.  " . ( read_next $full_moon);
 }
 
diff --git a/code/public/tivo_direct.pl b/code/public/tivo_direct.pl
index 19c6b93dc..f4683c3aa 100644
--- a/code/public/tivo_direct.pl
+++ b/code/public/tivo_direct.pl
@@ -41,8 +41,7 @@
 ############################
 
 # noloop=start
-$directivo = new Socket_Item( undef, undef, "192.168.0.103:4560", 'tivo', 'tcp',
-    'record' );
+$directivo = new Socket_Item( undef, undef, "192.168.0.103:4560", 'tivo', 'tcp', 'record' );
 start $directivo;
 
 # noloop=stop
@@ -87,22 +86,18 @@
         elsif ( $state_test eq "COM" ) {
             set $directivo "SENDKEY: 2 4 9";
         }
-        set $directivo
-          "OSD: *LWRP*1*SECS*5*FGCL*2*BGCL*1*XPOS*1*YPOS*1*TEXT*$state_test*";
+        set $directivo "OSD: *LWRP*1*SECS*5*FGCL*2*BGCL*1*XPOS*1*YPOS*1*TEXT*$state_test*";
     }
 }
 
 if ( $said_dtivo = said $directivo) {
-    set $directivo
-      "OSD: *LWRP*1*SECS*5*FGCL*2*BGCL*1*XPOS*1*YPOS*1*TEXT*$said_dtivo*";
+    set $directivo "OSD: *LWRP*1*SECS*5*FGCL*2*BGCL*1*XPOS*1*YPOS*1*TEXT*$said_dtivo*";
 }
 
 if ( inactive_now $directivo) {
     print_log "Direct Tivo Telnet session closed";
     set restartTimer 10, sub {
-        $directivo =
-          new Socket_Item( undef, undef, "192.168.0.103:4560", 'tivo', 'tcp',
-            'record' );
+        $directivo = new Socket_Item( undef, undef, "192.168.0.103:4560", 'tivo', 'tcp', 'record' );
     };
 
 }
diff --git a/code/public/tv_info_clive.pl b/code/public/tv_info_clive.pl
index c1f0dad35..5cf787eb3 100644
--- a/code/public/tv_info_clive.pl
+++ b/code/public/tv_info_clive.pl
@@ -6,18 +6,14 @@
 
 $f_tv_file = new File_Item("$config_parms{data_dir}/tv_info1.txt");
 
-$v_tv_movies1 = new Voice_Cmd(
-    'What TV movies are on channel [23,26,30,33,37] today (=Carlton, BBC1, Ch4, BBC2, Ch5)'
-);
+$v_tv_movies1 = new Voice_Cmd( 'What TV movies are on channel [23,26,30,33,37] today (=Carlton, BBC1, Ch4, BBC2, Ch5)' );
 
 #$v_tv_movies2 = new  Voice_Cmd('What TV movies are on at [6pm,7pm,8pm,9pm] tonight');
 $v_tv_movies1->set_info('Looks for TV movies, on channels:');
 
 #$v_tv_movies2-> set_info('Looks for TV shows that are 2-3 hours in length on all channels, at time:');
 
-$v_tv_shows1 = new Voice_Cmd(
-    'What TV shows are on channel [23,26,30,33,37] today (=Carlton, BBC1, Ch4, BBC2, Ch5)'
-);
+$v_tv_shows1 = new Voice_Cmd( 'What TV shows are on channel [23,26,30,33,37] today (=Carlton, BBC1, Ch4, BBC2, Ch5)' );
 $v_tv_shows1->set_info('Lists all shows on from 6 to 10 pm today on channel:');
 
 $v_tv_shows2 = new Voice_Cmd(
@@ -29,8 +25,7 @@
 #$config_parms{favorite_tv_shows}");
 
 $v_tv_shows3 = new Voice_Cmd('TV for [Clive,Edward,James,Best] today');
-$v_tv_shows3->set_info(
-    "Checks to see what's on TV today for Clive,Edward,James,Best");
+$v_tv_shows3->set_info("Checks to see what's on TV today for Clive,Edward,James,Best");
 ##$v_tv_shows3-> set_info("Checks to see if any of the following programs are on today:
 #$config_parms{favorite_tv_shows}");
 
@@ -56,8 +51,7 @@
 $Save{TV_on} = 0 if ($Reload);
 
 sub turn_on_tv {
-    $tv_window =
-      &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' );
+    $tv_window = &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' );
     my $tv_command = "Turn on TV channel $state";
     my $timer_tv   = new Timer;
     if ( $Save{TV_on} ) { &SendKeys( $tv_window, $state, 1, 500 ); }
@@ -72,8 +66,7 @@ sub turn_on_tv_spare2 {
     $Save{TV_on} = 0
       if ( &WaitForAnyWindow( 'WinTV', \$temp_window, 100, 100 ) );
     print "$Save{TV_on}\n";
-    my $window =
-      &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' );
+    my $window = &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' );
     my $tv_command = "Turn on TV channel $state";
     print_log $tv_command;
     print "$tv_command\n";
@@ -86,9 +79,7 @@ sub turn_on_tv_spare2 {
 }
 
 sub turn_on_tv_spare {
-    if ( my $window =
-        &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' ) )
-    {
+    if ( my $window = &sendkeys_find_window( 'WinTV', 'C:\Progra~1\WinTV\hcw.exe /WINTV2K' ) ) {
         &SendKeys( $window, '23', 1, 500 ) if $state == '23';
         &SendKeys( $window, '26', 1, 500 ) if $state == '26';
     }
@@ -117,8 +108,7 @@ sub turn_on_tv_spare {
 
     #    run qq[get_tv_info_uk -keys "$config_parms{favorite_tv_shows}"];
     #    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "10/7" -time "18-23.5"];
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$Mday" -time "$start-23.55"];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$Mday" -time "$start-23.55"];
 
     #   run qq[get_tv_info_uk -time "20:00" -keyfile "TV_clive.list" -dates $Month/$Mday  -quiet];
 ####    set_watch $f_tv_file 'favorites tonight';
@@ -145,15 +135,13 @@ sub turn_on_tv_spare {
         $key_file = "TV_james.list";
         $tv_times = "$start-22.5";
     }
-    run
-      qq[get_tv_info_uk -keyfile $key_file -dates "${Month}/$Mday" -time $tv_times];
+    run qq[get_tv_info_uk -keyfile $key_file -dates "${Month}/$Mday" -time $tv_times];
     set_watch $f_tv_file;
 }
 
 if ( said $v_tv_shows4) {
     print_log "Searching for TV programs";
-    run
-      qq[get_tv_info_uk -keys "film" -dates "${Month}/$Mday" -time "$start-23.5"];
+    run qq[get_tv_info_uk -keys "film" -dates "${Month}/$Mday" -time "$start-23.5"];
     set_watch $f_tv_file;
 }
 
@@ -161,8 +149,7 @@ sub turn_on_tv_spare {
 if ( said $v_tv_shows2 eq 'this morning' ) {
     $start = ( $Hour < 4 ) ? 4 : $Hour;
     print_log "Searching for TV programs";
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$Mday" -time "$start-13"];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$Mday" -time "$start-13"];
     set_watch $f_tv_file;
 }
 
@@ -170,8 +157,7 @@ sub turn_on_tv_spare {
 if ( said $v_tv_shows2 eq 'this afternoon' ) {
     $start = ( $Hour < 13 ) ? 13 : $Hour;
     print_log "Searching for TV programs";
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$Mday" -time "$start-18"];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$Mday" -time "$start-18"];
     set_watch $f_tv_file;
 }
 
@@ -182,8 +168,7 @@ sub turn_on_tv_spare {
     $start = 0;
     my $this_day = ( $Hour > 5 ) ? $Mday : $Mday - 1;
     print_log "Searching for TV programs";
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$this_day" -time "$start-6"];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$this_day" -time "$start-6"];
     set_watch $f_tv_file;
 }
 
@@ -191,8 +176,7 @@ sub turn_on_tv_spare {
 if ( said $v_tv_shows2 eq 'yesterday' ) {
     print_log "Searching for TV programs";
     my $this_day = $Mday - 1;
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$this_day" -times "all" ];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list"  -dates "${Month}/$this_day" -times "all" ];
     set_watch $f_tv_file;
 }
 
@@ -202,8 +186,7 @@ sub turn_on_tv_spare {
     my $tomorrow_day = $Mday + 1;
 
     #    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day" -time "$start-23.5"];
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day" -times "all" ];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day" -times "all" ];
     set_watch $f_tv_file;
     my $summary = read_head $f_tv_file 6;
     my ($show_count) = $summary =~ /Found (\d+)/;
@@ -217,8 +200,7 @@ sub turn_on_tv_spare {
     my $second_day   = $Mday + 2;
 
     #    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day" -time "$start-23.5"];
-    run
-      qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day-${Month}/$second_day" -times "all" ];
+    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates "${Month}/$tomorrow_day-${Month}/$second_day" -times "all" ];
 
     #    run qq[get_tv_info_uk -keyfile "TV_clive.list" -dates +2 -times "all" ];
     set_watch $f_tv_file;
@@ -245,8 +227,7 @@ sub turn_on_tv_spare {
     # if (time_cron('59,14,29,44 18-23.5 * * *')) {
     #    run qq[get_tv_info_uk -time $Hour:$Minute -keys "$config_parms{favorite_tv_shows}" -quiet];
     my $Next_Minute = ( $Minute == 59 ) ? "00" : $Minute + 1;
-    run
-      qq[get_tv_info_uk -time $Hour:$Next_Minute -keyfile "TV_best.list" -dates $Month/$Mday  -quiet];
+    run qq[get_tv_info_uk -time $Hour:$Next_Minute -keyfile "TV_best.list" -dates $Month/$Mday  -quiet];
     set_watch $f_tv_file 'favorites now';
 
     # scf new:
@@ -268,8 +249,7 @@ sub turn_on_tv_spare {
 #&tk_entry('TV search', \$Save{tv_search}, 'TV dates', \$Save{tv_days});
 if ( $Tk_results{'TV search'} or $Tk_results{'TV dates'} ) {
     speak "Searching";
-    run
-      qq[get_tv_info_uk -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
+    run qq[get_tv_info_uk -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
     set_watch $f_tv_file;
     undef $Tk_results{'TV search'};
     undef $Tk_results{'TV dates'};
@@ -312,11 +292,6 @@ sub turn_on_tv_spare {
 if ( said $v_tv_print) {
     browser "$config_parms{data_dir}/tv_info2.html";
     &WaitForAnyWindow( 'Explorer', \$window, 100, 100 );
-    &SendKeys(
-        $window,
-        '\\CTRL+\\p\\CTRL-\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\RET\\',
-        1,
-        500
-    );
+    &SendKeys( $window, '\\CTRL+\\p\\CTRL-\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\TAB\\RET\\', 1, 500 );
 }
 
diff --git a/code/public/tv_info_ge.pl b/code/public/tv_info_ge.pl
index e1ed3f7c7..6a354fd96 100644
--- a/code/public/tv_info_ge.pl
+++ b/code/public/tv_info_ge.pl
@@ -2,28 +2,17 @@
 
 $f_tv_file = new File_Item("$config_parms{data_dir}/tv_info1.txt");
 
-$v_tv_movies1 =
-  new Voice_Cmd('What TV movies are on channel [all,4-12,4,6,8,9,12] tonight');
-$v_tv_movies2 =
-  new Voice_Cmd('What TV movies are on at [18,19,20,21,22] tonight');
-$v_tv_movies1->set_info(
-    'Looks for TV shows that are 2-3 hours in length from 6 to 10 pm, on channels:'
-);
-$v_tv_movies2->set_info(
-    'Looks for TV shows that are 2-3 hours in length on all channels, at time:'
-);
-
-$v_tv_shows1 =
-  new Voice_Cmd('What TV shows are on channel [5,6,8,9,12,51] tonight');
+$v_tv_movies1 = new Voice_Cmd('What TV movies are on channel [all,4-12,4,6,8,9,12] tonight');
+$v_tv_movies2 = new Voice_Cmd('What TV movies are on at [18,19,20,21,22] tonight');
+$v_tv_movies1->set_info( 'Looks for TV shows that are 2-3 hours in length from 6 to 10 pm, on channels:' );
+$v_tv_movies2->set_info( 'Looks for TV shows that are 2-3 hours in length on all channels, at time:' );
+
+$v_tv_shows1 = new Voice_Cmd('What TV shows are on channel [5,6,8,9,12,51] tonight');
 $v_tv_shows2 = new Voice_Cmd('What favorite TV shows are on today');
-$v_tv_shows1->set_info(
-    'Lists all shows on from 6 to 10 pm tonight on channel:');
-$v_tv_shows2->set_info(
-    "Checks to see if any of the following shows in $config_parms{favorite_tv_shows} are on today"
-);
-
-$v_tv_news1 =
-  new Voice_Cmd('What TV news are on channel [all,1-5,1-20] tonight');
+$v_tv_shows1->set_info('Lists all shows on from 6 to 10 pm tonight on channel:');
+$v_tv_shows2->set_info( "Checks to see if any of the following shows in $config_parms{favorite_tv_shows} are on today" );
+
+$v_tv_news1 = new Voice_Cmd('What TV news are on channel [all,1-5,1-20] tonight');
 $v_tv_news1->set_info('Lists all news on from 19 to 23 tonight on channel:');
 
 if ( $state = said $v_tv_movies1) {
@@ -41,18 +30,15 @@
 }
 
 if ( said $v_tv_shows2) {
-    print_log
-      "Searching for shows listed in $config_parms{favorite_tv_shows_file}";
+    print_log "Searching for shows listed in $config_parms{favorite_tv_shows_file}";
 
     #   run qq[get_tv_info_ge -keys "$config_parms{favorite_tv_shows}" -title_only];
-    run
-      qq[get_tv_info_ge -times all -keyfile $config_parms{favorite_tv_shows_file} -title_only];
+    run qq[get_tv_info_ge -times all -keyfile $config_parms{favorite_tv_shows_file} -title_only];
     set_watch $f_tv_file 'favorites today';
 }
 
 if ( $state = said $v_tv_news1) {
-    run
-      qq[get_tv_info_ge -times "19-23"  -keyfile $config_parms{favorite_tv_shows_file} -channels $state];
+    run qq[get_tv_info_ge -times "19-23"  -keyfile $config_parms{favorite_tv_shows_file} -channels $state];
     set_watch $f_tv_file;
 }
 
@@ -73,8 +59,7 @@
 #&tk_entry('TV search', \$Save{tv_search}, 'TV dates', \$Save{tv_days});
 if ( $Tk_results{'TV search'} or $Tk_results{'TV dates'} ) {
     speak "Searching";
-    run
-      qq[get_tv_info_ge -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
+    run qq[get_tv_info_ge -times all -dates "$Save{tv_days}" -keys "$Save{tv_search}"];
     set_watch $f_tv_file;
     undef $Tk_results{'TV search'};
     undef $Tk_results{'TV dates'};
diff --git a/code/public/v4l_pvr.pl b/code/public/v4l_pvr.pl
index edf00d522..c806e6d63 100644
--- a/code/public/v4l_pvr.pl
+++ b/code/public/v4l_pvr.pl
@@ -68,16 +68,14 @@
 #my $logfile = "$config_parms{data_dir}/pvr_logfile.txt";
 my $logfile = "/dev/null";
 my $record_opts =
-  'divx4rec -N 32 -d /dev/dsp -v /dev/video0 -mixsrc /dev/mixer:line -mixvol /dev/mixer:line:0 '
+    'divx4rec -N 32 -d /dev/dsp -v /dev/video0 -mixsrc /dev/mixer:line -mixvol /dev/mixer:line:0 '
   . '-vq 25 -vg 10 -vb 3600 -w 384 -h 288 -norm NTSC -input Television ';
 
 $v_livetv =
-  new Voice_Cmd
-  'Live TV [on,off,mute,volume down,volume up,channel down,channel up,'
+  new Voice_Cmd 'Live TV [on,off,mute,volume down,volume up,channel down,channel up,'
   . 'record half hour,record hour,record 2 hours,2,11,31,38,41,44,46,54,64]';
 $v_pvr =
-  new Voice_Cmd
-  'PVR [pause,quit,volume down,volume up,skip 10 seconds,skip minute,skip 10 minutes,'
+  new Voice_Cmd 'PVR [pause,quit,volume down,volume up,skip 10 seconds,skip minute,skip 10 minutes,'
   . 'back 10 seconds,back minute,back 10 minutes,cancel recording,debug]';
 $t_pvr      = new Timer;
 $p_pvr      = new Process_Item;
@@ -205,9 +203,7 @@ sub pvr_check {
     foreach $line (@data) {
         $line =~ s/[,()']//g;
         if ( my ( $title, $channel, $start, $end ) =
-            $line =~
-            /^\d+\.\s+(.+)\.\s+\S+\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./
-          )
+            $line =~ /^\d+\.\s+(.+)\.\s+\S+\s+Channel (\d+).+From ([0-9: APM]+) till ([0-9: APM]+)\./ )
         {
             my $diff = my_time_diff( $start, $end );
             my $has_subtitle = $title =~ s/: +/-/g;
@@ -245,13 +241,11 @@ sub pvr_record {
     if ( !done $p_pvr) {
         my $remaining = minutes_remaining $t_pvr;
         if ( $remaining < 2 ) {
-            print_log
-              "Stopping previous recording with $remaining minutes remaining\n";
+            print_log "Stopping previous recording with $remaining minutes remaining\n";
             stop $p_pvr;
         }
         else {
-            print_log
-              "Cannot record $title due to previous recording with $remaining minutes remaining\n";
+            print_log "Cannot record $title due to previous recording with $remaining minutes remaining\n";
             return 1;
         }
     }
@@ -358,11 +352,7 @@ sub update_html {
       . "\n";
     my $i = 0;
     foreach ( split ',', $Save{pvr_shows} ) {
-        $Included_HTML{PVR} .=
-            '<option value="'
-          . $i++ . '">'
-          . $_
-          . "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp\n";
+        $Included_HTML{PVR} .= '<option value="' . $i++ . '">' . $_ . "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp\n";
     }
     $Included_HTML{PVR} .= '</select></td><td valign=top>
       <input type=image name=$pvr_up src=/graphics/up.gif width=16 height=16 border=0 alt="Up" vspace=2>
@@ -433,8 +423,7 @@ sub play_video {
     system 'aumix -d /dev/mixer -l 0 -w 80 -v 100';
 
     #    run "killall -s 9 mplayer; killall xawtv; mplayer -fs -ao oss:/dev/dsp1 -quiet '$video_dir/$file'";
-    run
-      "killall -s 9 mplayer; killall xawtv; mplayer -fs -ao oss:/dev/dsp -quiet -idx '$video_dir/$file'";
+    run "killall -s 9 mplayer; killall xawtv; mplayer -fs -ao oss:/dev/dsp -quiet -idx '$video_dir/$file'";
     set $TV 'on';
     set $AMP 'on';
     set $TV 'video1';
@@ -468,10 +457,7 @@ sub disk_space {
 
 sub pvr_stat {
     return 'Idle' if done $p_pvr;
-    return
-        "Recording $filename with "
-      . $t_pvr->minutes_remaining
-      . " minutes remaining";
+    return "Recording $filename with " . $t_pvr->minutes_remaining . " minutes remaining";
 }
 
 # The rest of this code is taken from tv_grid.pl
@@ -485,8 +471,7 @@ sub pvr_stat {
 
     # http://house:8080/SET?$tv_grid?channel_2_from_7:00_to_8:00
 
-    my ( $channel, $start, $stop, $date, $show_name ) =
-      $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
+    my ( $channel, $start, $stop, $date, $show_name ) = $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
 
     unless ($start) {
         my $msg = "Bad tv_grid time: $data";
@@ -499,28 +484,23 @@ sub pvr_stat {
     $show_name .= '_' . time_date_stamp 6 unless $has_subtitle;
     $show_name =~ s/&/and/g;
     $show_name =~ s/[\'\,\.\;\*\$\?\!\#\/]//g;
-    my $msg =
-      "Scheduling recording of $show_name.  Channel $channel from $start to $stop on $date.";
+    my $msg = "Scheduling recording of $show_name.  Channel $channel from $start to $stop on $date.";
     speak $msg;
     print_log $msg;
 
-    &trigger_set( "time_now '$date $start'",
-        "pvr_record('$show_name', $channel, my_time_diff('$start', '$stop'))" );
+    &trigger_set( "time_now '$date $start'", "pvr_record('$show_name', $channel, my_time_diff('$start', '$stop'))" );
 
 }
 
 # This is what downloads tv data.  This needs to be forked/detatched, as it can take a while
 $v_get_tv_grid_data1 = new Voice_Cmd('[Get,reget,redo] tv grid data for today');
-$v_get_tv_grid_data7 =
-  new Voice_Cmd('[Get,reget,redo] tv grid data for the next week');
+$v_get_tv_grid_data7 = new Voice_Cmd('[Get,reget,redo] tv grid data for the next week');
 $v_get_tv_grid_data1->set_icon('nostat.gif');
 $v_get_tv_grid_data1->set_info(
-    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.'
-);
+    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.' );
 $v_get_tv_grid_data7->set_icon('nostat.gif');
 $v_get_tv_grid_data7->set_info(
-    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.'
-);
+    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.' );
 if ( $state = said $v_get_tv_grid_data1 or $state = said $v_get_tv_grid_data7) {
 
     if (&net_connect_check) {
@@ -539,16 +519,14 @@ sub pvr_stat {
 
         # If we have set the net_mail_send_account, send default web page via email
         my $mail_account = $config_parms{net_mail_send_account};
-        my $mail_server =
-          $main::config_parms{"net_mail_${mail_account}_server_send"};
-        my $mail_to = $main::config_parms{"net_mail_${mail_account}_address"};
+        my $mail_server  = $main::config_parms{"net_mail_${mail_account}_server_send"};
+        my $mail_to      = $main::config_parms{"net_mail_${mail_account}_address"};
         if (    $mail_to
             and $mail_server
             and $main::config_parms{"tv_email_grids"} )
         {
             $pgm .= " -mail_to $mail_to -mail_server $mail_server ";
-            $pgm .=
-              " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
+            $pgm .= " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
         }
 
         run $pgm;
diff --git a/code/public/v4l_radio.pl b/code/public/v4l_radio.pl
index d0d0a952e..8e8c8a9ab 100644
--- a/code/public/v4l_radio.pl
+++ b/code/public/v4l_radio.pl
@@ -31,16 +31,13 @@
 
 =cut
 
-my %stations =
-  qw(KCLU 88.30 KUSC 91.55 Arrow 93.10 KLOS 95.50 KOCP 95.85 KLSX 97.10
+my %stations = qw(KCLU 88.30 KUSC 91.55 Arrow 93.10 KLOS 95.50 KOCP 95.85 KLSX 97.10
   K-Earth 101.10 KROQ 102.30 KMZT 105.10 Power106 105.90);
 my $state;
 
-$v4l_radio = new Voice_Cmd 'Streaming radio [Stop]';
-$v4l_radio_vol =
-  new Voice_Cmd 'Local output [Mute gain,Unmute gain,Volume up,Volume down]';
-$v4l_radio_stations =
-  new Voice_Cmd 'Play [' . join( ',', ( keys %stations ) ) . ']';
+$v4l_radio                  = new Voice_Cmd 'Streaming radio [Stop]';
+$v4l_radio_vol              = new Voice_Cmd 'Local output [Mute gain,Unmute gain,Volume up,Volume down]';
+$v4l_radio_stations         = new Voice_Cmd 'Play [' . join( ',', ( keys %stations ) ) . ']';
 $v4l_radio_streamer_process = new Process_Item;
 $v4l_radio_encoder_process  = new Process_Item;
 $v4l_radio_tuner_process    = new Process_Item;
@@ -49,10 +46,8 @@
     %stations = split ' ', $config_parms{v4l_radio_stations}
       if defined $config_parms{v4l_radio_stations};
     set $v4l_radio_streamer_process 'killall ffserver', 'ffserver';
-    set $v4l_radio_encoder_process 'killall ffmpeg',    'sleep 2',
-      'ffmpeg -vn  http://localhost:8090/feed1.ffm';
-    $Included_HTML{Radio} =
-      '<a href="/data/shoutcast-playlist.pls">Start listening</a>';
+    set $v4l_radio_encoder_process 'killall ffmpeg', 'sleep 2', 'ffmpeg -vn  http://localhost:8090/feed1.ffm';
+    $Included_HTML{Radio} = '<a href="/data/shoutcast-playlist.pls">Start listening</a>';
     my $ip = `/sbin/ifconfig eth0`;
     my ($address) = $ip =~ /.*inet addr:([0-9\.]*)\s.*/;
     open PLS, "> $config_parms{data_dir}/shoutcast-playlist.pls";
diff --git a/code/public/video_inline.pl b/code/public/video_inline.pl
index 6651aee5c..72f86ce97 100644
--- a/code/public/video_inline.pl
+++ b/code/public/video_inline.pl
@@ -25,13 +25,11 @@
 if ( $state = said $v_inline_save) {
     $inline->save;
 }
-$v_inline_sharp =
-  new Voice_Cmd('[Increase,Decrease, Default] Inline Sharpness');
+$v_inline_sharp = new Voice_Cmd('[Increase,Decrease, Default] Inline Sharpness');
 if ( $state = said $v_inline_sharp) {
     $inline->sharp($state);
 }
-$v_inline_brightp =
-  new Voice_Cmd('[Increase,Decrease, Default] Inline Brightness');
+$v_inline_brightp = new Voice_Cmd('[Increase,Decrease, Default] Inline Brightness');
 if ( $state = said $v_inline_sharp) {
     $inline->bright($state);
 }
@@ -39,13 +37,11 @@
 if ( $state = said $v_inline_hue) {
     $inline->hue($state);
 }
-$v_inline_contrast =
-  new Voice_Cmd('[Increase,Decrease, Default] Inline Contrast');
+$v_inline_contrast = new Voice_Cmd('[Increase,Decrease, Default] Inline Contrast');
 if ( $state = said $v_inline_contrast) {
     $inline->contrast($state);
 }
-$v_inline_saturation =
-  new Voice_Cmd('[Increase,Decrease, Default] Inline Saturation');
+$v_inline_saturation = new Voice_Cmd('[Increase,Decrease, Default] Inline Saturation');
 if ( $state = said $v_inline_saturation) {
     $inline->saturation($state);
 }
diff --git a/code/public/vocp_func.pl b/code/public/vocp_func.pl
index 74a7373e9..c1935e821 100644
--- a/code/public/vocp_func.pl
+++ b/code/public/vocp_func.pl
@@ -46,8 +46,7 @@ sub vocp_message_list {
     return ("$return_msg </table>");
 }
 
-$v_vocp_voice_mail =
-  new Voice_Cmd('[Count,Listen to,Delete] all voice mail messages');
+$v_vocp_voice_mail = new Voice_Cmd('[Count,Listen to,Delete] all voice mail messages');
 
 if ( $state = said $v_vocp_voice_mail) {
     my $num            = 0;
@@ -90,8 +89,7 @@ sub vocp_message_list {
                 my ($caller) = <CALLER>;
                 chomp $caller;
                 close CALLER;
-                my $msg =
-                  "Voice mail message number " . $curnum++ . " from $caller";
+                my $msg = "Voice mail message number " . $curnum++ . " from $caller";
                 speak(
                     text_first => 1,
                     play       => "$config_parms{data_dir}/$vfile.wav",
@@ -127,18 +125,14 @@ sub vocp_message_list {
     }
     if ( $vgetty_record =~ /NAME =/ ) {
         $callerid_data .= ' ' . $vgetty_record;
-        my ( $caller, $cid_number, $cid_name, $cid_time ) =
-          &Caller_ID::make_speakable( $callerid_data, 5 );
+        my ( $caller, $cid_number, $cid_name, $cid_time ) = &Caller_ID::make_speakable( $callerid_data, 5 );
         $Save{last_caller} = $caller;
         speak(
             play => "none",
             text => "Call from $caller.  Phone call is from $caller."
         );
-        print_log
-          "callerid data: number=$cid_number name=$cid_name time=$cid_time";
-        logit(
-            "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log",
-            "$cid_number $cid_name" );
+        print_log "callerid data: number=$cid_number name=$cid_name time=$cid_time";
+        logit( "$config_parms{data_dir}/phone/logs/callerid.$Year_Month_Now.log", "$cid_number $cid_name" );
         undef $callerid_data;
     }
 }
@@ -161,8 +155,7 @@ sub vocp_message_list {
         my $vmail_file = $1;
         my $vmail_base = basename($vmail_file);
         print_log "New voice mail file $vmail_file";
-        set $p_rmdtowav
-          qq[rmdtopvf $vmail_file | pvftowav > $config_parms{data_dir}/$vmail_base.wav];
+        set $p_rmdtowav qq[rmdtopvf $vmail_file | pvftowav > $config_parms{data_dir}/$vmail_base.wav];
         set $timer_rmdtowav 15;
         open( CALLER, ">>$config_parms{data_dir}/$vmail_base.txt" );
         print CALLER "$Save{last_caller}";
diff --git a/code/public/vocp_sean.pl b/code/public/vocp_sean.pl
index 1e2f3c225..8af445b4e 100644
--- a/code/public/vocp_sean.pl
+++ b/code/public/vocp_sean.pl
@@ -66,10 +66,7 @@ sub voicemails {
     return '' unless $Authorized eq 'admin' or $Authorized eq 'family';
     $Save{vmail_flag} = 0;
     set $Voicemail_Light "OFF";
-    my (
-        $FileName,       $PhoneName,   $PhoneNumber,
-        $PhoneTimeStamp, $PhoneLength, $htmlcode
-    );
+    my ( $FileName, $PhoneName, $PhoneNumber, $PhoneTimeStamp, $PhoneLength, $htmlcode );
     if ( opendir( DIRLIST, $config_parms{voicemail_dir} ) ) {
         $htmlcode =
           "<TABLE WIDTH=\"100%\" CELLSPACING=\"8\"><TR CLASS=\"wvtheader\"><TH></TH><TH>Date</TH><TH>Time</TH><TH>Size</TH></TR>\n";
@@ -81,15 +78,11 @@ sub voicemails {
                 my $size = -s $config_parms{voicemail_dir} . "/" . $FileName;
                 $tm =~ s/-/:/g;
                 $htmlcode .= "<TR CLASS=\"wvtrow\">";
-                $htmlcode .=
-                  "<TD WIDTH=\"70\"><A HREF=\"/bin/vmail_streamer.pl?$FileName\">";
-                $htmlcode .=
-                  "<IMG BORDER=\"0\" SRC=\"/graphics/icons/listen.png\"></A>";
+                $htmlcode .= "<TD WIDTH=\"70\"><A HREF=\"/bin/vmail_streamer.pl?$FileName\">";
+                $htmlcode .= "<IMG BORDER=\"0\" SRC=\"/graphics/icons/listen.png\"></A>";
                 $htmlcode .= "&nbsp;&nbsp;&nbsp;";
-                $htmlcode .=
-                  "<A HREF='/misc/SUB?speak(\"rooms=all $config_parms{voicemail_dir}$FileName\")'>";
-                $htmlcode .=
-                  "<IMG BORDER=\"0\" SRC=\"/ia5/images/play.png\"></A></TD>";
+                $htmlcode .= "<A HREF='/misc/SUB?speak(\"rooms=all $config_parms{voicemail_dir}$FileName\")'>";
+                $htmlcode .= "<IMG BORDER=\"0\" SRC=\"/ia5/images/play.png\"></A></TD>";
                 $htmlcode .= "<TD>$dt</TD><TD>$tm</TD<TD>$size</TD>";
                 $htmlcode .= "</TR>\n";
             }
@@ -97,12 +90,10 @@ sub voicemails {
         $htmlcode .= "</TABLE>";
         $htmlcode .= "<BR><BR>";
         if ( -e "/var/lock/nologin.ttyS3" ) {
-            $htmlcode .=
-              "<A HREF=\"/misc/SUB?unlockvoicemail\"><IMG BORDER=\"0\" SRC=\"/ia5/images/off.gif\"></A>";
+            $htmlcode .= "<A HREF=\"/misc/SUB?unlockvoicemail\"><IMG BORDER=\"0\" SRC=\"/ia5/images/off.gif\"></A>";
         }
         else {
-            $htmlcode .=
-              "<A HREF=\"/misc/SUB?lockvoicemail\"><IMG BORDER=\"0\" SRC=\"/ia5/images/on.gif\"></A> ";
+            $htmlcode .= "<A HREF=\"/misc/SUB?lockvoicemail\"><IMG BORDER=\"0\" SRC=\"/ia5/images/on.gif\"></A> ";
         }
         $htmlcode .= "<BR><BR>";
     }
@@ -111,8 +102,7 @@ sub voicemails {
 
 sub clearmsgs {
     return '' unless $Authorized eq 'admin' or $Authorized eq 'family';
-    return &html_header("Delete voicemail?")
-      . "<H2><A HREF=\"/misc/SUB?deletemsgs\">Continue?</A></H2>";
+    return &html_header("Delete voicemail?") . "<H2><A HREF=\"/misc/SUB?deletemsgs\">Continue?</A></H2>";
 }
 
 sub deletemsgs {
diff --git a/code/public/voice_client.pl b/code/public/voice_client.pl
index 4d7450311..35e9b86f2 100644
--- a/code/public/voice_client.pl
+++ b/code/public/voice_client.pl
@@ -33,10 +33,7 @@
 use IO::Socket;
 use IO::Select;
 
-my (
-    $host, $port,     $VTxt,       $VTxt_version, $VTxt_stream,
-    $data, $password, $askforpass, $socket
-);
+my ( $host, $port, $VTxt, $VTxt_version, $VTxt_stream, $data, $password, $askforpass, $socket );
 my ( $sel, $attempts, $connected, $rh, $buf, @ready );
 
 # Get host and port
@@ -75,8 +72,7 @@
 
 $|++;
 
-$socket =
-  new IO::Socket::INET( PeerAddr => $host, PeerPort => $port, Proto => 'tcp' )
+$socket = new IO::Socket::INET( PeerAddr => $host, PeerPort => $port, Proto => 'tcp' )
   or die "\nCould not create socket to $host port $port: $!\n";
 
 $sel = new IO::Select($socket);
diff --git a/code/public/voicemodem.pl b/code/public/voicemodem.pl
index aaa091224..8efc0ba4d 100644
--- a/code/public/voicemodem.pl
+++ b/code/public/voicemodem.pl
@@ -166,8 +166,7 @@
     $SendVoiceFile  = "c:/mh/code/klier/goodbye.r4";    # Voice File to Play
     run_voice_cmd "Send Voice Data";
 }
-if ( $VoiceModemMode eq "disconanswer" and $VoiceModemStatus eq "donesendmsg" )
-{
+if ( $VoiceModemMode eq "disconanswer" and $VoiceModemStatus eq "donesendmsg" ) {
     print_log "VOICE - Inactivity Timer Exceeded... Disconnecting...";
     run_voice_cmd "Voice Hangup";
     $VoiceModemStatus = "InactTimeOut";
@@ -185,14 +184,14 @@
     set $timer_stdwait 1;                               # Wait a second
 }
 if ( expired $timer_stdwait) {                          # After a second,
-    run_voice_cmd "Dial Number";    # Dial Number
-    set $timer_waitforanswer 20;    # Wait 20 Sec. for pickup
+    run_voice_cmd "Dial Number";                        # Dial Number
+    set $timer_waitforanswer 20;                        # Wait 20 Sec. for pickup
 }
 
 # If we get connected to someone,
 if ( $VoiceModemMode eq "delivermsg" and $VoiceModemStatus eq "Connect" ) {
     $VoiceModemStatus = "";
-    set $timer_waitforanswer 0;     # Reset possibility of failing
+    set $timer_waitforanswer 0;                         # Reset possibility of failing
     run_voice_cmd "Send Voice Data";
 }
 
@@ -201,7 +200,7 @@
     run_voice_cmd "Voice Hangup";
     print_log "VOICE - No Answer, Hungup";
     $VoiceModemStatus = "Failure";
-    set $timer_waitforanswer 0;     # Reset possibility of failing
+    set $timer_waitforanswer 0;                         # Reset possibility of failing
     $VoiceModemMode = "";
 }
 
@@ -211,7 +210,7 @@
     print_log "VOICE - Line was Busy, Hungup";
     $VoiceModemStatus = "Failure";
     $VoiceModemMode   = "";
-    set $timer_waitforanswer 0;     # Reset possibility of failing
+    set $timer_waitforanswer 0;                         # Reset possibility of failing
 }
 if ( $VoiceModemMode eq "delivermsg" and $VoiceModemStatus eq "donesendmsg" ) {
     run_voice_cmd "Voice Hangup";
@@ -230,8 +229,7 @@
     #VRA=35 makes the modem wait for 3.5 sec. of silence after ringing stops - Default is 45
     #set $phone_modem 'ATE0#CLS=8#VBS=4S30=60#BDR=0#VSP=20#VSS=1#VLS=0#TL=5800#VRA=35';
     #Changed S30 (Disconnect Inact Timer) to 0
-    set $phone_modem
-      'ATE0#CLS=8#VBS=4S30=0#BDR=0#VSP=20#VSS=1#VLS=0#TL=5800#VRA=35';
+    set $phone_modem 'ATE0#CLS=8#VBS=4S30=0#BDR=0#VSP=20#VSS=1#VLS=0#TL=5800#VRA=35';
     print_log "VOICE - MODEM is now in VOICE Mode";
 }
 
@@ -326,12 +324,12 @@
         print VOX $1;
         close VOX;
         set $phone_modem "";    # Send command to stop recording
-        $Serial_Ports{serial2}{data}     = $2;            # Store left over data
+        $Serial_Ports{serial2}{data}     = $2;             # Store left over data
         $Serial_Ports{serial2}{datatype} = 'record';
         $VoiceModemStatus                = 'recorddone';
         print_log "VOICE - Message recorded.";
         print "\nVOICE - Message recorded.\n\n";
-        $VoiceMsgCount = $VoiceMsgCount + 1;    # Increment Msg Counter
+        $VoiceMsgCount = $VoiceMsgCount + 1;               # Increment Msg Counter
     }
     else {
         print VOX $PhoneModemString;
@@ -341,7 +339,7 @@
 # -------------------------- Play Received Messages
 $v_play_messages = new Voice_Cmd('Play Messages');
 if ( said $v_play_messages) {
-    $SendVoiceFile = "c:/mh/data/phone/msg.r4";    # Voice File to Play
+    $SendVoiceFile = "c:/mh/data/phone/msg.r4";            # Voice File to Play
     run_voice_cmd "Send Voice Data";
 }
 
diff --git a/code/public/wakeup_tom.pl b/code/public/wakeup_tom.pl
index c66e11237..012c3a36a 100644
--- a/code/public/wakeup_tom.pl
+++ b/code/public/wakeup_tom.pl
@@ -17,8 +17,7 @@
 }
 
 &tk_entry( 'Wakeup Time', \$Save{wakeup_time} );
-&tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time},
-    [ '5:50 am', '6 am', '6:20 am', '6:40 am', ' ' ] );
+&tk_radiobutton( 'Wakeup Time', \$Save{wakeup_time}, [ '5:50 am', '6 am', '6:20 am', '6:40 am', ' ' ] );
 
 $Save{wakeup_time} = '5:50 am' unless $Save{wakeup_time};
 
@@ -49,12 +48,7 @@
 #my $benchmark_member;
 #my @original_item_code;
 
-if (
-    (
-            time_now( $Save{wakeup_time} )
-        and $Weekday
-        and $Save{mode} ne 'offline'
-    )
+if (   ( time_now( $Save{wakeup_time} ) and $Weekday and $Save{mode} ne 'offline' )
     or time_cron('0 10 * * 0,6')
     or said $v_wakeup)
 {
@@ -72,15 +66,11 @@
 
     if ( time_cron('* * * * 1') ) {
         play( 'file' => "roosterc.wav" );
-        speak(
-            "Good morning cottage bears.  It's marvelous Monday. Time to get up."
-        );
+        speak( "Good morning cottage bears.  It's marvelous Monday. Time to get up." );
     }
     elsif ( time_cron('* * * * 2') ) {
         play( 'file' => "goodmo.wav" );
-        speak(
-            "Good morning cottage bears.  It's titalating Tuesday.  Time to get up."
-        );
+        speak( "Good morning cottage bears.  It's titalating Tuesday.  Time to get up." );
     }
     elsif ( time_cron('* * * * 3') ) {
         play( 'file' => "truman~1.wav" );
@@ -88,15 +78,12 @@
     }
     elsif ( time_cron('* * * * 4') ) {
         play( 'file' => "reveille.wav" );
-        speak(
-            "Good morning cottage bears.  It's Garbage Day!.  Time to get up.");
+        speak("Good morning cottage bears.  It's Garbage Day!.  Time to get up.");
 
     }
     elsif ( time_cron('* * * * 5') ) {
         play( 'file' => "btls3.wav" );
-        speak(
-            "Good morning cottage bears.  It's dress down day!.  Time to get up."
-        );
+        speak( "Good morning cottage bears.  It's dress down day!.  Time to get up." );
     }
     else {
         play( 'file' => "moonstep.wav" );
@@ -104,8 +91,7 @@
     }
     speak("It is $Time_Now on $Date_Now.");
     speak("Sunrise is at $Time_Sunrise and sunset is at $Time_Sunset");
-    speak
-      qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old];
+    speak qq[The moon is $Moon{phase}, $Moon{brightness}% bright, and $Moon{age} days old];
     my $days = &time_diff( $Moon{"time_$state"}, $Time );
 
     #	speak qq[The next $state moon is in $days, on $Moon{$state}];
diff --git a/code/public/weather.pl b/code/public/weather.pl
index 5cbc94447..0796a2bec 100644
--- a/code/public/weather.pl
+++ b/code/public/weather.pl
@@ -50,8 +50,7 @@
 $p_weather_page = new Process_Item;
 $v_weather_page = new Voice_Cmd('[Get,Read,Show,Short] internet weather');
 $v_weather_page->set_info(
-    "Weather conditions and forecast for $config_parms{city}, $config_parms{state}  $config_parms{country}"
-);
+    "Weather conditions and forecast for $config_parms{city}, $config_parms{state}  $config_parms{country}" );
 $v_weather_page->set_authority('anyone');
 
 #speak($f_weather_page)
@@ -141,17 +140,12 @@
 
     # Details stored here
     my ($update_time) = $text =~ /Updated: (.+?, 20\d\d)/;
-    my ( $temp_F, $temp_C ) =
-      $text =~ /Temperature.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $temp_F, $temp_C ) = $text =~ /Temperature.+?(.+?) degrees.+?\/ (.+?) degrees/;
     my ($humidity) = $text =~ /Humidity (.+?)%/;
-    my ( $dewpoint_F, $dewpoint_C ) =
-      $text =~ /Dewpoint.+?(.+?) degrees.+?\/ (.+?) degrees/;
-    my ( $windchill_F, $windchill_C ) =
-      $text =~ /Windchill.+?(.+?) degrees.+?\/ (.+?) degrees/;
-    my ( $wind_dir, $wind_mph, $wind_kph ) =
-      $text =~ /Wind (.+?) at (\d+?) mph \/ (.+?) km\/h/;
-    my ( $pressure_in, $pressure_hPa ) =
-      $text =~ /Pressure (.+?) in \/ (.+?) hPa/;
+    my ( $dewpoint_F,  $dewpoint_C )  = $text =~ /Dewpoint.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $windchill_F, $windchill_C ) = $text =~ /Windchill.+?(.+?) degrees.+?\/ (.+?) degrees/;
+    my ( $wind_dir, $wind_mph, $wind_kph ) = $text =~ /Wind (.+?) at (\d+?) mph \/ (.+?) km\/h/;
+    my ( $pressure_in, $pressure_hPa ) = $text =~ /Pressure (.+?) in \/ (.+?) hPa/;
     my ($conditions) = $text =~ /Conditions (.+?)\n/;
     my ($clouds)     = $text =~ /Clouds (.+?)Sunrise/s;
     my ($today)      = $text =~ /Today(.+?)Tonight/s;
@@ -180,8 +174,7 @@
 
     my $data   = file_read($f_weather_log_html);
     my $header = "<HTML><HEAD><TITLE>Weather records</TITLE>\r\n";
-    $header .=
-      "<link rel=STYLESHEET href='../../list.css' type=text/css></HEAD>\r\n";
+    $header .= "<link rel=STYLESHEET href='../../list.css' type=text/css></HEAD>\r\n";
     $header .= "<BODY><table border=1>\r\n";
     $header .= "<tr><td>Date/time</td><td>Temp</td>\r\n";
     $header .= "<td>Humidity</td><td>Dewpoint</td>\r\n";
@@ -198,6 +191,5 @@
     );
     file_write( $f_weather_page, $text );
     display $f_weather_page;
-    browser
-      "http://localhost:$config_parms{http_port}/data/web/${WeatherFile}_log.html";
+    browser "http://localhost:$config_parms{http_port}/data/web/${WeatherFile}_log.html";
 }
diff --git a/code/public/weather_com.pl b/code/public/weather_com.pl
index c54d88008..9814a8499 100644
--- a/code/public/weather_com.pl
+++ b/code/public/weather_com.pl
@@ -13,9 +13,7 @@
 # noloop=start
 $weather_com   = new Geo::Weather;
 $v_weather_com = new Voice_Cmd '[Get,Display,Speak] internet weather.com data';
-$v_weather_com->set_info(
-    "Gets data from weather.com, for mh.ini city parm $config_parms{city}, $config_parms{state}"
-);
+$v_weather_com->set_info( "Gets data from weather.com, for mh.ini city parm $config_parms{city}, $config_parms{state}" );
 
 my %weatherComMap = (
     cond => 'Conditions',
@@ -34,11 +32,8 @@
 if ( $state = said $v_weather_com) {
     $v_weather_com->respond('Retrieving weather from weather.com');
     if ( $state eq 'Get' ) {
-        print_log
-          "Getting weather data for $config_parms{city}, $config_parms{state}";
-        my $data =
-          $weather_com->get_weather( $config_parms{city},
-            $config_parms{state} );
+        print_log "Getting weather data for $config_parms{city}, $config_parms{state}";
+        my $data = $weather_com->get_weather( $config_parms{city}, $config_parms{state} );
         if ( ref($data) eq 'HASH' ) {
             my %w = ();
             for my $key ( sort keys %{$data} ) {
@@ -92,9 +87,7 @@
                 run "get_url $$data{url} $config_parms{data_dir}/weather.html";
             }
             else {
-                print_log(
-                    "weather_com: couldn't retrieve weather page as url is missing or invaid"
-                );
+                print_log( "weather_com: couldn't retrieve weather page as url is missing or invaid" );
             }
         }
         else {
@@ -103,39 +96,28 @@
                 $errorReason = 'Invalid data supplied';
             }
             if ( $data == $Geo::Weather::ERROR_PAGE_INVALID ) {
-                $errorReason =
-                  'No URL, or incorrectly formatted UTL for retrieving the information';
+                $errorReason = 'No URL, or incorrectly formatted UTL for retrieving the information';
             }
             if ( $data == $Geo::Weather::ERROR_CONNECT ) {
                 $errorReason = 'Error connecting to weather.com';
             }
             if ( $data == $Geo::Weather::ERROR_NOT_FOUND ) {
-                $errorReason =
-                    'Weather for '
-                  . $config_parms{city} . ', '
-                  . $config_parms{state}
-                  . ' could not be found';
+                $errorReason = 'Weather for ' . $config_parms{city} . ', ' . $config_parms{state} . ' could not be found';
             }
             if ( $data == $Geo::Weather::ERROR_TIMEOUT ) {
-                $errorReason =
-                  'Timed out while trying to connect to or get date from weather.com';
+                $errorReason = 'Timed out while trying to connect to or get date from weather.com';
             }
-            &print_log(
-                "weather_com: problem retrieving forecast: $errorReason");
+            &print_log("weather_com: problem retrieving forecast: $errorReason");
         }
     }
     elsif ( $state eq 'Display' ) {
         browser "$config_parms{data_dir}/weather.html";
-        my $msg =
-          "Weather for $config_parms{city}\n  Conditions: $Weather{Conditions}\n";
-        $msg .=
-          "  Dewpoint: $Weather{DewOutdoor}\n  Humidity: $Weather{HumidOutdoor}\n";
-        $msg .=
-          "  Temperature: $Weather{TempOutdoor}\n  Wind: $Weather{WindAvgSpeed}\n";
+        my $msg = "Weather for $config_parms{city}\n  Conditions: $Weather{Conditions}\n";
+        $msg .= "  Dewpoint: $Weather{DewOutdoor}\n  Humidity: $Weather{HumidOutdoor}\n";
+        $msg .= "  Temperature: $Weather{TempOutdoor}\n  Wind: $Weather{WindAvgSpeed}\n";
         display $msg;
     }
     else {
-        speak
-          "It is $Weather{TempOutdoor} degrees, $Weather{HumidOutdoor} outside. Wind is $Weather{WindAvgSpeed}";
+        speak "It is $Weather{TempOutdoor} degrees, $Weather{HumidOutdoor} outside. Wind is $Weather{WindAvgSpeed}";
     }
 }
diff --git a/code/public/weather_ec.pl b/code/public/weather_ec.pl
index 6c2c3b23e..6e4688fe6 100644
--- a/code/public/weather_ec.pl
+++ b/code/public/weather_ec.pl
@@ -34,13 +34,11 @@
 
 # The obligatory voice command.
 $v_weather_page = new Voice_Cmd('[Reget,Get,Read,Show] internet weather');
-$v_weather_page->set_info(
-    "Weather conditions and forecast for $config_parms{weather_city}");
+$v_weather_page->set_info("Weather conditions and forecast for $config_parms{weather_city}");
 $v_weather_page->set_authority('anyone');
 
 $v_weather_forecast = new Voice_Cmd('[Read,Show] weather forecast');
-$v_weather_forecast->set_info(
-    "Weather forecast for $config_parms{weather_city}");
+$v_weather_forecast->set_info("Weather forecast for $config_parms{weather_city}");
 $v_weather_forecast->set_authority('anyone');
 
 speak &format_ec_weather   if said $v_weather_page eq 'Read';
@@ -106,10 +104,7 @@ sub format_ec_weather {
 
     if ( $Weather{WindAvg} ) {
         $data .=
-            "The wind is from the "
-          . convert_direction( $Weather{WindAvgDir} ) . " at "
-          . $Weather{WindAvg}
-          . " kilometers per hour";
+          "The wind is from the " . convert_direction( $Weather{WindAvgDir} ) . " at " . $Weather{WindAvg} . " kilometers per hour";
         $data .= ", gusting to " . $Weather{WindGust} . " kilometers per hour"
           if ( $Weather{WindGust} );
         $data .= ". ";
@@ -174,16 +169,10 @@ sub fetch_ec_weather {
     }
 
     # create the summaries used by the MH web (and tk?) displays.
-    $Weather{Summary_Short} = sprintf(
-        "%2d/%2d/%2d %3d%% %3d%%",
-        $Weather{TempIndoor},  $Weather{TempOutdoor}, $Weather{WindChill},
-        $Weather{HumidIndoor}, $Weather{HumidOutdoor}
-    );
-    $Weather{Summary} = sprintf(
-        "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
-        $Weather{TempIndoor},  $Weather{TempOutdoor}, $Weather{WindChill},
-        $Weather{HumidIndoor}, $Weather{HumidOutdoor}
-    );
+    $Weather{Summary_Short} = sprintf( "%2d/%2d/%2d %3d%% %3d%%",
+        $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
+    $Weather{Summary} = sprintf( "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
+        $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
 
     # and for fun, speak the current weather to anyone who is listening.
     &read_ec_weather;
@@ -206,15 +195,11 @@ sub windchill {
 
     my $chill;
 
-    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) )
-    {
+    if ( ( $wind < 5 ) || ( $wind > 100 ) || ( $temp < -50 ) || ( $temp > 5 ) ) {
         $chill = '';
     }
     else {
-        $chill =
-          ( 13.12 + 0.6215 * $temp -
-              11.37 * ( $wind**0.16 ) +
-              0.3965 * $temp * ( $wind**0.16 ) );
+        $chill = ( 13.12 + 0.6215 * $temp - 11.37 * ( $wind**0.16 ) + 0.3965 * $temp * ( $wind**0.16 ) );
         $chill = int( $chill + 0.5 );
 
         print "temp $temp wind $wind chill $chill\n";
@@ -234,10 +219,7 @@ sub dewpoint {
     $humidity /= 100;   # convert from percent to fraction
 
     # saturation vapour pressure
-    my $e_sw =
-      6.1078 *
-      exp( 5.0065 * log( 273.15 / $temp ) ) *
-      exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
+    my $e_sw = 6.1078 * exp( 5.0065 * log( 273.15 / $temp ) ) * exp( 24.846 * ( 1 - ( 273.15 / $temp ) ) );
 
     # current vapour pressure
     my $e_vp = $humidity * $e_sw;
@@ -245,9 +227,7 @@ sub dewpoint {
     # final
     my $dewpoint = 0;
     if ( $e_vp != 0 ) {
-        $dewpoint =
-          ( 237.3 * log( $e_vp / 6.1078 ) ) /
-          ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
+        $dewpoint = ( 237.3 * log( $e_vp / 6.1078 ) ) / ( 17.27 - ( log( $e_vp / 6.1078 ) ) );
         $dewpoint = int( $dewpoint + 0.5 );
     }
     return $dewpoint;
diff --git a/code/public/weather_ec_web.pl b/code/public/weather_ec_web.pl
index bb23c5d2f..4db58e90c 100644
--- a/code/public/weather_ec_web.pl
+++ b/code/public/weather_ec_web.pl
@@ -14,8 +14,7 @@ sub weather_dump {
     my $data = '<table border="1">' . "\n";
     my $key;
     foreach $key ( sort( keys(%Weather) ) ) {
-        $data .=
-          "<tr><td>" . $key . "</td><td>" . $Weather{$key} . "</td></tr>\n";
+        $data .= "<tr><td>" . $key . "</td><td>" . $Weather{$key} . "</td></tr>\n";
     }
     $data .= "</table>\n";
 
@@ -32,23 +31,15 @@ sub weather_ec_web {
     # WEATHER
     $data .= '<table border="1">' . "\n";
     $data .= '<tr><th colspan="2">Current Conditions</th></tr>' . "\n";
-    foreach $label
-      qw(TimeObserved Conditions TempOutdoor Barom HumidOutdoor Humidex DewpointOutdoor Wind WindChill Visibility)
-    {
+    foreach $label qw(TimeObserved Conditions TempOutdoor Barom HumidOutdoor Humidex DewpointOutdoor Wind WindChill Visibility) {
         my $item;
         if ( $label =~ /Time/ ) {
-            $item = time_date_stamp( 6, $Weather{$label} ) . " "
-              . time_date_stamp( 5, $Weather{$label} );
+            $item = time_date_stamp( 6, $Weather{$label} ) . " " . time_date_stamp( 5, $Weather{$label} );
         }
         else {
             $item = $Weather{$label};
         }
-        $data .=
-            "<tr><td>"
-          . &weather_getlabel($label)
-          . "</td><td>"
-          . $item
-          . "</td></tr>\n";
+        $data .= "<tr><td>" . &weather_getlabel($label) . "</td><td>" . $item . "</td></tr>\n";
     }
     $data .= "</table>\n";
 
@@ -58,15 +49,8 @@ sub weather_ec_web {
 
     $data .= '<table border="1">' . "\n";
     $data .= '<tr><th colspan="2">Almanac Data</th></tr>' . "\n";
-    foreach $label
-      qw(TempMaxOutdoor TempMinOutdoor RainTotal TempMaxNormal TempMinNormal TempMeanNormal)
-    {
-        $data .=
-            "<tr><td>"
-          . &weather_getlabel($label)
-          . "</td><td>"
-          . $Weather{$label}
-          . "</td></tr>";
+    foreach $label qw(TempMaxOutdoor TempMinOutdoor RainTotal TempMaxNormal TempMinNormal TempMeanNormal) {
+        $data .= "<tr><td>" . &weather_getlabel($label) . "</td><td>" . $Weather{$label} . "</td></tr>";
     }
     $data .= "<tr><td>Sunrise</td><td>" . $Time_Sunrise . "</td></tr>\n";
     $data .= "<tr><td>Sunset</td><td>" . $Time_Sunset . "</td></tr>\n";
@@ -85,18 +69,10 @@ sub weather_ec_web {
     # links
 
     $data .= '<br>' . "\n" . '<h2>Links:</h2> ';
-    $data .=
-      '<a href="http://weatheroffice.ec.gc.ca/forecast/city_e.html?yyz">Toronto Airport</a>'
-      . "\n";
-    $data .=
-      '<a href="http://weatheroffice.ec.gc.ca/forecast/24_hour_conditions_e.html?yyz&unit=m">[24 hour stats]</a>'
-      . "\n";
-    $data .=
-      '<a href="http://weatheroffice.ec.gc.ca/forecast/city_e.html?ytz">Toronto Island</a>'
-      . "\n";
-    $data .=
-      '<a href="http://weatheroffice.ec.gc.ca/forecast/24_hour_conditions_e.html?ytz&unit=m">[24 hour stats]</a>'
-      . "\n";
+    $data .= '<a href="http://weatheroffice.ec.gc.ca/forecast/city_e.html?yyz">Toronto Airport</a>' . "\n";
+    $data .= '<a href="http://weatheroffice.ec.gc.ca/forecast/24_hour_conditions_e.html?yyz&unit=m">[24 hour stats]</a>' . "\n";
+    $data .= '<a href="http://weatheroffice.ec.gc.ca/forecast/city_e.html?ytz">Toronto Island</a>' . "\n";
+    $data .= '<a href="http://weatheroffice.ec.gc.ca/forecast/24_hour_conditions_e.html?ytz&unit=m">[24 hour stats]</a>' . "\n";
 
     return $data;
 }
diff --git a/code/public/weather_email_breaking.pl b/code/public/weather_email_breaking.pl
index d91418878..6efee851e 100644
--- a/code/public/weather_email_breaking.pl
+++ b/code/public/weather_email_breaking.pl
@@ -4,13 +4,11 @@
 #weather announcement every 15 minutes and sends out a message to my pager.
 #Larry Roudebush
 
-my $person3email = $config_parms{person3email};
-my $speakweathertimes =
-  0;    # get_email_scan_file and $p_get_email are created by internet_mail.pl
+my $person3email      = $config_parms{person3email};
+my $speakweathertimes = 0;                             # get_email_scan_file and $p_get_email are created by internet_mail.pl
 if ( done_now $p_get_email and -e $get_email_scan_file ) {
     for my $line ( file_read $get_email_scan_file) {
-        my ( $from, $to, $subject, $body ) =
-          $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
+        my ( $from, $to, $subject, $body ) = $line =~ /From:(.+?) To:(.+?) Subject:(.+?) Body:(.+)/;
         if ( $from =~ /NBC4Columbus/i ) {
             my $msg = "Notice, just received Weather Information: $subject.\n";
             display $msg, 120;
@@ -29,10 +27,8 @@
 
 if ( time_cron '0,15,30,45 * * * *' ) {    #speaks every 15 minutes
     if ( -e "$config_parms{data_dir}/logs/weatherwarning.txt" ) {
-        $speakweathertimes =
-          $speakweathertimes + 1;          #remembers how many times it spoke
-        open( weatherwariningfile,
-            "$config_parms{data_dir}/logs/weatherwarning.txt" )
+        $speakweathertimes = $speakweathertimes + 1;    #remembers how many times it spoke
+        open( weatherwariningfile, "$config_parms{data_dir}/logs/weatherwarning.txt" )
           or die "No Warnings available.\n";
         while (<weatherwariningfile>) {
             speak $_;
@@ -41,8 +37,7 @@
         close(weatherwariningfile);
         if ( $speakweathertimes == '4' ) {
             $speakweathertimes = '0';
-            unlink "$config_parms{data_dir}/logs/weatherwarning.txt"
-              ;                            #deletes it after an hour
+            unlink "$config_parms{data_dir}/logs/weatherwarning.txt";    #deletes it after an hour
             print_log "Deleting weather warning file";
         }
     }
diff --git a/code/public/weather_monitor_ultimeter2000.pl b/code/public/weather_monitor_ultimeter2000.pl
index 2e4446336..cc9a8b2f8 100644
--- a/code/public/weather_monitor_ultimeter2000.pl
+++ b/code/public/weather_monitor_ultimeter2000.pl
@@ -12,102 +12,94 @@
     $weather_monitor->set_time;
 }
 
-$CurrentWindSpeed            = new Weather_Item("CurrentWindSpeed");
-$CurrentWindDirection        = new Weather_Item("CurrentWindDirection");
-$FiveMinPeakWindSpeed        = new Weather_Item("FiveMinPeakWindSpeed");
-$FiveMinPeakWindDirection    = new Weather_Item("FiveMinPeakWindDirection");
-$CurrentWindChill            = new Weather_Item("CurrentWindChill");
-$CurrentOutdoorTemp          = new Weather_Item("CurrentOutdoorTemp");
-$CurrentRain                 = new Weather_Item("CurrentRain");
-$CurrentBarometer            = new Weather_Item("CurrentBarometer");
-$ThreeHourBarometerChange    = new Weather_Item("ThreeHourBarometerChange");
-$CurrentIndoorTemp           = new Weather_Item("CurrentIndoorTemp");
-$CurrentOutdoorHumidity      = new Weather_Item("CurrentOutdoorHumidity");
-$CurrentIndoorHumidity       = new Weather_Item("CurrentIndoorHumidity");
-$CurrentDewPoint             = new Weather_Item("CurrentDewPoint");
-$TodayLowWindChill           = new Weather_Item("TodayLowWindChill");
-$TodayLowWindChillTime       = new Weather_Item("TodayLowWindChillTime");
-$YesterdayLowWindChill       = new Weather_Item("YesterdayLowWindChill");
-$YesterdayLowWindChillTime   = new Weather_Item("YesterdayLowWindChillTime");
-$LongtermLowWindChillDate    = new Weather_Item("LongtermLowWindChillDate");
-$LongtermLowWindChill        = new Weather_Item("LongtermLowWindChill");
-$LongtermLowWindChillTime    = new Weather_Item("LongtermLowWindChillTime");
-$TodayOutdoorLow             = new Weather_Item("TodayOutdoorLow");
-$TodayOutdoorLowTime         = new Weather_Item("TodayOutdoorLowTime");
-$YesterdayOutdoorLow         = new Weather_Item("YesterdayOutdoorLow");
-$YesterdayOutdoorLowTime     = new Weather_Item("YesterdayOutdoorLowTime");
-$LongtermOutdoorLowDate      = new Weather_Item("LongtermOutdoorLowDate");
-$LongtermOutdoorLow          = new Weather_Item("LongtermOutdoorLow");
-$LongtermOutdoorLowTime      = new Weather_Item("LongtermOutdoorLowTime");
-$TodayLowBarometer           = new Weather_Item("TodayLowBarometer");
-$TodayLowBarometerTime       = new Weather_Item("TodayLowBarometerTime");
-$YesterdayBarometerLow       = new Weather_Item("YesterdayBarometerLow");
-$YesterdayBarometerLowTime   = new Weather_Item("YesterdayBarometerLowTime");
-$LongtermBarometerLowDate    = new Weather_Item("LongtermBarometerLowDate");
-$LongtermBarometerLow        = new Weather_Item("LongtermBarometerLow");
-$LongtermBarometerLowTime    = new Weather_Item("LongtermBarometerLowTime");
-$TodayIndoorLow              = new Weather_Item("TodayIndoorLow");
-$TodayIndoorLowTime          = new Weather_Item("TodayIndoorLowTime");
-$YesterdayIndoorLow          = new Weather_Item("YesterdayIndoorLow");
-$YesterdayIndoorLowTime      = new Weather_Item("YesterdayIndoorLowTime");
-$LongtermIndoorLowDate       = new Weather_Item("LongtermIndoorLowDate");
-$LongtermIndoorLow           = new Weather_Item("LongtermIndoorLow");
-$LongtermIndoorLowTime       = new Weather_Item("LongtermIndoorLowTime");
-$TodayOutdoorLowHumidity     = new Weather_Item("TodayOutdoorLowHumidity");
-$TodayOutdoorLowHumidityTime = new Weather_Item("TodayOutdoorLowHumidityTime");
-$YesterdayOutdoorLowHumidity = new Weather_Item("YesterdayOutdoorLowHumidity");
-$YesterdayOutdoorLowHumidityTime =
-  new Weather_Item("YesterdayOutdoorLowHumidityTime");
-$LongtermOutdoorLowHumidityDate =
-  new Weather_Item("LongtermOutdoorLowHumidityDate");
-$LongtermOutdoorLowHumidity = new Weather_Item("LongtermOutdoorLowHumidity");
-$LongtermOutdoorLowHumidityTime =
-  new Weather_Item("LongtermOutdoorLowHumidityTime");
-$TodayWindSpeedPeak         = new Weather_Item("TodayWindSpeedPeak");
-$TodayWindSpeedPeakTime     = new Weather_Item("TodayWindSpeedPeakTime");
-$YesterdayWindSpeedPeak     = new Weather_Item("YesterdayWindSpeedPeak");
-$YesterdayWindSpeedPeakTime = new Weather_Item("YesterdayWindSpeedPeakTime");
-$LongtermWindSpeedDate      = new Weather_Item("LongtermWindSpeedPeakDate");
-$LongtermWindSpeed          = new Weather_Item("LongtermWindSpeedPeak");
-$LongtermWindSpeedTime      = new Weather_Item("LongtermWindSpeedPeakTime");
-$TodayOutdoorHigh           = new Weather_Item("TodayOutdoorHigh");
-$TodayOutdoorHighTime       = new Weather_Item("TodayOutdoorHighTime");
-$YesterdayOutdoorHigh       = new Weather_Item("YesterdayOutdoorHigh");
-$YesterdayOutdoorHighTime   = new Weather_Item("YesterdayOutdoorHighTime");
-$LongtermOutdoorHighDate    = new Weather_Item("LongtermOutdoorHighDate");
-$LongtermOutdoorHigh        = new Weather_Item("LongtermOutdoorHigh");
-$LongtermOutdoorHighTime    = new Weather_Item("LongtermOutdoorHighTime");
-$TodayBarometerHigh         = new Weather_Item("TodayBarometerHigh");
-$TodayBarometerHighTime     = new Weather_Item("TodayBarometerHighTime");
-$YesterdayBarometerHigh     = new Weather_Item("YesterdayBarometerHigh");
-$YesterdayBarometerHighTime = new Weather_Item("YesterdayBarometerHighTime");
-$LongtermBarometerHighDate  = new Weather_Item("LongtermBarometerHighDate");
-$LongtermBarometerHigh      = new Weather_Item("LongtermBarometerHigh");
-$LongtermBarometerHighTime  = new Weather_Item("LongtermBarometerHighTime");
-$TodayIndoorHighTemp        = new Weather_Item("TodayIndoorHighTemp");
-$TodayIndoorHighTempTime    = new Weather_Item("TodayIndoorHighTempTime");
-$YesterdayIndoorHighTemp    = new Weather_Item("YesterdayIndoorHighTemp");
-$YesterdayIndoorHighTime    = new Weather_Item("YesterdayIndoorHighTime");
-$LongtermIndoorHighDate     = new Weather_Item("LongtermIndoorHighDate");
-$LongtermIndoorHigh         = new Weather_Item("LongtermIndoorHigh");
-$LongtermIndoorHighTime     = new Weather_Item("LongtermIndoorHighTime");
-$TodayOutdoorHighHumidity   = new Weather_Item("TodayOutdoorHighHumidity");
-$TodayOutdoorHighHumidityTime =
-  new Weather_Item("TodayOutdoorHighHumidityTime");
-$YesterdayOutdoorHighHumidity =
-  new Weather_Item("YesterdayOutdoorHighHumidity");
-$YesterdayOutdoorHighHumidityTime =
-  new Weather_Item("YesterdayOutdoorHighHumidityTime");
-$LongtermOutdoorHighHumidityDate =
-  new Weather_Item("LongtermOutdoorHighHumidityDate");
-$LongtermOutdoorHighHumidity = new Weather_Item("LongtermOutdoorHighHumidity");
-$LongtermOutdoorHighHumidityTime =
-  new Weather_Item("LongtermOutdoorHighHumidityTime");
-$YesterdayRain              = new Weather_Item("YesterdayRain");
-$LongtermRainDate           = new Weather_Item("LongtermRainDate");
-$LongtermRainTotal          = new Weather_Item("LongtermRainTotal");
-$YesterdayHighWindDirection = new Weather_Item("YesterdayHighWindDirection");
-$TodayHighWindDirection     = new Weather_Item("TodayHighWindDirection");
-$LongtermHighWindDirection  = new Weather_Item("LongtermHighWindDirection");
-$OneMinWindSpeedAverage     = new Weather_Item("OneMinWindSpeedAverage");
-$TodayAirQualityIndex       = new Weather_Item("TodayAirQualityIndex");
+$CurrentWindSpeed                 = new Weather_Item("CurrentWindSpeed");
+$CurrentWindDirection             = new Weather_Item("CurrentWindDirection");
+$FiveMinPeakWindSpeed             = new Weather_Item("FiveMinPeakWindSpeed");
+$FiveMinPeakWindDirection         = new Weather_Item("FiveMinPeakWindDirection");
+$CurrentWindChill                 = new Weather_Item("CurrentWindChill");
+$CurrentOutdoorTemp               = new Weather_Item("CurrentOutdoorTemp");
+$CurrentRain                      = new Weather_Item("CurrentRain");
+$CurrentBarometer                 = new Weather_Item("CurrentBarometer");
+$ThreeHourBarometerChange         = new Weather_Item("ThreeHourBarometerChange");
+$CurrentIndoorTemp                = new Weather_Item("CurrentIndoorTemp");
+$CurrentOutdoorHumidity           = new Weather_Item("CurrentOutdoorHumidity");
+$CurrentIndoorHumidity            = new Weather_Item("CurrentIndoorHumidity");
+$CurrentDewPoint                  = new Weather_Item("CurrentDewPoint");
+$TodayLowWindChill                = new Weather_Item("TodayLowWindChill");
+$TodayLowWindChillTime            = new Weather_Item("TodayLowWindChillTime");
+$YesterdayLowWindChill            = new Weather_Item("YesterdayLowWindChill");
+$YesterdayLowWindChillTime        = new Weather_Item("YesterdayLowWindChillTime");
+$LongtermLowWindChillDate         = new Weather_Item("LongtermLowWindChillDate");
+$LongtermLowWindChill             = new Weather_Item("LongtermLowWindChill");
+$LongtermLowWindChillTime         = new Weather_Item("LongtermLowWindChillTime");
+$TodayOutdoorLow                  = new Weather_Item("TodayOutdoorLow");
+$TodayOutdoorLowTime              = new Weather_Item("TodayOutdoorLowTime");
+$YesterdayOutdoorLow              = new Weather_Item("YesterdayOutdoorLow");
+$YesterdayOutdoorLowTime          = new Weather_Item("YesterdayOutdoorLowTime");
+$LongtermOutdoorLowDate           = new Weather_Item("LongtermOutdoorLowDate");
+$LongtermOutdoorLow               = new Weather_Item("LongtermOutdoorLow");
+$LongtermOutdoorLowTime           = new Weather_Item("LongtermOutdoorLowTime");
+$TodayLowBarometer                = new Weather_Item("TodayLowBarometer");
+$TodayLowBarometerTime            = new Weather_Item("TodayLowBarometerTime");
+$YesterdayBarometerLow            = new Weather_Item("YesterdayBarometerLow");
+$YesterdayBarometerLowTime        = new Weather_Item("YesterdayBarometerLowTime");
+$LongtermBarometerLowDate         = new Weather_Item("LongtermBarometerLowDate");
+$LongtermBarometerLow             = new Weather_Item("LongtermBarometerLow");
+$LongtermBarometerLowTime         = new Weather_Item("LongtermBarometerLowTime");
+$TodayIndoorLow                   = new Weather_Item("TodayIndoorLow");
+$TodayIndoorLowTime               = new Weather_Item("TodayIndoorLowTime");
+$YesterdayIndoorLow               = new Weather_Item("YesterdayIndoorLow");
+$YesterdayIndoorLowTime           = new Weather_Item("YesterdayIndoorLowTime");
+$LongtermIndoorLowDate            = new Weather_Item("LongtermIndoorLowDate");
+$LongtermIndoorLow                = new Weather_Item("LongtermIndoorLow");
+$LongtermIndoorLowTime            = new Weather_Item("LongtermIndoorLowTime");
+$TodayOutdoorLowHumidity          = new Weather_Item("TodayOutdoorLowHumidity");
+$TodayOutdoorLowHumidityTime      = new Weather_Item("TodayOutdoorLowHumidityTime");
+$YesterdayOutdoorLowHumidity      = new Weather_Item("YesterdayOutdoorLowHumidity");
+$YesterdayOutdoorLowHumidityTime  = new Weather_Item("YesterdayOutdoorLowHumidityTime");
+$LongtermOutdoorLowHumidityDate   = new Weather_Item("LongtermOutdoorLowHumidityDate");
+$LongtermOutdoorLowHumidity       = new Weather_Item("LongtermOutdoorLowHumidity");
+$LongtermOutdoorLowHumidityTime   = new Weather_Item("LongtermOutdoorLowHumidityTime");
+$TodayWindSpeedPeak               = new Weather_Item("TodayWindSpeedPeak");
+$TodayWindSpeedPeakTime           = new Weather_Item("TodayWindSpeedPeakTime");
+$YesterdayWindSpeedPeak           = new Weather_Item("YesterdayWindSpeedPeak");
+$YesterdayWindSpeedPeakTime       = new Weather_Item("YesterdayWindSpeedPeakTime");
+$LongtermWindSpeedDate            = new Weather_Item("LongtermWindSpeedPeakDate");
+$LongtermWindSpeed                = new Weather_Item("LongtermWindSpeedPeak");
+$LongtermWindSpeedTime            = new Weather_Item("LongtermWindSpeedPeakTime");
+$TodayOutdoorHigh                 = new Weather_Item("TodayOutdoorHigh");
+$TodayOutdoorHighTime             = new Weather_Item("TodayOutdoorHighTime");
+$YesterdayOutdoorHigh             = new Weather_Item("YesterdayOutdoorHigh");
+$YesterdayOutdoorHighTime         = new Weather_Item("YesterdayOutdoorHighTime");
+$LongtermOutdoorHighDate          = new Weather_Item("LongtermOutdoorHighDate");
+$LongtermOutdoorHigh              = new Weather_Item("LongtermOutdoorHigh");
+$LongtermOutdoorHighTime          = new Weather_Item("LongtermOutdoorHighTime");
+$TodayBarometerHigh               = new Weather_Item("TodayBarometerHigh");
+$TodayBarometerHighTime           = new Weather_Item("TodayBarometerHighTime");
+$YesterdayBarometerHigh           = new Weather_Item("YesterdayBarometerHigh");
+$YesterdayBarometerHighTime       = new Weather_Item("YesterdayBarometerHighTime");
+$LongtermBarometerHighDate        = new Weather_Item("LongtermBarometerHighDate");
+$LongtermBarometerHigh            = new Weather_Item("LongtermBarometerHigh");
+$LongtermBarometerHighTime        = new Weather_Item("LongtermBarometerHighTime");
+$TodayIndoorHighTemp              = new Weather_Item("TodayIndoorHighTemp");
+$TodayIndoorHighTempTime          = new Weather_Item("TodayIndoorHighTempTime");
+$YesterdayIndoorHighTemp          = new Weather_Item("YesterdayIndoorHighTemp");
+$YesterdayIndoorHighTime          = new Weather_Item("YesterdayIndoorHighTime");
+$LongtermIndoorHighDate           = new Weather_Item("LongtermIndoorHighDate");
+$LongtermIndoorHigh               = new Weather_Item("LongtermIndoorHigh");
+$LongtermIndoorHighTime           = new Weather_Item("LongtermIndoorHighTime");
+$TodayOutdoorHighHumidity         = new Weather_Item("TodayOutdoorHighHumidity");
+$TodayOutdoorHighHumidityTime     = new Weather_Item("TodayOutdoorHighHumidityTime");
+$YesterdayOutdoorHighHumidity     = new Weather_Item("YesterdayOutdoorHighHumidity");
+$YesterdayOutdoorHighHumidityTime = new Weather_Item("YesterdayOutdoorHighHumidityTime");
+$LongtermOutdoorHighHumidityDate  = new Weather_Item("LongtermOutdoorHighHumidityDate");
+$LongtermOutdoorHighHumidity      = new Weather_Item("LongtermOutdoorHighHumidity");
+$LongtermOutdoorHighHumidityTime  = new Weather_Item("LongtermOutdoorHighHumidityTime");
+$YesterdayRain                    = new Weather_Item("YesterdayRain");
+$LongtermRainDate                 = new Weather_Item("LongtermRainDate");
+$LongtermRainTotal                = new Weather_Item("LongtermRainTotal");
+$YesterdayHighWindDirection       = new Weather_Item("YesterdayHighWindDirection");
+$TodayHighWindDirection           = new Weather_Item("TodayHighWindDirection");
+$LongtermHighWindDirection        = new Weather_Item("LongtermHighWindDirection");
+$OneMinWindSpeedAverage           = new Weather_Item("OneMinWindSpeedAverage");
+$TodayAirQualityIndex             = new Weather_Item("TodayAirQualityIndex");
diff --git a/code/public/weather_monitor_wmr968.pl b/code/public/weather_monitor_wmr968.pl
index 3f397a310..8c1e93208 100644
--- a/code/public/weather_monitor_wmr968.pl
+++ b/code/public/weather_monitor_wmr968.pl
@@ -91,17 +91,12 @@
 #&tk_label(\$Weather{SummaryRain});
 
 # Set up pointers to random weather comments
-$remark_on_humidity =
-  new File_Item("$config_parms{data_dir}/remarks/list_humid.txt");
-$remark_on_temp_below_0 =
-  new File_Item("$config_parms{data_dir}/remarks/list_temp_below_0.txt");
-$remark_on_temp_below_20 =
-  new File_Item("$config_parms{data_dir}/remarks/list_temp_below_20.txt");
+$remark_on_humidity      = new File_Item("$config_parms{data_dir}/remarks/list_humid.txt");
+$remark_on_temp_below_0  = new File_Item("$config_parms{data_dir}/remarks/list_temp_below_0.txt");
+$remark_on_temp_below_20 = new File_Item("$config_parms{data_dir}/remarks/list_temp_below_20.txt");
 
 $v_what_temp = new Voice_Cmd('What is the [,inside,outside] temperature');
-$v_what_temp->set_info(
-    'Returns the humidity, temperature, and windchill, as measured by wx200 weather station'
-);
+$v_what_temp->set_info( 'Returns the humidity, temperature, and windchill, as measured by wx200 weather station' );
 $v_what_temp->set_authority('anyone');
 
 if ( $state = said $v_what_temp) {
@@ -109,8 +104,7 @@
     #   my $temp     = round($analog{temp_outside});
     #   my $humidity = round($analog{humidity_outside});
 
-    if ( defined $Weather{TempOutdoor} and $Weather{TempOutdoor} ne 'unknown' )
-    {
+    if ( defined $Weather{TempOutdoor} and $Weather{TempOutdoor} ne 'unknown' ) {
         my $temp        = round( $Weather{TempOutdoor} );
         my $temp_in     = round( $Weather{TempIndoor} );
         my $windchill   = round( $Weather{WindChill} );
@@ -144,8 +138,7 @@
             $text = "It is $temp_out.";
         }
         else {
-            $text =
-              "It is $temp_in degrees $humidity_in percent inside, $temp_out. $remark ";
+            $text = "It is $temp_in degrees $humidity_in percent inside, $temp_out. $remark ";
 
         }
         speak $text;
@@ -156,8 +149,7 @@
 }
 
 $v_what_wind = new Voice_Cmd('What is the wind speed');
-$v_what_wind->set_info(
-    'The wind speed is measured with a WX200 weather station');
+$v_what_wind->set_info('The wind speed is measured with a WX200 weather station');
 $v_what_wind->set_authority('anyone');
 if ( said $v_what_wind) {
     undef $temp;
@@ -171,10 +163,7 @@
           . " MPH from the "
           . convert_direction( $Weather{WindGustDir} );
         $temp .=
-            ".  Average speed is "
-          . round( $Weather{WindAvgSpeed} )
-          . " from the "
-          . convert_direction( $Weather{WindAvgDir} );
+          ".  Average speed is " . round( $Weather{WindAvgSpeed} ) . " from the " . convert_direction( $Weather{WindAvgDir} );
     }
     speak $temp;
 }
@@ -183,8 +172,7 @@
   new Voice_Cmd( 'How much rain have we had in the last '
       . '[hour,2 hours,6 hours,12 hours,day,2 days,3 days,4 days,5 days,6 days,week,2 weeks,3 weeks,month,'
       . '2 months,3 months,4 months,6 months]' );
-$v_what_rain->set_info(
-    'Rainfall, measured by the WX200 weather station and logged by mh');
+$v_what_rain->set_info('Rainfall, measured by the WX200 weather station and logged by mh');
 if ( my $period = said $v_what_rain) {
     undef $temp;
     my $days;
@@ -217,8 +205,7 @@
         $temp = "Sorry, I don't have current weather info on rainfall";
     }
     elsif ( !@temp ) {
-        $temp =
-          "Sorry, I don't have a log of the weather from $days days ago.\n";
+        $temp = "Sorry, I don't have a log of the weather from $days days ago.\n";
     }
     else {
         my $rain_total_yesterday = $temp[21];
@@ -226,8 +213,7 @@
 
         #   print "db rt_previous=$rain_total_yesterday rt_today=$Weather{RainTotal} diff=$rain_diff\n";
         if ($rain_diff) {
-            $temp .=
-              "We have had " . round( $rain_diff, 2 ) . " inches of rain ";
+            $temp .= "We have had " . round( $rain_diff, 2 ) . " inches of rain ";
         }
         else {
             $temp .= "No rain has fallen ";
@@ -256,15 +242,12 @@ sub get_weather_record {
 {
     if ( $Weather{WindGustSpeed} > ( $Save{WindGustMax} + 5 ) ) {
         $Save{WindGustMax} = $Weather{WindGustSpeed};
-        speak "rooms=all Weather alert.  The wind is now gusting at "
-          . round( $Weather{WindGustSpeed} ) . " MPH.";
+        speak "rooms=all Weather alert.  The wind is now gusting at " . round( $Weather{WindGustSpeed} ) . " MPH.";
         set $timer_wind_gust 120 * 60;
     }
     elsif ( inactive $timer_wind_gust) {
         set $timer_wind_gust 120 * 60;
-        speak "rooms=all Weather alert.  A wind gust of "
-          . round( $Weather{WindGustSpeed} )
-          . " MPH was just recorded.";
+        speak "rooms=all Weather alert.  A wind gust of " . round( $Weather{WindGustSpeed} ) . " MPH was just recorded.";
     }
 }
 $Save{WindGustMax} = 0 if $New_Day;
diff --git a/code/public/weather_mos_forecast.pl b/code/public/weather_mos_forecast.pl
index 04c1a0b2d..095486970 100644
--- a/code/public/weather_mos_forecast.pl
+++ b/code/public/weather_mos_forecast.pl
@@ -54,9 +54,8 @@
 
 $v_mos_forecast = new Voice_Cmd 'get mos forecast';
 
-$p_mos_forecast = new Process_Item(
-    "get_url http://www.nws.noaa.gov/cgi-bin/mos/getmav.pl?sta=$f_mos_forecast_station $f_mos_forecast"
-);
+$p_mos_forecast =
+  new Process_Item( "get_url http://www.nws.noaa.gov/cgi-bin/mos/getmav.pl?sta=$f_mos_forecast_station $f_mos_forecast" );
 
 my @mos_forecast;
 
@@ -222,8 +221,7 @@
         }
         $l_prevHour = $l_time[$i];
         #### Morning
-        if ( $l_time[$i] > $l_startMorning and $l_time[$i] <= $l_endMorning )
-        {    #morning forecast
+        if ( $l_time[$i] > $l_startMorning and $l_time[$i] <= $l_endMorning ) {    #morning forecast
             my $values = {};
             $$values{hour}          = $l_time[$i];
             $$values{day}           = $l_dayOffset;
@@ -334,9 +332,7 @@ sub mos_brief_text_forecast {
         #		$l_message.="," . @mos_forecast[$i]->{hour} . ":";
         $l_message .= ",";
         $l_message .= @mos_forecast[$i]->{temperature} . "F";
-        $l_message .= ""
-          . ( @mos_forecast[$i]->{precip} ) . "%"
-          . @mos_forecast[$i]->{precip_type};
+        $l_message .= "" . ( @mos_forecast[$i]->{precip} ) . "%" . @mos_forecast[$i]->{precip_type};
     }
     return $l_message;
 }
diff --git a/code/public/weather_sbweather.pl b/code/public/weather_sbweather.pl
index 84703b94c..28ca23954 100644
--- a/code/public/weather_sbweather.pl
+++ b/code/public/weather_sbweather.pl
@@ -19,8 +19,7 @@
     # Take the 2nd to last record from todays file
     my @temp = get_weather_record(time);
 
-    my @keys =
-      qw(TimeStamp TempIndoor TempIndoorH TempIndoorL TempOutdoor TempOutdoorH TempOutdoorL
+    my @keys = qw(TimeStamp TempIndoor TempIndoorH TempIndoorL TempOutdoor TempOutdoorH TempOutdoorL
       HumidIndoor HumidIndoorH HumidIndoorL HumidOutdoor HumidOutdoorH HumidOutdoorL
       WindGustSpeed WindGustDir WindAvgSpeed WindAvgDir WindHighSpeed WindHighDir
       Barom BaromSea RainTotal RainRate RainYest
@@ -48,21 +47,17 @@
         {
             if ( $Weather{WindGustSpeed} > $Save{WindGustMax} ) {
                 $Save{WindGustMax} = $Weather{WindGustSpeed};
-                speak "rooms=all Weather alert.  The winnd is now gusting at "
-                  . round( $Weather{WindGustSpeed} ) . " MPH.";
+                speak "rooms=all Weather alert.  The winnd is now gusting at " . round( $Weather{WindGustSpeed} ) . " MPH.";
                 set $timer_wind_gust 120 * 60;
             }
             elsif ( inactive $timer_wind_gust) {
                 set $timer_wind_gust 120 * 60;
-                speak "rooms=all Weather alert.  A winnd gust of "
-                  . round( $Weather{WindGustSpeed} )
-                  . " MPH was just recorded.";
+                speak "rooms=all Weather alert.  A winnd gust of " . round( $Weather{WindGustSpeed} ) . " MPH was just recorded.";
             }
         }
         $Save{WindGustMax} = 0 if $New_Day;
 
-        $Weather{RainRecent} =
-          round( ( $Weather{RainTotal} - $raintotal_prev ), 2 )
+        $Weather{RainRecent} = round( ( $Weather{RainTotal} - $raintotal_prev ), 2 )
           if $raintotal_prev > 0;
         if ( $Weather{RainRecent} > 0 ) {
             speak "Notice, it just rained $Weather{RainRecent} inches";
diff --git a/code/public/weather_vw.pl b/code/public/weather_vw.pl
index 08f0b4513..3f66516df 100644
--- a/code/public/weather_vw.pl
+++ b/code/public/weather_vw.pl
@@ -42,8 +42,7 @@
 $Pressure        = new Generic_Item;
 $Pressure->restore_data( 'PressureLastHour', 'Trend' );
 $CumRain = new Generic_Item;
-$CumRain->restore_data( 'WeeklyRain', 'MonthlyRain', 'DailyRain',
-    'HourlyRain' );
+$CumRain->restore_data( 'WeeklyRain', 'MonthlyRain', 'DailyRain', 'HourlyRain' );
 $DailyTemp = new Generic_Item;
 $DailyTemp->restore_data( 'High', 'Low' );
 $v_WeatherReport = new Voice_Cmd "What is the current weather?";
@@ -98,10 +97,7 @@
       . " mph from the "
       . convert_direction( $Weather{WindAvgDir} ) . " \n"
       if state_now $Gusty;
-    speak "Wind gust of "
-      . round( $Weather{WindGustSpeed} )
-      . " mph from the "
-      . convert_direction( $Weather{WindAvgDir} ) . " \n"
+    speak "Wind gust of " . round( $Weather{WindGustSpeed} ) . " mph from the " . convert_direction( $Weather{WindAvgDir} ) . " \n"
       if state_now $Stormy;
     print_msg "It is raining $Weather{RainRate} \n" if state_now $Rainy;
 }
@@ -141,16 +137,14 @@
     }
     $pressure_mb = ( $Weather{Barom} / $mb_conv_factor ) * 10;
     $aprs_data =
-      sprintf
-      "your_call>APRS,TCPIP*:@%02d%02d%02dzDDMM.ddN/DDDMM.ddW_%03d/%03dg%03dt%03dr%03dP%03dh%02db%05d/station type\n",
+      sprintf "your_call>APRS,TCPIP*:@%02d%02d%02dzDDMM.ddN/DDDMM.ddW_%03d/%03dg%03dt%03dr%03dP%03dh%02db%05d/station type\n",
       $hh, $mm, $ss, $Weather{WindAvgDir}, $Weather{WindAvgSpeed},
       $Weather{WindGustSpeed}, $temp, $hourly_rain * 100, $daily_rain * 100,
       $adj_humidity, $pressure_mb;
     logit( "$config_parms{data_dir}/aprs.log", $aprs_data );
     unless ( active $aprs_net) {
         start $aprs_net;
-        set $aprs_net
-          "user your_call pass your_password vers misterhouse linux .01";
+        set $aprs_net "user your_call pass your_password vers misterhouse linux .01";
     }
     if ( $aprs_in = said $aprs_net) { }
     set $aprs_net $aprs_data;
diff --git a/code/public/weather_warnings.pl b/code/public/weather_warnings.pl
index e14dab6f9..edd69e775 100644
--- a/code/public/weather_warnings.pl
+++ b/code/public/weather_warnings.pl
@@ -10,34 +10,29 @@
 my $County = 'Tarrant';
 
 # Replace the "warncounty" portion of this URL with your warncounty (go to http://www.srh.noaa.gov)
-my $NOAA_Warnings_URL =
-  'http://www.srh.noaa.gov/showsigwx.php?warncounty=TXC439';
+my $NOAA_Warnings_URL = 'http://www.srh.noaa.gov/showsigwx.php?warncounty=TXC439';
 
 #439
 ########################################
-my $f_weather_warnings_summary =
-  "$config_parms{data_dir}/web/weather_warnings_summary.txt";
-my $f_weather_warnings_html =
-  "$config_parms{data_dir}/web/weather_warnings.html";
-my $prev_summary    = '';
-my $Severe_Wx_Flag  = '0';
-my $Severe_Wx_Type  = '';
-my $Severe_Wx_Type2 = '';
-my $Severe_Wx_Type3 = '';
-my $Severe_Wx_Type4 = '';
+my $f_weather_warnings_summary = "$config_parms{data_dir}/web/weather_warnings_summary.txt";
+my $f_weather_warnings_html    = "$config_parms{data_dir}/web/weather_warnings.html";
+my $prev_summary               = '';
+my $Severe_Wx_Flag             = '0';
+my $Severe_Wx_Type             = '';
+my $Severe_Wx_Type2            = '';
+my $Severe_Wx_Type3            = '';
+my $Severe_Wx_Type4            = '';
 my ( $summary, $i );
 $summary = '';
 $i       = 0;
 
-$p_weather_warnings =
-  new Process_Item("perl get_url $NOAA_Warnings_URL $f_weather_warnings_html");
+$p_weather_warnings = new Process_Item("perl get_url $NOAA_Warnings_URL $f_weather_warnings_html");
 $v_weather_warnings = new Voice_Cmd('[Get,Read,Show] weather warnings');
 
 speak($f_weather_warnings_summary)   if said $v_weather_warnings eq 'Read';
 display($f_weather_warnings_summary) if said $v_weather_warnings eq 'Show';
 
-if ( said $v_weather_warnings eq 'Get' or time_cron '10,20,30,40,50,0 * * * *' )
-{
+if ( said $v_weather_warnings eq 'Get' or time_cron '10,20,30,40,50,0 * * * *' ) {
 
     if (&net_connect_check) {
         print_log "Retrieving Weather Warnings from the net ...";
@@ -64,8 +59,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Tornado Watch has been issued and is currently in effect for $County county. ";
+            $summary .= "A Tornado Watch has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Tornado Watch';
             }
@@ -87,8 +81,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Severe Thunderstorm Warning has been issued and is currently in effect for $County county. ";
+            $summary .= "A Severe Thunderstorm Warning has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Thunderstorm Warning';
             }
@@ -110,8 +103,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Severe Thunderstorm Watch has been issued and is currently in effect for $County county. ";
+            $summary .= "A Severe Thunderstorm Watch has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Thunderstorm Watch';
             }
@@ -133,8 +125,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Tornado Warning has been issued and is currently in effect for $County county. ";
+            $summary .= "A Tornado Warning has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Tornado Warning';
             }
@@ -156,8 +147,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Flood Warning has been issued and is currently in effect for $County county. ";
+            $summary .= "A Flood Warning has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Flood Warning';
             }
@@ -179,8 +169,7 @@
         {
             $Save{Severe_Wx_Flag} = 1;
             $i++;
-            $summary .=
-              "A Flood Watch has been issued and is currently in effect for $County county. ";
+            $summary .= "A Flood Watch has been issued and is currently in effect for $County county. ";
             if ( $Save{Severe_Wx_Type} eq '' ) {
                 $Save{Severe_Wx_Type} = 'Flood Watch';
             }
diff --git a/code/public/weather_wrtv.pl b/code/public/weather_wrtv.pl
index 1028a43eb..cc6faf8bf 100644
--- a/code/public/weather_wrtv.pl
+++ b/code/public/weather_wrtv.pl
@@ -5,8 +5,7 @@
 
 #$f_wrtv6_weather2_html2 = new File_Item($f_wrtv6_weather2_html); # Needed if we use run instead of process_item
 
-$p_wrtv6_weather = new Process_Item(
-    "get_url http://www.wrtv.com/weather/index.shtml $f_wrtv6_weather_html");
+$p_wrtv6_weather = new Process_Item("get_url http://www.wrtv.com/weather/index.shtml $f_wrtv6_weather_html");
 $v_wrtv6_weather = new Voice_Cmd('[Get,Read,Show] wrtv6 weather');
 
 speak($f_wrtv6_weather)   if said $v_wrtv6_weather eq 'Read';
diff --git a/code/public/webcam_lite.pl b/code/public/webcam_lite.pl
index 17dad55ed..d00c4debc 100644
--- a/code/public/webcam_lite.pl
+++ b/code/public/webcam_lite.pl
@@ -12,8 +12,7 @@
 
 $webcam_light = new X10_Item('A1');
 
-$v_webcam_light =
-  new Voice_Cmd("WebCam light [on,off,-30,-50,-80,+30,+50,+80]");
+$v_webcam_light = new Voice_Cmd("WebCam light [on,off,-30,-50,-80,+30,+50,+80]");
 
 if ( $state = said $v_webcam_light) {
     set $webcam_light $state;
@@ -33,8 +32,7 @@
 
 $webcam_light2 = new X10_Item('A3');
 
-$v_webcam_light2 =
-  new Voice_Cmd("WebCam light2 [on,off,-30,-50,-80,+30,+50,+80]");
+$v_webcam_light2 = new Voice_Cmd("WebCam light2 [on,off,-30,-50,-80,+30,+50,+80]");
 
 if ( $state = said $v_webcam_light2) {
     set $webcam_light2 $state;
@@ -57,8 +55,7 @@
     my $domain_name =
       &net_domain_name( $Socket_Ports{http}{client_ip_address} );
     logit( "$config_parms{data_dir}/logs/webtext.$Year_Month_Now.log",
-        "ip=$Socket_Ports{http}{client_ip_address} $Save{web_nick1} said $Save{web_text1}"
-    );
+        "ip=$Socket_Ports{http}{client_ip_address} $Save{web_nick1} said $Save{web_text1}" );
     my $msg = "$Save{web_nick1} Internet Message: $Save{web_text1}";
     &display( $msg, 90, 'webcam text' );
     speak $msg if time_greater_than("5 AM") and time_less_than("11 PM");
diff --git a/code/public/weeder_doorbell_evan.pl b/code/public/weeder_doorbell_evan.pl
index e808ba9c8..301a9e11e 100644
--- a/code/public/weeder_doorbell_evan.pl
+++ b/code/public/weeder_doorbell_evan.pl
@@ -22,16 +22,14 @@
 # Initial Release
 ############################
 
-$v_test_dorbell = new Voice_Cmd("Test Doorbell");
-$v_set_f_bell_sound =
-  new Voice_Cmd("Set Front Doorbell Sound to [Chimes,Jetsons]");
-$v_set_b_bell_sound =
-  new Voice_Cmd("Set Back Doorbell Sound to [Chimes,Jetsons]");
-$f_doorbell_timer = new Timer();   # timer used to prevent annoying double rings
-$b_doorbell_timer = new Timer();   # timer used to prevent annoying double rings
-$read_timer       = new Timer();
-$f_fail_timer     = new Timer();
-$b_fail_timer     = new Timer();
+$v_test_dorbell     = new Voice_Cmd("Test Doorbell");
+$v_set_f_bell_sound = new Voice_Cmd("Set Front Doorbell Sound to [Chimes,Jetsons]");
+$v_set_b_bell_sound = new Voice_Cmd("Set Back Doorbell Sound to [Chimes,Jetsons]");
+$f_doorbell_timer   = new Timer();                                                     # timer used to prevent annoying double rings
+$b_doorbell_timer   = new Timer();                                                     # timer used to prevent annoying double rings
+$read_timer         = new Timer();
+$f_fail_timer       = new Timer();
+$b_fail_timer       = new Timer();
 my $f_doorbell_fail = 0;
 my $b_doorbell_fail = 0;
 my $f_counter       = 0;
@@ -82,9 +80,8 @@
     $f_counter++;    #increment ring counter used to detect doorbell failure
     print_log "Front DB Press: $f_counter \n";
     set $f_fail_timer 20;    #time increment to test for failures
-    if ( $f_counter >= 10 and not $f_doorbell_fail )
-    {    #10 rings in 20 seconds indicates a failure, disable doorbell
-        $f_doorbell_fail = 1;    #set broken doorbell flag
+    if ( $f_counter >= 10 and not $f_doorbell_fail ) {    #10 rings in 20 seconds indicates a failure, disable doorbell
+        $f_doorbell_fail = 1;                             #set broken doorbell flag
         speak(
             volume => 100,
             rooms  => 'all',
@@ -100,19 +97,15 @@
             volume => $Save{doorbell_vol},
             file   => $sound_dir . $Save{f_doorbell_sound}
         );
-        logit(
-            "$config_parms{data_dir}/logs/doorbell/doorbell.$Year_Month_Now.log",
-            "Front Doorbell"
-        );
+        logit( "$config_parms{data_dir}/logs/doorbell/doorbell.$Year_Month_Now.log", "Front Doorbell" );
         $Save{last_doorbell_time} = "$Date_Now $Time_Now";
         print_log "Front Doorbell";
         set $f_doorbell_timer 3;
     }
 }
 
-if ( expired $f_fail_timer)
-{   #if there have been no rings in the last 20 seconds, the doorbell will reset
-    $f_counter = 0;    #reset ring counter
+if ( expired $f_fail_timer) {    #if there have been no rings in the last 20 seconds, the doorbell will reset
+    $f_counter = 0;              #reset ring counter
     if ($f_doorbell_fail) {
         $f_doorbell_fail = 0;    #reset doorbell failure flag
         speak(
@@ -124,8 +117,7 @@
     }
 }
 
-if ( time_cron '30 18 * * *' and $f_doorbell_fail )
-{                                # Send reminder that doorbell is broken
+if ( time_cron '30 18 * * *' and $f_doorbell_fail ) {    # Send reminder that doorbell is broken
     speak(
         volume => 100,
         rooms  => 'all',
@@ -141,10 +133,9 @@
     $b_counter++;    #increment ring counter used to detect doorbell failure
     print_log "Back DB Press: $b_counter \n";
     set $b_fail_timer 20;    #time increment to test for failures
-    if ( $b_counter >= 10 and not $b_doorbell_fail )
-    {    #10 rings in 20 seconds indicates a failure, disable doorbell
+    if ( $b_counter >= 10 and not $b_doorbell_fail ) {    #10 rings in 20 seconds indicates a failure, disable doorbell
         print_log "count: $b_counter f_flag: $b_doorbell_fail\n";
-        $b_doorbell_fail = 1;    #set broken doorbell flag
+        $b_doorbell_fail = 1;                             #set broken doorbell flag
         speak(
             volume => 100,
             rooms  => 'all',
@@ -160,19 +151,15 @@
             volume => $Save{doorbell_vol},
             file   => $sound_dir . $Save{b_doorbell_sound}
         );
-        logit(
-            "$config_parms{data_dir}/logs/doorbell/doorbell.$Year_Month_Now.log",
-            "Back Doorbell"
-        );
+        logit( "$config_parms{data_dir}/logs/doorbell/doorbell.$Year_Month_Now.log", "Back Doorbell" );
         $Save{last_doorbell_time} = "$Date_Now $Time_Now";
         print_log "Back Doorbell";
         set $b_doorbell_timer 3;
     }
 }
 
-if ( expired $b_fail_timer)
-{   #if there have been no rings in the last 20 seconds, the doorbell will reset
-    $b_counter = 0;    #reset ring counter
+if ( expired $b_fail_timer) {    #if there have been no rings in the last 20 seconds, the doorbell will reset
+    $b_counter = 0;              #reset ring counter
     if ($b_doorbell_fail) {
         $b_doorbell_fail = 0;    #reset doorbell failure flag
         speak(
@@ -184,8 +171,7 @@
     }
 }
 
-if ( time_cron '31 18 * * *' and $b_doorbell_fail )
-{                                # Send reminder that doorbell is broken
+if ( time_cron '31 18 * * *' and $b_doorbell_fail ) {    # Send reminder that doorbell is broken
     speak(
         volume => 100,
         rooms  => 'all',
diff --git a/code/public/weeder_init.pl b/code/public/weeder_init.pl
index e5d99045f..9cfb84343 100644
--- a/code/public/weeder_init.pl
+++ b/code/public/weeder_init.pl
@@ -47,10 +47,8 @@
 # Init each bit on the weeder board
 if ( said $v_init_weeder or $Startup ) {
     for my $ref (
-        $WeedA_InC_DownFoyer_Motion, $WeedA_InD_Office_Motion,
-        $WeedA_InE_Garage_Motion,    $WeedA_InF_Car_Sensor,
-        $WeedA_OutG_RearBell,        $WeedA_InH_Pool_Mo,
-        $WeedA_InI_Pantry_Door,      $WeedA_OutJ_Garage_DoorN
+        $WeedA_InC_DownFoyer_Motion, $WeedA_InD_Office_Motion, $WeedA_InE_Garage_Motion, $WeedA_InF_Car_Sensor,
+        $WeedA_OutG_RearBell,        $WeedA_InH_Pool_Mo,       $WeedA_InI_Pantry_Door,   $WeedA_OutJ_Garage_DoorN
       )
     {
         set $ref 'init';
@@ -67,9 +65,8 @@
     }
 
     for my $ref (
-        $WeedA_InC_DownFoyer_Motion, $WeedA_InD_Office_Motion,
-        $WeedA_InE_Garage_Motion,    $WeedA_InF_Car_Sensor,
-        $WeedA_InH_Pool_Mo,          $WeedA_InI_Pantry_Door
+        $WeedA_InC_DownFoyer_Motion, $WeedA_InD_Office_Motion, $WeedA_InE_Garage_Motion,
+        $WeedA_InF_Car_Sensor,       $WeedA_InH_Pool_Mo,       $WeedA_InI_Pantry_Door
       )
     {
         set $ref 'read';
diff --git a/code/public/whole_house_audio_musica.pl b/code/public/whole_house_audio_musica.pl
index 54ddd5c7f..a12f84165 100644
--- a/code/public/whole_house_audio_musica.pl
+++ b/code/public/whole_house_audio_musica.pl
@@ -71,46 +71,36 @@
 }
 
 my @musica_zones = ( undef, $music_kitchen );
-my @musica_sources =
-  ( undef, $music_source1, $music_source2, $music_source3, $music_source4 );
+my @musica_sources = ( undef, $music_source1, $music_source2, $music_source3, $music_source4 );
 
 # noloop=stop
 
 sub handle_virtual_source {
     my ( $obj, $action, $source ) = @_;
-    print_log
-      "VirtualAudio: got action $action for $$obj{name} (source=$source)";
+    print_log "VirtualAudio: got action $action for $$obj{name} (source=$source)";
     if ( $obj->get_data('label') ) {
-        print_log "VirtualAudio:    $$obj{name} has label: "
-          . $obj->get_data('label');
+        print_log "VirtualAudio:    $$obj{name} has label: " . $obj->get_data('label');
     }
     if ( $obj->get_data('playlist') ) {
-        print_log "VirtualAudio:    $$obj{name} has playlist: "
-          . $obj->get_data('playlist');
+        print_log "VirtualAudio:    $$obj{name} has playlist: " . $obj->get_data('playlist');
     }
     if ( $action eq 'attach' ) {
         if ( $$obj{name} eq 'v_pvr' ) {
             set $IR_PVR 'SELECT';
         }
         if ( $obj->get_data('switch_input') ) {
-            print_log "VirtualAudio: Switch input for $$obj{name} is "
-              . $obj->get_data('switch_input')
-              . " (source=$source)";
+            print_log "VirtualAudio: Switch input for $$obj{name} is " . $obj->get_data('switch_input') . " (source=$source)";
             if ( $source == 3 ) {
 
                 # Send twice to make sure it is executed
-                push @Primary_IR_queue, $IR_Switch1,
-                  $obj->get_data('switch_input');
-                push @Secondary_IR_queue, $IR_Switch1,
-                  $obj->get_data('switch_input');
+                push @Primary_IR_queue,   $IR_Switch1, $obj->get_data('switch_input');
+                push @Secondary_IR_queue, $IR_Switch1, $obj->get_data('switch_input');
             }
             elsif ( $source == 4 ) {
 
                 # Send twice to make sure it is executed
-                push @Primary_IR_queue, $IR_Switch2,
-                  $obj->get_data('switch_input');
-                push @Secondary_IR_queue, $IR_Switch2,
-                  $obj->get_data('switch_input');
+                push @Primary_IR_queue,   $IR_Switch2, $obj->get_data('switch_input');
+                push @Secondary_IR_queue, $IR_Switch2, $obj->get_data('switch_input');
             }
         }
         if ( $obj->get_data('label') ) {
@@ -138,9 +128,7 @@ sub handle_virtual_source {
             $players[$source]->unpause();
         }
         if ( $obj->get_data('receiver_input') ) {
-            print_log
-              "VirtualAudio: Object $$obj{name} has receiver input (source=$source): "
-              . $obj->get_data('receiver_input');
+            print_log "VirtualAudio: Object $$obj{name} has receiver input (source=$source): " . $obj->get_data('receiver_input');
             if ( $source == 3 ) {
                 if ($Zone2_off_timer) {
                     print_log "VirtualAudio: cancelling timer for zone2";
@@ -148,15 +136,11 @@ sub handle_virtual_source {
                     $Zone2_off_timer = undef;
                 }
                 $Zone2_start_timer = 0;
-                print_log
-                  "VirtualAudio: Object $$obj{name} (source=$source) selecting input: "
-                  . $obj->get_data('receiver_input');
-                push @Primary_IR_queue, $IR_Zone2, 'ZONEON';
-                push @Primary_IR_queue, $IR_Zone2,
-                  $obj->get_data('receiver_input');
+                print_log "VirtualAudio: Object $$obj{name} (source=$source) selecting input: " . $obj->get_data('receiver_input');
+                push @Primary_IR_queue,   $IR_Zone2, 'ZONEON';
+                push @Primary_IR_queue,   $IR_Zone2, $obj->get_data('receiver_input');
                 push @Secondary_IR_queue, $IR_Zone2, 'ZONEON';
-                push @Secondary_IR_queue, $IR_Zone2,
-                  $obj->get_data('receiver_input');
+                push @Secondary_IR_queue, $IR_Zone2, $obj->get_data('receiver_input');
             }
             elsif ( $source == 4 ) {
                 if ($Zone3_off_timer) {
@@ -165,14 +149,11 @@ sub handle_virtual_source {
                     $Zone3_off_timer = undef;
                 }
                 $Zone3_start_timer = 0;
-                print_log
-                  "VirtualAudio: Object $$obj{name} (source=$source): turning on";
-                push @Primary_IR_queue, $IR_Zone3, 'ZONEON';
-                push @Primary_IR_queue, $IR_Zone3,
-                  $obj->get_data('receiver_input');
+                print_log "VirtualAudio: Object $$obj{name} (source=$source): turning on";
+                push @Primary_IR_queue,   $IR_Zone3, 'ZONEON';
+                push @Primary_IR_queue,   $IR_Zone3, $obj->get_data('receiver_input');
                 push @Secondary_IR_queue, $IR_Zone3, 'ZONEON';
-                push @Secondary_IR_queue, $IR_Zone3,
-                  $obj->get_data('receiver_input');
+                push @Secondary_IR_queue, $IR_Zone3, $obj->get_data('receiver_input');
             }
         }
         else {
@@ -209,8 +190,7 @@ sub turn_voice_on {
     my ($obj) = @_;
     unless ( $obj->get_source() ) {
         print_log "VirtualAudio/Musica: turn_voice_on() called...";
-        my $source = $audio_router->select_virtual_source( $obj->get_zone_num(),
-            'v_voice' );
+        my $source = $audio_router->select_virtual_source( $obj->get_zone_num(), 'v_voice' );
         $obj->set_source($source) if ( $source > 0 );
         if ( $speech_volume{$obj} ) {
             $obj->set_volume( $speech_volume{$obj} );
@@ -238,10 +218,8 @@ sub turn_audio_off {
     $pl_romantic->add_files('/mnt/mp3s/Les_Miserables.m3u');
     $pl_pink_floyd->add_files('/mnt/mp3s/All_Pink_Floyd.m3u');
     $pl_rock->add_files('/mnt/mp3s/Rock.m3u');
-    $pl_classical->add_files( '/mnt/mp3s/sorted/classical',
-        '/mnt/mp3s/mp3disks/classical' );
-    $pl_new_age->add_files( '/mnt/mp3s/sorted/new_age',
-        '/mnt/mp3s/mp3disks/folk/Enya' );
+    $pl_classical->add_files( '/mnt/mp3s/sorted/classical', '/mnt/mp3s/mp3disks/classical' );
+    $pl_new_age->add_files( '/mnt/mp3s/sorted/new_age', '/mnt/mp3s/mp3disks/folk/Enya' );
 
     # Set handlers for all virtual sources (I use the same for all)
     $v_kirk_mp3s->set_action_function( \&handle_virtual_source );
@@ -320,11 +298,7 @@ sub turn_audio_off {
     $v_new_age->set_data( 'shuffle',  1 );
     $v_new_age->set_data( 'label',    'SOUL' );
 
-    foreach (
-        $v_kirk_mp3s, $v_pink_floyd, $v_rock,
-        $v_classical, $v_romantic,   $v_new_age
-      )
-    {
+    foreach ( $v_kirk_mp3s, $v_pink_floyd, $v_rock, $v_classical, $v_romantic, $v_new_age ) {
         $_->set_data( 'switch_input', 'SOURCE1' );
     }
 
@@ -332,10 +306,8 @@ sub turn_audio_off {
     $audio_router->resume();
 
     # Timers to turn on/off audio
-    $om_presence_family_room->add_presence_timer( 120,
-        '&turn_voice_on($music_kitchen);' );
-    $om_presence_family_room->add_vacancy_timer( 600,
-        '&turn_audio_off($music_kitchen);' );
+    $om_presence_family_room->add_presence_timer( 120, '&turn_voice_on($music_kitchen);' );
+    $om_presence_family_room->add_vacancy_timer( 600, '&turn_audio_off($music_kitchen);' );
 }
 
 if ( state_now $om_presence_kitchen eq 'occupied' ) {
@@ -345,8 +317,7 @@ sub turn_audio_off {
 foreach (@musica_zones) {
     next unless $_;
     if ( $state = state_now $_) {
-        print_log "VirtualAudio: Got state for zone $$_{object_name}: $state ("
-          . $_->get_set_by() . ')';
+        print_log "VirtualAudio: Got state for zone $$_{object_name}: $state (" . $_->get_set_by() . ')';
         if (   ( $state eq 'zone_on' )
             or ( $state eq 'zone_off' )
             or ( $state eq 'source_changed' ) )
@@ -358,83 +329,56 @@ sub turn_audio_off {
             if ( $source eq 'E' ) {
                 $source = 0;
             }
-            $audio_router->specify_source_for_zone( $_->get_zone_num(),
-                $source );
+            $audio_router->specify_source_for_zone( $_->get_zone_num(), $source );
         }
         elsif ( $state eq 'button_pressed_stop' ) {
-            if (
-                $audio_router->get_virtual_source_name_for_zone(
-                    $_->get_zone_num()
-                ) eq 'v_voice'
-              )
-            {
+            if ( $audio_router->get_virtual_source_name_for_zone( $_->get_zone_num() ) eq 'v_voice' ) {
+
                 # Already on voice.. stop any MP3s
-                my $source =
-                  $audio_router->get_real_source_number_for_zone(
-                    $_->get_zone_num() );
+                my $source = $audio_router->get_real_source_number_for_zone( $_->get_zone_num() );
                 $players[$source]->stop();
                 $players[$source]->clear();
                 $players[$source]->restart();
             }
             else {
-                my $source =
-                  $audio_router->select_virtual_source( $_->get_zone_num(),
-                    'v_voice' );
+                my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_voice' );
                 $_->set_source($source) if ( $source > 0 );
             }
         }
         elsif ( $state eq 'button_held_pause' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_classical' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_classical' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_stop' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_romantic' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_romantic' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_play' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_new_age' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_new_age' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_rewind' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_kirk_mp3s' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_kirk_mp3s' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_up' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_pink_floyd' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_pink_floyd' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_forward' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_rock' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_rock' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_left' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_tivo' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_tivo' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_down' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_pvr' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_pvr' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_right' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_dvd' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_dvd' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_held_previous' ) {
@@ -448,21 +392,15 @@ sub turn_audio_off {
             #$_->set_source($source) if ($source > 0);
         }
         elsif ( $state eq 'button_held_next' ) {
-            my $source =
-              $audio_router->select_virtual_source( $_->get_zone_num(),
-                'v_internet' );
+            my $source = $audio_router->select_virtual_source( $_->get_zone_num(), 'v_internet' );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_pressed_left' ) {
-            my $source =
-              $audio_router->request_previous_virtual_source_for_zone(
-                $_->get_zone_num() );
+            my $source = $audio_router->request_previous_virtual_source_for_zone( $_->get_zone_num() );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'button_pressed_right' ) {
-            my $source =
-              $audio_router->request_next_virtual_source_for_zone(
-                $_->get_zone_num() );
+            my $source = $audio_router->request_next_virtual_source_for_zone( $_->get_zone_num() );
             $_->set_source($source) if ( $source > 0 );
         }
         elsif ( $state eq 'overheated' ) {
@@ -506,9 +444,7 @@ sub turn_audio_off {
 }
 
 if ( state_now $music_kitchen eq 'button_pressed_down' ) {
-    my $source =
-      $audio_router->select_virtual_source( $music_kitchen->get_zone_num(),
-        'v_tuner' );
+    my $source = $audio_router->select_virtual_source( $music_kitchen->get_zone_num(), 'v_tuner' );
     $music_kitchen->set_source($source) if ( $source > 0 );
 }
 
@@ -553,14 +489,11 @@ sub change_to_channel {
 foreach (@musica_sources) {
     next unless $_;
     if ( $state = state_now $_) {
-        my $source = $_->get_source_num();
-        my $vsource =
-          $audio_router->get_virtual_source_obj_for_real_source($source);
+        my $source  = $_->get_source_num();
+        my $vsource = $audio_router->get_virtual_source_obj_for_real_source($source);
         if ($vsource) {
-            print_log
-              "VirtualAudio: got state $state from source $source (vsource is $$vsource{name})";
-            print_log "VirtualAudio: playlist="
-              . $vsource->get_data('playlist');
+            print_log "VirtualAudio: got state $state from source $source (vsource is $$vsource{name})";
+            print_log "VirtualAudio: playlist=" . $vsource->get_data('playlist');
             if (   ( $vsource->get_data('playlist') )
                 or ( $$vsource{name} eq 'v_voice' ) )
             {
@@ -581,15 +514,11 @@ sub change_to_channel {
             }
             elsif ( $$vsource{name} eq 'v_pvr' ) {
                 if ( $state eq 'button_pressed_next' ) {
-                    $pvr_curr_channel =
-                      &pick_next_channel( $pvr_curr_channel,
-                        @dish_network_music );
+                    $pvr_curr_channel = &pick_next_channel( $pvr_curr_channel, @dish_network_music );
                     &change_to_channel( $IR_PVR, $pvr_curr_channel, 'SELECT' );
                 }
                 if ( $state eq 'button_pressed_previous' ) {
-                    $pvr_curr_channel =
-                      &pick_prev_channel( $pvr_curr_channel,
-                        @dish_network_music );
+                    $pvr_curr_channel = &pick_prev_channel( $pvr_curr_channel, @dish_network_music );
                     &change_to_channel( $IR_PVR, $pvr_curr_channel, 'SELECT' );
                 }
             }
@@ -629,8 +558,7 @@ sub change_to_channel {
     $Zone2_start_timer = 0;
 }
 if ( $Zone3_start_timer and not $Zone3_off_timer ) {
-    print_log
-      "VirtualAudio: setting timer for zone3 (start_timer=$Zone3_start_timer, off_timer=$Zone3_off_timer)";
+    print_log "VirtualAudio: setting timer for zone3 (start_timer=$Zone3_start_timer, off_timer=$Zone3_off_timer)";
     $Zone3_off_timer = new Timer;
     $Zone3_off_timer->set( 15, '$IR_Zone3->set("ZONEOFF");' );
     $Zone3_start_timer = 0;
@@ -665,9 +593,7 @@ sub change_to_channel {
 #  <a href="/RUN;referrer?&selectvsource($zone_object,'vsource_name')">...</a>
 sub selectvsource {
     my ( $zone_obj, $vsource ) = @_;
-    my $source =
-      $audio_router->select_virtual_source( $zone_obj->get_zone_num(),
-        $vsource );
+    my $source = $audio_router->select_virtual_source( $zone_obj->get_zone_num(), $vsource );
     $zone_obj->set_source($source) if ( $source > 0 );
     print_log "Got here: $zone_obj, $vsource";
     return "<P>Test message";
diff --git a/code/public/whole_house_audio_speech.pl b/code/public/whole_house_audio_speech.pl
index b1c046034..ceb6dfa78 100644
--- a/code/public/whole_house_audio_speech.pl
+++ b/code/public/whole_house_audio_speech.pl
@@ -60,14 +60,12 @@
 
 # If you want certain zones to turn on only if certain rooms are occupied,
 # you can list zone names and then associated presence objects here
-my %presence_by_room =
-  ( 'kitchen' => [ $om_presence_kitchen, $om_presence_family_room ] );
+my %presence_by_room = ( 'kitchen' => [ $om_presence_kitchen, $om_presence_family_room ] );
 
 # Define your alsa channels here (leave the undef there to fill the space
 # of the 0 array index).  These should be listed in the same order that
 # they are connected to you whole-house audio system
-my @alsa_channels =
-  ( undef, 'channel12', 'channel34', 'channel56', 'channel78' );
+my @alsa_channels = ( undef, 'channel12', 'channel34', 'channel56', 'channel78' );
 
 # Provide list of rooms to be used when speech goes to 'all' rooms
 # kitchen, master_bed, outside, office, kirks_room, guest_room
@@ -92,20 +90,13 @@
 my %delay;
 my %last_played;
 my $SpeechCount = 0;
-my @wav_players = (
-    undef,
-    new Process_Item(),
-    new Process_Item(),
-    new Process_Item(),
-    new Process_Item()
-);
+my @wav_players = ( undef, new Process_Item(), new Process_Item(), new Process_Item(), new Process_Item() );
 
 sub play_audio {
     my ( $output, $file ) = @_;
     my $cmd;
     if ( $bitrate and $file =~ /speak_festival/ ) {
-        $cmd =
-          "sox '$file' -r $bitrate '$file.new.wav'; /usr/bin/aplay -D '$alsa_channels[$output]' '$file.new.wav'";
+        $cmd = "sox '$file' -r $bitrate '$file.new.wav'; /usr/bin/aplay -D '$alsa_channels[$output]' '$file.new.wav'";
     }
     else {
         $cmd = "/usr/bin/aplay -D '$alsa_channels[$output]' '$file'";
@@ -167,19 +158,14 @@ sub pre_handle_room {
     my $source = 0;
     return 0 unless ( $zones_by_room{$room} );
     my $zone_num = $zones_by_room{$room}->get_zone_num();
-    print_log
-      "Speech: Checking room $room(zone=$zone_num): importance=$importance, only_if_occupied=$only_if_occupied";
-    print_log "Speech:    name of current virtual source: "
-      . $audio_router->get_virtual_source_name_for_zone($zone_num);
-    print_log "Speech:    current source: "
-      . $zones_by_room{$room}->get_source();
-    if ( $audio_router->get_virtual_source_name_for_zone($zone_num) eq
-        'v_voice' )
-    {
+    print_log "Speech: Checking room $room(zone=$zone_num): importance=$importance, only_if_occupied=$only_if_occupied";
+    print_log "Speech:    name of current virtual source: " . $audio_router->get_virtual_source_name_for_zone($zone_num);
+    print_log "Speech:    current source: " . $zones_by_room{$room}->get_source();
+    if ( $audio_router->get_virtual_source_name_for_zone($zone_num) eq 'v_voice' ) {
+
         # Always play if room is already tuned in...
         $source = $audio_router->get_real_source_number_for_zone($zone_num);
-        print_log
-          "Speech:    Room $room(zone=$zone_num): already on voice (source=$source)";
+        print_log "Speech:    Room $room(zone=$zone_num): already on voice (source=$source)";
 
         # Check for pause in case I'm playing MP3s through the Misterhouse web-based jukebox
         &check_for_pause($zone_num);
@@ -190,26 +176,21 @@ sub pre_handle_room {
         # Zone is already on another virtual source...
         print_log "Speech:    mute=" . $Save{"mute_$room"};
         if ( ( $importance eq 'urgent' ) or ( not $Save{"mute_$room"} ) ) {
-            my $vsource =
-              $audio_router->get_virtual_source_obj_for_zone($zone_num);
+            my $vsource = $audio_router->get_virtual_source_obj_for_zone($zone_num);
             print_log "Speech:    vsource=$$vsource{name}";
             if ( $vsource->get_data('playlist') ) {
 
                 # Source is playing MP3s...
                 $source = &check_for_pause($zone_num);
-                print_log
-                  "Speech:    Room $room(zone=$zone_num): listening to MP3s. (source=$source)";
+                print_log "Speech:    Room $room(zone=$zone_num): listening to MP3s. (source=$source)";
             }
             elsif (( $importance eq 'urgent' )
                 or ( $importance eq 'important' ) )
             {
                 # Not tuned to voice or MP3s
                 if ( not $only_if_occupied or &is_room_occupied($room) ) {
-                    $zone_recovery{$room}->{'vsource'} =
-                      $audio_router->get_virtual_source_name_for_zone(
-                        $zone_num);
-                    $source = $audio_router->select_virtual_source( $zone_num,
-                        'v_voice' );
+                    $zone_recovery{$room}->{'vsource'} = $audio_router->get_virtual_source_name_for_zone($zone_num);
+                    $source = $audio_router->select_virtual_source( $zone_num, 'v_voice' );
                     $zones_by_room{$room}->set_source($source)
                       if ( $source > 0 );
                     print_log
@@ -225,15 +206,12 @@ sub pre_handle_room {
         # Zone is off... turn on unless debug importance
         if ( not $only_if_occupied or &is_room_occupied($room) ) {
             if ( ( $importance eq 'urgent' ) or ( not $Save{"mute_$room"} ) ) {
-                $source =
-                  $audio_router->select_virtual_source( $zone_num, 'v_voice' );
+                $source = $audio_router->select_virtual_source( $zone_num, 'v_voice' );
                 if ( $source > 0 ) {
-                    print_log
-                      "Speech:    Room $room(zone=$zone_num): turning on to source $source";
+                    print_log "Speech:    Room $room(zone=$zone_num): turning on to source $source";
                     $zones_by_room{$room}->set_source($source);
                     if ( $speech_volume{ $zones_by_room{$room} } ) {
-                        $zones_by_room{$room}->set_volume(
-                            $speech_volume{ $zones_by_room{$room} } );
+                        $zones_by_room{$room}->set_volume( $speech_volume{ $zones_by_room{$room} } );
                     }
                     $zones_by_room{$room}->delay_off(120);
                 }
@@ -250,15 +228,13 @@ sub pre_handle_room {
             }
         }
     }
-    print_log
-      "Speech:    returning source $source for room $room(zone=$zone_num)";
+    print_log "Speech:    returning source $source for room $room(zone=$zone_num)";
     return $source;
 }
 
 sub pre_speak_hook {
     my ($parms) = @_;
-    print_log
-      "Speech: pre_speak_hook importance=$$parms{importance}, rooms=[$$parms{rooms}]";
+    print_log "Speech: pre_speak_hook importance=$$parms{importance}, rooms=[$$parms{rooms}]";
     my $only_if_occupied = 1;
     my $importance       = $$parms{'importance'};
     unless ($importance) {
@@ -280,8 +256,7 @@ sub pre_speak_hook {
     my $source;
     my %use_players;
     foreach (@rooms) {
-        if ( $source = &pre_handle_room( $_, $importance, $only_if_occupied ) )
-        {
+        if ( $source = &pre_handle_room( $_, $importance, $only_if_occupied ) ) {
             print_log "Speech: got source $source for room $_";
             $use_players{$source}++;
         }
@@ -298,8 +273,7 @@ sub pre_speak_hook {
     print_log "Speech: player string is: $player_str";
     if ($player_str) {
         $SpeechCount++;
-        $parms->{'to_file'} =
-          "$config_parms{html_alias_cache}/speak_festival.${Hour}.${Minute}.${Second}.${SpeechCount}.wav";
+        $parms->{'to_file'}     = "$config_parms{html_alias_cache}/speak_festival.${Hour}.${Minute}.${Second}.${SpeechCount}.wav";
         $parms->{'use_players'} = $player_str;
     }
     else {
@@ -328,8 +302,7 @@ sub post_speak_hook {
 #####################################################################
 
 if ($New_Hour) {
-    system( 'find', "$config_parms{html_alias_cache}",
-        '-mmin', '+5', '-exec', 'rm', '-f', '{}', ';' );
+    system( 'find', "$config_parms{html_alias_cache}", '-mmin', '+5', '-exec', 'rm', '-f', '{}', ';' );
 }
 
 if ($Reload) {
@@ -341,16 +314,14 @@ sub post_speak_hook {
 # Watch for completion...
 for ( my $source = 1; $source <= $#wav_players; $source++ ) {
     if ( $wav_players[$source]->done_now() ) {
-        print_log
-          "Speech:    speech to source $source is complete (restore_volume=$restore_volume[$source]).";
+        print_log "Speech:    speech to source $source is complete (restore_volume=$restore_volume[$source]).";
         if ( $restore_volume[$source] ) {
             if ($pause_mp3s) {
                 print_log "Speech:    Unpausing MP3s on source $source";
                 $players[$source]->unpause();
             }
             else {
-                print_log
-                  "Speech:    Increasing volume of MP3s on source $source";
+                print_log "Speech:    Increasing volume of MP3s on source $source";
                 $players[$source]->volume('1.0');
             }
             $restore_volume[$source] = 0;
@@ -358,12 +329,9 @@ sub post_speak_hook {
         foreach my $room ( keys %zone_recovery ) {
             if ( $zone_recovery{$room}->{'source'} == $source ) {
                 if ( $zone_recovery{$room}->{'vsource'} ) {
-                    print_log
-                      "Speech:    returning $room to virtual source $zone_recovery{$room}->{'vsource'}";
-                    my $newsource = $audio_router->select_virtual_source(
-                        $zone_recovery{$room}->{'zone'},
-                        $zone_recovery{$room}->{'vsource'}
-                    );
+                    print_log "Speech:    returning $room to virtual source $zone_recovery{$room}->{'vsource'}";
+                    my $newsource =
+                      $audio_router->select_virtual_source( $zone_recovery{$room}->{'zone'}, $zone_recovery{$room}->{'vsource'} );
                     $zones_by_room{$room}->set_source($newsource)
                       if ( $newsource > 0 );
                 }
diff --git a/code/public/winamp_control.pl b/code/public/winamp_control.pl
index 83d55c1d1..1027c97dc 100644
--- a/code/public/winamp_control.pl
+++ b/code/public/winamp_control.pl
@@ -30,11 +30,10 @@
 use Win32::GUI;
 
 sub winamp {
-    use constant WM_USER =>
-      0x0400;   # Some information about WM_USER is available at
-                # http://msdn.microsoft.com/library/psdk/winui/messques_4soi.htm
-                # WM_USER is not defined in Win32::GUI so it has to be
-                # defined manually to use it with windows messaging.
+    use constant WM_USER => 0x0400;    # Some information about WM_USER is available at
+                                       # http://msdn.microsoft.com/library/psdk/winui/messques_4soi.htm
+                                       # WM_USER is not defined in Win32::GUI so it has to be
+                                       # defined manually to use it with windows messaging.
     my $command = shift(@_);
     my $data    = shift(@_);
     my $winamp_handle;
@@ -43,46 +42,44 @@ sub winamp {
     my $DEBUG = 0;
 
     my %cmd = (
-        'previous'    => 40044,    #previous track
-        'next'        => 40048,    #next track
-        'play'        => 40045,    #play button
-        'pause'       => 40046,    #pause/unpause
-        'stop'        => 40047,    #stop button
-        'fade'        => 40147,    #fade out and stops
-        'stop next'   => 40157,    #stops after current track
-        'forward'     => 40148,    #Fast-forward 5 seconds
-        'rewind'      => 40144,    #Fast-rewind 5 seconds
-        'beginning'   => 40154,    #Start of playlist
-        'end'         => 40158,    #Go to end of playlist
-        'eq'          => 40036,    #Toggle EQ
-        'volume up'   => 40058,    #Raise volume by 1%
-        'volume down' => 40059,    #Lower volume by 1%
-        'repeat'      => 40022,    #Toggle repeat
-        'shuffle'     => 40023,    #Toggle shuffle
-        'close'       => 40001,    #Close Winamp
-        'back 10'     => 40197     #Moves back 10 tracks in playlist
+        'previous'    => 40044,        #previous track
+        'next'        => 40048,        #next track
+        'play'        => 40045,        #play button
+        'pause'       => 40046,        #pause/unpause
+        'stop'        => 40047,        #stop button
+        'fade'        => 40147,        #fade out and stops
+        'stop next'   => 40157,        #stops after current track
+        'forward'     => 40148,        #Fast-forward 5 seconds
+        'rewind'      => 40144,        #Fast-rewind 5 seconds
+        'beginning'   => 40154,        #Start of playlist
+        'end'         => 40158,        #Go to end of playlist
+        'eq'          => 40036,        #Toggle EQ
+        'volume up'   => 40058,        #Raise volume by 1%
+        'volume down' => 40059,        #Lower volume by 1%
+        'repeat'      => 40022,        #Toggle repeat
+        'shuffle'     => 40023,        #Toggle shuffle
+        'close'       => 40001,        #Close Winamp
+        'back 10'     => 40197         #Moves back 10 tracks in playlist
     );
 
     my %usr = (
-        'version'    => 0,   #Returns the version of Winamp.
-        'clear'      => 101, #Clears playlist.
-        'play track' => 102, #Begins play of selected track.
-        'status'     => 104, #Returns: playing=1, paused=3, stopped=all others
-        'position'   => 105, #If data is 0, returns the position in milliseconds
-             #If data is 1, returns current track length in seconds.
-             #Returns -1 if not playing or if an error occurs.
-        'offset' => 106,  #Seeks within the current track by 'data' milliseconds
-        'write playlist' => 120,    #Writes out the current playlist to
-                                    #Winampdir\winamp.m3u, and returns
-                                    #the current position in the playlist.
-        'set track'      => 121,    #Sets the playlist position to 'data'.
-        'set volume'     => 122,    #Sets the volume to 'data' (0 to 255).
-        'set balance' => 123, #Sets the balance to 'data' (0 left to 255 right).
-        'playlist length' =>
-          124,    #Returns length of the current playlist, in tracks.
-        'playlist position' =>
-          125,    #Returns current playlist position, in tracks.
-        'restart' => 135    #Restarts Winamp
+        'version'           => 0,      #Returns the version of Winamp.
+        'clear'             => 101,    #Clears playlist.
+        'play track'        => 102,    #Begins play of selected track.
+        'status'            => 104,    #Returns: playing=1, paused=3, stopped=all others
+        'position'          => 105,    #If data is 0, returns the position in milliseconds
+                                       #If data is 1, returns current track length in seconds.
+                                       #Returns -1 if not playing or if an error occurs.
+        'offset'            => 106,    #Seeks within the current track by 'data' milliseconds
+        'write playlist'    => 120,    #Writes out the current playlist to
+                                       #Winampdir\winamp.m3u, and returns
+                                       #the current position in the playlist.
+        'set track'         => 121,    #Sets the playlist position to 'data'.
+        'set volume'        => 122,    #Sets the volume to 'data' (0 to 255).
+        'set balance'       => 123,    #Sets the balance to 'data' (0 left to 255 right).
+        'playlist length'   => 124,    #Returns length of the current playlist, in tracks.
+        'playlist position' => 125,    #Returns current playlist position, in tracks.
+        'restart'           => 135     #Restarts Winamp
     );
 
     unless ( $winamp_handle = Win32::GUI::FindWindow( "Winamp v1.x", undef ) ) {
@@ -97,8 +94,7 @@ sub winamp {
 
     if ( $cmd_data = $cmd{"$command"} ) {
         print "Valid Winamp command: $command\n" if $DEBUG;
-        return Win32::GUI::SendMessage( $winamp_handle, WM_COMMAND, $cmd_data,
-            $id );
+        return Win32::GUI::SendMessage( $winamp_handle, WM_COMMAND, $cmd_data, $id );
     }
 
     print "Error: Invalid Winamp command\n" if $DEBUG;
diff --git a/code/public/winlirc_client.pl b/code/public/winlirc_client.pl
index 97e9f9d39..cea36fff1 100644
--- a/code/public/winlirc_client.pl
+++ b/code/public/winlirc_client.pl
@@ -3,8 +3,7 @@
 use strict;
 
 ##############################################################################
-$winlirc_client =
-  new Socket_Item( undef, undef, 'localhost:8765', 'winlirc', 'tcp', 'record' );
+$winlirc_client = new Socket_Item( undef, undef, 'localhost:8765', 'winlirc', 'tcp', 'record' );
 
 if ($Startup) {
     start $winlirc_client;
@@ -13,8 +12,7 @@
 if ( my $msg = said $winlirc_client) {
 
     #    		print_log "Winlirc_message_received: $msg\n";
-    my ( $code, $act, $key, $remote ) =
-      ( $msg =~ /([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) */ );
+    my ( $code, $act, $key, $remote ) = ( $msg =~ /([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) */ );
     if ( $act eq '00' ) {
         print_log "Winlirc_message_received: $msg\n";
         print "Winlirc_message_received: $msg\n";
@@ -40,35 +38,35 @@
         run_voice_cmd 'Set audible key to 2'       if ( $key eq 'CD-5' );
         run_voice_cmd 'Toggle the house mode'      if ( $key eq 'CD-Mute' );
         run_voice_cmd 'Media Box rand_next'        if ( $key eq 'TV-Prog-up' );
-        run_voice_cmd 'Media Box stop'       if ( $key eq 'TV-Prog-down' );
-        run_voice_cmd 'Media Box voldn'      if ( $key eq 'TV-1' );
-        run_voice_cmd 'Media Box volup'      if ( $key eq 'TV-3' );
-        run_voice_cmd 'Media Box voldn'      if ( $key eq 'TV-Volume-down' );
-        run_voice_cmd 'Media Box volup'      if ( $key eq 'TV-Volume-up' );
-        run_voice_cmd 'Media Box up'         if ( $key eq 'TV-2' );
-        run_voice_cmd 'Media Box down'       if ( $key eq 'TV-8' );
-        run_voice_cmd 'Media Box left'       if ( $key eq 'TV-4' );
-        run_voice_cmd 'Media Box right'      if ( $key eq 'TV-6' );
-        run_voice_cmd 'Media Box enter'      if ( $key eq 'TV-5' );
-        run_voice_cmd 'Media Box play_pause' if ( $key eq 'TV-0' );
-        run_voice_cmd 'Media Box play_pause' if ( $key eq 'TV-0' );
-        run_voice_cmd 'Media Box fforward'   if ( $key eq 'TV-9' );
-        run_voice_cmd 'Media Box mark'       if ( $key eq 'TV-7' );
-        run_voice_cmd 'Media Box exit'       if ( $key eq 'TV-Exit' );
-        run_voice_cmd 'Media Box start'      if ( $key eq 'TV-Switch-onoff' );
-        run_voice_cmd 'Turn on TV channel 1' if ( $key eq 'TV 1' );
-        run_voice_cmd 'Turn on TV channel 2' if ( $key eq 'TV 2' );
-        run_voice_cmd 'Turn on TV channel 3' if ( $key eq 'TV 3' );
-        run_voice_cmd 'Turn on TV channel 4' if ( $key eq 'TV 4' );
-        run_voice_cmd 'Turn on TV channel 5' if ( $key eq 'TV 5' );
-        run_voice_cmd 'Turn on TV channel 6' if ( $key eq 'TV 6' );
-        run_voice_cmd 'Turn on TV channel 7' if ( $key eq 'TV 7' );
-        run_voice_cmd 'Turn on TV channel 8' if ( $key eq 'TV 8' );
-        run_voice_cmd 'Set TV Channel up'    if ( $key eq 'TV-Prog-up' );
-        run_voice_cmd 'Set TV Channel down'  if ( $key eq 'TV-Prog-down' );
-        run_voice_cmd 'Set TV OnOff'         if ( $key eq 'TV Switch onoff' );
-        run_voice_cmd 'Set TV Full screen'   if ( $key eq 'TV Full screen' );
-        run_voice_cmd 'Set TV Mute'          if ( $key eq 'TV Mute' );
+        run_voice_cmd 'Media Box stop'             if ( $key eq 'TV-Prog-down' );
+        run_voice_cmd 'Media Box voldn'            if ( $key eq 'TV-1' );
+        run_voice_cmd 'Media Box volup'            if ( $key eq 'TV-3' );
+        run_voice_cmd 'Media Box voldn'            if ( $key eq 'TV-Volume-down' );
+        run_voice_cmd 'Media Box volup'            if ( $key eq 'TV-Volume-up' );
+        run_voice_cmd 'Media Box up'               if ( $key eq 'TV-2' );
+        run_voice_cmd 'Media Box down'             if ( $key eq 'TV-8' );
+        run_voice_cmd 'Media Box left'             if ( $key eq 'TV-4' );
+        run_voice_cmd 'Media Box right'            if ( $key eq 'TV-6' );
+        run_voice_cmd 'Media Box enter'            if ( $key eq 'TV-5' );
+        run_voice_cmd 'Media Box play_pause'       if ( $key eq 'TV-0' );
+        run_voice_cmd 'Media Box play_pause'       if ( $key eq 'TV-0' );
+        run_voice_cmd 'Media Box fforward'         if ( $key eq 'TV-9' );
+        run_voice_cmd 'Media Box mark'             if ( $key eq 'TV-7' );
+        run_voice_cmd 'Media Box exit'             if ( $key eq 'TV-Exit' );
+        run_voice_cmd 'Media Box start'            if ( $key eq 'TV-Switch-onoff' );
+        run_voice_cmd 'Turn on TV channel 1'       if ( $key eq 'TV 1' );
+        run_voice_cmd 'Turn on TV channel 2'       if ( $key eq 'TV 2' );
+        run_voice_cmd 'Turn on TV channel 3'       if ( $key eq 'TV 3' );
+        run_voice_cmd 'Turn on TV channel 4'       if ( $key eq 'TV 4' );
+        run_voice_cmd 'Turn on TV channel 5'       if ( $key eq 'TV 5' );
+        run_voice_cmd 'Turn on TV channel 6'       if ( $key eq 'TV 6' );
+        run_voice_cmd 'Turn on TV channel 7'       if ( $key eq 'TV 7' );
+        run_voice_cmd 'Turn on TV channel 8'       if ( $key eq 'TV 8' );
+        run_voice_cmd 'Set TV Channel up'          if ( $key eq 'TV-Prog-up' );
+        run_voice_cmd 'Set TV Channel down'        if ( $key eq 'TV-Prog-down' );
+        run_voice_cmd 'Set TV OnOff'               if ( $key eq 'TV Switch onoff' );
+        run_voice_cmd 'Set TV Full screen'         if ( $key eq 'TV Full screen' );
+        run_voice_cmd 'Set TV Mute'                if ( $key eq 'TV Mute' );
         run_voice_cmd 'Toggle recording of TV programme'
           if ( $key eq 'TV Record' );
         run_voice_cmd 'Play recorded file' if ( $key eq 'TV Red' );
@@ -109,13 +107,13 @@
         run_voice_cmd 'Turn on Radio channel 7' if ( $key eq 'RADIO 7' );
         run_voice_cmd 'Turn on Radio channel 8' if ( $key eq 'RADIO 8' );
         run_voice_cmd 'Set Radio Seek up'       if ( $key eq 'RADIO Prog up' );
-        run_voice_cmd 'Set Radio Seek down' if ( $key eq 'RADIO Prog down' );
-        run_voice_cmd 'Set Radio Volume up' if ( $key eq 'RADIO Volume up' );
+        run_voice_cmd 'Set Radio Seek down'     if ( $key eq 'RADIO Prog down' );
+        run_voice_cmd 'Set Radio Volume up'     if ( $key eq 'RADIO Volume up' );
         run_voice_cmd 'Set Radio Volume down'
           if ( $key eq 'RADIO Volume down' );
-        run_voice_cmd 'Set Radio Off'  if ( $key eq 'RADIO Exit' );
-        run_voice_cmd 'Set Radio Off'  if ( $key eq 'RADIO Switch onoff' );
-        run_voice_cmd 'Set Radio Mute' if ( $key eq 'RADIO Mute' );
+        run_voice_cmd 'Set Radio Off'              if ( $key eq 'RADIO Exit' );
+        run_voice_cmd 'Set Radio Off'              if ( $key eq 'RADIO Switch onoff' );
+        run_voice_cmd 'Set Radio Mute'             if ( $key eq 'RADIO Mute' );
         run_voice_cmd 'Set music audible key to 1' if ( $key eq 'TV-Red' );
         run_voice_cmd 'Set music audible key to 2' if ( $key eq 'TV-Green' );
         run_voice_cmd 'Set audible key to 1'       if ( $key eq 'TV-Yellow' );
diff --git a/code/public/wintv_radio.pl b/code/public/wintv_radio.pl
index 49123ac86..516dac2ea 100644
--- a/code/public/wintv_radio.pl
+++ b/code/public/wintv_radio.pl
@@ -16,9 +16,8 @@
 #Add the following to an HTML page to play via the web:
 #  <a href='/RUN?Set_house_radio_to_100.3'>KCYY 100.3 Country</a>
 
-$v_radio_control = new Voice_Cmd(
-    "Set House radio to [90.1,91.7,92.5,92.9,95.1,96.1,97.3,98.5,99.5,100.3,101.1,101.9,104.5,105.3,106.7,/QUIT]"
-);
+$v_radio_control =
+  new Voice_Cmd( "Set House radio to [90.1,91.7,92.5,92.9,95.1,96.1,97.3,98.5,99.5,100.3,101.1,101.9,104.5,105.3,106.7,/QUIT]" );
 
 if ( $state = said $v_radio_control) {
     run qq[$config_parms{WinRadio} "$state"];
diff --git a/code/public/wintvcapture.pl b/code/public/wintvcapture.pl
index 8380b725e..83a724c1d 100644
--- a/code/public/wintvcapture.pl
+++ b/code/public/wintvcapture.pl
@@ -41,8 +41,7 @@ sub CaptureWinTv32 {
     #my $KeyCommand = $string1.$FileName.$string2.$string3; # building command like this is versatile
     # WinTV32 must be running, but you can minimise it
     if ( my $window = &sendkeys_find_window( 'WinTV32', 'WinTV32' ) ) {
-        &SendKeys( $window, $KeyCommand, 0, 300 )
-          ;    # the 300 is a delay between key to give the program time,
+        &SendKeys( $window, $KeyCommand, 0, 300 );    # the 300 is a delay between key to give the program time,
 
         #adjust for your CPU speed, I'm running 1500MHz. Start with a bigger number to see how it works
         print_log "Picture captured";
diff --git a/code/public/wintvpvr_grid.pl b/code/public/wintvpvr_grid.pl
index ff4bbb723..9cf4bfd14 100644
--- a/code/public/wintvpvr_grid.pl
+++ b/code/public/wintvpvr_grid.pl
@@ -51,8 +51,7 @@
 
     # command line I need: C:\PROGRA~1\WinTV\WinTV2K.EXE  -c3 -ntod -startr:WinTV_(0)###.mpg -qvcd -limit:3600
     # so: runline = "$wintv_loc -c$channel -ntod -startr:$show_name###.mpg -qvcd -limit:(seconds time_diff{$stop - $start}+60)
-    my ( $channel, $start, $stop, $date, $show_name ) =
-      $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
+    my ( $channel, $start, $stop, $date, $show_name ) = $data =~ /(\d+) from (\S+) to (\S+) on (\S+) for (.*)/;
     my ( $stop_hr,  $stop_min )  = $stop =~ /(\d+):(\d+)/;
     my ( $start_hr, $start_min ) = $start =~ /(\d+):(\d+)/;
     my $end_date = $date;
@@ -64,8 +63,7 @@
         return;
     }
 
-    my $msg =
-      "Adding WinTV PVR schedule for $show_name.  Channel $channel from $start to $stop on $date.";
+    my $msg = "Adding WinTV PVR schedule for $show_name.  Channel $channel from $start to $stop on $date.";
     speak $msg;
     print_log $msg;
 
@@ -90,14 +88,12 @@
         #display "debug: start = $start, $date";
     }
 
-    my $showsecs =
-      &my_str2time("$stop + 00:01") - &my_str2time("$start - 00:01");
+    my $showsecs = &my_str2time("$stop + 00:01") - &my_str2time("$start - 00:01");
 
     #display "debug: difference = $showsecs";
 
     $show_name = _clean_text_string("$show_name");
-    my $WinTV_Cmdline =
-      "$wintv_loc -c$channel -nss -ntod -startr:\\\"$show_name###.mpg\\\" -qvcd -limit:$showsecs";
+    my $WinTV_Cmdline = "$wintv_loc -c$channel -nss -ntod -startr:\\\"$show_name###.mpg\\\" -qvcd -limit:$showsecs";
     display "start: $start Commandline: $WinTV_Cmdline";
     print_log "Recording stopped" if done_now $p_pvr_rec;
 
@@ -144,17 +140,14 @@
 
 # This is what downloads tv data.  This needs to be forked/detatched, as it can take a while
 $v_get_tv_grid_data1 = new Voice_Cmd('[Get,reget,redo] tv grid data for today');
-$v_get_tv_grid_data7 =
-  new Voice_Cmd('[Get,reget,redo] tv grid data for the next week');
+$v_get_tv_grid_data7 = new Voice_Cmd('[Get,reget,redo] tv grid data for the next week');
 $v_get_tv_grid_data1->set_info(
-    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.'
-);
+    'Updates the TV database with.  reget will reget html, redo re-uses.  Get will only reget or redo if the data is old.' );
 if ( $state = said $v_get_tv_grid_data1 or $state = said $v_get_tv_grid_data7) {
     if (&net_connect_check) {
         my $days = ( said $v_get_tv_grid_data7) ? 7 : 1;
         $state = ( $state eq 'Get' ) ? '' : "-$state";
-        my $pgm =
-          "get_tv_grid -zip $config_parms{zip_code} -provider $config_parms{tv_provider} $state -days $days";
+        my $pgm = "get_tv_grid -zip $config_parms{zip_code} -provider $config_parms{tv_provider} $state -days $days";
         $pgm .= qq[ -hour  "$config_parms{tv_hours}"]
           if $config_parms{tv_hours};
         $pgm .= qq[ -label "$config_parms{tv_label}"]
@@ -166,13 +159,11 @@
 
         # If we have set the net_mail_send_account, send default web page via email
         my $mail_account = $config_parms{net_mail_send_account};
-        my $mail_server =
-          $main::config_parms{"net_mail_${mail_account}_server_send"};
-        my $mail_to = $main::config_parms{"net_mail_${mail_account}_address"};
+        my $mail_server  = $main::config_parms{"net_mail_${mail_account}_server_send"};
+        my $mail_to      = $main::config_parms{"net_mail_${mail_account}_address"};
         if ( $mail_to and $mail_server ) {
             $pgm .= " -mail_to $mail_to -mail_server $mail_server ";
-            $pgm .=
-              " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
+            $pgm .= " -mail_baseref $config_parms{http_server}:$config_parms{http_port} ";
         }
 
         run $pgm;
diff --git a/code/public/wxserver_client.pl b/code/public/wxserver_client.pl
index 2092c70d1..a1291111b 100644
--- a/code/public/wxserver_client.pl
+++ b/code/public/wxserver_client.pl
@@ -73,25 +73,14 @@
             $CurrentWxRequest = 0;
 
             #$WxServer->stop;
-            $Weather{Summary_Short} = sprintf(
-                "%4.1f/%2d/%2d %3d%% %3d%%",
-                $Weather{TempIndoor}, $Weather{TempOutdoor},
-                $Weather{WindChill},  $Weather{HumidIndoor},
-                $Weather{HumidOutdoor}
-            );
-            $Weather{Summary} = sprintf(
-                "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
-                $Weather{TempIndoor}, $Weather{TempOutdoor},
-                $Weather{WindChill},  $Weather{HumidIndoor},
-                $Weather{HumidOutdoor}
-            );
+            $Weather{Summary_Short} = sprintf( "%4.1f/%2d/%2d %3d%% %3d%%",
+                $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
+            $Weather{Summary} = sprintf( "In/out/chill: %4.1f/%2d/%2d Humid:%3d%% %3d%%",
+                $Weather{TempIndoor}, $Weather{TempOutdoor}, $Weather{WindChill}, $Weather{HumidIndoor}, $Weather{HumidOutdoor} );
             $Weather{SummaryRain} =
-              sprintf( "Rain Recent/Total: %3.1f / %4.1f  Barom: %4d",
-                $Weather{RainRate}, $Weather{RainTotal}, $Weather{Barom} );
-            $Weather{SummaryWind} =
-              sprintf( "Wind avg/gust:%3d /%3d  from the %s",
-                $Weather{WindAvgSpeed}, $Weather{WindGustSpeed},
-                &main::convert_direction( $Weather{WindAvgDir} ) );
+              sprintf( "Rain Recent/Total: %3.1f / %4.1f  Barom: %4d", $Weather{RainRate}, $Weather{RainTotal}, $Weather{Barom} );
+            $Weather{SummaryWind} = sprintf( "Wind avg/gust:%3d /%3d  from the %s",
+                $Weather{WindAvgSpeed}, $Weather{WindGustSpeed}, &main::convert_direction( $Weather{WindAvgDir} ) );
         }
     }
 
diff --git a/code/public/wxserver_server.pl b/code/public/wxserver_server.pl
index 7f869b01a..0063fc561 100644
--- a/code/public/wxserver_server.pl
+++ b/code/public/wxserver_server.pl
@@ -12,8 +12,7 @@
 #
 #my $WxServerVersionID = 'mh server_wxserver.pl V0.0.1';
 
-$ServerWxServer =
-  new Socket_Item( undef, undef, 'server_wxserver', undef, 'tcp', 'raw' );
+$ServerWxServer = new Socket_Item( undef, undef, 'server_wxserver', undef, 'tcp', 'raw' );
 
 #                                  Ref             m        b    Units  units
 my %WxCommandSet = (
diff --git a/code/public/x10_priority.pl b/code/public/x10_priority.pl
index 9e239d8a3..c762ae405 100644
--- a/code/public/x10_priority.pl
+++ b/code/public/x10_priority.pl
@@ -41,8 +41,7 @@ sub set_cm11a {
         push( @cm11a_low, $device, $state, $cm11a_tick );
     }
     else {
-        print
-          "SET_CM11A: ERROR, BAD PRIORITY VALUE, DEVICE $device, STATE $state\n";
+        print "SET_CM11A: ERROR, BAD PRIORITY VALUE, DEVICE $device, STATE $state\n";
         return;
     }
     $cm11a_tick += 1;
@@ -61,8 +60,7 @@ sub set_cm17a {
         push( @cm17a_low, $device, $state, $cm17a_tick );
     }
     else {
-        print
-          "SET_CM17A: ERROR, BAD PRIORITY VALUE, DEVICE $device, STATE $state\n";
+        print "SET_CM17A: ERROR, BAD PRIORITY VALUE, DEVICE $device, STATE $state\n";
         return;
     }
     $cm17a_tick += 1;
@@ -151,11 +149,7 @@ sub do_x10_set {
 
             # See if this valid HIGH set had preempted any of the valid lower sets
             if (
-                (
-                        @cm11a_norm > 0
-                    and $cm11a_norm[2] < $tickcount
-                    and $cm11a_norm[1] ne 'invalid'
-                )
+                ( @cm11a_norm > 0 and $cm11a_norm[2] < $tickcount and $cm11a_norm[1] ne 'invalid' )
                 or (    @cm11a_low > 0
                     and $cm11a_low[2] < $tickcount
                     and $cm11a_low[1] ne 'invalid' )
@@ -278,11 +272,7 @@ sub do_x10_set {
 
             # See if this valid HIGH set had preempted any of the valid lower sets
             if (
-                (
-                        @cm17a_norm > 0
-                    and $cm17a_norm[2] < $tickcount
-                    and $cm17a_norm[1] ne 'invalid'
-                )
+                ( @cm17a_norm > 0 and $cm17a_norm[2] < $tickcount and $cm17a_norm[1] ne 'invalid' )
                 or (    @cm17a_low > 0
                     and $cm17a_low[2] < $tickcount
                     and $cm17a_low[1] ne 'invalid' )
@@ -377,30 +367,20 @@ sub do_x10_set {
 if ($New_Hour) {
     if ( ( $cm11a_actual_sets + $cm11a_discarded_sets ) > 0 ) {
         print "X10 CM11A Priority Statistics for x10_priority.pl code module\n";
-        print
-          "CM11A: Total actual sets = $cm11a_actual_sets, discarded sets = $cm11a_discarded_sets\n";
-        print
-          "CM11A: HIGH sets that preempted NORM & LOW sets = $cm11a_high_preempt\n";
-        print
-          "CM11A: NORM sets that preempted LOW sets = $cm11a_norm_preempt\n";
-        print
-          "CM11A: NORM sets Invalidated by HIGH sets = $cm11a_norm_invalid\n";
-        print
-          "CM11A: LOW sets Invalidated by HIGH & NORM sets = $cm11a_low_invalid\n";
+        print "CM11A: Total actual sets = $cm11a_actual_sets, discarded sets = $cm11a_discarded_sets\n";
+        print "CM11A: HIGH sets that preempted NORM & LOW sets = $cm11a_high_preempt\n";
+        print "CM11A: NORM sets that preempted LOW sets = $cm11a_norm_preempt\n";
+        print "CM11A: NORM sets Invalidated by HIGH sets = $cm11a_norm_invalid\n";
+        print "CM11A: LOW sets Invalidated by HIGH & NORM sets = $cm11a_low_invalid\n";
     }
 
     if ( ( $cm17a_actual_sets + $cm17a_discarded_sets ) > 0 ) {
         print "X10 CM17A Priority Statistics for x10_priority.pl code module\n";
-        print
-          "CM17A: Total actual sets = $cm17a_actual_sets, discarded sets = $cm17a_discarded_sets\n";
-        print
-          "CM17A: HIGH sets that preempted NORM & LOW sets = $cm17a_high_preempt\n";
-        print
-          "CM17A: NORM sets that preempted LOW sets = $cm17a_norm_preempt\n";
-        print
-          "CM17A: NORM sets Invalidated by HIGH sets = $cm17a_norm_invalid\n";
-        print
-          "CM17A: LOW sets Invalidated by HIGH & NORM sets = $cm17a_low_invalid\n";
+        print "CM17A: Total actual sets = $cm17a_actual_sets, discarded sets = $cm17a_discarded_sets\n";
+        print "CM17A: HIGH sets that preempted NORM & LOW sets = $cm17a_high_preempt\n";
+        print "CM17A: NORM sets that preempted LOW sets = $cm17a_norm_preempt\n";
+        print "CM17A: NORM sets Invalidated by HIGH sets = $cm17a_norm_invalid\n";
+        print "CM17A: LOW sets Invalidated by HIGH & NORM sets = $cm17a_low_invalid\n";
     }
 }
 
diff --git a/code/public/x10_video_security.pl b/code/public/x10_video_security.pl
index a9477fab8..a9ebb7b67 100644
--- a/code/public/x10_video_security.pl
+++ b/code/public/x10_video_security.pl
@@ -81,17 +81,14 @@
 
 #
 # Define Voice Commands
-$v_Back_Porch_Light = new Voice_Cmd "Turn Back Porch Lights [on,off]";
-$v_Back_Porch_Light_Timer =
-  new Voice_Cmd "Turn Back Porch Lights off in [1,5,10,30,60] minutes";
-$v_Surv_Item_Query = new Voice_Cmd "How long is [Back Porch Light,Camera] on?";
-$v_Which_Camera    = new Voice_Cmd "Which camera is on";
-$v_Show_Camera =
-  new Voice_Cmd "Show [Back Porch,Front Porch,Side Drive,Side Yard]";
-$v_Record_Camera =
-  new Voice_Cmd "Record [Back Porch,Front Porch,Side Drive,Side Yard]";
-$v_Camera_Status = new Voice_Cmd "What is the status of the Cameras";
-$v_Scan_Camera   = new Voice_Cmd "Scan Cameras";
+$v_Back_Porch_Light       = new Voice_Cmd "Turn Back Porch Lights [on,off]";
+$v_Back_Porch_Light_Timer = new Voice_Cmd "Turn Back Porch Lights off in [1,5,10,30,60] minutes";
+$v_Surv_Item_Query        = new Voice_Cmd "How long is [Back Porch Light,Camera] on?";
+$v_Which_Camera           = new Voice_Cmd "Which camera is on";
+$v_Show_Camera            = new Voice_Cmd "Show [Back Porch,Front Porch,Side Drive,Side Yard]";
+$v_Record_Camera          = new Voice_Cmd "Record [Back Porch,Front Porch,Side Drive,Side Yard]";
+$v_Camera_Status          = new Voice_Cmd "What is the status of the Cameras";
+$v_Scan_Camera            = new Voice_Cmd "Scan Cameras";
 
 #
 # Check each motion detector for change of state
@@ -117,10 +114,7 @@
         if ( ( 'Back Porch On' eq $state ) or ( 'Back Porch' eq $v_state ) ) {
             set $Camera_Back_Porch 'on' if ( 'off' eq state $Camera_Back_Porch);
             if (
-                (
-                        time_greater_than "$Time_Sunset"
-                    and time_less_than "11:59 PM"
-                )
+                ( time_greater_than "$Time_Sunset" and time_less_than "11:59 PM" )
                 or (    time_greater_than "12:00 AM"
                     and time_less_than "$Time_Sunrise" )
               )
@@ -131,12 +125,10 @@
             }
             if ( not active $Camera_Back_Porch_Timer) {
                 if ( 'Back Porch' eq $v_state ) {
-                    $remark =
-                      "Requested re cord of Back Porch. Turning on VCR and Camera.";
+                    $remark = "Requested re cord of Back Porch. Turning on VCR and Camera.";
                 }
                 else {
-                    $remark =
-                      "Motion on Back Porch. Turning on VCR and Camera.";
+                    $remark = "Motion on Back Porch. Turning on VCR and Camera.";
                 }
             }
             else {
@@ -159,12 +151,10 @@
             set $Camera_Front_Porch 'on';
             if ( not active $Camera_Front_Porch_Timer) {
                 if ( 'Front Porch' eq $v_state ) {
-                    $remark =
-                      "Requested re cord of Front Porch. Turning on VCR and Camera.";
+                    $remark = "Requested re cord of Front Porch. Turning on VCR and Camera.";
                 }
                 else {
-                    $remark =
-                      "Motion on Front Porch. Turning on VCR and Camera.";
+                    $remark = "Motion on Front Porch. Turning on VCR and Camera.";
                 }
             }
             else {
@@ -181,17 +171,14 @@
             set $Which_Camera_On 'FP';
             set $Camera_Status "Currently recording Front Porch.";
         }
-        elsif ( ( 'Side Drive On' eq $state ) or ( 'Side Drive' eq $v_state ) )
-        {
+        elsif ( ( 'Side Drive On' eq $state ) or ( 'Side Drive' eq $v_state ) ) {
             set $Camera_Side_Drive 'on';
             if ( not active $Camera_Side_Drive_Timer) {
                 if ( 'Side Drive' eq $v_state ) {
-                    $remark =
-                      "Requested re cord of Side Drive. Turning on VCR and Camera.";
+                    $remark = "Requested re cord of Side Drive. Turning on VCR and Camera.";
                 }
                 else {
-                    $remark =
-                      "Motion in Side Drive. Turning on VCR and Camera.";
+                    $remark = "Motion in Side Drive. Turning on VCR and Camera.";
                 }
             }
             else {
@@ -212,8 +199,7 @@
             set $Camera_Side_Yard 'on';
             if ( not active $Camera_Side_Yard_Timer) {
                 if ( 'Side Yard' eq $v_state ) {
-                    $remark =
-                      "Requested re cord of Side Yard. Turning on VCR and Camera.";
+                    $remark = "Requested re cord of Side Yard. Turning on VCR and Camera.";
                 }
                 else {
                     $remark = "Motion in Side Yard. Turning on VCR and Camera.";
diff --git a/code/public/yahoo_traffic.pl b/code/public/yahoo_traffic.pl
index c1c25190c..9ed6a2129 100644
--- a/code/public/yahoo_traffic.pl
+++ b/code/public/yahoo_traffic.pl
@@ -36,8 +36,7 @@ sub get_y_traffic {
         start $p_y_traffic;
     }
     else {
-        $response =
-          "Could not retrieve traffic from Yahoo (network connection is down.)";
+        $response = "Could not retrieve traffic from Yahoo (network connection is down.)";
     }
 
     $v_get_y_traffic->respond("app=traffic $response");
@@ -75,11 +74,7 @@ sub get_y_traffic {
         }
 
         $html .=
-            qq|<li><a href="|
-          . &recompose_uri( $item->{'link'} )
-          . qq|" title=$description>|
-          . $item->{'title'}
-          . qq|</a></li>|;
+          qq|<li><a href="| . &recompose_uri( $item->{'link'} ) . qq|" title=$description>| . $item->{'title'} . qq|</a></li>|;
 
     }
 
@@ -92,9 +87,7 @@ sub get_y_traffic {
     if ( $v_get_y_traffic->{state} eq 'Mail' ) {
         my $to = $config_parms{traffic_sendto} || "";
         $v_get_y_traffic->respond(
-                "connected=0 image=mail Sending Yahoo traffic to "
-              . ( ($to) ? $to : $config_parms{net_mail_send_account} )
-              . '.' );
+            "connected=0 image=mail Sending Yahoo traffic to " . ( ($to) ? $to : $config_parms{net_mail_send_account} ) . '.' );
         &net_mail_send(
             subject => "Current traffic from Yahoo",
             to      => $to,
@@ -108,8 +101,7 @@ sub get_y_traffic {
         # *** Check return value
         my $to = $config_parms{cell_phone};
         if ($to) {
-            $v_get_y_traffic->respond(
-                "connected=0 image=mail Sending Yahoo traffic to cell phone.");
+            $v_get_y_traffic->respond("connected=0 image=mail Sending Yahoo traffic to cell phone.");
             &net_mail_send(
                 subject => "Current traffic from Yahoo",
                 to      => $to,
@@ -117,17 +109,14 @@ sub get_y_traffic {
             );
         }
         else {
-            $v_get_ap_news->respond(
-                "connected=0 app=error Mobile phone email address not found!");
+            $v_get_ap_news->respond("connected=0 app=error Mobile phone email address not found!");
         }
     }
 
-    elsif ( $v_get_y_traffic->{state} ne 'Check' )
-    {    # get responds with story count
-        $v_get_y_traffic->respond(
-            "connected=0 app=traffic Yahoo traffic retrieved $i reports.");
+    elsif ( $v_get_y_traffic->{state} ne 'Check' ) {    # get responds with story count
+        $v_get_y_traffic->respond("connected=0 app=traffic Yahoo traffic retrieved $i reports.");
     }
-    else {    # check responds with stories
+    else {                                              # check responds with stories
         $v_get_y_traffic->respond("connected=0 app=traffic $text");
     }
 
@@ -147,8 +136,7 @@ sub get_y_traffic {
         &trigger_set(
             "state_now \$net_connect eq 'connected'",
             "run_voice_cmd 'Get Yahoo traffic'",
-            'NoExpire',
-            'get Yahoo traffic'
+            'NoExpire', 'get Yahoo traffic'
         ) unless &trigger_get('get Yahoo traffic');
 
     }
diff --git a/code/support/hai-omnistat/hai_web/omnistat_sched_web.pl b/code/support/hai-omnistat/hai_web/omnistat_sched_web.pl
index 5d5fda2c4..eab325a35 100644
--- a/code/support/hai-omnistat/hai_web/omnistat_sched_web.pl
+++ b/code/support/hai-omnistat/hai_web/omnistat_sched_web.pl
@@ -57,8 +57,7 @@
             push @locations, $object_name;
             if ( not $location ) {
                 $location = $object_name;
-                Omnistat::omnistat_debug(
-                    "$NAME: Will set location to $location");
+                Omnistat::omnistat_debug("$NAME: Will set location to $location");
             }
         }
     }
@@ -69,12 +68,10 @@
 
 if ( not $stat ) {
     if ( not $location ) {
-        die
-          "$NAME was not able to get an omnistat object, check your stat definitions in mycode/omnistat.pl";
+        die "$NAME was not able to get an omnistat object, check your stat definitions in mycode/omnistat.pl";
     }
     else {
-        die
-          "$NAME was not able to get an omnistat object with location \"$location\"";
+        die "$NAME was not able to get an omnistat object with location \"$location\"";
     }
 }
 else {
@@ -89,8 +86,8 @@
     Omnistat::omnistat_debug("$NAME: looking at arg# $i: $ARGV[$i]");
 
     # support 24H time like the rest of the educated world :) -- merlin
-    if ( $ARGV[$i] =~ /(\w+?)=(\d+$|[012]?[0-9]:\d+(?: AM| PM|))/ and $2 ne "" )
-    {
+    if ( $ARGV[$i] =~ /(\w+?)=(\d+$|[012]?[0-9]:\d+(?: AM| PM|))/ and $2 ne "" ) {
+
         #see if its a temp or time
         if ( $i % 3 != 1 ) {
 
@@ -142,8 +139,7 @@
 
     # Used later down to display Monday or Weekday for the first day.
     $weekday_or_monday = 'Monday';
-    ( $wmt, $wmc, $wmh, $wdt, $wdc, $wdh, $wet, $wec, $weh, $wnt, $wnc, $wnh )
-      = split ' ', $stat->read_cached_reg( "0x4B", 12 );
+    ( $wmt, $wmc, $wmh, $wdt, $wdc, $wdh, $wet, $wec, $weh, $wnt, $wnc, $wnh ) = split ' ', $stat->read_cached_reg( "0x4B", 12 );
     $days[1][0][0] = &Omnistat::translate_time($wmt);
     $days[1][0][1] = &Omnistat::translate_temp($wmc);
     $days[1][0][2] = &Omnistat::translate_temp($wmh);
@@ -237,8 +233,7 @@
 #$vaca[1][0] = &Omnistat::translate_time($ved);
 #$vaca[1][1] = &Omnistat::translate_time($veh);
 
-my $pretty_name =
-  &pretty_object_name($location) . " (" . $stat->get_stat_type() . ")";
+my $pretty_name = &pretty_object_name($location) . " (" . $stat->get_stat_type() . ")";
 
 $html = '<html><body>' . &html_header('Browse Items') . "
 <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
@@ -263,25 +258,16 @@
         if ( $location eq $statname ) {
 
             #Omnistat::omnistat_debug("$NAME: Selecting $statname in drop down menu since it is location $location. Objects are ".&::get_object_by_name($statname)." and ".&::get_object_by_name($statname));
-            $html =
-                $html
-              . "<option SELECTED  value ='$statname'>"
-              . &pretty_object_name($statname)
-              . "</option>";
+            $html = $html . "<option SELECTED  value ='$statname'>" . &pretty_object_name($statname) . "</option>";
         }
         else {
-            $html =
-                $html
-              . "<option value ='$statname'>"
-              . &pretty_object_name($statname)
-              . "</option>";
+            $html = $html . "<option value ='$statname'>" . &pretty_object_name($statname) . "</option>";
         }
     }
     $html = $html . "</select>";
 }
 else {
-    Omnistat::omnistat_debug(
-        "$NAME: Got single location $location, skipping drop down menu");
+    Omnistat::omnistat_debug("$NAME: Got single location $location, skipping drop down menu");
     $html = $html . $pretty_name;
     $html = $html . "<input name='location' value='$location' type='hidden'>";
 }
diff --git a/code/support/hai-omnistat/hai_web/omnistat_setup_web.pl b/code/support/hai-omnistat/hai_web/omnistat_setup_web.pl
index 6764ebf49..a4d3d5698 100644
--- a/code/support/hai-omnistat/hai_web/omnistat_setup_web.pl
+++ b/code/support/hai-omnistat/hai_web/omnistat_setup_web.pl
@@ -23,8 +23,7 @@
 
 =cut
 
-use vars
-  qw($stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold $stat_indoor_temp $stat_output);
+use vars qw($stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold $stat_indoor_temp $stat_output);
 use strict;
 my $html;
 my $stat;
@@ -56,8 +55,7 @@
             push @locations, $object_name;
             if ( not $location ) {
                 $location = $object_name;
-                Omnistat::omnistat_debug(
-                    "$NAME: Will set location to $location");
+                Omnistat::omnistat_debug("$NAME: Will set location to $location");
             }
         }
     }
@@ -68,12 +66,10 @@
 
 if ( not $stat ) {
     if ( not $location ) {
-        die
-          "$NAME was not able to get an omnistat object, check your stat definitions in mycode/omnistat.pl";
+        die "$NAME was not able to get an omnistat object, check your stat definitions in mycode/omnistat.pl";
     }
     else {
-        die
-          "$NAME was not able to get an omnistat object with location \"$location\"";
+        die "$NAME was not able to get an omnistat object with location \"$location\"";
     }
 }
 else {
@@ -89,8 +85,7 @@
 }
 
 if ( $submit eq 'reset stat to scheduled values' ) {
-    Omnistat::omnistat_debug(
-        "$NAME: Got 'reset to scheduled values' for $location");
+    Omnistat::omnistat_debug("$NAME: Got 'reset to scheduled values' for $location");
     $stat->restore_setpoints();
 }
 
@@ -127,13 +122,10 @@
 }
 
 # this will pickup changes we may have just made
-(
-    $stat_cool_temp, $stat_heat_temp, $stat_mode, $stat_fan, $stat_hold,
-    $stat_indoor_temp, $stat_output
-) = $stat->read_group1("true");
+( $stat_cool_temp, $stat_heat_temp, $stat_mode, $stat_fan, $stat_hold, $stat_indoor_temp, $stat_output ) =
+  $stat->read_group1("true");
 
-my $pretty_name =
-  &pretty_object_name($location) . " (" . $stat->get_stat_type() . ")";
+my $pretty_name = &pretty_object_name($location) . " (" . $stat->get_stat_type() . ")";
 
 #Write the HTML page
 $html = '<html><body>' . &html_header('Browse Items') . "
@@ -167,30 +159,20 @@
         if ( $location eq $statname ) {
 
             #Omnistat::omnistat_debug("$NAME: Selecting $statname in drop down menu since it is location $location. Objects are ".&::get_object_by_name($statname)." and ".&::get_object_by_name($statname));
-            $html =
-                $html
-              . "<option SELECTED  value ='$statname'>"
-              . &pretty_object_name($statname)
-              . "</option>";
+            $html = $html . "<option SELECTED  value ='$statname'>" . &pretty_object_name($statname) . "</option>";
         }
         else {
-            $html =
-                $html
-              . "<option value ='$statname'>"
-              . &pretty_object_name($statname)
-              . "</option>";
+            $html = $html . "<option value ='$statname'>" . &pretty_object_name($statname) . "</option>";
         }
     }
     $html = $html . "</select>";
 }
 else {
-    Omnistat::omnistat_debug(
-        "$NAME: Got single location $location, skipping drop down menu");
+    Omnistat::omnistat_debug("$NAME: Got single location $location, skipping drop down menu");
     $html = $html . $pretty_name;
     $html = $html . "<input name='location' value='$location' type='hidden'>";
 }
-$html = $html
-  . "<br><br><a style='font-size: 120%; font-weight: bold;'> Current temp&nbsp;$stat_indoor_temp
+$html = $html . "<br><br><a style='font-size: 120%; font-weight: bold;'> Current temp&nbsp;$stat_indoor_temp
               <br>
               <br>
               <a style='font-size: 120%; font-weight: bold;'> Current stat mode:&nbsp;$stat_output
diff --git a/code/support/hai-omnistat/omnistat.pl b/code/support/hai-omnistat/omnistat.pl
index c5cbcd006..059fa8aea 100644
--- a/code/support/hai-omnistat/omnistat.pl
+++ b/code/support/hai-omnistat/omnistat.pl
@@ -10,8 +10,7 @@
 # Close to full rewrite/overhaul by Marc MERLIN 2009/07/22
 
 #
-use vars
-  qw(%omnicache @omnilist @omnistat @omniname @omnioffset $stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold
+use vars qw(%omnicache @omnilist @omnistat @omniname @omnioffset $stat_cool_temp $stat_heat_temp $stat_mode $stat_fan $stat_hold
   $stat_indoor_temp $cmd  $stat_model @v_omnistat_fan @v_omnistat_resume @v_omnistat_hold @v_omnistat_mode
   @v_omnistat_cool_sp @v_omnistat_heat_sp @v_omnistat_setting @stat_reset_timer $house_stat $mbr_stat $test_stat
   @v_omnistat_background);
@@ -68,22 +67,15 @@
     my $statidx = " ";
     $statidx = " $omniname[$omnistat]" if ( $#omnilist > 0 );
 
-    $v_omnistat_fan[$omnistat] =
-      new Voice_Cmd("Set$statidx Thermostat fan [on,auto,cycle]");
-    $v_omnistat_resume[$omnistat] = new Voice_Cmd("Resume $statidx Thermostat");
-    $v_omnistat_hold[$omnistat] =
-      new Voice_Cmd("Set$statidx Thermostat hold [on,off,vacation]");
-    $v_omnistat_mode[$omnistat] =
-      new Voice_Cmd("Set$statidx Thermostat mode [off,heat,cool,auto]");
-    $v_omnistat_cool_sp[$omnistat] =
-      new Voice_Cmd("Set$statidx Thermostat cool setpoint to [$temprange]");
-    $v_omnistat_heat_sp[$omnistat] =
-      new Voice_Cmd("Set$statidx Thermostat heat setpoint to [$temprange]");
-    $v_omnistat_setting[$omnistat] =
-      new Voice_Cmd("What is the$statidx thermostat set to");
-    $v_omnistat_background[$omnistat] = new Voice_Cmd(
-        "Set$statidx Thermostat background to [Blue,Green,Purple,Red,Orange,Yellow]"
-    );
+    $v_omnistat_fan[$omnistat]     = new Voice_Cmd("Set$statidx Thermostat fan [on,auto,cycle]");
+    $v_omnistat_resume[$omnistat]  = new Voice_Cmd("Resume $statidx Thermostat");
+    $v_omnistat_hold[$omnistat]    = new Voice_Cmd("Set$statidx Thermostat hold [on,off,vacation]");
+    $v_omnistat_mode[$omnistat]    = new Voice_Cmd("Set$statidx Thermostat mode [off,heat,cool,auto]");
+    $v_omnistat_cool_sp[$omnistat] = new Voice_Cmd("Set$statidx Thermostat cool setpoint to [$temprange]");
+    $v_omnistat_heat_sp[$omnistat] = new Voice_Cmd("Set$statidx Thermostat heat setpoint to [$temprange]");
+    $v_omnistat_setting[$omnistat] = new Voice_Cmd("What is the$statidx thermostat set to");
+    $v_omnistat_background[$omnistat] =
+      new Voice_Cmd( "Set$statidx Thermostat background to [Blue,Green,Purple,Red,Orange,Yellow]" );
 
     # With these, you can either send
     # 'Set Thermostat cool setpoint to 68'
@@ -91,9 +83,7 @@
     # 'Set Bedroom Thermostat cool setpoint to 72'
     # if you have multiple
 
-    Omnistat::omnistat_log(
-        "$omniname[$omnistat] Omnistat: Mh restarted, will reconfigure stat",
-        2 );
+    Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: Mh restarted, will reconfigure stat", 2 );
 }
 
 # noloop=stop
@@ -177,19 +167,14 @@
 
     if ( $state = $v_omnistat_cool_sp[$omnistat]->said ) {
         $omnistat[$omnistat]->cool_setpoint($state);
-        respond
-          "Air conditioning set to $state degrees for $omniname[$omnistat] Omnistat";
-        Omnistat::omnistat_log(
-            "$omniname[$omnistat] Omnistat: Air conditioning set to $state degrees",
-            2
-        );
+        respond "Air conditioning set to $state degrees for $omniname[$omnistat] Omnistat";
+        Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: Air conditioning set to $state degrees", 2 );
     }
 
     if ( $state = $v_omnistat_heat_sp[$omnistat]->said ) {
         $omnistat[$omnistat]->heat_setpoint($state);
         respond "Heat set to $state degrees for $omniname[$omnistat] Omnistat";
-        Omnistat::omnistat_log(
-            "$omniname[$omnistat] Omnistat: Heat set to $state degrees", 2 );
+        Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: Heat set to $state degrees", 2 );
     }
 
     if ( $state = $v_omnistat_setting[$omnistat]->said ) {
@@ -197,10 +182,7 @@
         $cool = $omnistat[$omnistat]->get_cool_sp;
         $heat = $omnistat[$omnistat]->get_heat_sp;
         respond "cool setpoint $cool, heat setpoint $heat";
-        Omnistat::omnistat_log(
-            "$omniname[$omnistat] Omnistat: cool setpoint $cool, heat setpoint $heat",
-            2
-        );
+        Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: cool setpoint $cool, heat setpoint $heat", 2 );
     }
 
     if ( $state = $v_omnistat_background[$omnistat]->said ) {
@@ -228,20 +210,15 @@
     if ( time_now '7:45 PM' ) {
         my $filter_days = $omnistat[$omnistat]->get_filter_reminder;
         if ( $filter_days == 0 ) {
-            speak
-              "Replace the furnace filter linked to $omniname[$omnistat] Omnistat";
+            speak "Replace the furnace filter linked to $omniname[$omnistat] Omnistat";
             print_log "$omniname[$omnistat] Omnistat: replace the filter";
-            Omnistat::omnistat_log(
-                "$omniname[$omnistat] Omnistat: replace the filter", 0 );
+            Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: replace the filter", 0 );
 
             # reset the timer to 6 months
             $omnistat[$omnistat]->set_filter_reminder(180);
         }
         else {
-            Omnistat::omnistat_log(
-                "$omniname[$omnistat] Omnistat: $filter_days days before filter replacement",
-                1
-            );
+            Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: $filter_days days before filter replacement", 1 );
         }
     }
 
@@ -253,10 +230,7 @@
         # Set the outside temp on the thermostat if available (refreshing this value should cause the
         # stat to display the outside temperature on the display).
         if ( $Weather{TempOutdoor} ) {
-            Omnistat::omnistat_log(
-                "$omniname[$omnistat] Omnistat: Setting outside temperature to $Weather{TempOutdoor}",
-                2
-            );
+            Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: Setting outside temperature to $Weather{TempOutdoor}", 2 );
             $omnistat[$omnistat]->outdoor_temp( $Weather{TempOutdoor} );
         }
 
@@ -277,12 +251,9 @@
                 $background_color = "Purple";
             }
             elsif ( $Weather{TempOutdoor} < 55 ) { $background_color = "Blue"; }
-            else { $background_color = "Orange"; }
+            else                                 { $background_color = "Orange"; }
 
-            Omnistat::omnistat_log(
-                "$omniname[$omnistat] Omnistat: Setting background color to $background_color",
-                2
-            );
+            Omnistat::omnistat_log( "$omniname[$omnistat] Omnistat: Setting background color to $background_color", 2 );
             $omnistat[$omnistat]->set_background_color($state);
         }
     }
diff --git a/lib/AD2.pm b/lib/AD2.pm
index bb9e5313c..865e4682e 100755
--- a/lib/AD2.pm
+++ b/lib/AD2.pm
@@ -1,3 +1,4 @@
+
 =head1 B<AD2>
 
 =head2 SYNOPSIS
@@ -140,9 +141,9 @@ use strict;
 
 @AD2::ISA = ('Generic_Item');
 
-my %Socket_Items; #Stores the socket instances and attributes
-my %Interfaces; #Stores the relationships btw instances and interfaces
-my %Configuration; #Stores the local config parms 
+my %Socket_Items;     #Stores the socket instances and attributes
+my %Interfaces;       #Stores the relationships btw instances and interfaces
+my %Configuration;    #Stores the local config parms
 
 =item C<new()>
 
@@ -151,41 +152,42 @@ Instantiates a new object.
 =cut
 
 sub new {
-   my ($class, $instance) = @_;
-   $instance = "AD2" if (!defined($instance));
-   ::print_log("Starting $instance instance of ADEMCO panel interface module");
-
-   my $self = new Generic_Item();
-
-   # Initialize Variables
-   $$self{ac_power}       = 0;
-   $$self{battery_low}    = 1;
-   $$self{chime}          = 0;
-   $$self{keys_sent}      = 0;
-   $$self{instance}       = $instance;
-   $$self{reconnect_time} = $::config_parms{$instance.'_ser2sock_recon'};
-   $$self{reconnect_time} = 10 if !defined($$self{reconnect_time});
-   $$self{max_zones}      = 250; #The current max zones by any panel, can be increased
-   my $year_mon           = &::time_date_stamp( 10, time );
-   $$self{log_file}       = $::config_parms{'data_dir'}."/logs/AD2.$year_mon.log";
-
-   bless $self, $class;
-
-   # load command hash
-   $$self{CmdMsg} = $self->DefineCmdMsg();
-   $$self{CmdMsgRev} = {reverse %{$$self{CmdMsg}}}; #DeRef Hash, Rev, Conv to Ref
-
-   # The following logs default to being enabled, can only be disabled by 
-   # proactively setting their ini parameters to 0:
-   # AD2_part_log AD2_zone_log AD2_debug_log
-
-   #Store Object with Instance Name
-   $self->_set_object_instance($instance);
-
-   #Load the Parameters from the INI file
-   $self->read_parms($instance);
-
-   return $self;
+    my ( $class, $instance ) = @_;
+    $instance = "AD2" if ( !defined($instance) );
+    ::print_log("Starting $instance instance of ADEMCO panel interface module");
+
+    my $self = new Generic_Item();
+
+    # Initialize Variables
+    $$self{ac_power}       = 0;
+    $$self{battery_low}    = 1;
+    $$self{chime}          = 0;
+    $$self{keys_sent}      = 0;
+    $$self{instance}       = $instance;
+    $$self{reconnect_time} = $::config_parms{ $instance . '_ser2sock_recon' };
+    $$self{reconnect_time} = 10 if !defined( $$self{reconnect_time} );
+    $$self{max_zones}      = 250;                                              #The current max zones by any panel, can be increased
+    my $year_mon = &::time_date_stamp( 10, time );
+    $$self{log_file} = $::config_parms{'data_dir'} . "/logs/AD2.$year_mon.log";
+
+    bless $self, $class;
+
+    # load command hash
+    $$self{CmdMsg} = $self->DefineCmdMsg();
+    $$self{CmdMsgRev} =
+      { reverse %{ $$self{CmdMsg} } };                                         #DeRef Hash, Rev, Conv to Ref
+
+    # The following logs default to being enabled, can only be disabled by
+    # proactively setting their ini parameters to 0:
+    # AD2_part_log AD2_zone_log AD2_debug_log
+
+    #Store Object with Instance Name
+    $self->_set_object_instance($instance);
+
+    #Load the Parameters from the INI file
+    $self->read_parms($instance);
+
+    return $self;
 }
 
 =item C<restore_string()>
@@ -200,23 +202,22 @@ original code design.
 
 =cut
 
-sub restore_string
-{
-	my ($self) = @_;
-	# Do the normal restore_string
-	my $restore_string = $self->SUPER::restore_string();
-	# Add our custom routine to save the zone states
-	for my $partition (keys %{$$self{partition_address}}){
-	   for my $zone (keys %{$$self{$partition}{zone_status}}){
-	      my $status = $$self{$partition}{zone_status}{$zone};
-	      $restore_string .= $self->{object_name} 
-	         . "->ChangeZoneState($zone, q~$status~, 0);\n";
-	      my $bypass = $$self{$partition}{zone_bypass}{$zone};
-	      $restore_string .= $self->{object_name} 
-	         . "->zone_bypassed($zone, $bypass);\n";	      
-	   }
-	}
-	return $restore_string;
+sub restore_string {
+    my ($self) = @_;
+
+    # Do the normal restore_string
+    my $restore_string = $self->SUPER::restore_string();
+
+    # Add our custom routine to save the zone states
+    for my $partition ( keys %{ $$self{partition_address} } ) {
+        for my $zone ( keys %{ $$self{$partition}{zone_status} } ) {
+            my $status = $$self{$partition}{zone_status}{$zone};
+            $restore_string .= $self->{object_name} . "->ChangeZoneState($zone, q~$status~, 0);\n";
+            my $bypass = $$self{$partition}{zone_bypass}{$zone};
+            $restore_string .= $self->{object_name} . "->zone_bypassed($zone, $bypass);\n";
+        }
+    }
+    return $restore_string;
 }
 
 =item C<get_object_by_instance($instance)>
@@ -226,14 +227,14 @@ that name.
 
 =cut
 
-sub get_object_by_instance{
-   my ($instance) = @_;
-   return $Interfaces{$instance};
+sub get_object_by_instance {
+    my ($instance) = @_;
+    return $Interfaces{$instance};
 }
 
-sub _set_object_instance{
-   my ($self, $instance) = @_;
-   $Interfaces{$instance} = $self;
+sub _set_object_instance {
+    my ( $self, $instance ) = @_;
+    $Interfaces{$instance} = $self;
 }
 
 =item C<read_parms()>
@@ -243,65 +244,73 @@ hash.  This is necessary in order to join together ini and mht defined features.
 
 =cut
 
-sub read_parms{
-   my ($self, $instance) = @_;
-   foreach my $mkey (keys(%::config_parms)) {
-      next if $mkey =~ /_MHINTERNAL_/;
-      #Load All Configuration Settings
-      $Configuration{$mkey} = $::config_parms{$mkey} if $mkey =~ /^AD2_/;
-      #Put wireless settings in correct hash
-      if ($mkey =~ /^${instance}_wireless_(.*)/){
-         if (index($::config_parms{$mkey}, ',') <= 0){
-            #Supports new style ini parameter, wherein each zone is a separate entry:
-            #AD2_wireless_[RF_ID].[LOOP].[TYPE]=[ZONE] such as:
-            #AD2_wireless_1234567.1.k=10
-            $$self{wireless}{$1} = $::config_parms{$mkey};
-         }
-         else {
-            #This code supports the old style ini of wirelss parameters:
-            #AD2_wireless_[RF_ID]=[ZONE],[TYPE][LOOP](,repeat) such as:
-            #AD2_wireless_1234567=10,s1
-            my $rf_id = $1;
-            my $lc = 0;
-            my $ZoneNum;
-            foreach my $wnum(split(",", $::config_parms{$mkey})) {
-               if ($lc % 2 == 0) { 
-                  $ZoneNum = $wnum;
-               }
-               else {
-                  my ($sensortype, $ZoneLoop) = split("", $wnum);
-                  $$self{wireless}{"$rf_id.$ZoneLoop.$sensortype"} 
-                     = $ZoneNum;
-               }
-               $lc++;
+sub read_parms {
+    my ( $self, $instance ) = @_;
+    foreach my $mkey ( keys(%::config_parms) ) {
+        next if $mkey =~ /_MHINTERNAL_/;
+
+        #Load All Configuration Settings
+        $Configuration{$mkey} = $::config_parms{$mkey} if $mkey =~ /^AD2_/;
+
+        #Put wireless settings in correct hash
+        if ( $mkey =~ /^${instance}_wireless_(.*)/ ) {
+            if ( index( $::config_parms{$mkey}, ',' ) <= 0 ) {
+
+                #Supports new style ini parameter, wherein each zone is a separate entry:
+                #AD2_wireless_[RF_ID].[LOOP].[TYPE]=[ZONE] such as:
+                #AD2_wireless_1234567.1.k=10
+                $$self{wireless}{$1} = $::config_parms{$mkey};
+            }
+            else {
+                #This code supports the old style ini of wirelss parameters:
+                #AD2_wireless_[RF_ID]=[ZONE],[TYPE][LOOP](,repeat) such as:
+                #AD2_wireless_1234567=10,s1
+                my $rf_id = $1;
+                my $lc    = 0;
+                my $ZoneNum;
+                foreach my $wnum ( split( ",", $::config_parms{$mkey} ) ) {
+                    if ( $lc % 2 == 0 ) {
+                        $ZoneNum = $wnum;
+                    }
+                    else {
+                        my ( $sensortype, $ZoneLoop ) = split( "", $wnum );
+                        $$self{wireless}{"$rf_id.$ZoneLoop.$sensortype"} = $ZoneNum;
+                    }
+                    $lc++;
+                }
             }
-         }
-      }
-      #Put expander settings in correct hash
-      if ($mkey =~ /^${instance}_expander_(.*)/){
-         $$self{expander}{$1} = $::config_parms{$mkey};
-      }
-      #Put relay settings in correct hash
-      if ($mkey =~ /^${instance}_relay_(.*)/){
-         $$self{relay}{$1} = $::config_parms{$mkey};
-      }
-      #Put Partition Addresses in Correct Hash
-      if ($mkey =~ /^${instance}_partition_(\d*)_address$/){
-         $$self{partition_address}{$1} = $::config_parms{$mkey};
-      }
-      #Put Zone Names in Correct Hash
-      if ($mkey =~ /^${instance}_zone_(\d*)$/){
-         $$self{zone_name}{$1} = $::config_parms{$mkey};
-      }
-      #Put Zone Partition Relationship in Correct Hash
-      if ($mkey =~ /^${instance}_zone_(\d*)_partition$/){
-         $$self{zone_partition}{$1} = $::config_parms{$mkey};
-      }
-      #Put Partition Name in Correct Hash
-      if ($mkey =~ /^${instance}_part_(\d)$/){
-         $$self{partition_name}{$1} = $::config_parms{$mkey};
-      }
-   }
+        }
+
+        #Put expander settings in correct hash
+        if ( $mkey =~ /^${instance}_expander_(.*)/ ) {
+            $$self{expander}{$1} = $::config_parms{$mkey};
+        }
+
+        #Put relay settings in correct hash
+        if ( $mkey =~ /^${instance}_relay_(.*)/ ) {
+            $$self{relay}{$1} = $::config_parms{$mkey};
+        }
+
+        #Put Partition Addresses in Correct Hash
+        if ( $mkey =~ /^${instance}_partition_(\d*)_address$/ ) {
+            $$self{partition_address}{$1} = $::config_parms{$mkey};
+        }
+
+        #Put Zone Names in Correct Hash
+        if ( $mkey =~ /^${instance}_zone_(\d*)$/ ) {
+            $$self{zone_name}{$1} = $::config_parms{$mkey};
+        }
+
+        #Put Zone Partition Relationship in Correct Hash
+        if ( $mkey =~ /^${instance}_zone_(\d*)_partition$/ ) {
+            $$self{zone_partition}{$1} = $::config_parms{$mkey};
+        }
+
+        #Put Partition Name in Correct Hash
+        if ( $mkey =~ /^${instance}_part_(\d)$/ ) {
+            $$self{partition_name}{$1} = $::config_parms{$mkey};
+        }
+    }
 }
 
 =item C<init()>
@@ -312,17 +321,17 @@ Used to initialize the serial port.
 
 sub init {
 
-   my ($serial_port) = @_;
-   $serial_port->error_msg(1);
-   $serial_port->databits(8);
-   $serial_port->parity("none");
-   $serial_port->stopbits(1);
-   $serial_port->handshake('none');
-   $serial_port->datatype('raw');
-   $serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
-   $serial_port->rts_active(0);
+    my ($serial_port) = @_;
+    $serial_port->error_msg(1);
+    $serial_port->databits(8);
+    $serial_port->parity("none");
+    $serial_port->stopbits(1);
+    $serial_port->handshake('none');
+    $serial_port->datatype('raw');
+    $serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
+    $serial_port->rts_active(0);
 
-   select( undef, undef, undef, .100 );    # Sleep a bit
+    select( undef, undef, undef, .100 );    # Sleep a bit
 
 }
 
@@ -333,19 +342,25 @@ Called by the MH main script as a result of defining a serial port.
 =cut
 
 sub serial_startup {
-   my ($instance) = @_;
-   my ($port, $BaudRate, $ip);
-
-   if ($::config_parms{$instance . '_serial_port'} and 
-         $::config_parms{$instance . '_serial_port'} ne '/dev/none') {
-      $port = $::config_parms{$instance .'_serial_port'};
-      $BaudRate = ( defined $::config_parms{$instance . '_baudrate'} ) ? $::config_parms{"$instance" . '_baudrate'} : 115200;
-      if ( &main::serial_port_create( $instance, $port, $BaudRate, 'none', 'raw' ) ) {
-         init( $::Serial_Ports{$instance}{object}, $port );
-         ::print_log("[AD2] initializing $instance on port $port at $BaudRate baud") if $main::Debug{'AD2'};
-         ::MainLoop_pre_add_hook( sub {AD2::check_for_data($instance, 'serial');}, 1 ) if $main::Serial_Ports{"$instance"}{object};
-      }
-   }
+    my ($instance) = @_;
+    my ( $port, $BaudRate, $ip );
+
+    if (    $::config_parms{ $instance . '_serial_port' }
+        and $::config_parms{ $instance . '_serial_port' } ne '/dev/none' )
+    {
+        $port = $::config_parms{ $instance . '_serial_port' };
+        $BaudRate =
+          ( defined $::config_parms{ $instance . '_baudrate' } )
+          ? $::config_parms{ "$instance" . '_baudrate' }
+          : 115200;
+        if ( &main::serial_port_create( $instance, $port, $BaudRate, 'none', 'raw' ) ) {
+            init( $::Serial_Ports{$instance}{object}, $port );
+            ::print_log("[AD2] initializing $instance on port $port at $BaudRate baud")
+              if $main::Debug{'AD2'};
+            ::MainLoop_pre_add_hook( sub { AD2::check_for_data( $instance, 'serial' ); }, 1 )
+              if $main::Serial_Ports{"$instance"}{object};
+        }
+    }
 }
 
 =item C<server_startup()>
@@ -355,17 +370,20 @@ Called by the MH main script as a result of defining a server port.
 =cut
 
 sub server_startup {
-   my ($instance) = @_;
-
-   $Socket_Items{"$instance"}{recon_timer} = ::Timer::new();
-   my $ip = $::config_parms{"$instance".'_server_ip'};
-   my $port = $::config_parms{"$instance" . '_server_port'};
-   ::print_log("  AD2.pm initializing $instance TCP session with $ip on port $port") if $main::Debug{'AD2'};
-   $Socket_Items{"$instance"}{'socket'} = new Socket_Item($instance, undef, "$ip:$port", $instance, 'tcp', 'raw');
-   $Socket_Items{"$instance" . '_sender'}{'socket'} = new Socket_Item($instance . '_sender', undef, "$ip:$port", $instance . '_sender', 'tcp', 'rawout');
-   $Socket_Items{"$instance"}{'socket'}->start;
-   $Socket_Items{"$instance" . '_sender'}{'socket'}->start;
-   ::MainLoop_pre_add_hook( sub {AD2::check_for_data($instance, 'tcp');}, 1 );
+    my ($instance) = @_;
+
+    $Socket_Items{"$instance"}{recon_timer} = ::Timer::new();
+    my $ip   = $::config_parms{ "$instance" . '_server_ip' };
+    my $port = $::config_parms{ "$instance" . '_server_port' };
+    ::print_log("  AD2.pm initializing $instance TCP session with $ip on port $port")
+      if $main::Debug{'AD2'};
+    $Socket_Items{"$instance"}{'socket'} =
+      new Socket_Item( $instance, undef, "$ip:$port", $instance, 'tcp', 'raw' );
+    $Socket_Items{ "$instance" . '_sender' }{'socket'} =
+      new Socket_Item( $instance . '_sender', undef, "$ip:$port", $instance . '_sender', 'tcp', 'rawout' );
+    $Socket_Items{"$instance"}{'socket'}->start;
+    $Socket_Items{ "$instance" . '_sender' }{'socket'}->start;
+    ::MainLoop_pre_add_hook( sub { AD2::check_for_data( $instance, 'tcp' ); }, 1 );
 }
 
 =item C<check_for_data()>
@@ -379,79 +397,89 @@ logged and ignored.  If this is a new message it is sent to C<CheckCmd>.
 =cut
 
 sub check_for_data {
-   my ($instance, $connecttype) = @_;
-   my $self = get_object_by_instance($instance);
-   my $NewCmd;
-
-   # Clear Zone and Partition_Now Function
-   $self->{zone_now} = ();
-   $self->{partition_now} = ();
-   
-   # Reset any wireless keyfobs to ready
-   foreach my $rf_key (keys %{$$self{wireless}}){
-      if ($rf_key =~ /.*\..*\.k/i) {
-         $self->ChangeZoneState( int($$self{wireless}{$rf_key}), "ready", 1); 
-      }
-   }
-
-   # Get the data from serial or tcp source
-   if ($connecttype eq 'serial') {
-      &main::check_for_generic_serial_data($instance);
-      $NewCmd = $main::Serial_Ports{$instance}{data};
-      $main::Serial_Ports{$instance}{data} = '';
-   }
-
-   if ($connecttype eq 'tcp') {
-      if ($Socket_Items{$instance}{'socket'}->active) {
-         $NewCmd = $Socket_Items{$instance}{'socket'}->said;
-      } else {
-         # restart the TCP connection if its lost.
-         if ($Socket_Items{$instance}{recon_timer}->inactive) {
-            ::print_log("Connection to $instance instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds");
-            # ::logit("AD2.pm ser2sock connection lost! Trying to reconnect." );
-            $Socket_Items{$instance}{recon_timer}->set($$self{reconnect_time}, sub {
-               $Socket_Items{$instance}{'socket'}->start;
-            });
-         }
-      }
-   }
-
-   # Return if nothing received
-   return if !$NewCmd;
-
-   # Prepend any prior message fragment
-   $NewCmd = $self->{IncompleteCmd} . $NewCmd if $self->{IncompleteCmd};
-   $self->{IncompleteCmd} = '';
-
-   # Split Data into Individual Messages and Then Send the Message to be Parsed
-   foreach my $Cmd (split("\n", $NewCmd)){
-      # Split leaves part of line ending so full message can be confirmed
-      if (substr($Cmd, -1) eq "\r"){
-         # Valid Message, Strip off last line ending
-         $Cmd = substr($Cmd, 0, -1);
-         ::print_log("[AD2] " . $Cmd) if $main::Debug{AD2} >= 1;
-
-         # Get the Message Type, and Ignore Duplicate Status Messages
-         my $status_type = $self->GetStatusType($Cmd);
-         if ($status_type->{keypad} && $Cmd eq $self->{last_cmd} &&
-            (!$status_type->{fault})) {
-            # This is a duplicate panel message with no important status
-            $self->debug_log("DUPE: $Cmd");
-         }
-         else {
-            # This is a non-dupe panel message or a fault panel message or a
-            # relay or RF or zone expander message or something important
-            # Log the message, parse it, and store it to detect future dupes
-            $self->debug_log("MSG: $Cmd");
-            $self->CheckCmd($status_type);
-            $self->{last_cmd} = $Cmd if ($status_type->{keypad});
-         }
-      }
-      else {
-         # Save partial command for next serial read
-         $self->{IncompleteCmd} = $Cmd;
-      }
-   }
+    my ( $instance, $connecttype ) = @_;
+    my $self = get_object_by_instance($instance);
+    my $NewCmd;
+
+    # Clear Zone and Partition_Now Function
+    $self->{zone_now}      = ();
+    $self->{partition_now} = ();
+
+    # Reset any wireless keyfobs to ready
+    foreach my $rf_key ( keys %{ $$self{wireless} } ) {
+        if ( $rf_key =~ /.*\..*\.k/i ) {
+            $self->ChangeZoneState( int( $$self{wireless}{$rf_key} ), "ready", 1 );
+        }
+    }
+
+    # Get the data from serial or tcp source
+    if ( $connecttype eq 'serial' ) {
+        &main::check_for_generic_serial_data($instance);
+        $NewCmd = $main::Serial_Ports{$instance}{data};
+        $main::Serial_Ports{$instance}{data} = '';
+    }
+
+    if ( $connecttype eq 'tcp' ) {
+        if ( $Socket_Items{$instance}{'socket'}->active ) {
+            $NewCmd = $Socket_Items{$instance}{'socket'}->said;
+        }
+        else {
+            # restart the TCP connection if its lost.
+            if ( $Socket_Items{$instance}{recon_timer}->inactive ) {
+                ::print_log(
+                    "Connection to $instance instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds" );
+
+                # ::logit("AD2.pm ser2sock connection lost! Trying to reconnect." );
+                $Socket_Items{$instance}{recon_timer}->set(
+                    $$self{reconnect_time},
+                    sub {
+                        $Socket_Items{$instance}{'socket'}->start;
+                    }
+                );
+            }
+        }
+    }
+
+    # Return if nothing received
+    return if !$NewCmd;
+
+    # Prepend any prior message fragment
+    $NewCmd = $self->{IncompleteCmd} . $NewCmd if $self->{IncompleteCmd};
+    $self->{IncompleteCmd} = '';
+
+    # Split Data into Individual Messages and Then Send the Message to be Parsed
+    foreach my $Cmd ( split( "\n", $NewCmd ) ) {
+
+        # Split leaves part of line ending so full message can be confirmed
+        if ( substr( $Cmd, -1 ) eq "\r" ) {
+
+            # Valid Message, Strip off last line ending
+            $Cmd = substr( $Cmd, 0, -1 );
+            ::print_log( "[AD2] " . $Cmd ) if $main::Debug{AD2} >= 1;
+
+            # Get the Message Type, and Ignore Duplicate Status Messages
+            my $status_type = $self->GetStatusType($Cmd);
+            if (   $status_type->{keypad}
+                && $Cmd eq $self->{last_cmd}
+                && ( !$status_type->{fault} ) )
+            {
+                # This is a duplicate panel message with no important status
+                $self->debug_log("DUPE: $Cmd");
+            }
+            else {
+                # This is a non-dupe panel message or a fault panel message or a
+                # relay or RF or zone expander message or something important
+                # Log the message, parse it, and store it to detect future dupes
+                $self->debug_log("MSG: $Cmd");
+                $self->CheckCmd($status_type);
+                $self->{last_cmd} = $Cmd if ( $status_type->{keypad} );
+            }
+        }
+        else {
+            # Save partial command for next serial read
+            $self->{IncompleteCmd} = $Cmd;
+        }
+    }
 }
 
 =item C<CheckCmd()>
@@ -462,320 +490,369 @@ result.
 =cut
 
 sub CheckCmd {
-   my ($self, $status_type) = @_;
-   my $zone_padded = $status_type->{numeric_code};
-   my $zone_no_pad = int($zone_padded);
-   my @partitions = @{$status_type->{partition}} 
+    my ( $self, $status_type ) = @_;
+    my $zone_padded = $status_type->{numeric_code};
+    my $zone_no_pad = int($zone_padded);
+    my @partitions  = @{ $status_type->{partition} }
       if exists $status_type->{partition};
-   my $instance = $self->{instance};
-   
-   if ($status_type->{unknown}) {
-      $self->debug_log("UNKNOWN STATUS: $status_type->{cmd}");
-   }
-   elsif ($status_type->{cmd_sent}) {
-      if ($self->{keys_sent} == 0) {
-         $self->debug_log("Key sent from ANOTHER panel.");
-      }
-      else {
-         $self->{keys_sent}--;
-         $self->debug_log("Key received ($self->{keys_sent} left)");
-      }
-   }
-   elsif ($status_type->{fault_avail}) {
-      #Send command to show faults
-      cmd( $self, "ShowFaults" );
-   }
-   elsif ($status_type->{fault}) {
-      #Loop through partions set in message
-      foreach my $partition (@partitions){
-         #Parsing Alpha Fault messages is difficult. Only fault messages are
-         #reported, no per zone ready messages.  Fault messages cycle through
-         #from lowest to highest.  However, a new fault is immediately reported
-         #and the cycle then starts from the bottom again.
-         
-         #This means, that we can immediately set zones to fault. But to return
-         #to ready, we basically need the the highest and lowest zones to 
-         #remain constant for one cycle before chaning all other zones back
-         #to ready.  This works reasonable well, although there can be a big
-         #delay in returning a zone to ready.  Additionally, in certain 
-         #circumstances, a zone may be improperly returned to ready.
-         
-         #We do not mess with mapped zones, specific direct messages are 
-         #recevied for these (luckily)
-         
-         #Setup variables for testing of cycle first
-         if ($zone_no_pad < $self->{zone_last_num}{$partition}){
-            #This zone is lower than the last zone reported.
-            if($zone_no_pad == $self->{lowest_zone}{$partition}){
-               #Same lowest zone as last time
-               $self->{lowest_zone_unchanged}{$partition} = 1;
+    my $instance = $self->{instance};
+
+    if ( $status_type->{unknown} ) {
+        $self->debug_log("UNKNOWN STATUS: $status_type->{cmd}");
+    }
+    elsif ( $status_type->{cmd_sent} ) {
+        if ( $self->{keys_sent} == 0 ) {
+            $self->debug_log("Key sent from ANOTHER panel.");
+        }
+        else {
+            $self->{keys_sent}--;
+            $self->debug_log("Key received ($self->{keys_sent} left)");
+        }
+    }
+    elsif ( $status_type->{fault_avail} ) {
+
+        #Send command to show faults
+        cmd( $self, "ShowFaults" );
+    }
+    elsif ( $status_type->{fault} ) {
+
+        #Loop through partions set in message
+        foreach my $partition (@partitions) {
+
+            #Parsing Alpha Fault messages is difficult. Only fault messages are
+            #reported, no per zone ready messages.  Fault messages cycle through
+            #from lowest to highest.  However, a new fault is immediately reported
+            #and the cycle then starts from the bottom again.
+
+            #This means, that we can immediately set zones to fault. But to return
+            #to ready, we basically need the the highest and lowest zones to
+            #remain constant for one cycle before chaning all other zones back
+            #to ready.  This works reasonable well, although there can be a big
+            #delay in returning a zone to ready.  Additionally, in certain
+            #circumstances, a zone may be improperly returned to ready.
+
+            #We do not mess with mapped zones, specific direct messages are
+            #recevied for these (luckily)
+
+            #Setup variables for testing of cycle first
+            if ( $zone_no_pad < $self->{zone_last_num}{$partition} ) {
+
+                #This zone is lower than the last zone reported.
+                if ( $zone_no_pad == $self->{lowest_zone}{$partition} ) {
+
+                    #Same lowest zone as last time
+                    $self->{lowest_zone_unchanged}{$partition} = 1;
+                }
+                else {
+                    #New lowest zone, is at least a new cycle, could be new fault
+                    $self->{lowest_zone}{$partition}           = $zone_no_pad;
+                    $self->{lowest_zone_unchanged}{$partition} = 0;
+                }
+
+                #Now examine previous zone, it becomes new highest zone
+                if ( $self->{zone_last_num}{$partition} == $self->{highest_zone}{$partition} ) {
+
+                    #Same highest zone as last time
+                    $self->{highest_zone_unchanged}{$partition} = 1;
+                }
+                else {
+                    #New highest zone, is at least a new cycle, could be new fault
+                    $self->{highest_zone}{$partition} =
+                      $self->{zone_last_num}{$partition};
+                    $self->{highest_zone_unchanged}{$partition} = 0;
+                }
             }
-            else {
-               #New lowest zone, is at least a new cycle, could be new fault
-               $self->{lowest_zone}{$partition} = $zone_no_pad;
-               $self->{lowest_zone_unchanged}{$partition} = 0;
+
+            #If cycle is still consistent, then reset all zones between reported
+            #faults.  Obviously skip this if the zones are sequentially increasing
+            #since there are no zones in between.
+            if (   $self->{highest_zone_unchanged}{$partition}
+                && $self->{lowest_zone_unchanged}{$partition}
+                && ( ( $zone_no_pad - $self->{zone_last_num}{$partition} ) != 1 ) )
+            {
+                #Reset the zones between the current zone and the last zone.
+                my $start = $self->{zone_last_num}{$partition} + 1;
+                my $end   = $zone_no_pad - 1;
+
+                # Allow for reverse looping from max_zones->1
+                my $reverse = ( $start > $end ) ? 1 : 0;
+
+                # Prevent infinite loop scenario
+                my $y = 0;
+
+                # Loop through zones setting them as required
+                for (
+                    my $i = $start;
+                    ( $y <= $$self{max_zones} ) && ( ( !$reverse && $i <= $end )
+                        || ( $reverse && ( $i >= $start || $i <= $end ) ) );
+                    $i++
+                  )
+                {
+                    # Only alter zones in this partition
+                    if ( $partition == $self->zone_partition($i) ) {
+
+                        # Skip Mapped or Bypassed Zones
+                        if (   !$self->is_zone_mapped($i)
+                            && !$self->zone_bypassed($i) )
+                        {
+                            $self->ChangeZoneState( $i, "ready", 1 );
+                        }
+                    }
+                    $y++;
+                    $i = 0
+                      if ( $i == $$self{max_zones} && $reverse );    #loop around
+                }
             }
-            #Now examine previous zone, it becomes new highest zone
-            if($self->{zone_last_num}{$partition} == $self->{highest_zone}{$partition}){
-               #Same highest zone as last time
-               $self->{highest_zone_unchanged}{$partition} = 1;
+
+            # Always set the reported zone to fault
+            $self->ChangeZoneState( $zone_no_pad, "fault", 1 );
+
+            # Store Zone Number for Use in Fault Loop
+            $self->{zone_last_num}{$partition} = $zone_no_pad;
+        }
+    }
+    elsif ( $status_type->{bypass} ) {
+
+        # Skip Mapped Zones
+        if ( !$self->is_zone_mapped($zone_no_pad) ) {
+            $self->ChangeZoneState( $zone_no_pad, "bypass", 1 );
+        }
+        $self->zone_bypassed( $zone_no_pad, 1 );
+    }
+    elsif ( $status_type->{wireless} ) {
+        my $rf_id = $status_type->{rf_id};
+        $self->debug_log( "WIRELESS: rf_id("
+              . $rf_id
+              . ") status("
+              . $status_type->{rf_status}
+              . ") loop1("
+              . $status_type->{rf_loop_fault_1}
+              . ") loop2("
+              . $status_type->{rf_loop_fault_2}
+              . ") loop3("
+              . $status_type->{rf_loop_fault_3}
+              . ") loop4("
+              . $status_type->{rf_loop_fault_4}
+              . ")" );
+        $self->debug_log( "WIRELESS: rf_id("
+              . $status_type->{rf_id}
+              . ") status("
+              . $status_type->{rf_status}
+              . ") low_batt("
+              . $status_type->{rf_low_batt}
+              . ") supervised("
+              . $status_type->{rf_supervised}
+              . ")" );
+
+        foreach my $rf_key ( keys %{ $$self{wireless} } ) {
+            if ( $rf_key =~ /^$rf_id\.?(.*)/ ) {
+                my $LoopNum    = 1;
+                my $SensorType = 's';
+                my $Loopmap    = $1;
+                if ( $Loopmap =~ /(\d{1,3})\.(\w{1})$/ ) {
+                    $LoopNum    = $1;
+                    $SensorType = $2;
+                }
+                if ( $Loopmap =~ /^(\d{1,3})$/ ) { $LoopNum = $1 }
+                my $ZoneNum    = $$self{wireless}{$rf_key};
+                my $ZoneStatus = "ready";
+                if ( $status_type->{rf_low_batt} == "1" ) {
+                    $ZoneStatus = "low battery";
+                }
+                if ( $status_type->{ 'rf_loop_fault_' . $LoopNum } ) {
+                    $ZoneStatus = "fault";
+                }
+
+                $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1 );
             }
-            else {
-               #New highest zone, is at least a new cycle, could be new fault
-               $self->{highest_zone}{$partition} = $self->{zone_last_num}{$partition};
-               $self->{highest_zone_unchanged}{$partition} = 0;
+        }
+    }
+    elsif ( $status_type->{expander} ) {
+        my $exp_id   = $status_type->{exp_address};
+        my $input_id = $status_type->{exp_channel};
+        my $status   = $status_type->{exp_status};
+
+        $self->debug_log("EXPANDER: exp_id($exp_id) input($input_id) status($status)");
+
+        if ( my $ZoneNum = $$self{expander}{ $exp_id . $input_id } ) {
+            my $ZoneStatus = ( $status == 01 ) ? "fault" : "ready";
+            $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1 );
+        }
+    }
+    elsif ( $status_type->{relay} ) {
+        my $rel_id       = $status_type->{rel_address};
+        my $rel_input_id = $status_type->{rel_channel};
+        my $rel_status   = $status_type->{rel_status};
+
+        $self->debug_log("RELAY: rel_id($rel_id) input($rel_input_id) status($rel_status)");
+
+        if ( my $ZoneNum = $$self{relay}{ $rel_id . $rel_input_id } ) {
+            my $ZoneStatus = ( $rel_status == 01 ) ? "fault" : "ready";
+            $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1 );
+        }
+    }
+
+    # NORMAL STATUS TYPE
+    # ALWAYS Check Bits in Keypad Message
+    if ( $status_type->{keypad} ) {
+
+        # If this was not a fault message then clear log of last fault msg
+        foreach my $partition (@partitions) {
+            $self->{zone_last_num}{$partition} = ""
+              unless $status_type->{fault};
+            $self->{partition_msg}{$partition} = $status_type->{alphanumeric};
+        }
+
+        # Set things based on Bit Codes
+
+        # Prep mode for future use
+        my $mode = '';
+        $mode = 'fault' if $status_type->{fault};
+
+        # READY
+        if ( $status_type->{ready_flag} ) {
+            my $bypass = $status_type->{bypassed_flag};
+            $mode = 'ready';
+            $mode = 'bypass' if $bypass;
+
+            # Reset all zones, if bypass enabled skip bypassed zones
+            for my $partition (@partitions) {
+                for ( my $i = 1; $i <= $$self{max_zones}; $i++ ) {
+
+                    # Only work with zones in this partition
+                    if ( $partition == $self->zone_partition($i) ) {
+
+                        # Only change state of non-mapped zones
+                        if ( !$self->is_zone_mapped($i) ) {
+
+                            # Change if not-bypassed or bypass not enabled
+                            if ( !$bypass || !$self->zone_bypassed($i) ) {
+                                $self->ChangeZoneState( $i, "ready", 1 );
+                            }
+                        }
+                    }
+                }
             }
-         }
-         
-         #If cycle is still consistent, then reset all zones between reported
-         #faults.  Obviously skip this if the zones are sequentially increasing
-         #since there are no zones in between.
-         if ($self->{highest_zone_unchanged}{$partition} 
-            && $self->{lowest_zone_unchanged}{$partition}
-            && (($zone_no_pad - $self->{zone_last_num}{$partition}) != 1)) {
-            #Reset the zones between the current zone and the last zone.
-            my $start = $self->{zone_last_num}{$partition}+1;
-            my $end = $zone_no_pad-1;
-         
-            # Allow for reverse looping from max_zones->1
-            my $reverse = ($start > $end)? 1 : 0;
-            
-            # Prevent infinite loop scenario
-            my $y = 0;
-            
-            # Loop through zones setting them as required
-            for (my $i = $start; ($y <= $$self{max_zones}) &&
-               ((!$reverse && $i <= $end) ||
-               ($reverse && ($i >= $start || $i <= $end)));
-               $i++) {
-               # Only alter zones in this partition
-               if ($partition == $self->zone_partition($i)) {
-                  # Skip Mapped or Bypassed Zones
-                  if (!$self->is_zone_mapped($i) && 
-                     !$self->zone_bypassed($i)){
-                     $self->ChangeZoneState( $i, "ready", 1);
-                  }
-               }
-               $y++;
-               $i = 0 if ($i == $$self{max_zones} && $reverse); #loop around
+        }
+
+        # NOT BYPASSED
+        if ( !$status_type->{bypassed_flag} ) {
+            for my $partition (@partitions) {
+                for ( my $i = 1; $i <= $$self{max_zones}; $i++ ) {
+
+                    # Only work with zones in this partition
+                    if ( $partition == $self->zone_partition($i) ) {
+                        $self->zone_bypassed( $zone_no_pad, 0 );
+                    }
+                }
             }
-         }
-   
-         # Always set the reported zone to fault
-         $self->ChangeZoneState( $zone_no_pad, "fault", 1);
-         
-         # Store Zone Number for Use in Fault Loop
-         $self->{zone_last_num}{$partition}           = $zone_no_pad;
-      }
-   }
-   elsif ($status_type->{bypass}) {
-      # Skip Mapped Zones
-      if (!$self->is_zone_mapped($zone_no_pad)){
-         $self->ChangeZoneState( $zone_no_pad, "bypass", 1);
-      }
-      $self->zone_bypassed($zone_no_pad, 1);
-   }
-   elsif ($status_type->{wireless}) {
-      my $rf_id = $status_type->{rf_id};
-      $self->debug_log("WIRELESS: rf_id("
-         .$rf_id.") status(".$status_type->{rf_status}.") loop1("
-         .$status_type->{rf_loop_fault_1}.") loop2(".$status_type->{rf_loop_fault_2}
-         .") loop3(".$status_type->{rf_loop_fault_3}.") loop4("
-         .$status_type->{rf_loop_fault_4}.")" );
-      $self->debug_log("WIRELESS: rf_id("
-         .$status_type->{rf_id}.") status(".$status_type->{rf_status}.") low_batt("
-         .$status_type->{rf_low_batt}.") supervised(".$status_type->{rf_supervised}
-         .")" );
-
-      foreach my $rf_key (keys %{$$self{wireless}}){
-         if ($rf_key =~ /^$rf_id\.?(.*)/) {
-            my $LoopNum = 1;
-            my $SensorType = 's';
-	    my $Loopmap = $1;
-	    if ($Loopmap =~ /(\d{1,3})\.(\w{1})$/) { $LoopNum = $1; $SensorType = $2 }
-            if ($Loopmap =~ /^(\d{1,3})$/) { $LoopNum = $1 } 
-            my $ZoneNum = $$self{wireless}{$rf_key};
-            my $ZoneStatus = "ready";
-            if ($status_type->{rf_low_batt} == "1") {
-               $ZoneStatus = "low battery";
+        }
+
+        # ARMED AWAY
+        if ( $status_type->{armed_away_flag} ) {
+
+            # TODO The setting of modes needs to be done on partitions
+            my $mode = "armed away - error";
+            if ( index( $status_type->{alphanumeric}, "ALL SECURE" ) >= 1 ) {
+                $mode = "armed away";
             }
-            if ($status_type->{'rf_loop_fault_'.$LoopNum}) {
-               $ZoneStatus = "fault";
+            elsif ( index( $status_type->{alphanumeric}, "You may exit now" ) >= 1 ) {
+                $mode = "exit delay";
             }
-
-            $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1);
-         }
-      }
-   }
-   elsif ($status_type->{expander}) {
-      my $exp_id = $status_type->{exp_address};
-      my $input_id = $status_type->{exp_channel};
-      my $status = $status_type->{exp_status};
-
-      $self->debug_log("EXPANDER: exp_id($exp_id) input($input_id) status($status)");
-
-      if (my $ZoneNum = $$self{expander}{$exp_id.$input_id}) {
-         my $ZoneStatus = ($status == 01) ? "fault" : "ready";
-         $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1);
-      }
-   }
-   elsif ($status_type->{relay}) {
-      my $rel_id = $status_type->{rel_address};
-      my $rel_input_id = $status_type->{rel_channel};
-      my $rel_status = $status_type->{rel_status};
-
-      $self->debug_log("RELAY: rel_id($rel_id) input($rel_input_id) status($rel_status)");
-
-      if (my $ZoneNum = $$self{relay}{$rel_id.$rel_input_id}) {
-         my $ZoneStatus = ($rel_status == 01) ? "fault" : "ready";
-         $self->ChangeZoneState( int($ZoneNum), "$ZoneStatus", 1);
-      }
-   }
-
-   # NORMAL STATUS TYPE
-   # ALWAYS Check Bits in Keypad Message
-   if ($status_type->{keypad}) {
-      # If this was not a fault message then clear log of last fault msg
-      foreach my $partition (@partitions){
-         $self->{zone_last_num}{$partition} = "" unless $status_type->{fault};
-         $self->{partition_msg}{$partition} = $status_type->{alphanumeric};
-      }
-      
-      # Set things based on Bit Codes
-      
-      # Prep mode for future use
-      my $mode = '';
-      $mode = 'fault' if $status_type->{fault};
-
-      # READY
-      if ( $status_type->{ready_flag}) {
-         my $bypass = $status_type->{bypassed_flag};
-         $mode = 'ready';
-         $mode = 'bypass' if $bypass;
-         # Reset all zones, if bypass enabled skip bypassed zones
-         for my $partition (@partitions){
-            for (my $i = 1; $i <= $$self{max_zones}; $i++){
-               # Only work with zones in this partition
-               if ($partition == $self->zone_partition($i)) {
-                  # Only change state of non-mapped zones
-                  if (!$self->is_zone_mapped($i)){
-                     # Change if not-bypassed or bypass not enabled
-                     if (!$bypass || !$self->zone_bypassed($i)){
-                        $self->ChangeZoneState( $i, "ready", 1);
-                     }
-                  }
-               }
+            elsif ( index( $status_type->{alphanumeric}, "or alarm occurs" ) >= 1 ) {
+                $mode = "entry delay";
+            }
+            elsif ( index( $status_type->{alphanumeric}, "ZONE BYPASSED" ) >= 1 ) {
+                $mode = "armed away - bypass";
+            }
+        }
+
+        # ARMED HOME
+        $self->debug_log( "armed_home_flag = "
+              . $status_type->{armed_home_flag}
+              . " Alpha status = "
+              . $status_type->{alphanumeric}
+              . "| stay = "
+              . index( $status_type->{alphanumeric}, "***STAY***" )
+              . " exit delay = "
+              . index( $status_type->{alphanumeric}, "You may exit now" )
+              . "entry delay = "
+              . index( $status_type->{alphanumeric}, "or alarm occurs" ) );
+        if ( $status_type->{armed_home_flag} ) {
+            $mode = "armed stay - error";
+            if ( index( $status_type->{alphanumeric}, "You may exit now" ) >= 1 ) {
+                $mode = "exit delay";
+            }
+            elsif ( index( $status_type->{alphanumeric}, "or alarm occurs" ) >= 1 ) {
+                $mode = "entry delay";
+            }
+            elsif ( index( $status_type->{alphanumeric}, "ZONE BYPASSED" ) >= 1 ) {
+                $mode = "armed stay - bypass";
             }
-         }
-      }
-
-      # NOT BYPASSED
-      if (!$status_type->{bypassed_flag}) {
-         for my $partition (@partitions){
-            for (my $i = 1; $i <= $$self{max_zones}; $i++){
-               # Only work with zones in this partition
-               if ($partition == $self->zone_partition($i)) {
-                  $self->zone_bypassed( $zone_no_pad, 0);
-               }
+            elsif ( index( $status_type->{alphanumeric}, "***STAY***" ) >= 1 ) {
+                $mode = "armed stay";
             }
-         }
-      }
-
-      # ARMED AWAY
-      if ( $status_type->{armed_away_flag}) {
-         # TODO The setting of modes needs to be done on partitions
-         my $mode = "armed away - error";
-         if (index($status_type->{alphanumeric}, "ALL SECURE") >= 1) {
-            $mode = "armed away";
-         }
-         elsif (index($status_type->{alphanumeric}, "You may exit now") >= 1) {
-            $mode = "exit delay";
-         }
-         elsif (index($status_type->{alphanumeric}, "or alarm occurs") >= 1) {
-            $mode = "entry delay";
-         }
-         elsif (index($status_type->{alphanumeric}, "ZONE BYPASSED") >= 1) {
-            $mode = "armed away - bypass";
-         }
-      }
-
-      # ARMED HOME
-	$self->debug_log("armed_home_flag = ". $status_type->{armed_home_flag} ." Alpha status = ". $status_type->{alphanumeric} . "| stay = ". index($status_type->{alphanumeric}, "***STAY***") . " exit delay = ". index($status_type->{alphanumeric}, "You may exit now") . "entry delay = ". index($status_type->{alphanumeric}, "or alarm occurs") );
-      if ( $status_type->{armed_home_flag}) {
-         $mode = "armed stay - error";
-         if (index($status_type->{alphanumeric}, "You may exit now") >= 1) {
-            $mode = "exit delay";
-         }
-         elsif (index($status_type->{alphanumeric}, "or alarm occurs") >= 1) {
-            $mode = "entry delay";
-         }
-         elsif (index($status_type->{alphanumeric}, "ZONE BYPASSED") >= 1) {
-            $mode = "armed stay - bypass";
-         }
-         elsif (index($status_type->{alphanumeric}, "***STAY***") >= 1) {
-            $mode = "armed stay";
-         }
-      }
-
-      # BACKLIGHT
-      if ( $status_type->{backlight_flag}) {
-         $self->debug_log("Panel backlight is on");
-      }
-
-      # PROGRAMMING MODE
-      if ( $status_type->{programming_flag}) {
-         $mode = "programming";
-         $self->debug_log("Panel is in programming mode"); 
-      }
-
-      # BEEPS
-      if ( $status_type->{beep_count}) {
-         my $NumBeeps = $status_type->{beep_count};
-         $self->debug_log("Panel beeped $NumBeeps times"); 
-      }
-
-      # AC POWER
-      $$self{ac_power} = 1;
-      if ( !$status_type->{ac_flag} ) {
-         $$self{ac_power} = 0;
-         $mode = "ac power lost";
-         $self->debug_log("AC Power has been lost");;
-      }
-
-      # CHIME MODE
-      $self->{chime} = 0;
-      if ( $status_type->{chime_flag}) { 
-         $self->{chime} = 1;#            $self->debug_log("Chime is off");
-      }
-
-      # ALARM WAS TRIGGERED (Sticky until disarm)
-      if ( $status_type->{alarm_past_flag}) {
-         my $EventName = "ALARM WAS TRIGGERED";
-         $mode = "alarm was triggered";
-         $self->debug_log("$EventName" );
-      }
-
-      # ALARM IS SOUNDING
-      if ( $status_type->{alarm_now_flag}) {
-         $mode = "alarm now sounding";
-         $self->debug_log("ALARM IS SOUNDING - Zone $zone_no_pad (".$self->zone_name($zone_no_pad).")" );
-         $self->ChangeZoneState( $zone_no_pad, "alarm", 1);
-      }
-
-      # BATTERY LOW
-      $self->{battery_low} = 0;
-      if ( $status_type->{battery_low_flag}) {
-         $self->{battery_low} = 1;
-         $mode = "battery low";
-         $self->debug_log("Panel is low on battery");;
-      }
-
-      if ($mode ne $self->state && $mode ne ''){
-	 $self->debug_log("Setting system state to >>>>> $mode");
-         $self->set_receive($mode);
-      }
-   }
-   return;
+        }
+
+        # BACKLIGHT
+        if ( $status_type->{backlight_flag} ) {
+            $self->debug_log("Panel backlight is on");
+        }
+
+        # PROGRAMMING MODE
+        if ( $status_type->{programming_flag} ) {
+            $mode = "programming";
+            $self->debug_log("Panel is in programming mode");
+        }
+
+        # BEEPS
+        if ( $status_type->{beep_count} ) {
+            my $NumBeeps = $status_type->{beep_count};
+            $self->debug_log("Panel beeped $NumBeeps times");
+        }
+
+        # AC POWER
+        $$self{ac_power} = 1;
+        if ( !$status_type->{ac_flag} ) {
+            $$self{ac_power} = 0;
+            $mode = "ac power lost";
+            $self->debug_log("AC Power has been lost");
+        }
+
+        # CHIME MODE
+        $self->{chime} = 0;
+        if ( $status_type->{chime_flag} ) {
+            $self->{chime} = 1;    #            $self->debug_log("Chime is off");
+        }
+
+        # ALARM WAS TRIGGERED (Sticky until disarm)
+        if ( $status_type->{alarm_past_flag} ) {
+            my $EventName = "ALARM WAS TRIGGERED";
+            $mode = "alarm was triggered";
+            $self->debug_log("$EventName");
+        }
+
+        # ALARM IS SOUNDING
+        if ( $status_type->{alarm_now_flag} ) {
+            $mode = "alarm now sounding";
+            $self->debug_log( "ALARM IS SOUNDING - Zone $zone_no_pad (" . $self->zone_name($zone_no_pad) . ")" );
+            $self->ChangeZoneState( $zone_no_pad, "alarm", 1 );
+        }
+
+        # BATTERY LOW
+        $self->{battery_low} = 0;
+        if ( $status_type->{battery_low_flag} ) {
+            $self->{battery_low} = 1;
+            $mode = "battery low";
+            $self->debug_log("Panel is low on battery");
+        }
+
+        if ( $mode ne $self->state && $mode ne '' ) {
+            $self->debug_log("Setting system state to >>>>> $mode");
+            $self->set_receive($mode);
+        }
+    }
+    return;
 }
 
 =item C<GetStatusType()>
@@ -786,120 +863,133 @@ filled with the resulting message data.
 =cut
 
 sub GetStatusType {
-   my ($self, $AdemcoStr) = @_;
-   my $instance = $self->{instance};
-   my %message;
-   $message{cmd} = $AdemcoStr;
-
-   # Panel Message Format
-   if ($AdemcoStr =~ /(!KPM:)?\[([\d-]*)\],(\d{3}),\[(.*)\],\"(.*)\"/) {
-      $message{keypad} = 1;
-
-      # Parse The Cmd into Message Parts
-      $message{bit_field} = $2;
-      $message{numeric_code} = $3;
-      $message{raw_data} = $4;
-      $message{alphanumeric} = $5;
-      
-      # Partition Data is Contained in the Raw Data, in the form of a bit mask 
-      # identifying the panels that each message is destined for.  By knowing 
-      # which panels are on which partitions, we can determine the partition of 
-      # this message.
-      my $address_mask = substr($message{raw_data}, 2, 8);
-      my @addresses;
-      for (my $b = 3; $b >= 0; $b--){
-          my $byte = hex(uc substr($address_mask, -2));
-          $address_mask = substr($address_mask, 0, -2);
-          for (my $i = 0; $i <= 7; $i++){
-              push (@addresses, (($b*8)+$i)) if ($byte &0b1);
-              $byte = $byte >> 1;
-          }
-      }
-      #Place message in partition if address is equal to partition, or no 
-      #address is specified (system wide messages).
-	$self->debug_log(">>> Message is for Partition address: ". @addresses );
-      foreach my $partition (keys %{$$self{partition_address}}){
-         my $part_addr = $$self{partition_address}{$partition};
-         if (grep($part_addr, @addresses) || 
-            (scalar @addresses == 0)) {
-            push(@{$message{partition}}, $partition);
-         }
-      }
-      if (scalar $message{partition} == 0){
-         # The addresses identified in this message did not match any defined
-         # partition addresses, default to putting in partition 1.
-         push(@{$message{partition}}, 1); #Default to partition 1
-      }
-
-      # Decipher and Set Bit Flags
-      my @flags = ('ready_flag', 'armed_away_flag', 'armed_home_flag',
-      'backlight_flag', 'programming_flag', 'beep_count', 'bypassed_flag', 'ac_flag',
-      'chime_flag', 'alarm_past_flag', 'alarm_now_flag', 'battery_low_flag', 'no_delay_flag',
-      'fire_flag', 'zone_issue_flag', 'perimeter_only_flag');
-      for (my $i = 0; $i <= 15; $i++){
-         $message{$flags[$i]} = substr($message{bit_field}, $i, 1);
-      }
-
-      # Determine the Message Type
-      if ( $message{alphanumeric} =~ m/^FAULT/) {
-         $self->debug_log("Fault zones available: $AdemcoStr");
-         $message{fault} = 1;
-      }
-      elsif ( $message{alphanumeric} =~ m/^BYPAS \d/ ) {
-         $self->debug_log("Bypass zones available: $AdemcoStr");
-         $message{bypass} = 1;
-      }
-      elsif ($message{alphanumeric} =~ m/Hit \*|Press \*/) {
-         $self->debug_log("Faults available: $AdemcoStr");
-         $message{fault_avail} = 1;
-      }
-      else {
-         $message{status} = 1;
-      }
-   }
-   elsif ($AdemcoStr =~ /!RFX:(\d{7}),(\w{2})/) {
-      $self->debug_log("Wireless status received.");
-      $message{wireless} = 1;
-      $message{rf_id} = $1;
-      $message{rf_status} = $2;
-      
-      $message{rf_unknown_1} = ((hex(substr($message{rf_status}, 1, 1)) & 1) == 1) ? 1 : 0;
-      $message{rf_low_batt} = ((hex(substr($message{rf_status}, 1, 1)) & 2) == 2) ? 1 : 0;
-      $message{rf_supervised} = ((hex(substr($message{rf_status}, 1, 1)) & 4) == 4) ? 1 : 0;
-      $message{rf_unknown_8} = ((hex(substr($message{rf_status}, 1, 1)) & 8) == 8) ? 1 : 0;
-
-      $message{rf_loop_fault_1} = ((hex(substr($message{rf_status}, 0, 1)) & 8) == 8) ? 1 : 0;
-      $message{rf_loop_fault_2} = ((hex(substr($message{rf_status}, 0, 1)) & 2) == 2) ? 1 : 0;
-      $message{rf_loop_fault_3} = ((hex(substr($message{rf_status}, 0, 1)) & 1) == 1) ? 1 : 0;
-      $message{rf_loop_fault_4} = ((hex(substr($message{rf_status}, 0, 1)) & 4) == 4) ? 1 : 0;
-
-   }
-   elsif ($AdemcoStr =~ /!EXP:(\d{2}),(\d{2}),(\d{2})/) {
-      $self->debug_log("Expander status received.");
-      $message{expander} = 1;
-      $message{exp_address} = $1;
-      $message{exp_channel} = $2;
-      $message{exp_status} = $3;
-   }
-   elsif ($AdemcoStr =~ /!REL:(\d{2}),(\d{2}),(\d{2})/) {
-      $self->debug_log("Relay status received.");
-      $message{relay} = 1;
-      $message{rel_address} = $1;
-      $message{rel_channel} = $2;
-      $message{rel_status} = $3;
-   }
-   elsif ($AdemcoStr =~ /!Sending\.*done/) {
-      $self->debug_log("Command sent successfully.");
-      $message{cmd_sent} = 1;
-   }
-   elsif ($AdemcoStr =~ /!SER2SOCK/) {
-      $self->debug_log("Ser2Sock Message: $AdemcoStr");
-   }
-   else {
-      $message{unknown} = 1;
-   }
-
-   return \%message;
+    my ( $self, $AdemcoStr ) = @_;
+    my $instance = $self->{instance};
+    my %message;
+    $message{cmd} = $AdemcoStr;
+
+    # Panel Message Format
+    if ( $AdemcoStr =~ /(!KPM:)?\[([\d-]*)\],(\d{3}),\[(.*)\],\"(.*)\"/ ) {
+        $message{keypad} = 1;
+
+        # Parse The Cmd into Message Parts
+        $message{bit_field}    = $2;
+        $message{numeric_code} = $3;
+        $message{raw_data}     = $4;
+        $message{alphanumeric} = $5;
+
+        # Partition Data is Contained in the Raw Data, in the form of a bit mask
+        # identifying the panels that each message is destined for.  By knowing
+        # which panels are on which partitions, we can determine the partition of
+        # this message.
+        my $address_mask = substr( $message{raw_data}, 2, 8 );
+        my @addresses;
+        for ( my $b = 3; $b >= 0; $b-- ) {
+            my $byte = hex( uc substr( $address_mask, -2 ) );
+            $address_mask = substr( $address_mask, 0, -2 );
+            for ( my $i = 0; $i <= 7; $i++ ) {
+                push( @addresses, ( ( $b * 8 ) + $i ) ) if ( $byte & 0b1 );
+                $byte = $byte >> 1;
+            }
+        }
+
+        #Place message in partition if address is equal to partition, or no
+        #address is specified (system wide messages).
+        $self->debug_log( ">>> Message is for Partition address: " . @addresses );
+        foreach my $partition ( keys %{ $$self{partition_address} } ) {
+            my $part_addr = $$self{partition_address}{$partition};
+            if ( grep( $part_addr, @addresses )
+                || ( scalar @addresses == 0 ) )
+            {
+                push( @{ $message{partition} }, $partition );
+            }
+        }
+        if ( scalar $message{partition} == 0 ) {
+
+            # The addresses identified in this message did not match any defined
+            # partition addresses, default to putting in partition 1.
+            push( @{ $message{partition} }, 1 );    #Default to partition 1
+        }
+
+        # Decipher and Set Bit Flags
+        my @flags = (
+            'ready_flag',       'armed_away_flag', 'armed_home_flag', 'backlight_flag',
+            'programming_flag', 'beep_count',      'bypassed_flag',   'ac_flag',
+            'chime_flag',       'alarm_past_flag', 'alarm_now_flag',  'battery_low_flag',
+            'no_delay_flag',    'fire_flag',       'zone_issue_flag', 'perimeter_only_flag'
+        );
+        for ( my $i = 0; $i <= 15; $i++ ) {
+            $message{ $flags[$i] } = substr( $message{bit_field}, $i, 1 );
+        }
+
+        # Determine the Message Type
+        if ( $message{alphanumeric} =~ m/^FAULT/ ) {
+            $self->debug_log("Fault zones available: $AdemcoStr");
+            $message{fault} = 1;
+        }
+        elsif ( $message{alphanumeric} =~ m/^BYPAS \d/ ) {
+            $self->debug_log("Bypass zones available: $AdemcoStr");
+            $message{bypass} = 1;
+        }
+        elsif ( $message{alphanumeric} =~ m/Hit \*|Press \*/ ) {
+            $self->debug_log("Faults available: $AdemcoStr");
+            $message{fault_avail} = 1;
+        }
+        else {
+            $message{status} = 1;
+        }
+    }
+    elsif ( $AdemcoStr =~ /!RFX:(\d{7}),(\w{2})/ ) {
+        $self->debug_log("Wireless status received.");
+        $message{wireless}  = 1;
+        $message{rf_id}     = $1;
+        $message{rf_status} = $2;
+
+        $message{rf_unknown_1} =
+          ( ( hex( substr( $message{rf_status}, 1, 1 ) ) & 1 ) == 1 ) ? 1 : 0;
+        $message{rf_low_batt} =
+          ( ( hex( substr( $message{rf_status}, 1, 1 ) ) & 2 ) == 2 ) ? 1 : 0;
+        $message{rf_supervised} =
+          ( ( hex( substr( $message{rf_status}, 1, 1 ) ) & 4 ) == 4 ) ? 1 : 0;
+        $message{rf_unknown_8} =
+          ( ( hex( substr( $message{rf_status}, 1, 1 ) ) & 8 ) == 8 ) ? 1 : 0;
+
+        $message{rf_loop_fault_1} =
+          ( ( hex( substr( $message{rf_status}, 0, 1 ) ) & 8 ) == 8 ) ? 1 : 0;
+        $message{rf_loop_fault_2} =
+          ( ( hex( substr( $message{rf_status}, 0, 1 ) ) & 2 ) == 2 ) ? 1 : 0;
+        $message{rf_loop_fault_3} =
+          ( ( hex( substr( $message{rf_status}, 0, 1 ) ) & 1 ) == 1 ) ? 1 : 0;
+        $message{rf_loop_fault_4} =
+          ( ( hex( substr( $message{rf_status}, 0, 1 ) ) & 4 ) == 4 ) ? 1 : 0;
+
+    }
+    elsif ( $AdemcoStr =~ /!EXP:(\d{2}),(\d{2}),(\d{2})/ ) {
+        $self->debug_log("Expander status received.");
+        $message{expander}    = 1;
+        $message{exp_address} = $1;
+        $message{exp_channel} = $2;
+        $message{exp_status}  = $3;
+    }
+    elsif ( $AdemcoStr =~ /!REL:(\d{2}),(\d{2}),(\d{2})/ ) {
+        $self->debug_log("Relay status received.");
+        $message{relay}       = 1;
+        $message{rel_address} = $1;
+        $message{rel_channel} = $2;
+        $message{rel_status}  = $3;
+    }
+    elsif ( $AdemcoStr =~ /!Sending\.*done/ ) {
+        $self->debug_log("Command sent successfully.");
+        $message{cmd_sent} = 1;
+    }
+    elsif ( $AdemcoStr =~ /!SER2SOCK/ ) {
+        $self->debug_log("Ser2Sock Message: $AdemcoStr");
+    }
+    else {
+        $message{unknown} = 1;
+    }
+
+    return \%message;
 }
 
 =item C<ChangeZoneState($zone, $new_status, $log)>
@@ -916,30 +1006,35 @@ $log        = If true will log its actions
 =cut
 
 sub ChangeZoneState {
-   my ($self, $zone, $new_status, $log) = @_;
-   my $instance = $self->{instance};
-   
-   # This routine is called a lot, only update zones if they have changed
-   if ($self->status_zone($zone) ne $new_status){
-      #  Set the new state
-      $$self{$self->zone_partition($zone)}{zone_status}{$zone} = $new_status;
-      #  Store Change for Zone_Now Function
-      $self->{zone_now}{"$zone"} = 1;
-      #  Store Change for Partition_Now Function
-      $self->{partition_now}{$self->zone_partition($zone)} = 1;
-      $self->update_child_object($zone);
-      # Update child partition
-      my $zone_partition = $self->zone_partition($zone);
-      my $partition_status = $self->status_partition($zone_partition);
-      $$self{partition_object}{$zone_partition}->set_receive($partition_status, $$self{zone_object}{"$zone"}) 
-         if defined $$self{partition_object}{$zone_partition};
-      #  Log everything if requested
-      if ($log == 1) {
-         my $ZoneNumPadded = sprintf("%03d", $zone);
-         $self->debug_log( "Zone $zone (".$self->zone_name($zone)
-            .") changed to '$new_status'" );
-      }
-   }
+    my ( $self, $zone, $new_status, $log ) = @_;
+    my $instance = $self->{instance};
+
+    # This routine is called a lot, only update zones if they have changed
+    if ( $self->status_zone($zone) ne $new_status ) {
+
+        #  Set the new state
+        $$self{ $self->zone_partition($zone) }{zone_status}{$zone} =
+          $new_status;
+
+        #  Store Change for Zone_Now Function
+        $self->{zone_now}{"$zone"} = 1;
+
+        #  Store Change for Partition_Now Function
+        $self->{partition_now}{ $self->zone_partition($zone) } = 1;
+        $self->update_child_object($zone);
+
+        # Update child partition
+        my $zone_partition   = $self->zone_partition($zone);
+        my $partition_status = $self->status_partition($zone_partition);
+        $$self{partition_object}{$zone_partition}->set_receive( $partition_status, $$self{zone_object}{"$zone"} )
+          if defined $$self{partition_object}{$zone_partition};
+
+        #  Log everything if requested
+        if ( $log == 1 ) {
+            my $ZoneNumPadded = sprintf( "%03d", $zone );
+            $self->debug_log( "Zone $zone (" . $self->zone_name($zone) . ") changed to '$new_status'" );
+        }
+    }
 }
 
 =item C<zone_bypassed($zone, $bypass)>
@@ -959,29 +1054,32 @@ simply pass it as $bypass.
 =cut
 
 sub zone_bypassed {
-   my ($self, $zone, $bypass) = @_;
-   if (defined $bypass) {
-      my $old_bypass = $self->zone_bypassed($zone);
-      $$self{$self->zone_partition($zone)}{zone_bypass}{$zone} = $bypass;
-      if ($old_bypass ne $bypass){
-         $self->update_child_object($zone);
-      }
-   }
-   return $$self{$self->zone_partition($zone)}{zone_bypass}{$zone};
+    my ( $self, $zone, $bypass ) = @_;
+    if ( defined $bypass ) {
+        my $old_bypass = $self->zone_bypassed($zone);
+        $$self{ $self->zone_partition($zone) }{zone_bypass}{$zone} = $bypass;
+        if ( $old_bypass ne $bypass ) {
+            $self->update_child_object($zone);
+        }
+    }
+    return $$self{ $self->zone_partition($zone) }{zone_bypass}{$zone};
 }
 
 sub update_child_object {
-   my ($self, $zone) = @_;
-   #  Prep bypass variable
-   my $status = $self->status_zone($zone);
-   if ($self->zone_bypassed($zone) && $self->is_zone_mapped($zone)){
-      $status .= " - bypass";
-   }
-   #  Set child object status if it is registered to the zone
-   if (defined $$self{zone_object}{"$zone"} && 
-      $$self{zone_object}{"$zone"}->state ne $status) {
-      $$self{zone_object}{"$zone"}->set($status, $$self{zone_object}{"$zone"});
-   }
+    my ( $self, $zone ) = @_;
+
+    #  Prep bypass variable
+    my $status = $self->status_zone($zone);
+    if ( $self->zone_bypassed($zone) && $self->is_zone_mapped($zone) ) {
+        $status .= " - bypass";
+    }
+
+    #  Set child object status if it is registered to the zone
+    if ( defined $$self{zone_object}{"$zone"}
+        && $$self{zone_object}{"$zone"}->state ne $status )
+    {
+        $$self{zone_object}{"$zone"}->set( $status, $$self{zone_object}{"$zone"} );
+    }
 }
 
 =item C<DefineCmdMsg()>
@@ -993,64 +1091,72 @@ This undoubtedly still needs work.
 =cut
 
 sub DefineCmdMsg {
-   my ($self) = @_;
-   my $instance = $self->{instance};
-   my %Return_Hash = (
-      "Disarm"          => $::config_parms{$instance."_user_master_code"}."1",
-      "ArmAway"         => $::config_parms{$instance."_user_master_code"}."2",
-      "ArmStay"         => $::config_parms{$instance."_user_master_code"}."3",
-      "ArmAwayMax"      => $::config_parms{$instance."_user_master_code"}."4",
-      "Test"            => $::config_parms{$instance."_user_master_code"}."5",
-      "Bypass"          => $::config_parms{$instance."_user_master_code"}."6#",
-      "ArmStayInstant"  => $::config_parms{$instance."_user_master_code"}."7",
-      "Code"            => $::config_parms{$instance."_user_master_code"}."8",
-      "Chime"           => $::config_parms{$instance."_user_master_code"}."9",
-      "ToggleVoice"     => '#024',
-      "ShowFaults"      => "*",
-      "AD2Reboot"       => "=",
-      "AD2Configure"    => "!"
-   );
-
-   my $two_digit_zone;
-   foreach my $key (keys %::config_parms) {
-      #Create Commands for Relays
-      if ($key =~ /^${instance}_output_(\D+)_(\d+)$/){
-         if ($1 eq 'co') {
-            $Return_Hash{$::config_parms{$key}."c"} = $::config_parms{$instance."_user_master_code"}."#70$2";
-            $Return_Hash{$::config_parms{$key}."o"} = $::config_parms{$instance."_user_master_code"}."#80$2";
-         }
-         elsif ($1 eq 'oc') {
-            $Return_Hash{$::config_parms{$key}."o"} = $::config_parms{$instance."_user_master_code"}."#80$2";
-            $Return_Hash{$::config_parms{$key}."c"} = $::config_parms{$instance."_user_master_code"}."#70$2";
-         }
-         elsif ($1 eq 'o') {
-            $Return_Hash{$::config_parms{$key}."o"} = $::config_parms{$instance."_user_master_code"}."#80$2";
-         }
-         elsif ($1 eq 'c') {
-            $Return_Hash{$::config_parms{$key}."c"} = $::config_parms{$instance."_user_master_code"}."#70$2";
-         }
-      }
-      #Create Commands for Zone Expanders
-      elsif ($key =~ /^${instance}_expander_(\d+)$/) {
-         $two_digit_zone = substr($::config_parms{$key}, 1); #Trim leading zero
-         $Return_Hash{"exp".$::config_parms{$key}."c"} = "L$two_digit_zone"."0";
-         $Return_Hash{"exp".$::config_parms{$key}."f"} = "L$two_digit_zone"."1";
-         $Return_Hash{"exp".$::config_parms{$key}."p"} = "L$two_digit_zone"."2";
-      }
-   }
-
-   return \%Return_Hash;
+    my ($self)      = @_;
+    my $instance    = $self->{instance};
+    my %Return_Hash = (
+        "Disarm"         => $::config_parms{ $instance . "_user_master_code" } . "1",
+        "ArmAway"        => $::config_parms{ $instance . "_user_master_code" } . "2",
+        "ArmStay"        => $::config_parms{ $instance . "_user_master_code" } . "3",
+        "ArmAwayMax"     => $::config_parms{ $instance . "_user_master_code" } . "4",
+        "Test"           => $::config_parms{ $instance . "_user_master_code" } . "5",
+        "Bypass"         => $::config_parms{ $instance . "_user_master_code" } . "6#",
+        "ArmStayInstant" => $::config_parms{ $instance . "_user_master_code" } . "7",
+        "Code"           => $::config_parms{ $instance . "_user_master_code" } . "8",
+        "Chime"          => $::config_parms{ $instance . "_user_master_code" } . "9",
+        "ToggleVoice"    => '#024',
+        "ShowFaults"     => "*",
+        "AD2Reboot"      => "=",
+        "AD2Configure"   => "!"
+    );
+
+    my $two_digit_zone;
+    foreach my $key ( keys %::config_parms ) {
+
+        #Create Commands for Relays
+        if ( $key =~ /^${instance}_output_(\D+)_(\d+)$/ ) {
+            if ( $1 eq 'co' ) {
+                $Return_Hash{ $::config_parms{$key} . "c" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#70$2";
+                $Return_Hash{ $::config_parms{$key} . "o" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#80$2";
+            }
+            elsif ( $1 eq 'oc' ) {
+                $Return_Hash{ $::config_parms{$key} . "o" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#80$2";
+                $Return_Hash{ $::config_parms{$key} . "c" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#70$2";
+            }
+            elsif ( $1 eq 'o' ) {
+                $Return_Hash{ $::config_parms{$key} . "o" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#80$2";
+            }
+            elsif ( $1 eq 'c' ) {
+                $Return_Hash{ $::config_parms{$key} . "c" } =
+                  $::config_parms{ $instance . "_user_master_code" } . "#70$2";
+            }
+        }
+
+        #Create Commands for Zone Expanders
+        elsif ( $key =~ /^${instance}_expander_(\d+)$/ ) {
+            $two_digit_zone = substr( $::config_parms{$key}, 1 );    #Trim leading zero
+            $Return_Hash{ "exp" . $::config_parms{$key} . "c" } = "L$two_digit_zone" . "0";
+            $Return_Hash{ "exp" . $::config_parms{$key} . "f" } = "L$two_digit_zone" . "1";
+            $Return_Hash{ "exp" . $::config_parms{$key} . "p" } = "L$two_digit_zone" . "2";
+        }
+    }
+
+    return \%Return_Hash;
 }
 
 sub output_cmd {
-   my ($self, $cmd, $output) = @_;
-   my $instance = $self->{instance};
-   if ($cmd =~ /start/i){
-      $Configuration{$instance."_user_master_code"}."#8$output";
-   }
-   else {
-      $Configuration{$instance."_user_master_code"}."#7$output";
-   }
+    my ( $self, $cmd, $output ) = @_;
+    my $instance = $self->{instance};
+    if ( $cmd =~ /start/i ) {
+        $Configuration{ $instance . "_user_master_code" } . "#8$output";
+    }
+    else {
+        $Configuration{ $instance . "_user_master_code" } . "#7$output";
+    }
 }
 
 =item C<debug_log()>
@@ -1063,9 +1169,10 @@ debug routine in Generic_Item.
 =cut
 
 sub debug_log {
-   my ($self, $text) = @_;
-   my $instance = $$self{instance};
-   ::logit( $$self{log_file}, $text) unless ($Configuration{$instance.'_debug_log'} == 0);
+    my ( $self, $text ) = @_;
+    my $instance = $$self{instance};
+    ::logit( $$self{log_file}, $text )
+      unless ( $Configuration{ $instance . '_debug_log' } == 0 );
 }
 
 =item C<is_zone_mapped($zone)>
@@ -1076,24 +1183,24 @@ wireless, or expander.
 =cut
 
 sub is_zone_mapped {
-   my ($self, $zone) = @_;
-   $zone = sprintf "%03s", $zone;
-   if (defined $$self{relay}){
-      foreach my $mkey (keys %{$$self{relay}}) {
-         if ($zone eq $$self{relay}{$mkey}) { return 1 }
-      }
-   }
-   if (defined $$self{wireless}){
-      foreach my $mkey (keys %{$$self{wireless}}) {
-         if ($zone eq $$self{wireless}{$mkey}) { return 1 }
-      }
-   }
-   if (defined $$self{expander}){
-      foreach my $mkey (keys %{$$self{expander}}) {
-         if ($zone eq $$self{expander}{$mkey}) { return 1 }
-      }
-   }
-   return 0;
+    my ( $self, $zone ) = @_;
+    $zone = sprintf "%03s", $zone;
+    if ( defined $$self{relay} ) {
+        foreach my $mkey ( keys %{ $$self{relay} } ) {
+            if ( $zone eq $$self{relay}{$mkey} ) { return 1 }
+        }
+    }
+    if ( defined $$self{wireless} ) {
+        foreach my $mkey ( keys %{ $$self{wireless} } ) {
+            if ( $zone eq $$self{wireless}{$mkey} ) { return 1 }
+        }
+    }
+    if ( defined $$self{expander} ) {
+        foreach my $mkey ( keys %{ $$self{expander} } ) {
+            if ( $zone eq $$self{expander}{$mkey} ) { return 1 }
+        }
+    }
+    return 0;
 }
 
 =item C<cmd()>
@@ -1106,44 +1213,55 @@ to identify the Master Code.  Potentially other flaws too.
 =cut
 
 sub cmd {
-   my ( $self, $cmd, $password ) = @_;
-   my $instance = $$self{instance};
-   $cmd = $self->{CmdMsg}->{$cmd};
-
-   my $CmdName = ( exists $self->{CmdMsgRev}->{$cmd} ) ? $self->{CmdMsgRev}->{$cmd} : "unknown";
-   my $CmdStr = $cmd;
-
-   # Exit if unknown command
-   if ( $CmdName =~ /^unknown/ ) {
-      ::logit("Invalid ADEMCO panel command : $CmdName ($cmd)");
-      return;
-   }
-
-   # Exit if password is wrong
-   if ( ($password ne $Configuration{$instance.'_user_master_code'}) && ($CmdName ne "ShowFaults" ) ) {
-      ::logit("Invalid password for command $CmdName ($password)");
-      return;
-   }
-   $self->debug_log(">>> Sending to ADEMCO panel              $CmdName ($cmd)");
-   $self->{keys_sent} = $self->{keys_sent} + length($CmdStr);
-   if (defined $Socket_Items{$instance}) {
-      if ($Socket_Items{$instance . '_sender'}{'socket'}->active) {
-         $Socket_Items{$instance . '_sender'}{'socket'}->set("$CmdStr");
-      } else {
-         # restart the TCP connection if its lost.
-         if ($Socket_Items{$instance}{recon_timer}->inactive) {
-            ::print_log("Connection to $instance sending instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds");
-            $Socket_Items{$instance}{recon_timer}->set($$self{reconnect_time}, sub {
-               $Socket_Items{$instance . '_sender'}{'socket'}->start;
-               $Socket_Items{$instance . '_sender'}{'socket'}->set("$CmdStr");
-            });
-         }
-      }
-   }
-   else {
-      $main::Serial_Ports{$instance}{object}->write("$CmdStr");
-   }
-   return "Sending to ADEMCO panel: $CmdName ($cmd)";
+    my ( $self, $cmd, $password ) = @_;
+    my $instance = $$self{instance};
+    $cmd = $self->{CmdMsg}->{$cmd};
+
+    my $CmdName =
+      ( exists $self->{CmdMsgRev}->{$cmd} )
+      ? $self->{CmdMsgRev}->{$cmd}
+      : "unknown";
+    my $CmdStr = $cmd;
+
+    # Exit if unknown command
+    if ( $CmdName =~ /^unknown/ ) {
+        ::logit("Invalid ADEMCO panel command : $CmdName ($cmd)");
+        return;
+    }
+
+    # Exit if password is wrong
+    if (   ( $password ne $Configuration{ $instance . '_user_master_code' } )
+        && ( $CmdName ne "ShowFaults" ) )
+    {
+        ::logit("Invalid password for command $CmdName ($password)");
+        return;
+    }
+    $self->debug_log(">>> Sending to ADEMCO panel              $CmdName ($cmd)");
+    $self->{keys_sent} = $self->{keys_sent} + length($CmdStr);
+    if ( defined $Socket_Items{$instance} ) {
+        if ( $Socket_Items{ $instance . '_sender' }{'socket'}->active ) {
+            $Socket_Items{ $instance . '_sender' }{'socket'}->set("$CmdStr");
+        }
+        else {
+            # restart the TCP connection if its lost.
+            if ( $Socket_Items{$instance}{recon_timer}->inactive ) {
+                ::print_log(
+                    "Connection to $instance sending instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds"
+                );
+                $Socket_Items{$instance}{recon_timer}->set(
+                    $$self{reconnect_time},
+                    sub {
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->start;
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->set("$CmdStr");
+                    }
+                );
+            }
+        }
+    }
+    else {
+        $main::Serial_Ports{$instance}{object}->write("$CmdStr");
+    }
+    return "Sending to ADEMCO panel: $CmdName ($cmd)";
 }
 
 =item C<set()>
@@ -1153,30 +1271,39 @@ Used to send commands to the interface.
 =cut
 
 sub set {
-   my ($self, $p_state, $p_setby, $p_response) = @_;
-   my $instance = $$self{instance};
-   ## W.G. Doesn't match hash key ## $p_state = lc($p_state);
-   my $cmd = ( exists $self->{CmdMsg}->{$p_state} ) ? $self->{CmdMsg}->{$p_state} : $p_state;
-   $self->debug_log(">>> Sending to ADEMCO panel              $p_state ($cmd)");
-   $self->{keys_sent} = $self->{keys_sent} + length($cmd);
-   if (defined $Socket_Items{$instance}) {
-      if ($Socket_Items{$instance . '_sender'}{'socket'}->active) {
-         $Socket_Items{$instance . '_sender'}{'socket'}->set("$cmd");
-      } else {
-         # restart the TCP connection if its lost.
-         if ($Socket_Items{$instance}{recon_timer}->inactive) {
-            ::print_log("Connection to $instance sending instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds");
-            $Socket_Items{$instance}{recon_timer}->set($$self{reconnect_time}, sub {
-               $Socket_Items{$instance . '_sender'}{'socket'}->start;
-               $Socket_Items{$instance . '_sender'}{'socket'}->set("$cmd");
-            });
-         }
-      }
-   }
-   else {
-      $main::Serial_Ports{$instance}{object}->write("$cmd");
-   }
-   return;
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    my $instance = $$self{instance};
+    ## W.G. Doesn't match hash key ## $p_state = lc($p_state);
+    my $cmd =
+      ( exists $self->{CmdMsg}->{$p_state} )
+      ? $self->{CmdMsg}->{$p_state}
+      : $p_state;
+    $self->debug_log(">>> Sending to ADEMCO panel              $p_state ($cmd)");
+    $self->{keys_sent} = $self->{keys_sent} + length($cmd);
+    if ( defined $Socket_Items{$instance} ) {
+        if ( $Socket_Items{ $instance . '_sender' }{'socket'}->active ) {
+            $Socket_Items{ $instance . '_sender' }{'socket'}->set("$cmd");
+        }
+        else {
+            # restart the TCP connection if its lost.
+            if ( $Socket_Items{$instance}{recon_timer}->inactive ) {
+                ::print_log(
+                    "Connection to $instance sending instance of AD2 was lost, I will try to reconnect in $$self{reconnect_time} seconds"
+                );
+                $Socket_Items{$instance}{recon_timer}->set(
+                    $$self{reconnect_time},
+                    sub {
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->start;
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->set("$cmd");
+                    }
+                );
+            }
+        }
+    }
+    else {
+        $main::Serial_Ports{$instance}{object}->write("$cmd");
+    }
+    return;
 }
 
 =item C<set_receive()>
@@ -1186,8 +1313,8 @@ Used internally to update the state of the object inside MisterHouse.
 =cut
 
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
 }
 
 =item C<status_zone($zone)>
@@ -1201,9 +1328,9 @@ $object->state;
 =cut
 
 sub status_zone {
-   my ( $self, $zone ) = @_;
-   $zone =~ s/^0*//;
-   return $$self{$self->zone_partition($zone)}{zone_status}{$zone};
+    my ( $self, $zone ) = @_;
+    $zone =~ s/^0*//;
+    return $$self{ $self->zone_partition($zone) }{zone_status}{$zone};
 }
 
 =item C<zone_now($zone)>
@@ -1218,9 +1345,9 @@ $object->state_now;
 =cut
 
 sub zone_now {
-   my ( $self, $zone ) = @_;
-   $zone =~ s/^0*//;
-   return $self->{zone_now}{$zone};
+    my ( $self, $zone ) = @_;
+    $zone =~ s/^0*//;
+    return $self->{zone_now}{$zone};
 }
 
 =item C<zone_name($zone)>
@@ -1233,10 +1360,10 @@ made into individual objects.
 =cut
 
 sub zone_name {
-   my ( $self, $zone_num ) = @_;
-   my $instance = $self->{instance};
-   $zone_num = sprintf "%03s", $zone_num;
-   return $$self{zone_name}{$zone_num};
+    my ( $self, $zone_num ) = @_;
+    my $instance = $self->{instance};
+    $zone_num = sprintf "%03s", $zone_num;
+    return $$self{zone_name}{$zone_num};
 }
 
 =item C<zone_partition($zone)>
@@ -1246,13 +1373,14 @@ Takes a zone number and returns the partition that it is a member of.
 =cut
 
 sub zone_partition {
-   my ( $self, $zone_num ) = @_;
-   my $instance = $self->{instance};
-   $zone_num = sprintf "%03s", $zone_num;
-   my $partition = $$self{zone_partition}{$zone_num};
-   # Default to partition 1
-   $partition = 1 unless $partition;
-   return $partition;
+    my ( $self, $zone_num ) = @_;
+    my $instance = $self->{instance};
+    $zone_num = sprintf "%03s", $zone_num;
+    my $partition = $$self{zone_partition}{$zone_num};
+
+    # Default to partition 1
+    $partition = 1 unless $partition;
+    return $partition;
 }
 
 =item C<partition_now($part)>
@@ -1267,8 +1395,8 @@ $object->state_now;
 =cut
 
 sub partition_now {
-   my ( $self, $part ) = @_;
-   return $self->{partition_now}{$part};
+    my ( $self, $part ) = @_;
+    return $self->{partition_now}{$part};
 }
 
 =item C<partition_msg($part)>
@@ -1279,8 +1407,8 @@ by this partition.
 =cut
 
 sub partition_msg {
-   my ( $self, $part ) = @_;
-   return $self->{partition_msg}{part};
+    my ( $self, $part ) = @_;
+    return $self->{partition_msg}{part};
 }
 
 =item C<partition_name($part)>
@@ -1293,9 +1421,9 @@ made into individual objects.
 =cut
 
 sub partition_name {
-   my ( $self, $part_num ) = @_;
-   my $instance = $self->{instance};
-   return $$self{partition_name}{$part_num};
+    my ( $self, $part_num ) = @_;
+    my $instance = $self->{instance};
+    return $$self{partition_name}{$part_num};
 }
 
 =item C<status_partition($part)>
@@ -1309,23 +1437,23 @@ $object->state;
 =cut
 
 sub status_partition {
-   my ( $self, $partition ) = @_;
-   my %partition_zones = %{$$self{$partition}{zone_status}};
-   my $partition_status = 'ready';
-   for my $zone (keys %partition_zones){
-      if ($partition_zones{$zone} eq 'fault'){
-         $partition_status = 'fault';
-         last;
-      }
-      elsif ($partition_zones{$zone} eq 'alarm'){
-         $partition_status = 'alarm';
-         last;
-      }
-      elsif ($partition_zones{$zone} eq 'bypass'){
-         $partition_status = 'bypass';
-      }
-   }
-   return $partition_status;
+    my ( $self, $partition ) = @_;
+    my %partition_zones  = %{ $$self{$partition}{zone_status} };
+    my $partition_status = 'ready';
+    for my $zone ( keys %partition_zones ) {
+        if ( $partition_zones{$zone} eq 'fault' ) {
+            $partition_status = 'fault';
+            last;
+        }
+        elsif ( $partition_zones{$zone} eq 'alarm' ) {
+            $partition_status = 'alarm';
+            last;
+        }
+        elsif ( $partition_zones{$zone} eq 'bypass' ) {
+            $partition_status = 'bypass';
+        }
+    }
+    return $partition_status;
 }
 
 =item C<cmd_list()>
@@ -1335,10 +1463,10 @@ Returns the list of available commands.
 =cut
 
 sub cmd_list {
-   my ($self) = @_;
-   foreach my $k ( sort keys %{$self->{CmdMsg}} ) {
-      &::print_log("$k");
-   }
+    my ($self) = @_;
+    foreach my $k ( sort keys %{ $self->{CmdMsg} } ) {
+        &::print_log("$k");
+    }
 }
 
 =item C<register()>
@@ -1348,32 +1476,35 @@ Used to associate child objects with the interface.
 =cut
 
 sub register {
-   my ($self, $object, $num, $expander,$relay,$wireless) = @_;
-   if ($object->isa('AD2_Item')) {
-      ::print_log("Registering Child Object for zone $num");
-      $self->{zone_object}{$num} = $object;
-      $num = sprintf("%03d", $num);
-      #Put wireless settings in correct hash
-      if (defined $wireless){
-         $$self{wireless}{$wireless} = $num;
-      }
-      #Put expander settings in correct hash
-      if (defined $expander){
-         $$self{expander}{$expander} = $num;
-      }
-      #Put relay settings in correct hash
-      if (defined $relay){
-         $$self{relay}{$relay} = $num;
-      }
-   }
-   elsif ($object->isa('AD2_Partition')) {
-      ::print_log("Registering Child Object for partition $num");
-      $self->{partition_object}{$num} = $object;
-   }
-   elsif ($object->isa('AD2_Output')) {
-      ::print_log("Registering Child Object for output $num");
-      $self->{output_object}{$num} = $object;
-   }
+    my ( $self, $object, $num, $expander, $relay, $wireless ) = @_;
+    if ( $object->isa('AD2_Item') ) {
+        ::print_log("Registering Child Object for zone $num");
+        $self->{zone_object}{$num} = $object;
+        $num = sprintf( "%03d", $num );
+
+        #Put wireless settings in correct hash
+        if ( defined $wireless ) {
+            $$self{wireless}{$wireless} = $num;
+        }
+
+        #Put expander settings in correct hash
+        if ( defined $expander ) {
+            $$self{expander}{$expander} = $num;
+        }
+
+        #Put relay settings in correct hash
+        if ( defined $relay ) {
+            $$self{relay}{$relay} = $num;
+        }
+    }
+    elsif ( $object->isa('AD2_Partition') ) {
+        ::print_log("Registering Child Object for partition $num");
+        $self->{partition_object}{$num} = $object;
+    }
+    elsif ( $object->isa('AD2_Output') ) {
+        ::print_log("Registering Child Object for output $num");
+        $self->{output_object}{$num} = $object;
+    }
 }
 
 =item C<get_child_object_name($zone)>
@@ -1383,9 +1514,9 @@ Takes a zone number and returns the name of the child object associated with it.
 =cut
 
 sub get_child_object_name {
-   my ($self,$zone_num) = @_;
-   my $object = $self->{zone_object}{$zone_num};
-   return $object->get_object_name() if defined ($object);
+    my ( $self, $zone_num ) = @_;
+    my $object = $self->{zone_object}{$zone_num};
+    return $object->get_object_name() if defined($object);
 }
 
 =back
@@ -1520,21 +1651,20 @@ type is the letter k.
 
 =cut
 
-sub new
-{
-   my ($class,$type,$interface,$zone,$partition,$expander,$relay,$wireless) = @_;
+sub new {
+    my ( $class, $type, $interface, $zone, $partition, $expander, $relay, $wireless ) = @_;
 
-   my $self = new Generic_Item();
-   bless $self,$class;
+    my $self = new Generic_Item();
+    bless $self, $class;
 
-   $$self{last_fault} = 0;
-   $$self{last_ready} = 0;
-   $$self{item_type} = lc($type);
-   $interface = AD2::get_object_by_instance($interface);
-   $interface->register($self,$zone,$expander,$relay,$wireless);
-   $zone = sprintf("%03d", $zone);
-   $$self{zone_partition}{$zone} = $partition;
-   return $self;
+    $$self{last_fault} = 0;
+    $$self{last_ready} = 0;
+    $$self{item_type}  = lc($type);
+    $interface         = AD2::get_object_by_instance($interface);
+    $interface->register( $self, $zone, $expander, $relay, $wireless );
+    $zone = sprintf( "%03d", $zone );
+    $$self{zone_partition}{$zone} = $partition;
+    return $self;
 
 }
 
@@ -1544,28 +1674,32 @@ Sets the object's state.
 
 =cut
 
-sub set
-{
-   my ($self,$p_state,$p_setby) = @_;
-
-      if (ref $p_setby and $p_setby->can('get_set_by')) {
-         ::print_log("AD2_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by) if $main::Debug{AD2};
-      } else {
-         ::print_log("AD2_Item($$self{object_name})::set($p_state, $p_setby)") if $main::Debug{AD2};
-      }
-
-      if ($p_state =~ /^fault/) {
-         $p_state =~ s/fault/open/ if $$self{item_type} eq 'door';
-         $p_state =~ s/fault/motion/ if $$self{item_type} eq 'motion';
-         $$self{last_fault} = $::Time;
-
-      } elsif ($p_state =~ /^ready/) {
-         $p_state =~ s/ready/closed/ if $$self{item_type} eq 'door';
-         $p_state =~ s/ready/still/ if $$self{item_type} eq 'motion';
-         $$self{last_ready} = $::Time;
-      }
-
-      $self->SUPER::set($p_state,$p_setby);
+sub set {
+    my ( $self, $p_state, $p_setby ) = @_;
+
+    if ( ref $p_setby and $p_setby->can('get_set_by') ) {
+        ::print_log(
+            "AD2_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by )
+          if $main::Debug{AD2};
+    }
+    else {
+        ::print_log("AD2_Item($$self{object_name})::set($p_state, $p_setby)")
+          if $main::Debug{AD2};
+    }
+
+    if ( $p_state =~ /^fault/ ) {
+        $p_state =~ s/fault/open/   if $$self{item_type} eq 'door';
+        $p_state =~ s/fault/motion/ if $$self{item_type} eq 'motion';
+        $$self{last_fault} = $::Time;
+
+    }
+    elsif ( $p_state =~ /^ready/ ) {
+        $p_state =~ s/ready/closed/ if $$self{item_type} eq 'door';
+        $p_state =~ s/ready/still/  if $$self{item_type} eq 'motion';
+        $$self{last_ready} = $::Time;
+    }
+
+    $self->SUPER::set( $p_state, $p_setby );
 }
 
 =item C<get_child_item_type()>
@@ -1575,8 +1709,8 @@ Returns the item type, either 'motion' or 'door'.
 =cut
 
 sub get_child_item_type {
-   my ($self) = @_;
-   return $$self{item_type};
+    my ($self) = @_;
+    return $$self{item_type};
 }
 
 =back
@@ -1597,8 +1731,8 @@ Returns the time the object was closed.
 =cut
 
 sub get_last_close_time {
-   my ($self) = @_;
-   return $$self{last_ready};
+    my ($self) = @_;
+    return $$self{last_ready};
 }
 
 =item C<get_last_open_time()>
@@ -1608,8 +1742,8 @@ Returns the time the object was opened.
 =cut
 
 sub get_last_open_time {
-   my ($self) = @_;
-   return $$self{last_fault};
+    my ($self) = @_;
+    return $$self{last_fault};
 }
 
 =item C<get_last_still_time()>
@@ -1619,8 +1753,8 @@ Returns the time the object was still.
 =cut
 
 sub get_last_still_time {
-   my ($self) = @_;
-   return $$self{last_ready};
+    my ($self) = @_;
+    return $$self{last_ready};
 }
 
 =item C<get_last_motion_time()>
@@ -1630,8 +1764,8 @@ Returns the time the object was motion.
 =cut
 
 sub get_last_motion_time {
-   my ($self) = @_;
-   return $$self{last_fault};
+    my ($self) = @_;
+    return $$self{last_fault};
 }
 
 =back
@@ -1740,41 +1874,39 @@ addresses, only ONE address is needed in $address.
 
 =cut
 
-sub new
-{
-   my ($class,$interface, $partition, $address) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $interface = AD2::get_object_by_instance($interface);
-   $$interface{partition_address}{$partition} = $address;
-   $interface->register($self,$partition);
-   $$self{interface} = $interface;
-   @{$$self{states}} = ('Disarm', 'ArmAway','ArmStay','ArmAwayMax','Test','Bypass',
-        'ArmStayInstant','Code','Chime','ToggleVoice');
-   return $self;
+sub new {
+    my ( $class, $interface, $partition, $address ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $interface = AD2::get_object_by_instance($interface);
+    $$interface{partition_address}{$partition} = $address;
+    $interface->register( $self, $partition );
+    $$self{interface} = $interface;
+    @{ $$self{states} } =
+      ( 'Disarm', 'ArmAway', 'ArmStay', 'ArmAwayMax', 'Test', 'Bypass', 'ArmStayInstant', 'Code', 'Chime', 'ToggleVoice' );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-	my $found_state = 0;
-	foreach my $test_state (@{$$self{states}}){
-		if (lc($test_state) eq lc($p_state)){
-			$found_state = 1;
-		}
-	}
-	if ($found_state){
-		::print_log("[AD2::Partition] Received request to "
-			. $p_state . " for partition " . $self->get_object_name);
-		$$self{interface}->set($p_state);
-	}
-	else {
-	   $$self{interface}->set($p_state);   
-	}
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    my $found_state = 0;
+    foreach my $test_state ( @{ $$self{states} } ) {
+        if ( lc($test_state) eq lc($p_state) ) {
+            $found_state = 1;
+        }
+    }
+    if ($found_state) {
+        ::print_log( "[AD2::Partition] Received request to " . $p_state . " for partition " . $self->get_object_name );
+        $$self{interface}->set($p_state);
+    }
+    else {
+        $$self{interface}->set($p_state);
+    }
 }
 
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
 }
 
 =back
@@ -1844,20 +1976,19 @@ package AD2_Output;
 
 =cut
 
-sub new
-{
-   my ($class,$interface,$output) = @_;
+sub new {
+    my ( $class, $interface, $output ) = @_;
 
-   my $self = new Generic_Item();
-   bless $self,$class;
+    my $self = new Generic_Item();
+    bless $self, $class;
 
-   $interface = AD2::get_object_by_instance($interface);
-   $$self{interface} = $interface;
-   $output = sprintf("%02d", $output);
-   $$self{output} = $output;
-   $interface->register($self,$output);
-   @{$$self{states}} = ('Start','Stop');
-   return $self;
+    $interface        = AD2::get_object_by_instance($interface);
+    $$self{interface} = $interface;
+    $output           = sprintf( "%02d", $output );
+    $$self{output}    = $output;
+    $interface->register( $self, $output );
+    @{ $$self{states} } = ( 'Start', 'Stop' );
+    return $self;
 
 }
 
@@ -1867,28 +1998,31 @@ Sets the object's state.
 
 =cut
 
-sub set
-{
-   my ($self,$p_state,$p_setby) = @_;
-
-      if (ref $p_setby and $p_setby->can('get_set_by')) {
-         ::print_log("AD2_Output($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by) if $main::Debug{AD2};
-      } else {
-         ::print_log("AD2_Output($$self{object_name})::set($p_state, $p_setby)") if $main::Debug{AD2};
-      }
-      my $reported_state;
-      if ($p_state =~ /^start/i || $p_state =~ /^stop/i) {
-         $reported_state = $p_state;
-         $$self{interface}->set(($$self{interface}->output_cmd($p_state, $$self{output})));
-      } 
-      else {
-         # This may be an attempt to send the alarm code, not sure if this is
-         # a good way to handle this
-         $reported_state = '';
-         $$self{interface}->set($p_state); 
-      }
-
-      $self->SUPER::set($reported_state,$p_setby);
+sub set {
+    my ( $self, $p_state, $p_setby ) = @_;
+
+    if ( ref $p_setby and $p_setby->can('get_set_by') ) {
+        ::print_log(
+            "AD2_Output($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by )
+          if $main::Debug{AD2};
+    }
+    else {
+        ::print_log("AD2_Output($$self{object_name})::set($p_state, $p_setby)")
+          if $main::Debug{AD2};
+    }
+    my $reported_state;
+    if ( $p_state =~ /^start/i || $p_state =~ /^stop/i ) {
+        $reported_state = $p_state;
+        $$self{interface}->set( ( $$self{interface}->output_cmd( $p_state, $$self{output} ) ) );
+    }
+    else {
+        # This may be an attempt to send the alarm code, not sure if this is
+        # a good way to handle this
+        $reported_state = '';
+        $$self{interface}->set($p_state);
+    }
+
+    $self->SUPER::set( $reported_state, $p_setby );
 }
 
 =back
diff --git a/lib/Acid.pm b/lib/Acid.pm
index 3a07e8fa0..9e60df020 100644
--- a/lib/Acid.pm
+++ b/lib/Acid.pm
@@ -49,8 +49,7 @@ sub read {
     foreach my $fh ( $sel->can_read(0) ) {
         $fh->recv( $data, 256, 0 );
         my ( $type, $port, $cid_name, $cid_number ) = &unfmt_udp_msg($data);
-        my ( $clientport, $client_ip_addr ) =
-          Socket::sockaddr_in( $fh->peername );
+        my ( $clientport, $client_ip_addr ) = Socket::sockaddr_in( $fh->peername );
         my ( $a, $b, $c, $d ) = unpack( 'C4', $client_ip_addr );
         my $dottedip = "$a.$b.$c.$d";
         if ( $type == &CID_TYPE_SUBSCRIBE ) {
@@ -89,10 +88,9 @@ sub write {
     print "Sending acid $PacketType , $CIDName , $CIDNumber\n"
       if $main::Debug{phone};
     foreach my $key ( keys %clientList ) {
-        my $ipaddr = Socket::inet_aton("$key");
+        my $ipaddr   = Socket::inet_aton("$key");
         my $portaddr = Socket::sockaddr_in( $clientList{$key}, $ipaddr );
-        my $buf = &fmt_udp_msg( $PacketType, $main::config_parms{Acid_UDP_Port},
-            $CIDName, $CIDNumber );
+        my $buf      = &fmt_udp_msg( $PacketType, $main::config_parms{Acid_UDP_Port}, $CIDName, $CIDNumber );
         print "Sending data to $ipaddr, $portaddr: $buf" if $main::Debug{phone};
         defined( send( $udp_fh, $buf, 0, $portaddr ) )
           || warn "send udp failed: $!";
@@ -134,9 +132,9 @@ sub CID_TYPE_UNSUBSCRIBE {
 }    # Param2 is client computer name/address
 sub CID_TYPE_INCOMING_CALL { return (3); }    # Param2 is caller's name
                                               # Param3 is caller's phone #
-sub CID_TYPE_ERROR_CALL { return (4); }   # Same as of ICallerIDNotify.OnError()
-                                          # Param2 is error message
-sub CID_TYPE_TEST { return (5); }    # same syntax as subscribe (ping request)
+sub CID_TYPE_ERROR_CALL    { return (4); }    # Same as of ICallerIDNotify.OnError()
+                                              # Param2 is error message
+sub CID_TYPE_TEST          { return (5); }    # same syntax as subscribe (ping request)
 
 1;
 
diff --git a/lib/AlsaPlayer.pm b/lib/AlsaPlayer.pm
index 82f4bcf84..c6824d7de 100644
--- a/lib/AlsaPlayer.pm
+++ b/lib/AlsaPlayer.pm
@@ -254,9 +254,7 @@ sub DESTROY {
     &::print_log("AlsaPlayer($$self{session_name}): Destructor called.");
     if ( $$self{'session'} >= 0 ) {
         if ( $sessions[ $$self{'session'} ] eq $self ) {
-            &::print_log(
-                "AlsaPlayer($$self{session_name}): Destructor unregistering session $$self{session}..."
-            );
+            &::print_log( "AlsaPlayer($$self{session_name}): Destructor unregistering session $$self{session}..." );
             $sessions[ $$self{'session'} ] = undef;
         }
     }
@@ -285,12 +283,8 @@ sub DESTROY {
 #-----------------------------------------
 sub _get_status {
     my ($id) = @_;
-    unless (
-        open( STATUS, "$::config_parms{alsaplayer_binary} --status -n $id|" ) )
-    {
-        &::print_log(
-            "AlsaPlayer: ERROR: Couldn't execute program '$::config_parms{alsaplayer_binary}'"
-        );
+    unless ( open( STATUS, "$::config_parms{alsaplayer_binary} --status -n $id|" ) ) {
+        &::print_log( "AlsaPlayer: ERROR: Couldn't execute program '$::config_parms{alsaplayer_binary}'" );
         return;
     }
     my $name = '';
@@ -316,8 +310,8 @@ sub _get_status {
                     {
                         if ( $sessions[$id]->{'playlist_length'} > 0 ) {
                             &::print_log(
-                                "AlsaPlayer($sessions[$id]->{session_name}): Resuming because it is paused but shouldn't be"
-                            ) if $main::Debug{alsaplayer};
+                                "AlsaPlayer($sessions[$id]->{session_name}): Resuming because it is paused but shouldn't be" )
+                              if $main::Debug{alsaplayer};
                             $sessions[$id]->_queue_cmd('start');
                         }
                     }
@@ -325,9 +319,8 @@ sub _get_status {
                         and ( $sessions[$id]->{'paused'} )
                         and ( not @{ $sessions[$id]->{'queue'} } ) )
                     {
-                        &::print_log(
-                            "AlsaPlayer($sessions[$id]->{session_name}): Pausing because it is playing but shouldn't be"
-                        ) if $main::Debug{alsaplayer};
+                        &::print_log( "AlsaPlayer($sessions[$id]->{session_name}): Pausing because it is playing but shouldn't be" )
+                          if $main::Debug{alsaplayer};
                         $sessions[$id]->_queue_cmd('pause');
                     }
                 }
@@ -344,8 +337,7 @@ sub _get_status {
             elsif ( $key eq 'volume' ) {
                 if ( $sessions[$id] ) {
                     unless ( $sessions[$id]->{'volume'} == $val ) {
-                        $sessions[$id]
-                          ->_queue_cmd( 'volume', $sessions[$id]->{'volume'} );
+                        $sessions[$id]->_queue_cmd( 'volume', $sessions[$id]->{'volume'} );
                     }
                 }
             }
@@ -407,24 +399,20 @@ sub _rebuild_playlist {
 
 sub _reconnect {
     my ($self) = @_;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): _reconnect(): session=$$self{'session'}, pending=$$self{'pending'}"
-    ) if $main::Debug{alsaplayer};
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): trying to restart and reconnect...");
+    &::print_log( "AlsaPlayer($$self{session_name}): _reconnect(): session=$$self{'session'}, pending=$$self{'pending'}" )
+      if $main::Debug{alsaplayer};
+    &::print_log("AlsaPlayer($$self{session_name}): trying to restart and reconnect...");
     $self->start();
     $self->_rebuild_playlist();
 }
 
 sub _died {
     my ($self) = @_;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): _died(): session=$$self{'session'}, pending=$$self{'pending'}"
-    ) if $main::Debug{alsaplayer};
+    &::print_log( "AlsaPlayer($$self{session_name}): _died(): session=$$self{'session'}, pending=$$self{'pending'}" )
+      if $main::Debug{alsaplayer};
     if ( $$self{'session'} >= 0 ) {
         unless ( $$self{'halted'} or $$self{'restarted'} ) {
-            &::print_log(
-                "AlsaPlayer($$self{session_name}): ERROR: process died...");
+            &::print_log("AlsaPlayer($$self{session_name}): ERROR: process died...");
         }
         $$self{'restarted'} = 0;
         $sessions[ $$self{'session'} ] = undef;
@@ -435,25 +423,18 @@ sub _died {
         $$self{'session'} = -1;
         $$self{'pending'} = 0;
         if ( $$self{'object_name'} and not $$self{'halted'} ) {
-            &::print_log(
-                "AlsaPlayer($$self{session_name}): Scheduling a restart...");
+            &::print_log("AlsaPlayer($$self{session_name}): Scheduling a restart...");
             $$self{'reconnect_timer'} = new Timer;
-            $$self{'reconnect_timer'}
-              ->set( 5, "$$self{object_name}->_reconnect()" );
+            $$self{'reconnect_timer'}->set( 5, "$$self{object_name}->_reconnect()" );
         }
     }
 }
 
 sub _send_cmd {
     my ( $self, $cmd, $args ) = @_;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): about to execute '$cmd' with args '$args'"
-    ) if $main::Debug{alsaplayer};
-    system(
-        "$::config_parms{alsaplayer_binary} -n $$self{'session'} --$cmd $args");
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): done executing '$cmd' with args '$args'"
-    ) if $main::Debug{alsaplayer};
+    &::print_log( "AlsaPlayer($$self{session_name}): about to execute '$cmd' with args '$args'" ) if $main::Debug{alsaplayer};
+    system("$::config_parms{alsaplayer_binary} -n $$self{'session'} --$cmd $args");
+    &::print_log( "AlsaPlayer($$self{session_name}): done executing '$cmd' with args '$args'" ) if $main::Debug{alsaplayer};
 }
 
 sub _queue_cmd {
@@ -470,9 +451,7 @@ sub _queue_cmd {
         my $ref;
         $ref->[0] = $cmd;
         $ref->[1] = $args;
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): queueing '$cmd' with args '$args'"
-        ) if $main::Debug{alsaplayer};
+        &::print_log( "AlsaPlayer($$self{session_name}): queueing '$cmd' with args '$args'" ) if $main::Debug{alsaplayer};
         push @{ $$self{'queue'} }, $ref;
     }
 }
@@ -587,13 +566,10 @@ sub _remove_playlist_files {
     }
     @{ $$self{'pending_playlist'} } = ();
     foreach ( keys %{ $$self{'playlist'} } ) {
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): removing '$_' from pending playlist"
-        ) if $main::Debug{alsaplayer};
+        &::print_log( "AlsaPlayer($$self{session_name}): removing '$_' from pending playlist" ) if $main::Debug{alsaplayer};
         if ( $$self{'playlist'}->{$_} > 0 ) {
             push @{ $$self{'pending_playlist'} }, $_;
-            &::print_log(
-                "AlsaPlayer($$self{session_name}): keeping '$_' in playlist")
+            &::print_log("AlsaPlayer($$self{session_name}): keeping '$_' in playlist")
               if $main::Debug{alsaplayer};
         }
         else {
@@ -607,9 +583,7 @@ sub _remove_playlist_files {
         #      &::print_log("AlsaPlayer($$self{session_name}): setting paused to 0 because replace is about to be called (after remove)") if $main::Debug{alsaplayer};
     }
     else {
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): no songs left in playlist... pausing."
-        ) if $main::Debug{alsaplayer};
+        &::print_log( "AlsaPlayer($$self{session_name}): no songs left in playlist... pausing." ) if $main::Debug{alsaplayer};
 
         # No songs left... just pause it...
         $self->pause();
@@ -673,9 +647,8 @@ sub _scan_sessions() {
             if ( @{ $sessions[$i]->{'queue'} }
                 and not $sessions[$i]->{'replace'} )
             {
-                &::print_log(
-                    "AlsaPlayer($sessions[$i]->{session_name}): Replace=$sessions[$i]->{'replace'}"
-                ) if $main::Debug{alsaplayer};
+                &::print_log( "AlsaPlayer($sessions[$i]->{session_name}): Replace=$sessions[$i]->{'replace'}" )
+                  if $main::Debug{alsaplayer};
                 my $cmd = shift @{ $sessions[$i]->{'queue'} };
                 $sessions[$i]->_send_cmd( $cmd->[0], $cmd->[1] );
             }
@@ -692,14 +665,12 @@ sub _scan_sessions() {
                 &::print_log(
                     "AlsaPlayer($sessions[$i]->{session_name}): before: pending playlist has $#{$sessions[$i]->{'pending_playlist'}} entries"
                 ) if $main::Debug{alsaplayer};
-                while ( $song = shift @{ $sessions[$i]->{'pending_playlist'} } )
-                {
+                while ( $song = shift @{ $sessions[$i]->{'pending_playlist'} } ) {
                     $songs .= ' ' . &_quote_str($song);
 
                     #               &::print_log("AlsaPlayer($sessions[$i]->{session_name}): adding song: $song");
                     if (   ( length $songs > 4000 )
-                        or
-                        ( ( length $songs > 500 ) and ( $cmd eq 'replace' ) ) )
+                        or ( ( length $songs > 500 ) and ( $cmd eq 'replace' ) ) )
                     {
                         last;
                     }
@@ -710,9 +681,8 @@ sub _scan_sessions() {
                 if ($songs) {
 
                     #&::print_log("AlsaPlayer($sessions[$i]->{session_name}): adding songs with '$cmd': $songs") if $main::Debug{alsaplayer};
-                    $sessions[$i]->{'control'}->set(
-                        "$::config_parms{alsaplayer_binary} -n '$sessions[$i]->{'session'}' --$cmd $songs"
-                    );
+                    $sessions[$i]->{'control'}
+                      ->set( "$::config_parms{alsaplayer_binary} -n '$sessions[$i]->{'session'}' --$cmd $songs" );
                     $sessions[$i]->{'control'}->start();
                     unless ( @{ $sessions[$i]->{'pending_playlist'} } ) {
                         if ( $sessions[$i]->{'shuffle'} ) {
@@ -720,8 +690,8 @@ sub _scan_sessions() {
                         }
                         $sessions[$i]->set('playlist_loaded');
                         &::print_log(
-                            "AlsaPlayer($sessions[$i]->{session_name}): playlist has been loaded: paused=$sessions[$i]->{paused}"
-                        ) if $main::Debug{alsaplayer};
+                            "AlsaPlayer($sessions[$i]->{session_name}): playlist has been loaded: paused=$sessions[$i]->{paused}" )
+                          if $main::Debug{alsaplayer};
                     }
                 }
             }
@@ -746,8 +716,7 @@ sub _scan_sessions() {
         unless ( $sessions[$i] ) {
             if ( @pending or @check_once ) {
                 if ( $label = &_get_status($i) ) {
-                    &::print_log(
-                        "AlsaPlayer: scanned id $i and found label: $label")
+                    &::print_log("AlsaPlayer: scanned id $i and found label: $label")
                       if $main::Debug{alsaplayer};
                     if (@pending) {
                         for ( my $j = 0; $j <= $#pending; $j++ ) {
@@ -772,9 +741,7 @@ sub _scan_sessions() {
     my @start = @check_once;
     @check_once = ();
     foreach (@start) {
-        &::print_log(
-            "AlsaPlayer($$_{session_name}): did not find process already running..."
-        ) if $main::Debug{alsaplayer};
+        &::print_log( "AlsaPlayer($$_{session_name}): did not find process already running..." ) if $main::Debug{alsaplayer};
         if ( $$_{'pending'} ) {
             $$_{'pending'} = 0;
             $_->start();
@@ -786,8 +753,7 @@ sub unpause {
     my ($self) = @_;
     $self->_queue_cmd('start');
     $$self{'paused'} = 0;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): setting paused to 0 in unpause()")
+    &::print_log("AlsaPlayer($$self{session_name}): setting paused to 0 in unpause()")
       if $main::Debug{alsaplayer};
 }
 
@@ -801,8 +767,7 @@ sub pause {
     unless ( $$self{'paused'} ) {
         $self->_queue_cmd('pause');
         $$self{'paused'} = 1;
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): setting paused to 1 in pause()")
+        &::print_log("AlsaPlayer($$self{session_name}): setting paused to 1 in pause()")
           if $main::Debug{alsaplayer};
     }
 }
@@ -811,9 +776,8 @@ sub pause_toggle {
     my ($self) = @_;
     $self->_queue_cmd('pause');
     $$self{'paused'} = not $$self{'paused'};
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): setting paused to $$self{paused} in pause_toggle()"
-    ) if $main::Debug{alsaplayer};
+    &::print_log( "AlsaPlayer($$self{session_name}): setting paused to $$self{paused} in pause_toggle()" )
+      if $main::Debug{alsaplayer};
 }
 
 sub next_song {
@@ -832,9 +796,7 @@ sub forward {
         $self->_queue_cmd( 'relative', $seconds );
     }
     else {
-        &::print_log(
-            "AlsaPlayer($$_{session_name}): forward($seconds): Invalid parameter"
-        );
+        &::print_log( "AlsaPlayer($$_{session_name}): forward($seconds): Invalid parameter" );
     }
 }
 
@@ -844,9 +806,7 @@ sub rewind {
         $self->_queue_cmd( 'relative', -$seconds );
     }
     else {
-        &::print_log(
-            "AlsaPlayer($$_{session_name}): rewind($seconds): Invalid parameter"
-        );
+        &::print_log( "AlsaPlayer($$_{session_name}): rewind($seconds): Invalid parameter" );
     }
 }
 
@@ -955,16 +915,14 @@ sub restart {
 
 sub start {
     my ($self) = @_;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): start(): session=$$self{'session'}, pending=$$self{'pending'}"
-    ) if $main::Debug{alsaplayer};
+    &::print_log( "AlsaPlayer($$self{session_name}): start(): session=$$self{'session'}, pending=$$self{'pending'}" )
+      if $main::Debug{alsaplayer};
     if ( ( $$self{'session'} >= 0 ) or ( $$self{'pending'} ) ) {
 
         # Already running, so send in the --start command
         $self->_queue_cmd('start');
         $$self{'paused'} = 0;
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): setting paused to 0 in start()")
+        &::print_log("AlsaPlayer($$self{session_name}): setting paused to 0 in start()")
           if $main::Debug{alsaplayer};
         return;
     }
@@ -973,9 +931,8 @@ sub start {
         if ( $self eq $check_once[$k] ) {
 
             # Wait to check if the process is already running...
-            &::print_log(
-                "AlsaPlayer($$self{session_name}): waiting to see if process is already running..."
-            ) if $main::Debug{alsaplayer};
+            &::print_log( "AlsaPlayer($$self{session_name}): waiting to see if process is already running..." )
+              if $main::Debug{alsaplayer};
             $$self{'pending'} = 1;
             return;
         }
@@ -988,21 +945,16 @@ sub start {
     if ( $$self{'channel'} ) {
         $channel = "-d $$self{'channel'}";
     }
-    my $program =
-      "$::config_parms{alsaplayer_binary} $opts -s '$$self{session_name}' -r $channel &";
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): About to execute: '$program'")
+    my $program = "$::config_parms{alsaplayer_binary} $opts -s '$$self{session_name}' -r $channel &";
+    &::print_log("AlsaPlayer($$self{session_name}): About to execute: '$program'")
       if $main::Debug{alsaplayer};
     unless ( system($program) == 0 ) {
-        &::print_log(
-            "AlsaPlayer($$self{session_name}): start() ERROR: Couldn't execute program '$program'"
-        );
+        &::print_log( "AlsaPlayer($$self{session_name}): start() ERROR: Couldn't execute program '$program'" );
         return;
     }
     $$self{'pending'} = 1;
     $$self{'replace'} = 1;
-    &::print_log(
-        "AlsaPlayer($$self{session_name}): setting paused to 1 in start()")
+    &::print_log("AlsaPlayer($$self{session_name}): setting paused to 1 in start()")
       if $main::Debug{alsaplayer};
 
     #   $$self{'paused'} = 1;
diff --git a/lib/AnalogSensor_Item.pm b/lib/AnalogSensor_Item.pm
index 2cddf9144..84e58ef8d 100644
--- a/lib/AnalogSensor_Item.pm
+++ b/lib/AnalogSensor_Item.pm
@@ -120,17 +120,12 @@ sub new {
     $$self{m_activityTime} = 24 * 3600;
 
     # maintain measurement member as it is like state
-    $self->restore_data(
-        'm_measurement',         'm_timestamp',
-        'm_time_since_previous', 'm_measurement_change',
-        'm_activityTime'
-    );
+    $self->restore_data( 'm_measurement', 'm_timestamp', 'm_time_since_previous', 'm_measurement_change', 'm_activityTime' );
     $$self{m_max_records} = 10;
     for my $token (@args) {
         my ( $tag, $value ) = split( /=/, $token );
         if ( defined($tag) and defined($value) ) {
-            print "[AnalogSensor_Item] Adding analog sensor token: $tag "
-              . "having value: $value\n"
+            print "[AnalogSensor_Item] Adding analog sensor token: $tag " . "having value: $value\n"
               if $main::Debug{analogsensor};
             $self->token( $tag, $value );
         }
@@ -181,17 +176,13 @@ sub measurement {
         # if we have a prior record, then compute the deltas
         if ( !($p_skip_delta) && @measurement_records ) {
             my $last_index = 0;    #scalar(@measurement_records)-1;
-            $$self{m_time_since_previous} =
-              $p_timestamp -
-              $measurement_records[$last_index]->{time_since_previous};
+            $$self{m_time_since_previous} = $p_timestamp - $measurement_records[$last_index]->{time_since_previous};
             $$self{m_measurement_change} =
               $p_measurement - $measurement_records[$last_index]->{measurement};
 
             # and update this record
-            $measurement_record->{time_since_previous} =
-              $$self{m_time_since_previous};
-            $measurement_record->{measurement_change} =
-              $$self{m_measurement_change};
+            $measurement_record->{time_since_previous} = $$self{m_time_since_previous};
+            $measurement_record->{measurement_change}  = $$self{m_measurement_change};
         }
         else {
             $measurement_record->{time_since_previous} = 0;
@@ -218,8 +209,7 @@ sub measurement {
         if ( $$self{m_objects} ) {
             for my $averager ( @{ $$self{m_objects} } ) {
                 if ( $averager && $averager->can('update_measurement') ) {
-                    $averager->update_measurement( $self, $p_measurement,
-                        $p_timestamp );
+                    $averager->update_measurement( $self, $p_measurement, $p_timestamp );
                 }
             }
         }
@@ -239,9 +229,7 @@ sub set {
             package AnalogSensor_Item;
         }
         else {
-            &print_log(
-                "$$self{object_name}->Has not received a measurement in $$self{'m_inactivityTime'} seconds"
-            );
+            &print_log( "$$self{object_name}->Has not received a measurement in $$self{'m_inactivityTime'} seconds" );
         }
         $p_state = 'check';
         $self->SUPER::set( $p_state, $p_setby );
@@ -323,16 +311,13 @@ sub map_to_weather {
             if ( $sensor_names !~ /$rrd_ref\W/i ) {
                 $sensor_names .= ", $rrd_ref => $p_sensor_name";
                 $main::config_parms{weather_graph_sensor_names} = $sensor_names;
-                print
-                  "[AnalogSensor] weather_graph_sensor_names: $sensor_names\n"
+                print "[AnalogSensor] weather_graph_sensor_names: $sensor_names\n"
                   if $main::Debug{analogsensor};
             }
         }
         else {
-            $main::config_parms{weather_graph_sensor_names} =
-              "$rrd_ref => $p_sensor_name";
-            print
-              "[AnalogSensor] weather_graph_sensor_names: $main::config_parms{weather_graph_sensor_names}\n"
+            $main::config_parms{weather_graph_sensor_names} = "$rrd_ref => $p_sensor_name";
+            print "[AnalogSensor] weather_graph_sensor_names: $main::config_parms{weather_graph_sensor_names}\n"
               if $main::Debug{analogsensor};
         }
     }
@@ -382,8 +367,7 @@ sub check_tied_state_conditions {
     # construct the tokens
     my $token_string = "";
     for my $token ( keys %{ $$self{tokens} } ) {
-        $token_string .=
-          'my $token_' . $token . ' = ' . $$self{tokens}{$token} . '; ';
+        $token_string .= 'my $token_' . $token . ' = ' . $$self{tokens}{$token} . '; ';
     }
     print "[AnalogSensor] token_string: $token_string\n"
       if ($token_string) && $main::Debug{analogsensor};
@@ -399,14 +383,11 @@ sub check_tied_state_conditions {
         my $recent_change_rate  = $self->get_average_change_rate(3);
         my $state               = $self->state;
         my $code                = "no strict; ";
-        $code .=
-          ($token_string) ? ( $token_string . ' ' . $condition ) : $condition;
+        $code .= ($token_string) ? ( $token_string . ' ' . $condition ) : $condition;
         my $result = eval($code);
 
         if ($@) {
-            &::print_log( "Problem encountered when evaluating "
-                  . $self->{object_name}
-                  . " condition: $condition: $@" );
+            &::print_log( "Problem encountered when evaluating " . $self->{object_name} . " condition: $condition: $@" );
             $self->untie_state_condition($condition);
         }
         elsif ($result) {
@@ -438,8 +419,7 @@ sub check_tied_event_conditions {
     # construct the tokens
     my $token_string = "";
     for my $token ( keys %{ $$self{tokens} } ) {
-        $token_string .=
-          'my $token_' . $token . ' = ' . $$self{tokens}{$token} . '; ';
+        $token_string .= 'my $token_' . $token . ' = ' . $$self{tokens}{$token} . '; ';
     }
     print "[AnalogSensor] token_string: $token_string\n"
       if ($token_string) && $main::Debug{analogsensor};
@@ -455,27 +435,21 @@ sub check_tied_event_conditions {
         my $recent_change_rate  = $self->get_average_change_rate(3);
         my $state               = $self->state;
         my $code                = "no strict; ";
-        $code .=
-          ($token_string) ? ( $token_string . ' ' . $condition ) : $condition;
+        $code .= ($token_string) ? ( $token_string . ' ' . $condition ) : $condition;
         my $result = eval($code);
 
         if ($@) {
-            &::print_log( "Problem encountered when evaluating "
-                  . $self->{object_name}
-                  . " condition: $condition; $@" );
+            &::print_log( "Problem encountered when evaluating " . $self->{object_name} . " condition: $condition; $@" );
             $self->untie_state_condition($condition);
         }
         elsif ($result) {
 
-            package main
-              ; # needed to do this to allow usercode callbacks and vars to be used w/o needing main::
+            package main;    # needed to do this to allow usercode callbacks and vars to be used w/o needing main::
             my $code = "no strict; ";
             $code .= $$self{tied_event_conditions}{$condition};
             eval($code);
             if ($@) {
-                &::print_log( "Problem encountered when executing event for "
-                      . $self->{object_name}
-                      . " and code: $code; $@" );
+                &::print_log( "Problem encountered when executing event for " . $self->{object_name} . " and code: $code; $@" );
             }
 
             package AnalogSensor_Item;
@@ -584,8 +558,7 @@ sub new {
     for my $token (@args) {
         my ( $tag, $value ) = split( /=/, $token );
         if ( defined($tag) and defined($value) ) {
-            print "[AnalogRangeSensor_Item] Adding analog sensor token: $tag "
-              . "having value: $value\n"
+            print "[AnalogRangeSensor_Item] Adding analog sensor token: $tag " . "having value: $value\n"
               if $main::Debug{analogsensor};
             $diag_config{$tag} = $value;
         }
@@ -763,17 +736,13 @@ sub new {
 
     my $self = {};
     bless $self, $class;
-    $$self{m_activityTime} = 24 * 3600;
-    $$self{m_sensorTimeout} = 3600; # ignore any sensors whose value is 1 hr old
+    $$self{m_activityTime}  = 24 * 3600;
+    $$self{m_sensorTimeout} = 3600;        # ignore any sensors whose value is 1 hr old
     $self->id('');
     $self->type('averaging');
 
     # maintain measurement member as it is like state
-    $self->restore_data(
-        'm_measurement',         'm_timestamp',
-        'm_time_since_previous', 'm_measurement_change',
-        'm_activityTime'
-    );
+    $self->restore_data( 'm_measurement', 'm_timestamp', 'm_time_since_previous', 'm_measurement_change', 'm_activityTime' );
     $$self{m_max_records} = 10;
 
     if ( $p_sensor_item && $p_sensor_item->isa('AnalogSensor_Item') ) {
@@ -782,9 +751,7 @@ sub new {
         for my $token (@p_tokens) {
             my ( $tag, $value ) = split( /=/, $token );
             if ( defined($tag) and defined($value) ) {
-                print
-                  "[AnalogAveraging_Item] Adding analog averager token: $tag "
-                  . "having value: $value\n"
+                print "[AnalogAveraging_Item] Adding analog averager token: $tag " . "having value: $value\n"
                   if $main::Debug{analogsensor};
                 $self->token( $tag, $value );
             }
@@ -818,13 +785,7 @@ sub update_measurement {
     my $measurement_count       = 0;
 
     for my $measurement_key ( keys %{ $$self{m_measurements} } ) {
-        if (
-            (
-                $p_timestamp -
-                $$self{m_measurements}{$measurement_key}{timestamp}
-            ) < $self->sensor_timeout
-          )
-        {
+        if ( ( $p_timestamp - $$self{m_measurements}{$measurement_key}{timestamp} ) < $self->sensor_timeout ) {
             $measurement_accumulator +=
               $$self{m_measurements}{$measurement_key}{measurement};
             $measurement_count++;
@@ -835,8 +796,8 @@ sub update_measurement {
         my $average = $measurement_accumulator / $measurement_count;
         &::print_log( "[AnalogAveraging_Item] average value for "
               . $self->get_object_name
-              . " is $average using a total of $measurement_count individual sensors"
-        ) if $main::Debug{analogsensor};
+              . " is $average using a total of $measurement_count individual sensors" )
+          if $main::Debug{analogsensor};
         $self->measurement($average);
     }
 }
diff --git a/lib/Android_Item.pm b/lib/Android_Item.pm
index f52c3a8a4..96561a798 100644
--- a/lib/Android_Item.pm
+++ b/lib/Android_Item.pm
@@ -36,8 +36,7 @@ sub new {
     #Tell MH to call our routine each time something is spoken
     #&::Speak_parms_add_hook(\&Andoid_Server::pre_speak_to_android, $self);
     #&::Play_parms_add_hook(\&Andoid_Server::pre_play_to_android, $self);
-    &::MainLoop_pre_add_hook( \&Android_Item::state_machine,
-        'persistent', $self );
+    &::MainLoop_pre_add_hook( \&Android_Item::state_machine, 'persistent', $self );
 
     $self->{toggle_item} = new Generic_Item();
     $self->{toggle_item}->set_states( 'on', 'off' );
@@ -58,15 +57,13 @@ sub state_machine {
 
 sub speech_log {
     my ($self) = @_;
-    my @last_spoken =
-      &main::speak_log_last( $main::config_parms{max_log_entries} );
+    my @last_spoken = &main::speak_log_last( $main::config_parms{max_log_entries} );
     return @last_spoken;
 }
 
 sub print_log {
     my ($self) = @_;
-    my @last_printed =
-      &main::print_log_last( $main::config_parms{max_log_entries} );
+    my @last_printed = &main::print_log_last( $main::config_parms{max_log_entries} );
     return @last_printed;
 }
 
@@ -129,15 +126,12 @@ sub get_hash_example ( ) {
 
 sub android_xml {
     my ( $self, $depth, $fields, $num_tags, $attributes ) = @_;
-    my @f =
-      qw( speech_log print_log text_item toggle_item spinner_item image_button array_example hash_example);
+    my @f = qw( speech_log print_log text_item toggle_item spinner_item image_button array_example hash_example);
 
     # Avoid filter due to no state
     $attributes->{noFilterState} = "true";
 
-    my $xml_objects =
-      $self->SUPER::android_xml( $depth, $fields, $num_tags + scalar(@f),
-        $attributes );
+    my $xml_objects = $self->SUPER::android_xml( $depth, $fields, $num_tags + scalar(@f), $attributes );
     my $prefix = '  ' x $depth;
 
     foreach my $f (@f) {
@@ -217,8 +211,7 @@ sub android_xml {
             $attributes->{object}       = $value->{object_name};
             $attributes->{type}         = ref $value;
             $attributes->{memberObject} = "true";
-            $xml_objects .=
-              $value->android_xml( $depth + 1, $fields, 0, $attributes );
+            $xml_objects .= $value->android_xml( $depth + 1, $fields, 0, $attributes );
             $xml_objects .= $prefix . "</$value->{object_name}>\n";
         }
 
@@ -230,8 +223,7 @@ sub android_xml {
                 $_ = "" unless defined $_;
                 my $val = $_;
                 $val = encode_entities( $val, "\200-\377&<>" );
-                $xml_objects .=
-                  $self->android_xml_tag( $prefix, "value", $attributes, $val );
+                $xml_objects .= $self->android_xml_tag( $prefix, "value", $attributes, $val );
             }
             $prefix = '  ' x $depth;
             $xml_objects .= $prefix . "</$f>\n";
@@ -248,8 +240,7 @@ sub android_xml {
                 $key = encode_entities( $key, "\200-\377&<>" );
                 $key =~ s/ /_/g;
                 $key =~ s/[\[\]]/_/g;
-                $xml_objects .=
-                  $self->android_xml_tag( $prefix, $key, $attributes, $val );
+                $xml_objects .= $self->android_xml_tag( $prefix, $key, $attributes, $val );
             }
             $prefix = '  ' x $depth;
             $xml_objects .= $prefix . "</$f>\n";
@@ -257,8 +248,7 @@ sub android_xml {
 
         else {
             $value = "" unless defined $value;
-            $xml_objects .=
-              $self->android_xml_tag( $prefix, $f, $attributes, $value );
+            $xml_objects .= $self->android_xml_tag( $prefix, $f, $attributes, $value );
         }
     }
     return $xml_objects;
diff --git a/lib/Audible_Menu.pm b/lib/Audible_Menu.pm
index d637f9617..38400c889 100644
--- a/lib/Audible_Menu.pm
+++ b/lib/Audible_Menu.pm
@@ -164,10 +164,7 @@ sub speak_next {
     #print "$menu state $$self{menu_state} of $#{$$ptr{Dstates}} cy $$self{cy}";
 
     if ( $$ptr{Dstates} and $#{ $$ptr{Dstates} } > 0 ) {
-        $text =
-            $$ptr{Dprefix}
-          . $$ptr{Dstates}[ $$self{menu_state} ]
-          . $$ptr{Dsuffix};
+        $text = $$ptr{Dprefix} . $$ptr{Dstates}[ $$self{menu_state} ] . $$ptr{Dsuffix};
     }
     else {
         $text = $$ptr{D};
diff --git a/lib/AudiotronPlayer.pm b/lib/AudiotronPlayer.pm
index 09dcbc82a..bf4994ffa 100644
--- a/lib/AudiotronPlayer.pm
+++ b/lib/AudiotronPlayer.pm
@@ -42,12 +42,8 @@ sub new {
     push( @audiotronplayer_object_list, $self );
 
     # See http://gulf.uvic.ca/~karvanit/winamp/commands.html
-    push(
-        @{ $$self{states} },
-        'play',     'pause',      'stop',   'next',
-        'prev',     'random',     'repeat', 'randomsong',
-        'volumeup', 'volumedown', 'clear'
-    );
+    push( @{ $$self{states} },
+        'play', 'pause', 'stop', 'next', 'prev', 'random', 'repeat', 'randomsong', 'volumeup', 'volumedown', 'clear' );
 
     print "AudiotronPlayer $address created" . "\n";
 
@@ -60,20 +56,15 @@ sub new {
 sub default_setstate {
     my ( $self, $state, $substate ) = @_;
 
-    print "Audiotron set called: "
-      . $self->{address} . " to "
-      . $state . ":"
-      . $substate . " ";
+    print "Audiotron set called: " . $self->{address} . " to " . $state . ":" . $substate . " ";
 
     my $apiwebpassword = '';
     $apiwebpassword = "admin:" . $main::config_parms{AudiotronWebPassword} . "@"
       if $main::config_parms{AudiotronWebPassword};
 
-    my $apicmdurl =
-      "http://" . $apiwebpassword . $self->{address} . "/apicmd.asp?cmd=";
+    my $apicmdurl = "http://" . $apiwebpassword . $self->{address} . "/apicmd.asp?cmd=";
 
-    my $apiqfile =
-      "http://" . $apiwebpassword . $self->{address} . "/apiqfile.asp?type=";
+    my $apiqfile = "http://" . $apiwebpassword . $self->{address} . "/apiqfile.asp?type=";
 
     if ( $state eq 'randomsong' ) {
         ;
@@ -87,15 +78,8 @@ sub default_setstate {
 
         #$self->{audiotron_last_entry} = $BaseName;
         $self->{audiotron_last_entry} = $file;
-        print "Playlist: "
-          . $apiqfile
-          . $self->{audiotron_last_type}
-          . "&file="
-          . $self->{audiotron_last_entry};
-        print ::filter_cr ::get $apiqfile
-          . $self->{audiotron_last_type}
-          . "&file="
-          . $self->{audiotron_last_entry};
+        print "Playlist: " . $apiqfile . $self->{audiotron_last_type} . "&file=" . $self->{audiotron_last_entry};
+        print ::filter_cr ::get $apiqfile . $self->{audiotron_last_type} . "&file=" . $self->{audiotron_last_entry};
     }
     elsif ( $state =~ /volume/i ) {
 
@@ -114,15 +98,8 @@ sub default_setstate {
             $self->set("repeat:on");
             $self->{audiotron_last_type}  = 'List';
             $self->{audiotron_last_entry} = 'Background';
-            print "Playlist: "
-              . $apiqfile
-              . $self->{audiotron_last_type}
-              . "&file="
-              . $self->{audiotron_last_entry};
-            print ::filter_cr ::get $apiqfile
-              . $self->{audiotron_last_type}
-              . "&file="
-              . $self->{audiotron_last_entry};
+            print "Playlist: " . $apiqfile . $self->{audiotron_last_type} . "&file=" . $self->{audiotron_last_entry};
+            print ::filter_cr ::get $apiqfile . $self->{audiotron_last_type} . "&file=" . $self->{audiotron_last_entry};
         }
 
         print ::filter_cr ::get $apicmdurl . "play";
diff --git a/lib/Audrey_Play.pm b/lib/Audrey_Play.pm
index 9bff98c12..c4738b639 100644
--- a/lib/Audrey_Play.pm
+++ b/lib/Audrey_Play.pm
@@ -60,12 +60,7 @@ sub play {
     &::print_log("Called 'play' in Audrey_Play object...");
     my $MHWeb = $::Info{IPAddress_local} . ":" . $::config_parms{http_port};
     &::print_log($MHWeb);
-    &::run( "get_url -quiet http://"
-          . $self->{address}
-          . "/mhspeak.shtml?http://"
-          . $MHWeb . "/"
-          . $web_file
-          . " /dev/null" );
+    &::run( "get_url -quiet http://" . $self->{address} . "/mhspeak.shtml?http://" . $MHWeb . "/" . $web_file . " /dev/null" );
 }
 
 1;
diff --git a/lib/BSC.pm b/lib/BSC.pm
index 122425609..0ed7fce65 100644
--- a/lib/BSC.pm
+++ b/lib/BSC.pm
@@ -54,12 +54,10 @@ sub new {
     $self->writable($p_writable) if defined $p_writable;
     $self->set_casesensitive();
     my $friendly_name = "bsc_$p_source_name";
-    &main::store_object_data( $$self{m_xap}, 'xAP_Item', $friendly_name,
-        $friendly_name );
+    &main::store_object_data( $$self{m_xap}, 'xAP_Item', $friendly_name, $friendly_name );
     $$self{m_xap}->tie_items($self);
     $$self{source_name} = $p_source_name;
-    $self->restore_data( 'm_xapuid', 'bsc_state', 'level', 'text',
-        'display_text' );
+    $self->restore_data( 'm_xapuid', 'bsc_state', 'level', 'text', 'display_text' );
 
     return $self;
 }
@@ -163,10 +161,7 @@ sub set {
         elsif ( lc $sender_class eq 'xapbsc.query' ) {
 
             # handle query
-            $state = $self->query_callback(
-                $$p_setby{'xap-header'}{target},
-                $$p_setby{'xap-header'}{source}
-            );
+            $state = $self->query_callback( $$p_setby{'xap-header'}{target}, $$p_setby{'xap-header'}{source} );
         }
         elsif ( lc $sender_class eq 'xapbsc.event' ) {
 
@@ -191,9 +186,7 @@ sub set {
                 $subuid = substr( $self->uid, 6 )
                   if !( defined $subuid )
                   and length( $self->uid ) == 8;
-                print "[BSC] "
-                  . $self->{object_name}
-                  . " extracting subaddress uid = $subuid\n"
+                print "[BSC] " . $self->{object_name} . " extracting subaddress uid = $subuid\n"
                   if $main::Debug{bsc};
             }
             else {
@@ -228,8 +221,7 @@ sub set {
         }
         my $target_address = $$self{m_xap}{source};
         $target_address =~ s/(\:.*)/\:\>/;
-        &xAP::sendXap( $target_address, 'xapbsc.cmd',
-            'output.state.1' => $bsc_block );
+        &xAP::sendXap( $target_address, 'xapbsc.cmd', 'output.state.1' => $bsc_block );
 
         # if allow_local_set_state is set false, then don't propogate the state
         # and instead only allow the device to acknowledge it's state change via info or event
@@ -276,8 +268,7 @@ sub cmd_callback {
                 $text = $value;
             }
         }
-        print
-          "db BSC_Item->cmd_callback: id=$id,state=$state,level=$level,text=$text\n"
+        print "db BSC_Item->cmd_callback: id=$id,state=$state,level=$level,text=$text\n"
           if $main::Debug{bsc};
         if ( ($id) and ($state) ) {
             my $mode = 'output';    # cmds can only affect an 'output'
@@ -303,9 +294,7 @@ sub event_callback {
     $$self{display_text} = undef;
     for my $section_name ( keys %{$p_xap} ) {
         next unless ( $section_name =~ /^(input|output)\.state/ );
-        print "db BSC_Item->event_callback: Process section:$section_name"
-          . " from "
-          . $$p_xap{'xap-header'}{source} . "\n"
+        print "db BSC_Item->event_callback: Process section:$section_name" . " from " . $$p_xap{'xap-header'}{source} . "\n"
           if $main::Debug{bsc};
         my $bsc_level = $$p_xap{$section_name}{level};
         my $bsc_state = $$p_xap{$section_name}{state};
@@ -339,9 +328,7 @@ sub info_callback {
     $$self{display_text} = undef;
     for my $section_name ( keys %{$p_xap} ) {
         next unless ( $section_name =~ /^(input|output)\.state/ );
-        print "db BSC_Item->info_callback: Process section:$section_name"
-          . " from "
-          . $$p_xap{'xap-header'}{source} . "\n"
+        print "db BSC_Item->info_callback: Process section:$section_name" . " from " . $$p_xap{'xap-header'}{source} . "\n"
           if $main::Debug{bsc};
         my $bsc_level = $$p_xap{$section_name}{level};
         my $bsc_state = $$p_xap{$section_name}{state};
@@ -379,13 +366,10 @@ sub query {
     my ( $headerVars, @data2 );
     $headerVars->{'class'}  = 'xAPBSC.query';
     $headerVars->{'target'} = $$self{source_name};
-    $headerVars->{'source'} =
-      &xAP::get_xap_mh_source_info(xAP::XAP_REAL_DEVICE_NAME);
-    $headerVars->{'uid'} =
-      &xAP::get_xap_base_uid(xAP::XAP_REAL_DEVICE_NAME) . '00';
+    $headerVars->{'source'} = &xAP::get_xap_mh_source_info(xAP::XAP_REAL_DEVICE_NAME);
+    $headerVars->{'uid'}    = &xAP::get_xap_base_uid(xAP::XAP_REAL_DEVICE_NAME) . '00';
     push @data2, $headerVars;
-    push @data2, 'request', ''
-      ; # hmmm, this could blow-up maybe? really only want a blank request block
+    push @data2, 'request', '';    # hmmm, this could blow-up maybe? really only want a blank request block
 
     &xAP::sendXapWithHeaderVars(@data2);
 }
@@ -485,16 +469,14 @@ sub new {
     $$self{m_device_family} = $p_device_family;
     $$self{m_source_name}   = &xAP::get_xap_mh_source_info($p_device_family);
 
-    my $source_name = &xAP::get_xap_mh_source_info($p_device_family);  # . ':>';
+    my $source_name = &xAP::get_xap_mh_source_info($p_device_family);    # . ':>';
     $$self{m_xap} = new xAP_Item( 'xAPBSC.*', '*' );
-    $$self{m_xap}->target_address($source_name)
-      ;    # want to listen to messages directed to us
+    $$self{m_xap}->target_address($source_name);    # want to listen to messages directed to us
     $$self{m_xap}->device_name($p_device_family);
-    $$self{m_xap}->allow_empty_state(1)
-      ;    # because query commands result in an empty xap body
-           # init a virtual xap device
-     #   this will force a new xap listener to exist as well as separate hearbeats.
-     #   it is only required because of the current max 254 endpoint limitation
+    $$self{m_xap}->allow_empty_state(1);            # because query commands result in an empty xap body
+                                                    # init a virtual xap device
+                                                    #   this will force a new xap listener to exist as well as separate hearbeats.
+                                                    #   it is only required because of the current max 254 endpoint limitation
 
     &xAP::init_xap_virtual_device($p_device_family);
 
@@ -519,8 +501,7 @@ sub register_obj {
             # we can only permit the subaddress space to map to 254 devices;
             # so, don't allow the last 2 possible x10 devices
             if ( $x10_id eq 'PF' or $x10_id eq 'PG' ) {
-                print
-                  "WARNING: x10 devices w/ housecode/usercodes of $x10_id are not supported\n"
+                print "WARNING: x10 devices w/ housecode/usercodes of $x10_id are not supported\n"
                   if $main::Debug{bsc};
                 return;
             }
@@ -530,13 +511,10 @@ sub register_obj {
     }
 
     # reserve the UID
-    my $sub_uid =
-      &xAP::get_xap_subaddress_uid( $handler_name, $mh_obj_name,
-        $requested_uid );
+    my $sub_uid = &xAP::get_xap_subaddress_uid( $handler_name, $mh_obj_name, $requested_uid );
     $$self{m_registered_objects}{ $$o{object_name} } = $handler_name;
     $o->tie_items($self) if $o;
-    print
-      "Registered $$o{object_name} as $sub_uid to $$self{object_name} using handler: $handler_name\n"
+    print "Registered $$o{object_name} as $sub_uid to $$self{object_name} using handler: $handler_name\n"
       if $main::Debug{bsc};
 }
 
@@ -588,10 +566,7 @@ sub set {
         elsif ( $msg_class_name eq 'xapbsc.query' ) {
 
             # handle query
-            $state = $self->query_callback(
-                $$p_setby{'xap-header'}{target},
-                $$p_setby{'xap-header'}{target}
-            );
+            $state = $self->query_callback( $$p_setby{'xap-header'}{target}, $$p_setby{'xap-header'}{target} );
         }
         elsif ( $msg_class_name eq 'xapbsc.event' ) {
 
@@ -606,8 +581,7 @@ sub set {
         $p_setby = $self;    # override so that SUPER doesn't attempt;
     }
     elsif ( defined( $$p_setby{object_name} )
-        && ( exists( $$self{m_registered_objects}{ $$p_setby{object_name} } ) )
-      )
+        && ( exists( $$self{m_registered_objects}{ $$p_setby{object_name} } ) ) )
     {
         print
           "In $$self{object_name} set callback for $$p_setby{object_name} using $$self{m_registered_objects}{$$p_setby{object_name}}\n"
@@ -616,10 +590,8 @@ sub set {
         # only handle changes in state
         if ( $self->state_changed($p_setby) ) {
             my ( $mh_obj_name, $bsc_obj_name, $handler_name ) = @_;
-            my $code =
-              "\&BSCMH_Item::_handle_$$self{m_registered_objects}{$$p_setby{object_name}}";
-            $code .=
-              "('send-event', \'$$p_setby{object_name}\',\'$$self{object_name}\')";
+            my $code = "\&BSCMH_Item::_handle_$$self{m_registered_objects}{$$p_setby{object_name}}";
+            $code .= "('send-event', \'$$p_setby{object_name}\',\'$$self{object_name}\')";
             eval($code);
             $p_setby = $self;    # override so that SUPER doesn't attempt
         }
@@ -630,8 +602,7 @@ sub set {
         $p_setby = $self;
     }
     else {
-        print
-          "Unable to process $$self{object_name}->set for $$p_setby{object_name}\n"
+        print "Unable to process $$self{object_name}->set for $$p_setby{object_name}\n"
           if $main::Debug{bsc};
     }
 
@@ -643,10 +614,7 @@ sub set {
 
 sub state_changed {
     my ( $self, $p_setby ) = @_;
-    my $id =
-      &xAP::get_xap_subaddress_uid(
-        $$self{m_registered_objects}{ $$p_setby{object_name} },
-        $$p_setby{object_name} );
+    my $id = &xAP::get_xap_subaddress_uid( $$self{m_registered_objects}{ $$p_setby{object_name} }, $$p_setby{object_name} );
     my $current_bsc_state = $self->{device_state}{$id}{'RefState'};
     return 1 if !( defined($current_bsc_state) );
     return ( $p_setby->state() ne $current_bsc_state );
@@ -669,8 +637,7 @@ set's a device's state given the device's ID, mode (input or output), state and
 =cut
 
 sub set_device {
-    my ( $self, $id, $ref_state, $mode, $bsc_state, $bsc_level, $bsc_text ) =
-      @_;
+    my ( $self, $id, $ref_state, $mode, $bsc_state, $bsc_level, $bsc_text ) = @_;
 
     # set the device data in a "pending state" hash until it is committed
     $$self{pending_device_state_mode}{$id} = $mode;
@@ -684,8 +651,7 @@ sub set_device {
 sub send_cmd {
     my ( $self, $family_name, $target );
     $target = '*'
-      unless $target
-      ; # possibly a bad idea as wildcarding across all devices doesn't make sense
+      unless $target;    # possibly a bad idea as wildcarding across all devices doesn't make sense
     my ( $headerVars, @data2 );
     $headerVars->{'class'}  = 'xAPBSC.cmd';
     $headerVars->{'target'} = $target;
@@ -705,8 +671,7 @@ sub send_cmd {
                 $bsc_block->{'State'} = $pending_state->{'State'};
             }
             else {
-                $bsc_block->{'State'} = '?'
-                  ; # this doesn't make much sense as we can't command an uncertainty
+                $bsc_block->{'State'} = '?';    # this doesn't make much sense as we can't command an uncertainty
             }
             $bsc_block->{'Level'} = $pending_state->{'Level'}
               if $pending_state->{'Level'};
@@ -744,8 +709,7 @@ sub send_info {
     my ( $headerVars, @data2 );
     $headerVars->{'class'}  = 'xAPBSC.info';
     $headerVars->{'target'} = '*';
-    $headerVars->{'source'} =
-      &xAP::get_xap_mh_source_info($family_name) . ":" . $subaddress_name;
+    $headerVars->{'source'} = &xAP::get_xap_mh_source_info($family_name) . ":" . $subaddress_name;
 
     # iterate over the pending/"state now" device state hash and create the blocks
     if ( $$self{pending_device_state} ) {
@@ -809,8 +773,7 @@ sub send_event {
     my ( $headerVars, @data2 );
     $headerVars->{'class'}  = 'xAPBSC.event';
     $headerVars->{'target'} = '*';
-    $headerVars->{'source'} =
-      &xAP::get_xap_mh_source_info($family_name) . ":" . $subaddress_name;
+    $headerVars->{'source'} = &xAP::get_xap_mh_source_info($family_name) . ":" . $subaddress_name;
 
     # iterate over the pending/"state now" device state hash and create the blocks
     if ( $$self{pending_device_state} ) {
@@ -863,9 +826,8 @@ sub commit_pending_state {
       $self->{pending_device_state}{$id}{State};
     $self->{device_state}{$id}{Level} =
       $self->{pending_device_state}{$id}{Level};
-    $self->{device_state}{$id}{Text} = $self->{pending_device_state}{$id}{Text};
-    $self->{device_state}{$id}{RefState} =
-      $self->{pending_device_state}{$id}{RefState}
+    $self->{device_state}{$id}{Text}     = $self->{pending_device_state}{$id}{Text};
+    $self->{device_state}{$id}{RefState} = $self->{pending_device_state}{$id}{RefState}
       if $self->{pending_device_state}{$id}{RefState};
     print "Committed refstate: $$self{device_state}{$id}{RefState}\n"
       if $main::Debug{bsc};
@@ -880,8 +842,7 @@ sub cmd_callback {
     for my $key ( keys %{ $$self{pending_device_state} } ) {
 
         # get the mh_obj that is indexed by $key
-        my $mh_obj_name =
-          &xAP::get_xap_subaddress_devname( $$self{m_device_family}, $key );
+        my $mh_obj_name = &xAP::get_xap_subaddress_devname( $$self{m_device_family}, $key );
         print "Device to be controlled by cmd_callback: $mh_obj_name\n"
           if $main::Debug{bsc};
 
@@ -943,61 +904,51 @@ sub _handle_x10_device {
 
         # get a valid BSC ID--hopefully, corresponding to the x10 id
         # that should have been reserved at the point that the object was registered
-        my $bsc_id =
-          &xAP::get_xap_subaddress_uid( DEVICE_TYPE_X10, $mh_obj_name );
+        my $bsc_id = &xAP::get_xap_subaddress_uid( DEVICE_TYPE_X10, $mh_obj_name );
         if ( ( $msg_type eq 'send-event' ) or ( $msg_type eq 'set-info' ) ) {
             my $mh_state = $mh_obj->state_now()
               if ( $msg_type eq 'send-event' );
             $mh_state = $mh_obj->state()
-              if ( $msg_type eq 'set-info' )
-              ;    # probably need to parse out stacked state vals if they exist
+              if ( $msg_type eq 'set-info' );    # probably need to parse out stacked state vals if they exist
 
             # TO-DO: handle "bright" and "dim"; this requires translating the relative vals to absolute levels
             if ( $mh_state eq 'on' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                    '100%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '100%', '' );
             }
             elsif ( $mh_state eq 'off' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off',
-                    '0%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off', '0%', '' );
             }
             elsif ( $mh_state =~ /.*\%$/ ) {
 
                 # handle levels expressed as percent
                 my ($state_in_percent) = $mh_state =~ /^[+|-]*(\d+)%$/;
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                    $state_in_percent . '%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', $state_in_percent . '%', '' );
             }
             elsif ( $mh_state =~ /&P\d+/ ) {
 
                 # handle levels expressed as their presets
                 # the following needs to change so that the preset amount is converted to
                 # an actual level rather than passed as a text string
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '', $mh_state );
 
             }
             elsif ( $mh_state eq 'motion' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '', $mh_state );
             }
             elsif ( $mh_state eq 'still' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '', $mh_state );
 
                 # now, handle X10_Sensor objects w/ photocells but ONLY if defined as type: brightness (not ms13)
             }
             elsif ( ( $mh_state eq 'light' )
                 and ( lc $mh_obj->{type} eq 'brightness' ) )
             {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '', $mh_state );
             }
             elsif ( ( $mh_state eq 'dark' )
                 and ( lc $mh_obj->{type} eq 'brightness' ) )
             {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '', $mh_state );
             }
             else {
                 print "Warning: unable to process state: $mh_state\n"
@@ -1020,11 +971,10 @@ sub _handle_x10_device {
         elsif ( $msg_type eq 'receive' ) {
 
             # now, construct the blocks that will be send
-            my $pending_state = $$bsc_obj{pending_device_state}{$bsc_id};
-            my $pending_state_mode =
-              $$bsc_obj{pending_device_state_mode}{$bsc_id};
-            my $bsc_state = $$pending_state{'State'};
-            my $mh_state  = '';
+            my $pending_state      = $$bsc_obj{pending_device_state}{$bsc_id};
+            my $pending_state_mode = $$bsc_obj{pending_device_state_mode}{$bsc_id};
+            my $bsc_state          = $$pending_state{'State'};
+            my $mh_state           = '';
             if ($bsc_state) {
 
                 # TO-DO: the following logic attempts to set the mh obj state
@@ -1069,8 +1019,7 @@ sub _handle_x10_device {
                 }
             }
             else {
-                print
-                  "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
+                print "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
             }
 
             # be sure to set the 'RefState' hash member to whatever mh state gets mapped
@@ -1088,46 +1037,37 @@ sub _handle_abstract_device {
 
         # get a valid BSC ID--hopefully, corresponding to the x10 id
         # that should have been reserved at the point that the object was registered
-        my $bsc_id =
-          &xAP::get_xap_subaddress_uid( DEVICE_TYPE_ABSTRACT, $mh_obj_name );
+        my $bsc_id = &xAP::get_xap_subaddress_uid( DEVICE_TYPE_ABSTRACT, $mh_obj_name );
         if ( ( $msg_type eq 'send-event' ) or ( $msg_type eq 'set-info' ) ) {
             my $mh_state = $mh_obj->state_now()
               if ( $msg_type eq 'send-event' );
             $mh_state = $mh_obj->state()
-              if ( $msg_type eq 'set-info' )
-              ;    # probably need to parse out stacked state vals if they exist
+              if ( $msg_type eq 'set-info' );    # probably need to parse out stacked state vals if they exist
 
             # TO-DO: handle "bright" and "dim"; this requires translating the relative vals to absolute levels
             if ( $mh_state eq 'on' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                    '100%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '100%', '' );
             }
             elsif ( $mh_state eq 'off' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off',
-                    '0%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off', '0%', '' );
             }
             elsif ( $mh_state =~ /.*\%$/ ) {
 
                 # handle levels expressed as percent
                 my ($state_in_percent) = $mh_state =~ /^[+|-]*(\d+)%$/;
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                    $state_in_percent . '%', '' );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', $state_in_percent . '%', '' );
             }
             elsif ( $mh_state eq 'motion' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '', $mh_state );
             }
             elsif ( $mh_state eq 'still' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '', $mh_state );
             }
             elsif ( $mh_state eq 'light' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'on', '', $mh_state );
             }
             elsif ( $mh_state eq 'dark' ) {
-                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '',
-                    $mh_state );
+                $bsc_obj->set_device( $bsc_id, $mh_state, 'input', 'off', '', $mh_state );
             }
             else {
                 print "Warning: unable to process state: $mh_state\n"
@@ -1150,11 +1090,10 @@ sub _handle_abstract_device {
         elsif ( $msg_type eq 'receive' ) {
 
             # now, construct the blocks that will be send
-            my $pending_state = $$bsc_obj{pending_device_state}{$bsc_id};
-            my $pending_state_mode =
-              $$bsc_obj{pending_device_state_mode}{$bsc_id};
-            my $bsc_state = $$pending_state{'State'};
-            my $mh_state  = '';
+            my $pending_state      = $$bsc_obj{pending_device_state}{$bsc_id};
+            my $pending_state_mode = $$bsc_obj{pending_device_state_mode}{$bsc_id};
+            my $bsc_state          = $$pending_state{'State'};
+            my $mh_state           = '';
             if ($bsc_state) {
 
                 # TO-DO: the following logic attempts to set the mh obj state
@@ -1203,8 +1142,7 @@ sub _handle_abstract_device {
                 }
             }
             else {
-                print
-                  "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
+                print "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
             }
 
             # be sure to set the 'RefState' hash member to whatever mh state gets mapped
@@ -1222,34 +1160,26 @@ sub _handle_presence {
 
         # get a valid BSC ID
         # that should have been reserved at the point that the object was registered
-        my $bsc_id =
-          &xAP::get_xap_subaddress_uid( DEVICE_TYPE_PRESENCE, $mh_obj_name );
+        my $bsc_id = &xAP::get_xap_subaddress_uid( DEVICE_TYPE_PRESENCE, $mh_obj_name );
         if ( ( $msg_type eq 'send-event' ) or ( $msg_type eq 'set-info' ) ) {
             my $mh_state = $mh_obj->state_now()
               if ( $msg_type eq 'send-event' );
             $mh_state = $mh_obj->state()
-              if ( $msg_type eq 'set-info' )
-              ;    # probably need to parse out stacked state vals if they exist
+              if ( $msg_type eq 'set-info' );    # probably need to parse out stacked state vals if they exist
             if ( $mh_obj->isa(PRESENCE_MONITOR) ) {
                 my $room_count = $mh_obj->get_count();
                 if ( $mh_state eq 'occupied' ) {
                     $room_count = 1
-                      if $room_count == 0
-                      ; # doesn't make much sense otherwise; perhaps a mistake in Presence_Monitor
-                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                        '', "room_count=$room_count" );
+                      if $room_count == 0;       # doesn't make much sense otherwise; perhaps a mistake in Presence_Monitor
+                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '', "room_count=$room_count" );
                 }
                 elsif ( $mh_state eq 'predict' ) {
-                    $room_count =
-                      0;    # allowing -1 doesn't make much sense except to mh
-                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on',
-                        '', "room_count=$room_count" );
+                    $room_count = 0;             # allowing -1 doesn't make much sense except to mh
+                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'on', '', "room_count=$room_count" );
                 }
                 elsif ( $mh_state eq 'vacant' ) {
-                    $room_count = 0
-                      ; # apparently, no room count exists if vacant and we want to report it always
-                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off',
-                        '', "room_count=$room_count" );
+                    $room_count = 0;             # apparently, no room count exists if vacant and we want to report it always
+                    $bsc_obj->set_device( $bsc_id, $mh_state, 'output', 'off', '', "room_count=$room_count" );
                 }
             }
             else {
@@ -1273,11 +1203,10 @@ sub _handle_presence {
         elsif ( $msg_type eq 'receive' ) {
 
             # now, construct the blocks that will be send
-            my $pending_state = $$bsc_obj{pending_device_state}{$bsc_id};
-            my $pending_state_mode =
-              $$bsc_obj{pending_device_state_mode}{$bsc_id};
-            my $bsc_state = $$pending_state{'State'};
-            my $mh_state  = '';
+            my $pending_state      = $$bsc_obj{pending_device_state}{$bsc_id};
+            my $pending_state_mode = $$bsc_obj{pending_device_state_mode}{$bsc_id};
+            my $bsc_state          = $$pending_state{'State'};
+            my $mh_state           = '';
             if ($bsc_state) {
 
                 # TO-DO: the following logic attempts to set the mh obj state
@@ -1309,8 +1238,7 @@ sub _handle_presence {
                 }
             }
             else {
-                print
-                  "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
+                print "State for $mh_obj_name:$bsc_id is unset for incoming xAP BSC message!\n";
             }
 
             # be sure to set the 'RefState' hash member to whatever mh state gets mapped
diff --git a/lib/Base_Item.pm b/lib/Base_Item.pm
index 69a8a82ae..10b3cd0e3 100644
--- a/lib/Base_Item.pm
+++ b/lib/Base_Item.pm
@@ -127,16 +127,14 @@ sub set {
 
     if ( ( defined $main::DBI ) && $::config_parms{events_table} ) {
         if ( defined $p_setby and $p_setby->isa("Generic_Item") ) {
-            $main::DBI->prepare(
-                "insert into Events (Object,ObjectType,State,Setby) values ('$$self{object_name}','"
+            $main::DBI->prepare( "insert into Events (Object,ObjectType,State,Setby) values ('$$self{object_name}','"
                   . ref($self)
                   . "','$p_state','"
                   . $p_setby->{object_name}
                   . "');" )->execute();
         }
         else {
-            $main::DBI->prepare(
-                "insert into Events (Object,ObjectType,State,Setby) values ('$$self{object_name}','"
+            $main::DBI->prepare( "insert into Events (Object,ObjectType,State,Setby) values ('$$self{object_name}','"
                   . ref($self)
                   . "','$p_state','"
                   . $p_setby
@@ -158,8 +156,7 @@ sub set {
                 if (   ( $obj->can('writable') and $obj->writable )
                     or ( !$obj->can('writable') ) )
                 {    #check for "settable" objects
-                    &::print_log( $self->get_object_name()
-                          . "::set($p_state, $p_setby) -> $$obj{object_name}" )
+                    &::print_log( $self->get_object_name() . "::set($p_state, $p_setby) -> $$obj{object_name}" )
                       if $main::Debug{occupancy};
 
                     #					$obj->set($p_state,$p_setby,$p_response);
diff --git a/lib/CCNet_Monitor.pm b/lib/CCNet_Monitor.pm
index d64573588..c7c5541d1 100644
--- a/lib/CCNet_Monitor.pm
+++ b/lib/CCNet_Monitor.pm
@@ -56,10 +56,7 @@ sub new {
     $$self{previous_status} = "";
     $$self{status}          = "UNKNOWN";
 
-    $$self{data_file} =
-        $main::config_parms{data_dir}
-      . "/web/ccnet_status-"
-      . $$self{project} . ".html";
+    $$self{data_file} = $main::config_parms{data_dir} . "/web/ccnet_status-" . $$self{project} . ".html";
     return $self;
 }
 
@@ -91,8 +88,7 @@ sub get_status {
     #	$$self{process}->add($cmd1);
     #	$$self{process}->start();
 
-    &::print_log(
-        "Retrieving ccnet status for: $$self{project}, with " . $cmd1 . ":" );
+    &::print_log( "Retrieving ccnet status for: $$self{project}, with " . $cmd1 . ":" );
 
     #	exec($cmd0);
     &::run( 'inline', $cmd0 );
@@ -119,8 +115,7 @@ sub parse_status {
         if (/.*class=\"header-title\"/) {
             $found_status = 1;
             $self->previous_status( $$self{status} );
-            @l_data =
-              $_ =~ /<td class=\"header-title\" colspan=\"2\">BUILD (.*)</;
+            @l_data = $_ =~ /<td class=\"header-title\" colspan=\"2\">BUILD (.*)</;
             $self->current_status( $l_data[0] );
 
             #			$self->{status} = $l_data[0];
@@ -174,8 +169,7 @@ sub parse_status {
             if ( $section_no eq 2 ) {
                 $section_no    = 0;
                 $found_section = 0;
-                @l_data =
-                  $_ =~ /<td class=\"section-data\" valign=\"top\">(.*)<\/td>/;
+                @l_data        = $_ =~ /<td class=\"section-data\" valign=\"top\">(.*)<\/td>/;
                 if (    $self->current_status() ne 'SUCCESSFUL'
                     and $previous_suspect ne $l_data[0] )
                 {
@@ -193,9 +187,7 @@ sub parse_status {
         next;
     }
     close(l_file);
-    &::print_log(
-        "Build:$$self{project} Status:$$self{status} Suspects:$$self{suspects} Previous:$$self{previous_status}"
-    );
+    &::print_log( "Build:$$self{project} Status:$$self{status} Suspects:$$self{suspects} Previous:$$self{previous_status}" );
     return $self;
 }
 
diff --git a/lib/CID_Announce.pm b/lib/CID_Announce.pm
index c7d7ffceb..b31acca96 100644
--- a/lib/CID_Announce.pm
+++ b/lib/CID_Announce.pm
@@ -98,13 +98,11 @@ sub set {
 
         if ( $p_setby->isa('CID_Lookup') ) {
             if ( lc $p_setby->category() ne 'reject' ) {
-                $self->announce( $p_setby, $self->speak_format(),
-                    $::config_parms{local_area_code} );
+                $self->announce( $p_setby, $self->speak_format(), $::config_parms{local_area_code} );
             }
         }
         else {
-            $self->announce( $p_setby, $self->speak_format(),
-                $::config_parms{local_area_code} );
+            $self->announce( $p_setby, $self->speak_format(), $::config_parms{local_area_code} );
         }
     }
     $self->SUPER::set($p_state);
@@ -125,12 +123,11 @@ sub mod_ring {
 sub announce {
     my ( $self, $p_telephony, $p_speak_format, $p_local_area_code ) = @_;
 
-    my $response =
-      $self->parse_format( $p_telephony, $p_speak_format, $p_local_area_code );
+    my $response = $self->parse_format( $p_telephony, $p_speak_format, $p_local_area_code );
 
     #	print "CID Announce $response,$p_telephony,$p_speak_format";
     return
-      if $response =~ /MESSAGE WAITING/;   # Don't announce message waiting data
+      if $response =~ /MESSAGE WAITING/;    # Don't announce message waiting data
     return if $response =~ /\-MSG OFF\-/;
     if ( $response =~ /\.wav$/ ) {
         $self->play_cid($response);
@@ -165,14 +162,8 @@ sub play_cid {
 sub parse_format {
     my ( $self, $p_telephony, $p_speak_format, $p_local_area_code ) = @_;
 
-    my (
-        $number,  $name, $address, $city, $state,
-        $fnumber, $type, $time,    $sound_file
-    );
-    my (
-        $first,  $middle,    $last,    $areacode, $suffix,
-        $prefix, $soundfile, $snumber, $category
-    );
+    my ( $number, $name,   $address, $city,     $state,  $fnumber, $type,      $time,    $sound_file );
+    my ( $first,  $middle, $last,    $areacode, $suffix, $prefix,  $soundfile, $snumber, $category );
     my %table_types = qw(p private u unknown i internation n normal);
     my ($format1);
 
diff --git a/lib/CID_Log.pm b/lib/CID_Log.pm
index 92a7b7fa5..c6255e6b1 100644
--- a/lib/CID_Log.pm
+++ b/lib/CID_Log.pm
@@ -104,7 +104,7 @@ sub log {
           if $p_telephony->formated_number() ne '';
     }
     $l_name = $p_telephony->cid_name()
-      || $p_telephony->city();    # Needed in UK, as there is no NAME data in UK
+      || $p_telephony->city();           # Needed in UK, as there is no NAME data in UK
     $l_address = $p_telephony->address();
 
     #Log to text file
@@ -121,13 +121,9 @@ sub log {
               if $p_telephony->call_duration();
             $call_type = $p_telephony->call_type() if $p_telephony->call_type();
         }
-        my $log_line =
-          "O$l_number name=$duration ext=$extension line=$l_address type=$call_type";
+        my $log_line = "O$l_number name=$duration ext=$extension line=$l_address type=$call_type";
         print "LOG LINE: $log_line\n";
-        &::logit(
-            "$::config_parms{data_dir}/phone/logs/phone.$::Year_Month_Now.log",
-            $log_line
-        );
+        &::logit( "$::config_parms{data_dir}/phone/logs/phone.$::Year_Month_Now.log", $log_line );
     }
     else {
         &::logit(
@@ -137,8 +133,7 @@ sub log {
     }
 
     #Log to dbm
-    &::logit_dbm( "$::config_parms{data_dir}/phone/callerid.dbm",
-        $l_number, "$::Time_Now $::Date_Now $::Year name=$l_name" );
+    &::logit_dbm( "$::config_parms{data_dir}/phone/callerid.dbm", $l_number, "$::Time_Now $::Date_Now $::Year name=$l_name" );
 
     # If this caller is not in our caller_id_file, let's save their info
     # in the same format as caller_id_file but to a different file.
@@ -151,8 +146,7 @@ sub log {
 
             #			&::print_log("LOG:". $::config_parms{caller_id_file2} .":");
             if ( $::config_parms{caller_id_file2} ) {
-                &::logit( $::config_parms{caller_id_file2},
-                    "$l_number\t$l_name\t*\n", 0 );
+                &::logit( $::config_parms{caller_id_file2}, "$l_number\t$l_name\t*\n", 0 );
             }
         }
     }
diff --git a/lib/CID_Lookup.pm b/lib/CID_Lookup.pm
index bf043192e..0e3c131ec 100644
--- a/lib/CID_Lookup.pm
+++ b/lib/CID_Lookup.pm
@@ -134,8 +134,7 @@ sub set {
         $self->ring_count( $p_setby->ring_count() );
         $self->parse_number($p_setby);
         $self->lookup_info( $::config_parms{caller_id_file} );
-        $self->lookup_areacode( $::config_parms{area_code_file},
-            $::config_parms{state_file} );
+        $self->lookup_areacode( $::config_parms{area_code_file}, $::config_parms{state_file} );
         $self->parse_name($p_setby);
         $self->call_duration( $p_setby->call_duration() )
           if $p_setby->isa('Telephony_Item');
@@ -304,9 +303,9 @@ sub parse_number {
     if ( $::config_parms{country} =~ /US|CANADA|CA/i ) {
 
         #US Centric code (just dont use these parameters if you are not US)
-        $l_Number =~ s/[\(,\),\-]//g;  #No Need for syntax take it out
+        $l_Number =~ s/[\(,\),\-]//g;    #No Need for syntax take it out
         $self->number($l_Number);
-        $l_Number =~ s/^1//;           #if 1 in the beginning of number, ice it.
+        $l_Number =~ s/^1//;             #if 1 in the beginning of number, ice it.
         $l_Number =~ /(\d\d\d)(\d\d\d)(\d\d\d\d)$/;
         $self->areacode($1);
         $self->prefix($2);
@@ -338,16 +337,14 @@ sub lookup_info {
 
     if ($p_CIDFile) {
         open( CALLERID, $p_CIDFile )
-          or print
-          "\nError, could not find the caller id file $p_CIDFile: $!\n";
+          or print "\nError, could not find the caller id file $p_CIDFile: $!\n";
 
         #find the matching rows
         $l_CIDNumber = $self->cid_number();
         $l_CIDName   = $self->cid_name();
         $l_CIDType   = $self->cid_type();
 
-        &::print_log(
-            "CID Lookup searching for: $l_CIDNumber, $l_CIDName, $l_CIDType");
+        &::print_log("CID Lookup searching for: $l_CIDNumber, $l_CIDName, $l_CIDType");
         while (<CALLERID>) {
 
             #			print "CID1:$_\n";
@@ -467,8 +464,7 @@ sub lookup_areacode {
             #			($areacode, $state) = $_ =~ /(\d\d\d) All parts of (.+)/;
             #			($areacode, $city, $state) = $_ =~ /(\d\d\d)(.*), *(.+)/ unless $state;
             # 			New format Adapted from Tim Doyle's parsing code
-            ( $areacode, $state, $timeoffset, $city ) =
-              $_ =~ /(\S*)\s*(\S*)\s*(\S*)\s*(.*)/;
+            ( $areacode, $state, $timeoffset, $city ) = $_ =~ /(\S*)\s*(\S*)\s*(\S*)\s*(.*)/;
 
             if ( $city =~ /.*:.*/ ) {
                 ($city) = $city =~ /.*:(.*)/;
@@ -489,9 +485,7 @@ sub lookup_areacode {
                 $self->time_zone($timeoffset);
 
                 #process the formated number
-                $self->formated_number( $self->areacode() . "-"
-                      . $self->prefix() . "-"
-                      . $self->suffix() );
+                $self->formated_number( $self->areacode() . "-" . $self->prefix() . "-" . $self->suffix() );
 
                 last;
             }
diff --git a/lib/CID_Server.pm b/lib/CID_Server.pm
index 806c87c84..cdcaa2744 100644
--- a/lib/CID_Server.pm
+++ b/lib/CID_Server.pm
@@ -61,17 +61,13 @@ sub set {
 
             # Service YAC clients
             for my $current_object (@CID_Server_yac_objects) {
-                print
-                  "CID_Server set calling $current_object->{client_address}\n"
+                print "CID_Server set calling $current_object->{client_address}\n"
                   if $main::Debug{cid_server};
-                $current_object->set( 'cid:'
-                      . $p_setby->cid_name() . '~'
-                      . $p_setby->formated_number() );
+                $current_object->set( 'cid:' . $p_setby->cid_name() . '~' . $p_setby->formated_number() );
             }
 
             # Service Acid clients
-            &Acid::write( &Acid::CID_TYPE_INCOMING_CALL(),
-                $p_setby->cid_name(), $p_setby->formated_number() );
+            &Acid::write( &Acid::CID_TYPE_INCOMING_CALL(), $p_setby->cid_name(), $p_setby->formated_number() );
 
             # Send xAP/xPL data, if xAP/xPL port is opened
             if ( $main::Socket_Ports{'xap_send'} ) {
@@ -162,8 +158,7 @@ sub setstate_cid {
         #       my $YacServerProcess = new Process_Item(qq|send_ip_msg $self->{client_address}:10629 "$state"|);
         #       start $YacServerProcess;
         my $yakmessage = '@CALL' . $substate;
-        &main::run( qq|send_ip_msg $self->{client_address}:10629 "$yakmessage"|,
-            1 );
+        &main::run( qq|send_ip_msg $self->{client_address}:10629 "$yakmessage"|, 1 );
     }
 }
 
diff --git a/lib/Caller_ID.pm b/lib/Caller_ID.pm
index fa3c4c35b..aac0bce7f 100644
--- a/lib/Caller_ID.pm
+++ b/lib/Caller_ID.pm
@@ -24,8 +24,7 @@ NONE
 package Caller_ID;
 use strict;
 
-use vars '%name_by_number', '%reject_name_by_number', '%state_by_areacode',
-  '%wav_by_number', '%group_by_number';
+use vars '%name_by_number', '%reject_name_by_number', '%state_by_areacode', '%wav_by_number', '%group_by_number';
 my ( $my_areacode, @my_areacodes, $my_state );
 my $caller_file_2   = 1;
 my $caller_id_debug = 0;
@@ -96,11 +95,7 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
     # Switch name strings so first last, not last first.
     # Use only the 1st two blank delimited fields, as the 3rd, 4th are usually just initials or incomplete
 
-    my (
-        $number,   $numberTo,     $name,  $time,
-        $date,     $last,         $first, $middle,
-        $areacode, $local_number, $caller
-    );
+    my ( $number, $numberTo, $name, $time, $date, $last, $first, $middle, $areacode, $local_number, $caller );
 
     # Last First M
     # Last M First
@@ -123,9 +118,9 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
         $name = substr( $name, 0, 15 );
 
         #       $name = 'Unavailable' if $name =~ /^O$/; # Jay's & Chaz's exceptions
-        $name = 'Out of Area' if $name =~ /^O$/;    # Jay's & Chaz's exceptions
-        $name = 'Private'     if $name =~ /^P$/;    # Chaz's exception
-        $name = 'Pay' if $name =~ /^TEL PUBLIC BELL$/;    # Chaz's exception
+        $name = 'Out of Area' if $name =~ /^O$/;                  # Jay's & Chaz's exceptions
+        $name = 'Private'     if $name =~ /^P$/;                  # Chaz's exception
+        $name = 'Pay'         if $name =~ /^TEL PUBLIC BELL$/;    # Chaz's exception
         ( $last, $first, $middle ) = split( /[\s,]+/, $name, 3 );
 
         # This is used for ZyXEL u1496 (see format at top)
@@ -146,20 +141,18 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
         ( $last, $first, $middle ) = split( /[\s,]+/, $name, 3 );
     }
     elsif ( $format == 4 ) {
-        ( $date, $time, $number, $name ) =
-          $data =~ /DATE(\d{4})(\d{4})\.{3}NMBR(.*)\.{3}NAME(.+?)\+*$/;
+        ( $date, $time, $number, $name ) = $data =~ /DATE(\d{4})(\d{4})\.{3}NMBR(.*)\.{3}NAME(.+?)\+*$/;
         $name = 'Unknown' if $name =~ /unknown/i;
         print "phone number=$number name=$name\n" if $caller_id_debug;
-        print
-          "\nCaller_ID format=4 not parsed: d=$data date=$date time=$time number=$number name=$name\n"
+        print "\nCaller_ID format=4 not parsed: d=$data date=$date time=$time number=$number name=$name\n"
           unless ( $name and ( !$caller_id_debug ) );
     }
 
     # NCID data=CID:*DATE*10202003*TIME*0019*NMBR*2125551212*MESG*NONE*NAME*INFORMATION*
     # http://ncid.sourceforge.net/
     elsif ( $format == 5 ) {
-        ( $date, $time, $number, $name ) = $data =~
-          /CID:\*DATE\*(\d{8})\*TIME\*(\d{4})\*NMBR\*(\d{10})\*MESG\*.*\*NAME\*([^\*]+)\*$/;
+        ( $date, $time, $number, $name ) =
+          $data =~ /CID:\*DATE\*(\d{8})\*TIME\*(\d{4})\*NMBR\*(\d{10})\*MESG\*.*\*NAME\*([^\*]+)\*$/;
         print "phone number=$number name=$name\n" if $caller_id_debug;
     }
 
@@ -230,8 +223,7 @@ Format=4   NetCallerID (http://ugotcall.com/nci.htm)
         $caller = "Nummer $local_number"
           if ( $local_area_code_language =~ /swiss-german/gi );
     }
-    elsif ( $last eq "Unknown" and $number =~ /^\d{3}/ )
-    {    # From Steve Switzer: An unknown name, but phone number is known.
+    elsif ( $last eq "Unknown" and $number =~ /^\d{3}/ ) {    # From Steve Switzer: An unknown name, but phone number is known.
         $caller = $local_number;
     }
     elsif ( $last eq "Out-of-area" or $last eq "Out" or $number eq "O" ) {
@@ -298,19 +290,16 @@ sub read_areacode_list {
     #   &main::print_log("Reading area code table ... ");
     #   print "Reading area code table ... ";
 
-    my ( $area_code_file, %city_by_areacode, $city, $state, $areacode,
-        $areacode_cnt );
+    my ( $area_code_file, %city_by_areacode, $city, $state, $areacode, $areacode_cnt );
     if ( $parms{area_code_file} ) {
         open( AREACODE, $parms{area_code_file} )
-          or print
-          "\nError, could not find the area code file $parms{area_code_file}: $!\n";
+          or print "\nError, could not find the area code file $parms{area_code_file}: $!\n";
 
         while (<AREACODE>) {
             next if /^\#/;
             $areacode_cnt++;
-            $_ =~ s/\(.+?\)//
-              ; # Delete descriptors like (Southern) Texas ... too much to speak
-                #406 All parts of Montana
+            $_ =~ s/\(.+?\)//;    # Delete descriptors like (Southern) Texas ... too much to speak
+                                  #406 All parts of Montana
 
             ( $areacode, $state ) = $_ =~ /(\d\d\d) All parts of (.+)/;
             ( $areacode, $city, $state ) = $_ =~ /(\d\d\d)(.*), *(.+)/
@@ -359,9 +348,7 @@ sub read_callerid_list {
 
     my ( $number, $name, $callerid_cnt, $wav, $group );
 
-    &main::print_log(
-        "Reading override phone list $caller_id_file, $reject_caller_id_file ... "
-    ) if $caller_id_debug;
+    &main::print_log( "Reading override phone list $caller_id_file, $reject_caller_id_file ... " ) if $caller_id_debug;
     print "Reading override phone list ... \n" if $caller_id_debug;
 
     undef %name_by_number;
@@ -369,8 +356,7 @@ sub read_callerid_list {
     undef %group_by_number;    #hp added
     if ($caller_id_file) {
         open( CALLERID, $caller_id_file )
-          or print
-          "\nError, could not find the caller id file $caller_id_file: $!\n";
+          or print "\nError, could not find the caller id file $caller_id_file: $!\n";
 
         $callerid_cnt = 0;
         while (<CALLERID>) {
@@ -385,13 +371,10 @@ sub read_callerid_list {
             $name_by_number{$number}  = $name;
             $wav_by_number{$number}   = $wav;      #hp added
             $group_by_number{$number} = $group;    #hp added
-            print
-              "Callerid names: number=$number  name=$name wav=$wav group=$group\n"
+            print "Callerid names: number=$number  name=$name wav=$wav group=$group\n"
               if $caller_id_debug;                 ###DBG
         }
-        &main::print_log(
-            "read in $callerid_cnt caller ID override names/numbers from $caller_id_file"
-        ) if $caller_id_debug;
+        &main::print_log( "read in $callerid_cnt caller ID override names/numbers from $caller_id_file" ) if $caller_id_debug;
         print "Read $callerid_cnt entries from $caller_id_file\n"
           if ( $caller_id_debug or $Main::Reload );
         close CALLERID;
@@ -400,8 +383,7 @@ sub read_callerid_list {
     undef %reject_name_by_number;
     if ($reject_caller_id_file) {
         open( CALLERID, $reject_caller_id_file )
-          or print
-          "\nError, could not find the reject caller id file $reject_caller_id_file: $!\n";
+          or print "\nError, could not find the reject caller id file $reject_caller_id_file: $!\n";
 
         $callerid_cnt = 0;
         while (<CALLERID>) {
diff --git a/lib/Compool.pm b/lib/Compool.pm
index 35d4d3c55..05b5467ce 100644
--- a/lib/Compool.pm
+++ b/lib/Compool.pm
@@ -62,13 +62,7 @@ my ( %Compool_Data, @compool_command_list, $temp, $last_command_time );
 sub serial_startup {
     if ( $::config_parms{Compool_serial_port} ) {
         my ($speed) = $::config_parms{Compool_baudrate} || 9600;
-        if (
-            &::serial_port_create(
-                'Compool', $::config_parms{Compool_serial_port},
-                $speed, 'none', 'raw'
-            )
-          )
-        {
+        if ( &::serial_port_create( 'Compool', $::config_parms{Compool_serial_port}, $speed, 'none', 'raw' ) ) {
             init( $::Serial_Ports{Compool}{object} );
             &::MainLoop_pre_add_hook( \&Compool::UserCodePreHook, 1 );
 
@@ -137,9 +131,7 @@ sub UserCodePreHook {
                 if ( $index >= 0 ) {
                     my $packet = substr( $data, $index, 24 );
 
-                    if (
-                        length($packet) >=
-                        9 )    # 9 is the minimum length required
+                    if ( length($packet) >= 9 )    # 9 is the minimum length required
                     {
                         if (   substr( $packet, 4, 1 ) eq "\x02"
                             && substr( $packet, 5, 1 ) eq "\x10"
@@ -152,78 +144,35 @@ sub UserCodePreHook {
                             # Remove bytes from the received data to account for this packet
                             $packetsize = 24;
 
-                            my $Checksum =
-                              unpack( '%16C*', substr( $packet, 0, 22 ) )
-                              % 65536;
-                            my $Checksum = pack( "CC",
-                                ( ( $Checksum >> 8 ) & 0xFF ),
-                                ( $Checksum & 0xFF ) );
+                            my $Checksum = unpack( '%16C*', substr( $packet, 0, 22 ) ) % 65536;
+                            my $Checksum = pack( "CC", ( ( $Checksum >> 8 ) & 0xFF ), ( $Checksum & 0xFF ) );
 
                             #
                             # Check if this is tagged as a basic acknowledge packet (Opcode == 2 && InfoFieldLengh == 10h)
                             #
                             if ( $Checksum eq substr( $packet, 22, 2 ) ) {
-                                print "Compool BAP data : "
-                                  . unpack( 'H*', $packet ) . "\n"
+                                print "Compool BAP data : " . unpack( 'H*', $packet ) . "\n"
                                   if $main::Debug{compool}
                                   and $main::Debug{compool} >= 3;
 
                                 # If first packet then we must initialize the Next_ data for the equipment to be in the opposite bit states
                                 # as the data inidicates so we fire the first get_device_now triggers.
 
-                                if ( $Compool_Data{$serial_port}
-                                    {Last_Basic_Acknowledgement_Packet} eq
-                                    undef )
-                                {
-                                    print
-                                      "Compool initializing _now data bit fields\n"
+                                if ( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} eq undef ) {
+                                    print "Compool initializing _now data bit fields\n"
                                       if $main::Debug{compool}
                                       and $main::Debug{compool} >= 2;
-                                    substr(
-                                        $Compool_Data{$serial_port}
-                                          {Now_Basic_Acknowledgement_Packet},
-                                        8,
-                                        1
-                                      )
-                                      = pack(
-                                        'C',
-                                        (
-                                            unpack( 'C',
-                                                substr( $packet, 8, 1 ) ) ^ 255
-                                        )
-                                      );
-                                    substr(
-                                        $Compool_Data{$serial_port}
-                                          {Now_Basic_Acknowledgement_Packet},
-                                        9,
-                                        1
-                                      )
-                                      = pack(
-                                        'C',
-                                        (
-                                            unpack( 'C',
-                                                substr( $packet, 9, 1 ) ) ^ 255
-                                        )
-                                      );
+                                    substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet}, 8, 1 ) =
+                                      pack( 'C', ( unpack( 'C', substr( $packet, 8, 1 ) ) ^ 255 ) );
+                                    substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet}, 9, 1 ) =
+                                      pack( 'C', ( unpack( 'C', substr( $packet, 9, 1 ) ) ^ 255 ) );
                                 }
-                                $Compool_Data{$serial_port}
-                                  {Last_Basic_Acknowledgement_Packet} = $packet;
-                                $Compool_Data{$serial_port}
-                                  {Last_Basic_Acknowledgement_Recent} = 1;
+                                $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} = $packet;
+                                $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Recent} = 1;
 
                                 if (
-                                    substr(
-                                        $Compool_Data{$serial_port}
-                                          {Last_Basic_Acknowledgement_Packet},
-                                        8,
-                                        10
-                                    ) ne substr(
-                                        $Compool_Data{$serial_port}
-                                          {Now_Basic_Acknowledgement_Packet},
-                                        8,
-                                        10
-                                    )
-                                  )
+                                    substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 8, 10 ) ne
+                                    substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet},  8, 10 ) )
                                 {
                                     print "Compool change detected\n"
                                       if $main::Debug{compool}
@@ -233,8 +182,7 @@ sub UserCodePreHook {
                                     # set tied objects to the corosponding state.
                                     my $object;
                                     foreach $object (@compool_item_list) {
-                                        my $newstate =
-                                          $object->GetDeviceState();
+                                        my $newstate = $object->GetDeviceState();
                                         print "Compool checking "
                                           . $object->{object_name} . " is "
                                           . $object->state()
@@ -242,32 +190,27 @@ sub UserCodePreHook {
                                           if $main::Debug{compool}
                                           and $main::Debug{compool} >= 2;
                                         if ( $newstate ne undef
-                                            and
-                                            ( $object->state() ne $newstate ) )
+                                            and ( $object->state() ne $newstate ) )
                                         {
                                             print "Compool "
                                               . $object->{object_name} . " was "
                                               . $object->state()
                                               . " now $newstate\n"
                                               if $main::Debug{compool};
-                                            $object->set_states_for_next_pass(
-                                                $newstate);
+                                            $object->set_states_for_next_pass($newstate);
                                         }
                                     }
 
                                     # Update the NOW packet so later compares will match
-                                    $Compool_Data{$serial_port}
-                                      {Now_Basic_Acknowledgement_Packet} =
-                                      $Compool_Data{$serial_port}
-                                      {Last_Basic_Acknowledgement_Packet};
+                                    $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet} =
+                                      $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet};
                                     print "Compool change done\n"
                                       if $main::Debug{compool}
                                       and $main::Debug{compool} >= 2;
                                 }
                             }
                             else {
-                                print
-                                  "Compool BAP packet recieved with invalid checksum, ignoring\n"
+                                print "Compool BAP packet recieved with invalid checksum, ignoring\n"
                                   if $main::Debug{compool};
                             }
                         }
@@ -320,8 +263,7 @@ sub UserCodePreHook {
                             if ( length($packet) >= 24 ) {
                                 $packetsize = 1;
                             }
-                            print "Compool unchecked data   : "
-                              . unpack( 'H*', $packet ) . "\n"
+                            print "Compool unchecked data   : " . unpack( 'H*', $packet ) . "\n"
                               if $protocol_debugging;
                         }
                     }
@@ -348,21 +290,15 @@ sub UserCodePreHook {
                   if $main::Debug{compool}
                   and $main::Debug{compool} >= 3
                   and length( substr( $data, $packetsize ) ) > 0;
-                print "Compool debug remaining data="
-                  . unpack( 'H*', substr( $data, $packetsize ) ) . "\n"
+                print "Compool debug remaining data=" . unpack( 'H*', substr( $data, $packetsize ) ) . "\n"
                   if $protocol_debugging;
             }
 
             # Require a recent status packet and at least 2 seconds between commands (delay in order to avoid blowing any circuit breakers by
             # turning on too many items at once.
-            if (
-                (
-                    $Compool_Data{$serial_port}
-                    {Last_Basic_Acknowledgement_Recent} == 1
-                )
+            if (    ( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Recent} == 1 )
                 and ( @compool_command_list > 0 )
-                and ( time - $last_command_time > 3 )
-              )
+                and ( time - $last_command_time > 3 ) )
             {
                 # Increment our retry count
                 @compool_command_list[2]++;
@@ -376,15 +312,8 @@ sub UserCodePreHook {
                 else {
                     # If this is an device set command (these toggle the state) make sure the state isn't already where it was requested
                     # before continuing.
-                    if (
-                        ( @compool_command_list[3] ne undef )
-                        and (
-                            get_device(
-                                @compool_command_list[0],
-                                @compool_command_list[3]
-                            ) eq @compool_command_list[4]
-                        )
-                      )
+                    if (    ( @compool_command_list[3] ne undef )
+                        and ( get_device( @compool_command_list[0], @compool_command_list[3] ) eq @compool_command_list[4] ) )
                     {
                         print "Compool removing queued command (device "
                           . @compool_command_list[3]
@@ -394,16 +323,11 @@ sub UserCodePreHook {
                         remove_command();
                     }
                     else {
-                        send_command(
-                            @compool_command_list[0],
-                            @compool_command_list[1]
-                        );
+                        send_command( @compool_command_list[0], @compool_command_list[1] );
 
                         # We are about to get a new BAP packet, nuke any holdover data
-                        $Compool_Data{ @compool_command_list[0] }
-                          {Last_Partial_Packet} = "";
-                        $Compool_Data{$serial_port}
-                          {Last_Basic_Acknowledgement_Recent} = 0;
+                        $Compool_Data{ @compool_command_list[0] }{Last_Partial_Packet} = "";
+                        $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Recent} = 0;
                     }
                 }
             }
@@ -425,23 +349,16 @@ sub UserCodePreHook {
 
 sub set_time {
     my ($serial_port) = @_;
-    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst )
-      = localtime time;
+    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst ) = localtime time;
     my $Compool_Time = pack( "CC", $Minute, $Hour );
     print "Compool set_time setting time to current local time\n"
       if $main::Debug{compool};
-    return queue_command( $serial_port,
-        $Compool_Time . "\x00\x00\x00\x00\x00\x00\x03" );
+    return queue_command( $serial_port, $Compool_Time . "\x00\x00\x00\x00\x00\x00\x03" );
 }
 
 sub get_time {
     my ( $serial_port, $nowstate ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_time no status packet received\n";
         }
@@ -451,27 +368,15 @@ sub get_time {
     if (
         $nowstate
         and (
-            substr(
-                $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-                6,
-                2
-            ) eq substr(
-                $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet},
-                6, 2
-            )
-        )
+            substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 6, 2 ) eq
+            substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet},  6, 2 ) )
       )
     {
         return undef;
     }
     else {
-        return
-          substr(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-            7, 1 ),
-          substr(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-            6, 1 );
+        return substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 7, 1 ),
+          substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 6, 1 );
     }
 }
 
@@ -482,40 +387,22 @@ sub set_temp {
 
     SWITCH: for ($targetdevice) {
         /pooldesiredtemp/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x00\x20" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x00\x20" );
         };
         /pooldesired/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x00\x20" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x00\x20" );
         };
         /pool/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x00\x20" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x00\x20" );
         };
         /spadesiredtemp/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x40" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x40" );
         };
         /spadesired/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x40" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x40" );
         };
         /spa/i && do {
-            return queue_command( $serial_port,
-                    "\x00\x00\x00\x00\x00\x00"
-                  . $Compool_Target_Temp
-                  . "\x00\x40" );
+            return queue_command( $serial_port, "\x00\x00\x00\x00\x00\x00" . $Compool_Target_Temp . "\x00\x40" );
         };
         ::print_log "Compool set_temp unknown device\n";
     }
@@ -524,12 +411,7 @@ sub set_temp {
 
 sub get_temp {
     my ( $serial_port, $targetdevice, $comparison, $limit, $nowstate ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_temp no status packet received\n";
         }
@@ -550,9 +432,9 @@ sub get_temp {
         /spasolartemp/i    && do { $PacketOffset = 14; last SWITCH; };
         /spasolar/i        && do { $PacketOffset = 14; last SWITCH; };
         /spatemp/i
-          && do { $PacketOffset = 11; last SWITCH; }; # This is 13 on the 3830 controller.  Detect from byte 21 and autoswitch
+          && do { $PacketOffset = 11; last SWITCH; };    # This is 13 on the 3830 controller.  Detect from byte 21 and autoswitch
         /spa/i
-          && do { $PacketOffset = 11; last SWITCH; }; # This is 13 on the 3830 controller.  Detect from byte 21 and autoswitch
+          && do { $PacketOffset = 11; last SWITCH; };    # This is 13 on the 3830 controller.  Detect from byte 21 and autoswitch
 
         #   /spatemp/i 	        && do { $PacketOffset = 13; last SWITCH; };
         #   /spa/i 	        && do { $PacketOffset = 13; last SWITCH; };
@@ -564,32 +446,14 @@ sub get_temp {
     if (
         $nowstate
         and (
-            substr(
-                $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-                $PacketOffset,
-                1
-            ) eq substr(
-                $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet},
-                $PacketOffset, 1
-            )
-        )
+            substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $PacketOffset, 1 ) eq
+            substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet},  $PacketOffset, 1 ) )
       )
     {
         return undef;
     }
     else {
-        if (
-            unpack(
-                'C',
-                substr(
-                    $Compool_Data{$serial_port}
-                      {Last_Basic_Acknowledgement_Packet},
-                    $PacketOffset,
-                    1
-                )
-            ) == 0
-          )
-        {
+        if ( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $PacketOffset, 1 ) ) == 0 ) {
             return 0;
         }
         else {
@@ -600,15 +464,8 @@ sub get_temp {
             my $temp = int(
                 (
                     (
-                        unpack(
-                            'C',
-                            substr(
-                                $Compool_Data{$serial_port}
-                                  {Last_Basic_Acknowledgement_Packet},
-                                $PacketOffset,
-                                1
-                            )
-                        ) / $divisor
+                        unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $PacketOffset, 1 ) ) /
+                          $divisor
                     ) * 1.8
                 ) + 32
             );
@@ -630,8 +487,7 @@ sub set_device {
 
     # Handle 'toggle' state
     if ( $targetstate eq 'toggle' ) {
-        $targetstate =
-          ( get_device( $serial_port, $targetdevice ) eq 'on' ) ? 'off' : 'on';
+        $targetstate = ( get_device( $serial_port, $targetdevice ) eq 'on' ) ? 'off' : 'on';
     }
 
     if ( $targetstate eq 'on' or $targetstate eq 'ON' or $targetstate eq '1' ) {
@@ -667,26 +523,20 @@ sub set_device {
         /aux6/i && do { $targetbit = 128; last SWITCH; };
         $targetprimary = 9;
         $byteuseenable = 8;
-        /remote/i      && do { $targetbit = 1; last SWITCH; };
-        /display/i     && do { $targetbit = 2; last SWITCH; };
-        /delaycancel/i && do { $targetbit = 4; last SWITCH; };
-        /spare1/i      && do { $targetbit = 8; last SWITCH; };
-        /aux7/i   && do { $targetbit = 16;  $byteuseenable = 4; last SWITCH; };
-        /spare2/i && do { $targetbit = 32;  last SWITCH; };
-        /spare3/i && do { $targetbit = 64;  last SWITCH; };
-        /spare4/i && do { $targetbit = 128; last SWITCH; };
+        /remote/i      && do { $targetbit = 1;   last SWITCH; };
+        /display/i     && do { $targetbit = 2;   last SWITCH; };
+        /delaycancel/i && do { $targetbit = 4;   last SWITCH; };
+        /spare1/i      && do { $targetbit = 8;   last SWITCH; };
+        /aux7/i        && do { $targetbit = 16;  $byteuseenable = 4; last SWITCH; };
+        /spare2/i      && do { $targetbit = 32;  last SWITCH; };
+        /spare3/i      && do { $targetbit = 64;  last SWITCH; };
+        /spare4/i      && do { $targetbit = 128; last SWITCH; };
         ::print_log "Compool set_device unknown device", return -1;
     }
 
     my $currentstate;
 
-    $currentstate = unpack(
-        'C',
-        substr(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-            $targetprimary, 1
-        )
-    );
+    $currentstate = unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $targetprimary, 1 ) );
 
     #
     # Determine if we need to toggle the device to get it into the right state.
@@ -703,34 +553,17 @@ sub set_device {
 
     # Sending to primary equipment field or secondary equipment field?
     ( $targetprimary == 8 )
-      ? return queue_command(
-        $serial_port,
-        "\x00\x00"
-          . pack( "C", $targetbit )
-          . "\x00\x00\x00\x00\x00"
-          . pack( "C", $byteuseenable ),
-        $targetdevice,
-        $targetstate == 1 ? "on" : "off"
-      )
-      : return queue_command(
-        $serial_port,
-        "\x00\x00\x00"
-          . pack( "C", $targetbit )
-          . "\x00\x00\x00\x00"
-          . pack( "C", $byteuseenable ),
-        $targetdevice,
-        $targetstate == 1 ? "on" : "off"
-      );
+      ? return queue_command( $serial_port,
+        "\x00\x00" . pack( "C", $targetbit ) . "\x00\x00\x00\x00\x00" . pack( "C", $byteuseenable ),
+        $targetdevice, $targetstate == 1 ? "on" : "off" )
+      : return queue_command( $serial_port,
+        "\x00\x00\x00" . pack( "C", $targetbit ) . "\x00\x00\x00\x00" . pack( "C", $byteuseenable ),
+        $targetdevice, $targetstate == 1 ? "on" : "off" );
 }
 
 sub get_device {
     my ( $serial_port, $targetdevice, $nowstate ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_device no status packet received\n";
         }
@@ -765,75 +598,36 @@ sub get_device {
     if (
         $nowstate
         and (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Last_Basic_Acknowledgement_Packet},
-                        $targetprimary,
-                        1
-                    )
-                )
-            ) & $targetbit
-        ) == (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Now_Basic_Acknowledgement_Packet},
-                        $targetprimary,
-                        1
-                    )
-                )
-            ) & $targetbit
-        )
+            int( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $targetprimary, 1 ) ) ) &
+            $targetbit ) == (
+            int( unpack( 'C', substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet}, $targetprimary, 1 ) ) ) &
+              $targetbit
+            )
       )
     {
         return undef;
     }
     else {
-        (
-            unpack(
-                'C',
-                substr(
-                    $Compool_Data{$serial_port}
-                      {Last_Basic_Acknowledgement_Packet},
-                    $targetprimary,
-                    1
-                )
-            ) & $targetbit
-        ) ? return "on" : return "off";
+        ( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, $targetprimary, 1 ) ) & $targetbit )
+          ? return "on"
+          : return "off";
     }
 }
 
 sub get_version {
     my ( $serial_port, $targetdevice ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_version no status packet received\n";
         }
         return undef;
     }
-    return
-      substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-        3, 1 );
+    return substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 3, 1 );
 }
 
 sub get_delay {
     my ( $serial_port, $targetdevice, $nowstate ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_delay no status packet received\n";
         }
@@ -852,76 +646,31 @@ sub get_delay {
         ::print_log "Compool get_delay unknown device", return undef;
     }
 
-    if (
-        $nowstate
-        and (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Last_Basic_Acknowledgement_Packet},
-                        10,
-                        1
-                    )
-                )
-            ) & $targetbit
-        ) == (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Now_Basic_Acknowledgement_Packet},
-                        10,
-                        1
-                    )
-                )
-            ) & $targetbit
-        )
-      )
+    if ( $nowstate
+        and ( int( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 10, 1 ) ) ) & $targetbit )
+        == ( int( unpack( 'C', substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet}, 10, 1 ) ) ) & $targetbit ) )
     {
         return undef;
     }
     else {
-        (
-            unpack(
-                'C',
-                substr(
-                    $Compool_Data{$serial_port}
-                      {Last_Basic_Acknowledgement_Packet},
-                    10,
-                    1
-                )
-            ) & $targetbit
-        ) ? return "on" : return "off";
+        ( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 10, 1 ) ) & $targetbit )
+          ? return "on"
+          : return "off";
     }
 }
 
 sub get_solar_present {
     my ( $serial_port, $targetdevice ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_solar_present no status packet received\n";
         }
         return undef;
     }
 
-    (
-        unpack(
-            'C',
-            substr(
-                $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-                10,
-                1
-            )
-        ) & 8
-    ) ? return "yes" : return "no";
+    ( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 10, 1 ) ) & 8 )
+      ? return "yes"
+      : return "no";
 }
 
 sub set_heatsource {
@@ -931,26 +680,15 @@ sub set_heatsource {
 
 sub get_heatsource {
     my ( $serial_port, $targetdevice, $nowstate ) = @_;
-    unless (
-        length(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}
-        ) == 24
-      )
-    {
+    unless ( length( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet} ) == 24 ) {
         if ( $main::Debug{compool} ) {
             ::print_log "Compool get_heatsource no status packet received\n";
         }
         return undef;
     }
 
-    my $targetbit  = 0;
-    my $targetbyte = unpack(
-        'C',
-        substr(
-            $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet},
-            10, 1
-        )
-    );
+    my $targetbit   = 0;
+    my $targetbyte  = unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 10, 1 ) );
     my $targetshift = 0;
 
     SWITCH: for ($targetdevice) {
@@ -981,34 +719,9 @@ sub get_heatsource {
         ::print_log "Compool get_heatsource unknown device\n", return undef;
     }
 
-    if (
-        $nowstate
-        and (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Last_Basic_Acknowledgement_Packet},
-                        10,
-                        1
-                    )
-                )
-            ) & $targetbit
-        ) == (
-            int(
-                unpack(
-                    'C',
-                    substr(
-                        $Compool_Data{$serial_port}
-                          {Now_Basic_Acknowledgement_Packet},
-                        10,
-                        1
-                    )
-                )
-            ) & $targetbit
-        )
-      )
+    if ( $nowstate
+        and ( int( unpack( 'C', substr( $Compool_Data{$serial_port}{Last_Basic_Acknowledgement_Packet}, 10, 1 ) ) ) & $targetbit )
+        == ( int( unpack( 'C', substr( $Compool_Data{$serial_port}{Now_Basic_Acknowledgement_Packet}, 10, 1 ) ) ) & $targetbit ) )
     {
         return undef;
     }
@@ -1063,13 +776,11 @@ sub send_command {
 
     my $Compool_Command_Header = "\xFF\xAA\x00\x01\x82\x09";
 
-    my $Checksum =
-      unpack( "%16C*", $Compool_Command_Header . $command ) % 65536;
+    my $Checksum = unpack( "%16C*", $Compool_Command_Header . $command ) % 65536;
     my $Checksum =
       pack( "CC", ( ( $Checksum >> 8 ) & 0xFF ), ( $Checksum & 0xFF ) );
 
-    print "Compool send data: "
-      . unpack( 'H*', $Compool_Command_Header . $command . $Checksum ) . "\n"
+    print "Compool send data: " . unpack( 'H*', $Compool_Command_Header . $command . $Checksum ) . "\n"
       if $main::Debug{compool};
 
     ( my $BlockingFlags, my $InBytes, my $OutBytes, my $LatchErrorFlags ) =
@@ -1084,17 +795,11 @@ sub send_command {
 
     #   select (undef, undef, undef, .05); # Sleep a bit
     select( undef, undef, undef, .04 );    # Sleep a bit
-    if (
-        17 == (
-            $temp = $serial_port->write(
-                $Compool_Command_Header . $command . $Checksum
-            )
-        )
-      )
-    {
+    if ( 17 == ( $temp = $serial_port->write( $Compool_Command_Header . $command . $Checksum ) ) ) {
+
         #      select (undef, undef, undef, .02); # Sleep a bit
         select( undef, undef, undef, .025 );    # Sleep a bit
-             #$serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
+                                                #$serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
         $serial_port->rts_active(0);
         print "Compool send command ok\n"
           if $main::Debug{compool} and $main::Debug{compool} >= 3;
@@ -1106,8 +811,8 @@ sub send_command {
     }
     else {
         #       select (undef, undef, undef, .02); # Sleep a bit
-        select( undef, undef, undef, .05 );    # Sleep a bit
-             #$serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
+        select( undef, undef, undef, .05 );     # Sleep a bit
+                                                #$serial_port->dtr_active(1) or warn "Could not set dtr_active(1)";
         $serial_port->rts_active(0);
         print "Compool send command failed sent " . $temp . " bytes\n";
         return -1;
@@ -1153,8 +858,7 @@ sub new {
       if ( $serial_port == undef );
 
     if (    ( $comparison ne undef )
-        and
-        ( $comparison ne '<' and $comparison ne '>' and $comparison ne '=' ) )
+        and ( $comparison ne '<' and $comparison ne '>' and $comparison ne '=' ) )
     {
         print "Invalid comparison operator (<>= valid) in Compool_Item\n";
         return;
@@ -1174,30 +878,26 @@ sub new {
         /pooltemp/i && do {
             push(
                 @{ $$self{states} },
-                '64', '66', '68', '70', '72',  '74',  '76',
-                '78', '80', '82', '84', '86',  '88',  '90',
-                '92', '94', '96', '98', '100', '102', '104'
+                '64', '66', '68', '70', '72', '74', '76', '78',  '80',  '82', '84',
+                '86', '88', '90', '92', '94', '96', '98', '100', '102', '104'
             );
             last SWITCH;
         };
         /spatemp/i && do {
             push(
                 @{ $$self{states} },
-                '64', '66', '68', '70', '72',  '74',  '76',
-                '78', '80', '82', '84', '86',  '88',  '90',
-                '92', '94', '96', '98', '100', '102', '104'
+                '64', '66', '68', '70', '72', '74', '76', '78',  '80',  '82', '84',
+                '86', '88', '90', '92', '94', '96', '98', '100', '102', '104'
             );
             last SWITCH;
         };
 
         /spaheatsource/i && do {
-            push( @{ $$self{states} },
-                'off', 'solar', 'heater', 'solarpriority' );
+            push( @{ $$self{states} }, 'off', 'solar', 'heater', 'solarpriority' );
             last SWITCH;
         };
         /poolheatsource/i && do {
-            push( @{ $$self{states} },
-                'off', 'solar', 'heater', 'solarpriority' );
+            push( @{ $$self{states} }, 'off', 'solar', 'heater', 'solarpriority' );
             last SWITCH;
         };
 
@@ -1246,46 +946,25 @@ sub GetDeviceState {
 
     SWITCH: for ( $self->{device} ) {
         /pooltemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /poolsolartemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /pooldesiredtemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /spatemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /spasolartemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /spadesiredtemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
         /airtemp/i && do {
-            return &Compool::get_temp(
-                $self->{serial_port}, $self->{device},
-                $self->{comparison},  $self->{limit}
-            );
+            return &Compool::get_temp( $self->{serial_port}, $self->{device}, $self->{comparison}, $self->{limit} );
         };
 
         /spadelay/i && do {
@@ -1299,89 +978,68 @@ sub GetDeviceState {
         };
 
         /spaheatsource/i && do {
-            return &Compool::get_heatsource( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_heatsource( $self->{serial_port}, $self->{device} );
         };
         /poolheatsource/i && do {
-            return &Compool::get_heatsource( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_heatsource( $self->{serial_port}, $self->{device} );
         };
 
         /spa/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /pool/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux1/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux2/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux3/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux4/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux5/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux6/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /heater/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /solar/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /remote/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /display/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /delaycancel/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /spare1/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /aux7/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /spare2/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /spare3/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /spare4/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
         /service/i && do {
-            return &Compool::get_device( $self->{serial_port},
-                $self->{device} );
+            return &Compool::get_device( $self->{serial_port}, $self->{device} );
         };
     }
     print "Compool Item: state_now device item $self->{device}\n";
@@ -1422,94 +1080,76 @@ sub default_setstate {
         };
 
         /spaheatsource/i && do {
-            &Compool::set_heatsource( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_heatsource( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /poolheatsource/i && do {
-            &Compool::set_heatsource( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_heatsource( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
 
         /spa/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /pool/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux1/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux2/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux3/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux4/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux5/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux6/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /remote/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /display/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /delaycancel/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /spare1/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /aux7/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /spare2/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /spare3/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
         /spare4/i && do {
-            &Compool::set_device( $self->{serial_port}, $self->{device},
-                $state );
+            &Compool::set_device( $self->{serial_port}, $self->{device}, $state );
             return -1;
         };
     }
diff --git a/lib/Concept.pm b/lib/Concept.pm
index 3dfa546d6..acac091d3 100644
--- a/lib/Concept.pm
+++ b/lib/Concept.pm
@@ -41,11 +41,9 @@ package Concept;
 
 @Concept::ISA = ('Generic_Item');
 
-my @Zone_Objects
-  ;    # Holds a list of all the zone objects to try match the to inputs
-my @timer_refs;    # Hold the object instances for when timers are operating
-my $FirstCall =
-  0;    # Used to indicate to the serial_startup, the first time it is called.
+my @Zone_Objects;    # Holds a list of all the zone objects to try match the to inputs
+my @timer_refs;      # Hold the object instances for when timers are operating
+my $FirstCall = 0;   # Used to indicate to the serial_startup, the first time it is called.
 
 =item C<serial_startup> 
 
@@ -58,8 +56,7 @@ sub serial_startup {
     my $speed = $::config_parms{"Concept_baudrate"};
     if ( &::serial_port_create( "Concept", $port, $speed, 'dtr' ) ) {
         init( $::Serial_Ports{"Concept"}{object} );
-        ::print_log
-          "\nConcept.pm initialzed Concept on hardware $port at $speed baud"
+        ::print_log "\nConcept.pm initialzed Concept on hardware $port at $speed baud"
           if $main::Debug{concept};
     }
 
@@ -67,11 +64,8 @@ sub serial_startup {
         $FirstCall = 1;
         &::MainLoop_pre_add_hook( \&Concept::UserCodePreHook, 1 );
         &::MainLoop_post_add_hook( \&Concept::UserCodePostHook, 1 );
-        $::Year_Month_Day =
-          &::time_date_stamp( 18, time );    # Not yet set when we init.
-        &::logit(
-            "$::config_parms{data_dir}/logs/Concept.$::Year_Month_Day.log",
-            "Concept.pm Initialized" );
+        $::Year_Month_Day = &::time_date_stamp( 18, time );    # Not yet set when we init.
+        &::logit( "$::config_parms{data_dir}/logs/Concept.$::Year_Month_Day.log", "Concept.pm Initialized" );
         ::print_log "Concept.pm adding hooks" if $main::Debug{concept};
     }
 }
@@ -91,10 +85,9 @@ sub init {
 }
 
 sub UserCodePreHook {
-    if ($::New_Day)    # Move the log file name if it's a new day
+    if ($::New_Day)                         # Move the log file name if it's a new day
     {
-        $::Year_Month_Day =
-          &::time_date_stamp( 18, time );    # Not yet set when we init.
+        $::Year_Month_Day = &::time_date_stamp( 18, time );    # Not yet set when we init.
     }
 
     if ($::New_Msecond_100) {
@@ -110,10 +103,7 @@ sub UserCodePreHook {
             }
 
             # Hey, we got something, So we had best do the logging bit
-            &::logit(
-                "$::config_parms{data_dir}/logs/Concept.$::Year_Month_Day.log",
-                "$data"
-            );
+            &::logit( "$::config_parms{data_dir}/logs/Concept.$::Year_Month_Day.log", "$data" );
             ::print_log "Concept.pm, Recieved data = $data, $::Loop_Count"
               if $main::Debug{concept};
 
@@ -145,9 +135,7 @@ sub UserCodePreHook {
                     ::print_log "Concept.pm, No handler for zone:$zone_name";
                 }
             }
-            elsif (
-                substr( $data, 22, 11 ) eq
-                "Restore on " )    # Is it a Zone Restore?
+            elsif ( substr( $data, 22, 11 ) eq "Restore on " )    # Is it a Zone Restore?
             {
                 # Get the zone name
                 my $zone_name = substr( $data, 33 );
@@ -287,8 +275,7 @@ sub new {
     };
     bless( $self, $class );
     $self->{timer}->unset;
-    $timer_refs[ $self->{timer_index} ] =
-      $self;    # ugly code to handle the ocuppied timer
+    $timer_refs[ $self->{timer_index} ] = $self;    # ugly code to handle the ocuppied timer
     push @Zone_Objects, $self;
 
     return $self;
@@ -337,8 +324,7 @@ sub restore {
         # so I store the instance in an array and pass the index to the array
         # element to the timer function.
 
-        $self->{timer}->set( $self->{idle_time},
-            "&ConceptZone::timer_expired( $self->{ timer_index } )" );
+        $self->{timer}->set( $self->{idle_time}, "&ConceptZone::timer_expired( $self->{ timer_index } )" );
     }
 
     return;
diff --git a/lib/DSC5401.pm b/lib/DSC5401.pm
index 887709d60..f47cf8739 100644
--- a/lib/DSC5401.pm
+++ b/lib/DSC5401.pm
@@ -62,9 +62,7 @@ sub new {
     foreach (@LogType) {
         if ( !exists $::config_parms{$_} ) {
             $main::config_parms{$_} = 1;
-            &::print_log(
-                "Parameter $_ not defined in mh.private.ini, enabling by default"
-            );
+            &::print_log( "Parameter $_ not defined in mh.private.ini, enabling by default" );
         }
     }
 
@@ -77,29 +75,19 @@ sub new {
     # no big deal.
     cmd( $self, 'Poll' );    # request an initial poll
 
-    select( undef, undef, undef, 0.250 )
-      ; # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
-    cmd( $self, 'StatusReport' );    # request an initial status report
-    if ( defined $::config_parms{DSC_5401_verbose_arming} )
-    {    # enable/disable verbose arming if configured
-        select( undef, undef, undef, 0.250 )
-          ; # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
-        cmd( $self, 'VerboseArmingControl',
-            $::config_parms{DSC_5401_verbose_arming} );
+    select( undef, undef, undef, 0.250 );    # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
+    cmd( $self, 'StatusReport' );            # request an initial status report
+    if ( defined $::config_parms{DSC_5401_verbose_arming} ) {    # enable/disable verbose arming if configured
+        select( undef, undef, undef, 0.250 );    # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
+        cmd( $self, 'VerboseArmingControl', $::config_parms{DSC_5401_verbose_arming} );
     }
-    if ( defined $::config_parms{DSC_5401_time_log} )
-    {       # enable/disable time broadcasts if configured
-        select( undef, undef, undef, 0.250 )
-          ; # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
-        cmd( $self, 'TimeBroadcastControl',
-            $::config_parms{DSC_5401_time_log} );
+    if ( defined $::config_parms{DSC_5401_time_log} ) {    # enable/disable time broadcasts if configured
+        select( undef, undef, undef, 0.250 );    # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
+        cmd( $self, 'TimeBroadcastControl', $::config_parms{DSC_5401_time_log} );
     }
-    if ( defined $::config_parms{DSC_5401_temp_log} )
-    {       # enable/disable temperature broadcasts if configured
-        select( undef, undef, undef, 0.250 )
-          ; # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
-        cmd( $self, 'TemperatureBroadcastControl',
-            $::config_parms{DSC_5401_temp_log} );
+    if ( defined $::config_parms{DSC_5401_temp_log} ) {    # enable/disable temperature broadcasts if configured
+        select( undef, undef, undef, 0.250 );    # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
+        cmd( $self, 'TemperatureBroadcastControl', $::config_parms{DSC_5401_temp_log} );
     }
     return $self;
 }
@@ -134,27 +122,20 @@ module startup / enabling serial port
 sub startup {
     my $self = $Self;
     ( my $port = $::config_parms{'DSC_5401_serial_port'} )
-      or warn
-      "DSC5401.pm->startup  DSC_5401_serial_port not defined in mh.ini file";
+      or warn "DSC5401.pm->startup  DSC_5401_serial_port not defined in mh.ini file";
     my $BaudRate =
       ( defined $::config_parms{DSC_5401_baudrate} )
       ? $main::config_parms{DSC_5401_baudrate}
       : 9600;
-    if ( &main::serial_port_create( 'DSC5401', $port, $BaudRate, 'none', 'raw' )
-      )
-    {
+    if ( &main::serial_port_create( 'DSC5401', $port, $BaudRate, 'none', 'raw' ) ) {
         init( $::Serial_Ports{DSC5401}{object}, $port );
-        &main::print_log(
-            "  DSC5401.pm initializing port $port at $BaudRate baud")
+        &main::print_log("  DSC5401.pm initializing port $port at $BaudRate baud")
           if $main::config_parms{debug} eq 'DSC5401';
         &::MainLoop_pre_add_hook( \&DSC5401::check_for_data, 1 )
           if $main::Serial_Ports{DSC5401}{object};
-        $::Year_Month_Now =
-          &::time_date_stamp( 10, time );    # Not yet set when we init.
-        LocalLogit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            "    ========= DSC5401.pm Initialized ========="
-        );
+        $::Year_Month_Now = &::time_date_stamp( 10, time );    # Not yet set when we init.
+        LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            "    ========= DSC5401.pm Initialized =========" );
     }
 }
 
@@ -213,29 +194,20 @@ sub CheckCmd {
         if ( $cmd == 500 ) {    # System Error
             my $CmdName = "Unknown";
             $CmdName = $CmdMsgRev{$data} if exists $CmdMsgRev{$data};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} $CmdName"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "$cmd $EventMsg{$cmd} $CmdName" );
 
             #&::print_log("$EventMsg{$cmd}:   $CmdName");
         }
         elsif ( $cmd == 501 ) {    # Command Error (bad checksum)
             my $ECName = "Unknown";
             $ECName = $ErrorCode{$data} if exists $ErrorCode{$data};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} $ECName"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "$cmd $EventMsg{$cmd} $ECName" );
             &::print_log("$EventMsg{$cmd}:   $ECName");
         }
         elsif ( $cmd == 502 ) {    # System Error
             my $ECName = "Unknown";
             $ECName = $ErrorCode{$data} if exists $ErrorCode{$data};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} $ECName"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "$cmd $EventMsg{$cmd} $ECName" );
             &::print_log("$EventMsg{$cmd}:   $ECName");
         }
         elsif ( $cmd == 550 ) {    # Time Broadcast
@@ -244,10 +216,9 @@ sub CheckCmd {
             my $MM   = substr( $data, 4, 2 );
             my $DD   = substr( $data, 6, 2 );
             my $YY   = substr( $data, 8, 2 );
-            LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} $Hour:$Min $MM/$DD/$YY"
-            ) if $main::config_parms{DSC_5401_time_log};
+            LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} $Hour:$Min $MM/$DD/$YY" )
+              if $main::config_parms{DSC_5401_time_log};
             $self->{TimeBroadcast} = 'on';
             $self->{Time}          = "$Hour:$Min $MM/$DD/$YY";
             $self->{TimeStamp}     = &::time_date_stamp( 17, time );
@@ -255,10 +226,8 @@ sub CheckCmd {
         }
         elsif ( $cmd == 560 ) {    # Telephone ring detected
             my $Name = $data;
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd}:"
-            ) if $main::config_parms{DSC_5401_ring_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "$cmd $EventMsg{$cmd}:" )
+              if $main::config_parms{DSC_5401_ring_log};
             $self->{ring_now} = 1;
         }
         elsif ( $cmd == 561 ) {    # Indoor Temperature Broadcast
@@ -298,18 +267,16 @@ sub CheckCmd {
               if exists $main::config_parms{"DSC_5401_zone_$ZoneNum"};
             $PartName = $main::config_parms{"DSC_5401_part_$PartName"}
               if exists $main::config_parms{"DSC_5401_part_$PartName"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" );
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd} = $cmd;
+            $self->{zone_now_cmd}            = $cmd;
             $self->{zone_status}{"$ZoneNum"} = "alarm";
-            $self->{zone_now_msg}   = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_state} = "alarm";
-            $self->{zone_now}       = "$ZoneNum";
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_state}          = "alarm";
+            $self->{zone_now}                = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "alarm";
-            $self->{zone_now_cmd} = $cmd;
+            $self->{zone_now_cmd}            = $cmd;
         }
         elsif ( $cmd == 602 ) {    # zone alarm restore
             my $PartName = substr( $data, 0, 1 );
@@ -318,16 +285,14 @@ sub CheckCmd {
               if exists $main::config_parms{"DSC_5401_zone_$ZoneNum"};
             $PartName = $main::config_parms{"DSC_5401_part_$PartName"}
               if exists $main::config_parms{"DSC_5401_part_$PartName"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" );
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}     = $cmd;
-            $self->{zone_now_msg}     = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_state}   = "alarm restore";
-            $self->{zone_now}         = "$ZoneNum";
-            $self->{zone_now_restore} = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_state}          = "alarm restore";
+            $self->{zone_now}                = "$ZoneNum";
+            $self->{zone_now_restore}        = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "alarm restore";
         }
         elsif ( $cmd == 603 ) {    # zone tamper
@@ -337,16 +302,14 @@ sub CheckCmd {
               if exists $main::config_parms{"DSC_5401_zone_$ZoneNum"};
             $PartName = $main::config_parms{"DSC_5401_part_$PartName"}
               if exists $main::config_parms{"DSC_5401_part_$PartName"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" );
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}    = $cmd;
-            $self->{zone_now_msg}    = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_status} = "alarm restore";
-            $self->{zone_now}        = "$ZoneNum";
-            $self->{zone_now_tamper} = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_status}         = "alarm restore";
+            $self->{zone_now}                = "$ZoneNum";
+            $self->{zone_now_tamper}         = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "alarm restore";
         }
         elsif ( $cmd == 604 ) {    # zone tamper restore
@@ -356,15 +319,13 @@ sub CheckCmd {
               if exists $main::config_parms{"DSC_5401_zone_$ZoneNum"};
             $PartName = $main::config_parms{"DSC_5401_part_$PartName"}
               if exists $main::config_parms{"DSC_5401_part_$PartName"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" );
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}    = $cmd;
-            $self->{zone_now_msg}    = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_status} = "alarm restore";
-            $self->{zone_now}        = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_status}         = "alarm restore";
+            $self->{zone_now}                = "$ZoneNum";
             $self->{zone_now_tamper_restore} = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "alarm restore";
         }
@@ -372,10 +333,9 @@ sub CheckCmd {
             my $ZoneName = my $ZoneNum = $data;
             $ZoneName = $main::config_parms{"DSC_5401_zone_${data}"}
               if exists $main::config_parms{"DSC_5401_zone_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            ) if $main::config_parms{DSC_5401_zone_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" )
+              if $main::config_parms{DSC_5401_zone_log};
             $ZoneNum =~ s/^0*//;
             $self->{zone_now_cmd}            = $cmd;
             $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName";
@@ -388,58 +348,54 @@ sub CheckCmd {
             my $ZoneName = my $ZoneNum = $data;
             $ZoneName = $main::config_parms{"DSC_5401_zone_${data}"}
               if exists $main::config_parms{"DSC_5401_zone_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)"
-            ) if $main::config_parms{DSC_5401_zone_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName  ($ZoneNum)" )
+              if $main::config_parms{DSC_5401_zone_log};
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}    = $cmd;
-            $self->{zone_now_msg}    = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_status} = "fault restored";
-            $self->{zone_now}        = "$ZoneNum";
-            $self->{zone_now_fault_restore} = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_status}         = "fault restored";
+            $self->{zone_now}                = "$ZoneNum";
+            $self->{zone_now_fault_restore}  = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "fault restored";
         }
         elsif ( $cmd == 609 ) {    # zone open
             my $ZoneName = my $ZoneNum = $data;
             $ZoneName = $main::config_parms{"DSC_5401_zone_${data}"}
               if exists $main::config_parms{"DSC_5401_zone_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName ($ZoneNum)"
-            ) if $main::config_parms{DSC_5401_zone_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName ($ZoneNum)" )
+              if $main::config_parms{DSC_5401_zone_log};
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}    = $cmd;
-            $self->{zone_now_msg}    = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_status} = "open";
-            $self->{zone_now}        = "$ZoneNum";
-            $self->{zone_now_open}   = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_status}         = "open";
+            $self->{zone_now}                = "$ZoneNum";
+            $self->{zone_now_open}           = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "open";
         }
         elsif ( $cmd == 610 ) {    # zone restored
             my $ZoneName = my $ZoneNum = $data;
             $ZoneName = $main::config_parms{"DSC_5401_zone_${data}"}
               if exists $main::config_parms{"DSC_5401_zone_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} zone $ZoneName ($ZoneNum)"
-            ) if $main::config_parms{DSC_5401_zone_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} zone $ZoneName ($ZoneNum)" )
+              if $main::config_parms{DSC_5401_zone_log};
             $ZoneNum =~ s/^0*//;
-            $self->{zone_now_cmd}     = $cmd;
-            $self->{zone_now_msg}     = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
-            $self->{zone_now_status}  = "restored";
-            $self->{zone_now}         = "$ZoneNum";
-            $self->{zone_now_restore} = "$ZoneNum";
+            $self->{zone_now_cmd}            = $cmd;
+            $self->{zone_now_msg}            = "$EventMsg{$cmd} $ZoneName ($ZoneNum)";
+            $self->{zone_now_status}         = "restored";
+            $self->{zone_now}                = "$ZoneNum";
+            $self->{zone_now_restore}        = "$ZoneNum";
             $self->{zone_status}{"$ZoneNum"} = "restored";
         }
         elsif ( $cmd == 650 ) {    # Partition Ready
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} partition $PartName  ($PartNum)"
-            ) if $main::config_parms{DSC_5401_part_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} partition $PartName  ($PartNum)" )
+              if $main::config_parms{DSC_5401_part_log};
             $self->{zone_now_cmd}         = $cmd;
             $self->{partition_now_msg}    = "Partition $PartName is ready";
             $self->{partition_now_status} = "ready";
@@ -449,10 +405,9 @@ sub CheckCmd {
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} parition $PartName  ($PartNum)"
-            ) if $main::config_parms{DSC_5401_part_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} parition $PartName  ($PartNum)" )
+              if $main::config_parms{DSC_5401_part_log};
             $self->{partition_now_cmd}    = $cmd;
             $self->{partition_now_msg}    = "Partition $PartName is not ready";
             $self->{partition_now_status} = "not ready";
@@ -461,23 +416,15 @@ sub CheckCmd {
         elsif ( $cmd == 652 ) {    # Partition Armed
             my $PartNum = my $PartName = substr( $data, 0, 1 );
             my $Mode = ( length($data) == 2 ) ? substr( $data, 1, 1 ) : 4;
-            my @ModeTxt = (
-                "armed away",
-                "armed stay",
-                "armed Zero-Entry-Away",
-                "armed Zero-Entry-Stay",
-                "armed"
-            );
+            my @ModeTxt = ( "armed away", "armed stay", "armed Zero-Entry-Away", "armed Zero-Entry-Stay", "armed" );
             $PartName = $main::config_parms{"DSC_5401_part_${PartName}"}
               if exists $main::config_parms{"DSC_5401_part_${PartName}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
                 "$cmd $EventMsg{$cmd} partition $PartName ($PartNum) in mode $ModeTxt[$Mode] by user $self->{user_name}  ($self->{user_id})"
             );
             set $self "$ModeTxt[$Mode]";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "Partition $PartName armed $ModeTxt[$Mode] by user $self->{user_name}";
+            $self->{partition_now_cmd}        = $cmd;
+            $self->{partition_now_msg}        = "Partition $PartName armed $ModeTxt[$Mode] by user $self->{user_name}";
             $self->{partition_now_status}     = "$ModeTxt[$Mode]";
             $self->{partition_now}            = "$PartNum";
             $self->{partition_now_mode}       = "$ModeTxt[$Mode]";
@@ -487,10 +434,9 @@ sub CheckCmd {
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} parition $PartName  ($PartNum)"
-            ) if $main::config_parms{DSC_5401_part_log};
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} parition $PartName  ($PartNum)" )
+              if $main::config_parms{DSC_5401_part_log};
             $self->{partition_now_cmd}    = $cmd;
             $self->{partition_now_msg}    = "Partition $PartName is in alarm";
             $self->{partition_now_status} = "alarm";
@@ -500,14 +446,11 @@ sub CheckCmd {
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} partition $PartName ($PartNum) by user $self->{user_name} ($self->{user_id})"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} partition $PartName ($PartNum) by user $self->{user_name} ($self->{user_id})" );
             set $self "disarmed";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "Partition $PartName ($PartNum) disarmed by user $self->{user_name}";
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "Partition $PartName ($PartNum) disarmed by user $self->{user_name}";
             $self->{partition_now_status} = "disarmed";
             $self->{partition_now}        = "$PartNum";
         }
@@ -515,28 +458,24 @@ sub CheckCmd {
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} partition $PartName  ($PartNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} partition $PartName  ($PartNum)" );
             set $self "exit delay";
-            $self->{partition_now_cmd}    = $cmd;
-            $self->{partition_now_msg}    = "Partition $PartName in exit delay";
-            $self->{partition_now_status} = "exit delay";
-            $self->{partition_now}        = "$PartNum";
+            $self->{partition_now_cmd}        = $cmd;
+            $self->{partition_now_msg}        = "Partition $PartName in exit delay";
+            $self->{partition_now_status}     = "exit delay";
+            $self->{partition_now}            = "$PartNum";
             $self->{partition_mode}{$PartNum} = "exit delay";
         }
         elsif ( $cmd == 657 ) {    # Entry Delay in Progress
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${data}"}
               if exists $main::config_parms{"DSC_5401_part_${data}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} partition $PartName ($PartNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} partition $PartName ($PartNum)" );
             set $self "Entry Delay";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} = "Partition $PartName in entry delay";
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "Partition $PartName in entry delay";
             $self->{partition_now_status} = "entry delay";
             $self->{partition_now}        = "$PartNum";
         }
@@ -552,47 +491,38 @@ sub CheckCmd {
                 "$cmd $EventMsg{$cmd} user $UserName ($UserNum) closing partition $PartName ($PartNum)"
             );
             set $self "user closing";
-            $self->{user_name}         = $UserName;
-            $self->{user_id}           = $UserNum;
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "User $UserName  closing partition $PartName";
+            $self->{user_name}            = $UserName;
+            $self->{user_id}              = $UserNum;
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "User $UserName  closing partition $PartName";
             $self->{partition_now_status} = "user closing";
             $self->{partition_now}        = "$PartNum";
         }
-        elsif ( $cmd == 701 )
-        {    # Special closing (probably via computer command)
+        elsif ( $cmd == 701 ) {    # Special closing (probably via computer command)
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${PartName}"}
               if exists $main::config_parms{"DSC_5401_part_${PartName}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing special closing on partition $PartName ($PartNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing special closing on partition $PartName ($PartNum)" );
             set $self "special closing";
-            $self->{user_name}         = "Misterhouse or Anonymous";
-            $self->{user_id}           = "0000";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "Misterhouse or Anonymous doing special closing on partition $PartName";
+            $self->{user_name}            = "Misterhouse or Anonymous";
+            $self->{user_id}              = "0000";
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "Misterhouse or Anonymous doing special closing on partition $PartName";
             $self->{partition_now_status} = "special closing";
             $self->{partition_now}        = "$PartNum";
         }
-        elsif ( $cmd == 702 )
-        {    # Partial closing (probably via computer command)
+        elsif ( $cmd == 702 ) {    # Partial closing (probably via computer command)
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${PartName}"}
               if exists $main::config_parms{"DSC_5401_part_${PartName}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing spartial closing on partition $PartName ($PartNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing spartial closing on partition $PartName ($PartNum)" );
             set $self "partial closing";
-            $self->{user_name}         = "Misterhouse or Anonymous";
-            $self->{user_id}           = "0000";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "Misterhouse or Anonymous doing partital closing on partition $PartName";
+            $self->{user_name}            = "Misterhouse or Anonymous";
+            $self->{user_id}              = "0000";
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "Misterhouse or Anonymous doing partital closing on partition $PartName";
             $self->{partition_now_status} = "partial closing";
             $self->{partition_now}        = "$PartNum";
         }
@@ -608,29 +538,24 @@ sub CheckCmd {
                 "$cmd $EventMsg{$cmd} User $UserName ($UserNum) opening partition $PartName ($PartNum)"
             );
             set $self "user opening";
-            $self->{user_name}         = "$UserName";
-            $self->{user_id}           = $UserNum;
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "User $UserName  opening partition $PartName";
+            $self->{user_name}            = "$UserName";
+            $self->{user_id}              = $UserNum;
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "User $UserName  opening partition $PartName";
             $self->{partition_now_status} = "user opening";
             $self->{partition_now}        = "$PartNum";
         }
-        elsif ( $cmd == 751 )
-        {    # Special opening (probably via computer command)
+        elsif ( $cmd == 751 ) {    # Special opening (probably via computer command)
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${PartName}"}
               if exists $main::config_parms{"DSC_5401_part_${PartName}"};
-            &LocalLogit(
-                "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing spartial closing on partition $PartName ($PartNum)"
-            );
+            &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+                "$cmd $EventMsg{$cmd} Misterhouse or Anonymous doing spartial closing on partition $PartName ($PartNum)" );
             set $self "special opening";
-            $self->{user_name}         = "Misterhouse or Anonymous";
-            $self->{user_id}           = "0000";
-            $self->{partition_now_cmd} = $cmd;
-            $self->{partition_now_msg} =
-              "Misterhouse or Anonymous opening partition $PartName";
+            $self->{user_name}            = "Misterhouse or Anonymous";
+            $self->{user_id}              = "0000";
+            $self->{partition_now_cmd}    = $cmd;
+            $self->{partition_now_msg}    = "Misterhouse or Anonymous opening partition $PartName";
             $self->{partition_now_status} = "special opening";
             $self->{partition_now}        = "$PartNum";
         }
@@ -670,8 +595,7 @@ sub CheckCmd {
                 "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
                 "$cmd $EventMsg{$cmd} System report trouble with Escort"
             );
-            &::print_log(
-                "$EventMsg{$cmd}:   System report trouble with Escort module");
+            &::print_log("$EventMsg{$cmd}:   System report trouble with Escort module");
         }
         elsif ( $cmd == 832 ) {    # Escort trouble restored
             my $PartName = my $PartNum = $data;
@@ -691,11 +615,9 @@ sub CheckCmd {
                 "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
                 "$cmd $EventMsg{$cmd} System report trouble on partition $PartName"
             );
-            &::print_log(
-                "$EventMsg{$cmd}:   System report trouble on partition $PartName"
-            );
+            &::print_log( "$EventMsg{$cmd}:   System report trouble on partition $PartName" );
         }
-        elsif ( $cmd == 841 ) {  # Trouble Status Restore (No trouble on system)
+        elsif ( $cmd == 841 ) {    # Trouble Status Restore (No trouble on system)
             my $PartName = my $PartNum = $data;
             $PartName = $main::config_parms{"DSC_5401_part_${PartName}"}
               if exists $main::config_parms{"DSC_5401_part_${PartName}"};
@@ -703,20 +625,14 @@ sub CheckCmd {
                 "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
                 "$cmd $EventMsg{$cmd} System report no trouble on partition $PartName"
             );
-            print(
-                "$EventMsg{$cmd}:   System report no trouble on partition $PartName\n"
-            );
+            print( "$EventMsg{$cmd}:   System report no trouble on partition $PartName\n" );
         }
         else {
-            &main::print_log(
-                "DSC5401:check_for_data  Undefined command [$cmd] received via $CmdStr"
-            );
+            &main::print_log( "DSC5401:check_for_data  Undefined command [$cmd] received via $CmdStr" );
         }
     }
     else {
-        &main::print_log(
-            "DSC5401:check_for_data  Invalid checksum from $CmdStr ($CalcChecksum)"
-        );
+        &main::print_log( "DSC5401:check_for_data  Invalid checksum from $CmdStr ($CalcChecksum)" );
     }
     return;
 }
@@ -794,8 +710,8 @@ sub ResetDscState {
             $self->{partition_cmd}{$PartNum}    = $self->{partition_now_cmd};
             $self->{partition_msg}{$PartNum}    = $self->{partition_now_msg};
             $self->{partition_status}{$PartNum} = $self->{partition_now_status};
-            $self->{partition_time}{$PartNum}  = &::time_date_stamp( 17, time );
-            $self->{partition_epoch}{$PartNum} = time;
+            $self->{partition_time}{$PartNum}   = &::time_date_stamp( 17, time );
+            $self->{partition_epoch}{$PartNum}  = time;
             undef $self->{partition_now};
             undef $self->{partition_now_cmd};
             undef $self->{partition_now_msg};
@@ -848,8 +764,7 @@ Define hash with DSC message event
 sub DefineEventMsg {
 
     %EventMsg = (
-        "000" => "Poll                                     "
-        ,    # Application originated command
+        "000" => "Poll                                     ",    # Application originated command
         "001" => "Status Report                            ",    #         |
         "010" => "Set Date and Time                        ",    #        \ /
         "020" => "Command Output Control                   ",
@@ -864,8 +779,7 @@ sub DefineEventMsg {
         "057" => "Temperature Broadcast Control            ",
         "060" => "Trigger Panic Alarm                      ",
         "200" => "Code Send                                ",
-        "500" => "Command Acknowledge                      "
-        ,    # PC5401 Originated Command
+        "500" => "Command Acknowledge                      ",    # PC5401 Originated Command
         "501" => "Command Error                            ",    #        |
         "502" => "System Error                             ",    #       \ /
         "550" => "Time/Date Broadcast                      ",
@@ -1038,8 +952,7 @@ sub cmd {
     $CmdName = ( exists $CmdMsgRev{$cmd} ) ? $CmdMsgRev{$cmd} : "unknown";
 
     if ( $CmdName =~ /^unknown/ ) {
-        &::print_log(
-            "Invalid DSC panel command : $CmdName ($cmd) with argument $arg");
+        &::print_log("Invalid DSC panel command : $CmdName ($cmd) with argument $arg");
         return;
     }
 
@@ -1053,12 +966,9 @@ sub cmd {
         return "Sending to DSC panel: $CmdName ($cmd)";
     }
     else {
-        &::print_log(
-            "Sending to DSC panel     $CmdName ($cmd) with argument ($arg)");
-        &LocalLogit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            ">>> Sending to DSC panel                      $CmdName ($cmd) with argument ($arg)  [$CmdStr]"
-        );
+        &::print_log("Sending to DSC panel     $CmdName ($cmd) with argument ($arg)");
+        &LocalLogit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            ">>> Sending to DSC panel                      $CmdName ($cmd) with argument ($arg)  [$CmdStr]" );
         $main::Serial_Ports{DSC5401}{object}->write("$CmdStr\r\n");
         return "Sending to DSC panel: $CmdName ($cmd) with argument ($arg)";
     }
@@ -1154,16 +1064,14 @@ sub user_id {
 
 sub IntTstat {
     my ( $class, $TstatNum ) = @_;
-    return $_[0]->{IntTstatTemp}{$TstatNum}, $_[0]->{IntTstatTime}{$TstatNum},
-      $_[0]->{IntTstatEpoch}{$TstatNum}
+    return $_[0]->{IntTstatTemp}{$TstatNum}, $_[0]->{IntTstatTime}{$TstatNum}, $_[0]->{IntTstatEpoch}{$TstatNum}
       if defined $_[0]->{IntTstatTemp};
     return -999;
 }
 
 sub ExtTstat {
     my ( $class, $TstatNum ) = @_;
-    return $_[0]->{ExtTstatTemp}{$TstatNum}, $_[0]->{ExtTstatTime}{$TstatNum},
-      $_[0]->{ExtTstatEpoch}{$TstatNum}
+    return $_[0]->{ExtTstatTemp}{$TstatNum}, $_[0]->{ExtTstatTime}{$TstatNum}, $_[0]->{ExtTstatEpoch}{$TstatNum}
       if defined $_[0]->{ExtTstatTemp};
     return -999;
 }
@@ -1183,8 +1091,7 @@ This method copied from Gaeton's example DSC_Clock.pl code.  I recommend that th
 sub set_clock {
     my ($self) = @_;
 
-    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime(time);
+    my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
     $year = sprintf( "%02d", $year % 100 );
     $mon += 1;
     $m    = ( $m < 10 )    ? "0" . $m    : $m;
@@ -1193,10 +1100,7 @@ sub set_clock {
     $mon  = ( $mon < 10 )  ? "0" . $mon  : $mon;
     my $TimeStamp = "$h$m$mon$mday$year";
     &::print_log("Setting time on DSC panel to $TimeStamp");
-    &::logit(
-        "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-        "Setting time on DSC panel to $TimeStamp"
-    );
+    &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log", "Setting time on DSC panel to $TimeStamp" );
     $self->cmd( "SetDateTime", $TimeStamp );
 }
 
diff --git a/lib/DSC_Alarm.pm b/lib/DSC_Alarm.pm
index 0bc410b1a..e35d7fd90 100644
--- a/lib/DSC_Alarm.pm
+++ b/lib/DSC_Alarm.pm
@@ -86,8 +86,7 @@ sub serial_startup {
 
         # The create call will not succeed for proxies, so we don't enter this case for proxy configsk
         init( $::Serial_Ports{$instance}{object} );
-        ::print_log
-          "\nDSC_Alarm.pm initialzed $instance on hardware $port at $speed baud\n"
+        ::print_log "\nDSC_Alarm.pm initialzed $instance on hardware $port at $speed baud\n"
           if $main::Debug{dsc};
     }
 
@@ -102,11 +101,8 @@ sub serial_startup {
         #&::Serial_data_add_hook(\&DSC_Alarm::serial_data, 'persistent');
         #      &::MainLoop_pre_add_hook( \&DSC_Alarm::UserCodePreHook,   1);
         #      &::MainLoop_post_add_hook( \&DSC_Alarm::UserCodePostHook, 1 );
-        $::Year_Month_Now =
-          &::time_date_stamp( 10, time );    # Not yet set when we init.
-        &::logit(
-            "$::config_parms{data_dir}/logs/$instance.$::Year_Month_Now.log",
-            "DSC_Alarm.pm Initialized" );
+        $::Year_Month_Now = &::time_date_stamp( 10, time );    # Not yet set when we init.
+        &::logit( "$::config_parms{data_dir}/logs/$instance.$::Year_Month_Now.log", "DSC_Alarm.pm Initialized" );
         ::print_log "DSC_Alarm.pm adding hooks \n" if $main::Debug{dsc};
     }
 }
@@ -134,12 +130,8 @@ sub check_for_data {
     for my $port_name (@DSC_Alarm_Ports) {
         if ( my $data = $main::Serial_Ports{$port_name}{data_record} ) {
             $main::Serial_Ports{$port_name}{data_record} = undef;
-            &::logit(
-                "$::config_parms{data_dir}/logs/$port_name.$::Year_Month_Now.log",
-                "$data"
-            );
-            ::print_log
-              "DSC_Alarm port $port_name data = $data, $::Loop_Count\n"
+            &::logit( "$::config_parms{data_dir}/logs/$port_name.$::Year_Month_Now.log", "$data" );
+            ::print_log "DSC_Alarm port $port_name data = $data, $::Loop_Count\n"
               if $main::Debug{dsc};
 
             #print "DSC_Alarm port $port_name data = $data, $::Loop_Count\n";
@@ -160,10 +152,8 @@ sub check_for_data {
                 }
             }
             else {
-                ::print_log
-                  "DSC_Alarm.pm Warning: Data received on port $port_name, but no user script objects defined\n";
-                my $warn_once = new DSC_Alarm($port_name)
-                  ;    # Create dummy object to avoid repetitious log messages.
+                ::print_log "DSC_Alarm.pm Warning: Data received on port $port_name, but no user script objects defined\n";
+                my $warn_once = new DSC_Alarm($port_name);    # Create dummy object to avoid repetitious log messages.
             }
         }
     }
@@ -191,8 +181,7 @@ sub new {
     bless $self, $class;
 
     push @{ $DSC_Alarm_Objects{$port_name} }, $self;
-    ::print_log
-      "DSC_Alarm.pm Warning: Over 50 DSC Alarm user script objects defined on $port_name\n"
+    ::print_log "DSC_Alarm.pm Warning: Over 50 DSC Alarm user script objects defined on $port_name\n"
       if 50 < scalar @{ $DSC_Alarm_Objects{$port_name} };
     restore_data $self ( 'user', 'zone', 'mode' );
 
diff --git a/lib/DVDPlayer.pm b/lib/DVDPlayer.pm
index 77fb6fd64..733c65855 100644
--- a/lib/DVDPlayer.pm
+++ b/lib/DVDPlayer.pm
@@ -25,15 +25,14 @@ B<Generic_Item>
 #!/usr/bin/perl
 
 use strict;
-use Win32::TieRegistry 0.20 ( Delimiter => "/", ArrayValues => 0 )
-  ;    # used to find installed WinDVD
+use Win32::TieRegistry 0.20 ( Delimiter => "/", ArrayValues => 0 );    # used to find installed WinDVD
 
 package DVDPlayer;
 @DVDPlayer::ISA = ('Generic_Item');
 
 my @dvdplayer_object_list;
 
-my $title;    # *** These two should be $self hash.
+my $title;                                                             # *** These two should be $self hash.
 my $mode;
 
 my $windvd_path;
@@ -46,11 +45,9 @@ sub find_program_path {
     }
     else {
         unless ($windvd_path) {
-            $windvd_path = $Registry->{
-                'Classes/Applications/Windvd.exe/shell/open/command//'};
+            $windvd_path = $Registry->{'Classes/Applications/Windvd.exe/shell/open/command//'};
             $windvd_path = $1 if $windvd_path =~ /"(.*?)"/;
-            $windvd_path =~
-              s/\x20"*\%\d"*//g;   # remove parameter templates (%1, "%2", etc.)
+            $windvd_path =~ s/\x20"*\%\d"*//g;    # remove parameter templates (%1, "%2", etc.)
         }
         return $windvd_path;
     }
@@ -67,20 +64,13 @@ sub new {
 
     push(
         @{ $$self{states} },
-        'play',             'pause',          'stop',
-        'rewind',           'fast forward',   'step',
-        'skip forward',     'instant replay', 'full screen',
-        'root menu',        'title menu',     'volume down',
-        'volume up',        'mute',           'brightness up',
-        'brightness down',  'chapter',        'next chapter',
-        'previous chapter', 'on',             'off',
-        '0',                '1',              '2',
-        '3',                '4',              '5',
-        '6',                '7',              '8',
-        '9',                'angle',          'audio',
-        'subtitle',         'unzoom',         'pan',
-        'bookmark',         'capture',        'on',
-        'off'
+        'play',             'pause',          'stop',          'rewind',          'fast forward', 'step',
+        'skip forward',     'instant replay', 'full screen',   'root menu',       'title menu',   'volume down',
+        'volume up',        'mute',           'brightness up', 'brightness down', 'chapter',      'next chapter',
+        'previous chapter', 'on',             'off',           '0',               '1',            '2',
+        '3',                '4',              '5',             '6',               '7',            '8',
+        '9',                'angle',          'audio',         'subtitle',        'unzoom',       'pan',
+        'bookmark',         'capture',        'on',            'off'
     );
     return $self;
 }
@@ -116,9 +106,7 @@ sub windvd_control {
 
         # *** Find the IFO!
 
-        &::run(
-            qq|"$windvd_path" "$::config_parms{dvd_archives_folder}\\$1\\video_ts\\VTS_01_0.ifo"|
-        );
+        &::run( qq|"$windvd_path" "$::config_parms{dvd_archives_folder}\\$1\\video_ts\\VTS_01_0.ifo"| );
 
         $title = $1;
 
@@ -136,8 +124,7 @@ sub windvd_control {
         while ( $retries++ < 3 and !$window ) {
             print "Trying to find WinDVD attempt #$retries\n"
               if $::Debug{windvd};
-            $window =
-              &::sendkeys_find_window( 'Intervideo WinDVD', $windvd_path );
+            $window = &::sendkeys_find_window( 'Intervideo WinDVD', $windvd_path );
         }
 
         $fresh = $retries;
@@ -234,12 +221,10 @@ sub windvd_control {
                 $result = &::SendKeys( $window, 'e', 1 );
             }
             elsif ( $command eq 'volume up' ) {
-                $result =
-                  &::SendKeys( $window, '\\SHIFT+\\\\UP\\\\SHIFT-\\', 1 );
+                $result = &::SendKeys( $window, '\\SHIFT+\\\\UP\\\\SHIFT-\\', 1 );
             }
             elsif ( $command eq 'volume down' ) {
-                $result =
-                  &::SendKeys( $window, '\\SHIFT+\\\\DOWN\\\\SHIFT-\\', 1 );
+                $result = &::SendKeys( $window, '\\SHIFT+\\\\DOWN\\\\SHIFT-\\', 1 );
             }
             elsif ( $command eq 'brightness up' ) {
                 $result = &::SendKeys( $window, '\\SHIFT+\\+\\SHIFT-\\', 1 );
diff --git a/lib/Device_Item.pm b/lib/Device_Item.pm
index f2fc50d35..9de673ff8 100644
--- a/lib/Device_Item.pm
+++ b/lib/Device_Item.pm
@@ -90,10 +90,8 @@ sub set_standard_config {
     }
 
     # copy settings locally from the main hash
-    grep ( {
-            $self->{$_} = $self->{mainHash}->{$device_name}{$_}
-              if defined( $self->{mainHash}->{$device_name}{$_} )
-    } qw(readable writeable prefix datatype break) );
+    grep ( { $self->{$_} = $self->{mainHash}->{$device_name}{$_}
+              if defined( $self->{mainHash}->{$device_name}{$_} ) } qw(readable writeable prefix datatype break) );
 }
 
 sub said {
@@ -315,10 +313,7 @@ sub get_supported_interfaces {
 sub supports {
     my ( $self, $interface ) = @_;
 
-    if (
-        grep ( { lc $interface eq lc $_ } @{ $self->get_supported_interfaces } )
-        > 0 )
-    {
+    if ( grep ( { lc $interface eq lc $_ } @{ $self->get_supported_interfaces } ) > 0 ) {
         return 1;
     }
     return 0;
diff --git a/lib/Display.pm b/lib/Display.pm
index 85f0f765f..1ab688eea 100644
--- a/lib/Display.pm
+++ b/lib/Display.pm
@@ -33,10 +33,7 @@ sub new {
     my %parms;
     %parms = @parms unless @parms % 2;
     unless ( $parms{text} ) {
-        (
-            $parms{text}, $parms{time},        $parms{title},
-            $parms{font}, $parms{window_name}, $parms{append}
-        ) = @parms;
+        ( $parms{text}, $parms{time}, $parms{title}, $parms{font}, $parms{window_name}, $parms{append} ) = @parms;
     }
     $parms{time}      = 120            unless defined $parms{time};
     $parms{auto_quit} = 1              unless $parms{time} == 0;
@@ -45,8 +42,7 @@ sub new {
     bless $self, $class;
 
     print "New window:\n" if $main::Debug{display};
-    print
-      " - time: $parms{time}, title: $parms{title}, window_name: $parms{window_name}\n"
+    print " - time: $parms{time}, title: $parms{title}, window_name: $parms{window_name}\n"
       if $main::Debug{display};
     print "\nCalling display sub...\n" if $main::Debug{display};
     &display($self);
@@ -72,7 +68,7 @@ sub read_text {
         if ( $file =~ /\.gif$/i or $file =~ /\.jpg$/i or $file =~ /\.png$/i ) {
             $$self{type}  = 'photo';
             $$self{title} = "Image: $file"
-              unless $$self{title};  # *** Get rid of that timestamp in caption!
+              unless $$self{title};    # *** Get rid of that timestamp in caption!
             return;
         }
         $$self{text} = '';
@@ -85,13 +81,13 @@ sub read_text {
     }
 
     # Find width and height of text ( *** oh come on!)
-    my ( $width, $height );  # Pass explicit height/width always, let text wrap!
+    my ( $width, $height );    # Pass explicit height/width always, let text wrap!
     while (@data) {
         $_ = shift @data;
         my $length = length;
         $width = $length if !$width or $length > $width;
         $height++;
-        $height += int( $length / 100 ); # Add more rows if we are line wrapping
+        $height += int( $length / 100 );    # Add more rows if we are line wrapping
         $$self{text} .= $_ if $file;
     }
 
@@ -144,8 +140,7 @@ sub display {
     if ( $$self{font} eq 'fixed' ) {
         $$self{font} = 'Courier 10';
     }
-    elsif ( $$self{font} eq 'biggest' )
-    {    # *** Only abstraction is biggest? This is strange too.
+    elsif ( $$self{font} eq 'biggest' ) {    # *** Only abstraction is biggest? This is strange too.
         $$self{geometry} = '+0+0';
         my $w = $$self{MW}->screenwidth;
 
@@ -166,13 +161,12 @@ sub display {
         $$self{MW}   = $Windows{ $$self{window_name} }{mw};
         $$self{loop} = 0;
         $reuse_flag++;
-        $$self{activated} =
-          1;    # let instantiating code know that re-use occurred.
+        $$self{activated} = 1;    # let instantiating code know that re-use occurred.
 
     }
 
-    if ( !$reuse_flag ) {    # Not reusing extant window
-                             # New window from main tk
+    if ( !$reuse_flag ) {         # Not reusing extant window
+                                  # New window from main tk
 
         if ($main::MW) {
             $$self{MW} = $main::MW->Toplevel;
@@ -223,16 +217,14 @@ sub display {
 
         &main::configure_element( 'button', \$b1 ) if $$self{time};
 
-        $l =
-          $f1->Label( -textvariable => \$$self{time} )->pack( -side => 'left' )
+        $l = $f1->Label( -textvariable => \$$self{time} )->pack( -side => 'left' )
           if $$self{time};
 
         &main::configure_element( 'frame', \$l ) if $l;
 
         my $b2 = $f1->Button(
-            -text => 'Pause [F1]',
-            -command =>
-              sub { $$self{auto_quit} = ( $$self{auto_quit} ) ? 0 : 1 }
+            -text    => 'Pause [F1]',
+            -command => sub { $$self{auto_quit} = ( $$self{auto_quit} ) ? 0 : 1 }
           )->pack( -side => 'left' )
           if $$self{time};
 
@@ -315,8 +307,7 @@ sub display {
                 -scrollbars => $$self{scroll}
             );
 
-            &main::configure_element( 'frame', \$t1 )
-              ;    # *** set state of this textbox to read only unless editable!
+            &main::configure_element( 'frame', \$t1 );    # *** set state of this textbox to read only unless editable!
             $t1->configure(qw/-font $$self{font}/)  if $$self{font};
             $t1->configure(qw/-bg $$self{bgcolor}/) if $$self{bgcolor};
 
@@ -333,8 +324,7 @@ sub display {
         sub {
             return unless $$self{auto_quit};
             $$self{time}--;
-            $l->configure( -textvariable => \$$self{time} )
-              ;    # Shouldn't have to do this
+            $l->configure( -textvariable => \$$self{time} );    # Shouldn't have to do this
 
             #                                 print "$$self{time} mw=$$self{MW}\n";
             $self->destroy unless $$self{time} > 0;
@@ -355,15 +345,11 @@ sub display {
 
     #$$self{app}_$$self{window_name}_window_closed()
 
-    $$self{MW}->protocol( 'WM_DELETE_WINDOW', sub { $self->destroy } )
-      ;    # *** Added to kill on close
+    $$self{MW}->protocol( 'WM_DELETE_WINDOW', sub { $self->destroy } );    # *** Added to kill on close
 
-    $$self{MW}->bind(
-        '<F1>' => sub { $$self{auto_quit} = ( $$self{auto_quit} ) ? 0 : 1 } );
+    $$self{MW}->bind( '<F1>' => sub { $$self{auto_quit} = ( $$self{auto_quit} ) ? 0 : 1 } );
 
-    my $f2 =
-      $$self{MW}->Frame->pack(qw/-anchor s -side bottom -fill both -expand 1/)
-      ;    # add bottom frame
+    my $f2 = $$self{MW}->Frame->pack(qw/-anchor s -side bottom -fill both -expand 1/);    # add bottom frame
     $$self{MW}{bottom_frame} = $f2;
 
     &main::configure_element( 'frame', \$f2 );
diff --git a/lib/Display_Alpha.pm b/lib/Display_Alpha.pm
index 753555916..70d76d9da 100644
--- a/lib/Display_Alpha.pm
+++ b/lib/Display_Alpha.pm
@@ -88,14 +88,12 @@ sub startup {
             $port = $port_room;
             $room = 'default';
         }
-        print
-          "Opening Display_Alpha port: pr=$port_room port=$port room=$room\n"
+        print "Opening Display_Alpha port: pr=$port_room port=$port room=$room\n"
           if $::Debug{display_alpha};
         push @room_names, $room;
 
         if ( $type and $type eq 'old' ) {
-            &::serial_port_create( "Display_Alpha_$room", $port, 9600, undef,
-                undef, undef, "even", 7, 2 );
+            &::serial_port_create( "Display_Alpha_$room", $port, 9600, undef, undef, undef, "even", 7, 2 );
         }
         else {
             &::serial_port_create( "Display_Alpha_$room", $port, 9600 );
@@ -281,9 +279,7 @@ sub set_image_memory {
 
     ( $height, $width ) = &image_dimensions($image);
 
-    return
-      $address . 'DU'
-      . uc( sprintf( "%02x", $height ) . sprintf( "%02x", $width ) ) . '4000';
+    return $address . 'DU' . uc( sprintf( "%02x", $height ) . sprintf( "%02x", $width ) ) . '4000';
 
 }
 
@@ -304,8 +300,7 @@ sub image {
     print "Address: $address height: $height width: $width\n"
       if $::Debug{display_alpha};
 
-    return (
-        uc( sprintf( "%02x", $height ) . sprintf( "%02x", $width ) ) . $image );
+    return ( uc( sprintf( "%02x", $height ) . sprintf( "%02x", $width ) ) . $image );
 
 }
 
@@ -328,18 +323,11 @@ sub header {
 sub message {
     my (%parms) = @_;
 
-    my (
-        $message,  $color, $mode,    $position, $font,
-        $fontsize, $speed, $address, $image,    $imageposition
-    );
+    my ( $message, $color, $mode, $position, $font, $fontsize, $speed, $address, $image, $imageposition );
     my $special;
 
     if ( !$parms{text} ) {
-        (
-            $message,       $color,    $mode,  $position,
-            $font,          $fontsize, $speed, $image,
-            $imageposition, $address
-        ) = @_;
+        ( $message, $color, $mode, $position, $font, $fontsize, $speed, $image, $imageposition, $address ) = @_;
     }
     else {
         $message       = $parms{text};
@@ -368,8 +356,7 @@ sub message {
     $imageposition = 'left' unless $imageposition;
     $position = 'middle' if !$position or !$positions{$position};
     $address = "A" unless $address;
-    my $result = $positions{$position}
-      . ( ($special) ? ( "\x6E" . $special_modes{$mode} ) : $modes{$mode} );
+    my $result = $positions{$position} . ( ($special) ? ( "\x6E" . $special_modes{$mode} ) : $modes{$mode} );
     $result .= "\x1c" . $colors{$color} if $color    and $colors{$color};
     $result .= "\x1a" . $fonts{$font}   if $font     and $fonts{$font};
     $result .= "\x12"                   if $fontsize and $fontsize eq 'wide';
@@ -389,10 +376,7 @@ sub message {
 sub main::display_alpha {
     my (%parms) = @_;
     my %message_parms;
-    my (
-        $text,  $mode,           $color, $font, $position,
-        $image, $image_position, $rooms, $wait
-    );
+    my ( $text, $mode, $color, $font, $position, $image, $image_position, $rooms, $wait );
     my @rooms;
     my $image_address;
 
@@ -408,10 +392,7 @@ sub main::display_alpha {
         $image_position = $parms{imageposition};
     }
     else {
-        (
-            $text,  $mode,           $color, $font, $position,
-            $image, $image_position, $rooms, $wait
-        ) = @_;
+        ( $text, $mode, $color, $font, $position, $image, $image_position, $rooms, $wait ) = @_;
     }
 
     $message_parms{text}          = $text;
@@ -427,9 +408,8 @@ sub main::display_alpha {
 
         #	    my $image_file = "$::config_parms{data_dir}/alpha/images/$image.bmp";
         my $image_file = $::Pgm_Root . "/data/alpha/images/$image.bmp";
-        if ( -e $image_file )
-        {    # look for Windows Bitmap (Todo: add XBM support)
-            if ( !&::file_changed($image_file) and $bitmaps{$image} ) {  #cached
+        if ( -e $image_file ) {           # look for Windows Bitmap (Todo: add XBM support)
+            if ( !&::file_changed($image_file) and $bitmaps{$image} ) {    #cached
                 $image = $bitmaps{$image};
             }
             else {
@@ -440,12 +420,8 @@ sub main::display_alpha {
                 print "\n" if $::Debug{display_alpha};
                 for my $i ( 0 .. $#picture ) {
                     for my $j ( 0 .. $#{ $picture[$i] } ) {
-                        if (
-                            defined $beta_brite_colors{
-                                uc( @color_table[ $picture[$i][$j] ] ) } )
-                        {
-                            $image .= $beta_brite_colors{
-                                uc( @color_table[ $picture[$i][$j] ] ) };
+                        if ( defined $beta_brite_colors{ uc( @color_table[ $picture[$i][$j] ] ) } ) {
+                            $image .= $beta_brite_colors{ uc( @color_table[ $picture[$i][$j] ] ) };
                         }
                         else {    # unmapped color, turn LED off
                             $image .= $beta_brite_colors{'000000'};
@@ -508,8 +484,7 @@ sub send {
             and $::Serial_Ports{"Display_Alpha_$room"}{object} )
         {
             $::Serial_Ports{"Display_Alpha_default"}{object}->write($data);
-            warn
-              "Invalid alphanumeric display port: $room.  Data sent to default port\n";
+            warn "Invalid alphanumeric display port: $room.  Data sent to default port\n";
         }
         else {
             warn "Invalid alphanumeric display port: $room.\n";
@@ -523,7 +498,7 @@ sub send_sequence {
     my $run_sequence;
 
     @rooms = @room_names
-      unless @rooms; # populated on init, contains 'default' if no rooms defined
+      unless @rooms;    # populated on init, contains 'default' if no rooms defined
     for my $room (@rooms) {
 
         # Set memory
@@ -545,10 +520,7 @@ sub send_sequence {
         for (@images) {
             print "Setting image: $address\n" if $::Debug{display_alpha};
 
-            &send(
-                &set_image_memory( image => $_, address => chr( $address++ ) ),
-                $room
-            );
+            &send( &set_image_memory( image => $_, address => chr( $address++ ) ), $room );
         }
         &send( $FINISH, $room );
 
@@ -689,14 +661,13 @@ sub GetBMPInfo ($) {
     $data_size += 256 * ord( BMPRead( $fh, 1 ) );
 
     unless ($data_size) {
-        $data_size =
-          $size - $offset;    #file size minus header size equals data size
+        $data_size = $size - $offset;    #file size minus header size equals data size
     }
 
     print "Data size: $data_size\n" if $::Debug{display_alpha};
 
-    BMPRead( $fh, 4 );        # skip pels
-    BMPRead( $fh, 4 );        # skip pels
+    BMPRead( $fh, 4 );                   # skip pels
+    BMPRead( $fh, 4 );                   # skip pels
 
     my $colors = ord( BMPRead( $fh, 1 ) );
     $colors += 256 * ord( BMPRead( $fh, 1 ) );
@@ -707,19 +678,18 @@ sub GetBMPInfo ($) {
 
     print "Colors: $colors\n" if $::Debug{display_alpha};
 
-    BMPRead( $fh, 4 );    # skip "important" colors (don't care)
+    BMPRead( $fh, 4 );                            # skip "important" colors (don't care)
 
     my $color_table;
     my @color_table;
 
-    if ( $bitsperpixel == 4 or $bitsperpixel == 8 )
-    { #16-color bitmap has 16 * 4 byte color table (colors take up four bytes each)
+    if ( $bitsperpixel == 4 or $bitsperpixel == 8 ) {  #16-color bitmap has 16 * 4 byte color table (colors take up four bytes each)
 
         for my $i ( 1 .. 2**$bitsperpixel ) {
             my $blue  = unpack( 'H2', BMPRead( $fh, 1 ) );
             my $green = unpack( 'H2', BMPRead( $fh, 1 ) );
             my $red   = unpack( 'H2', BMPRead( $fh, 1 ) );
-            BMPRead( $fh, 1 );    #skip reserved byte (last in quad)
+            BMPRead( $fh, 1 );                         #skip reserved byte (last in quad)
             my $hex_color = "$red$green$blue";
             push @color_table, $hex_color;
             print "Color #$i: " . uc($hex_color) . "\n"
@@ -746,7 +716,7 @@ sub GetBMPInfo ($) {
 
     print "Bytes per row: $bytes_per_row\n" if $::Debug{display_alpha};
 
-    my @picture;    # array of row array references (PERL 2D array)
+    my @picture;                   # array of row array references (PERL 2D array)
     for my $row ( 1 .. $height ) {
         my $column = 1;
         my $pixel  = 1;
diff --git a/lib/Display_osd232.pm b/lib/Display_osd232.pm
index 353733615..f4f4bcd13 100644
--- a/lib/Display_osd232.pm
+++ b/lib/Display_osd232.pm
@@ -50,27 +50,26 @@ use constant osdCLRmagenta => 5;
 use constant osdCLRyellow  => 6;
 use constant osdCLRwhite   => 7;
 
-use constant osdCTLmode        => 128; # parm=1: 0=overlay, 1=full screen
-use constant osdCTLposition    => 129; # parm=2: xpos(1-28), ypos(1-11)
-use constant osdCTLclear       => 130; # parm=0: (wait 10 ms after command sent)
-use constant osdCTLvisible     => 131; # parm=1: 0=hide text, 1=show text
-use constant osdCTLtranslucent => 132; # parm=1: 0=off, 1=on
-use constant osdCTLbgcolor     => 133; # parm=1: see osdCLRxxxxxx above
-use constant osdCTLzoom =>
-  134;    # parm=3: zoom row (1-11), h-zoom (1-4), v-zoom (1-4)
-use constant osdCTLcolor   => 135;   # parm-1: see osdCLRxxxxxx above
-use constant osdCTLblink   => 136;   # parm=1: 0=off, 1=on
-use constant osdCTLreset   => 137;   # parm=0: (wait 10 ms after command sent)
-use constant osdCTLvertoff => 138;   # parm=1: vertical position offset (1-63)
-use constant osdCTLhorzoff => 139;   # parm=1: horizontal position offset (1-58)
-use constant osdCTLframe   => 140;   # parm=1: black character frame 0=off, 1=on
+use constant osdCTLmode        => 128;    # parm=1: 0=overlay, 1=full screen
+use constant osdCTLposition    => 129;    # parm=2: xpos(1-28), ypos(1-11)
+use constant osdCTLclear       => 130;    # parm=0: (wait 10 ms after command sent)
+use constant osdCTLvisible     => 131;    # parm=1: 0=hide text, 1=show text
+use constant osdCTLtranslucent => 132;    # parm=1: 0=off, 1=on
+use constant osdCTLbgcolor     => 133;    # parm=1: see osdCLRxxxxxx above
+use constant osdCTLzoom        => 134;    # parm=3: zoom row (1-11), h-zoom (1-4), v-zoom (1-4)
+use constant osdCTLcolor       => 135;    # parm-1: see osdCLRxxxxxx above
+use constant osdCTLblink       => 136;    # parm=1: 0=off, 1=on
+use constant osdCTLreset       => 137;    # parm=0: (wait 10 ms after command sent)
+use constant osdCTLvertoff     => 138;    # parm=1: vertical position offset (1-63)
+use constant osdCTLhorzoff     => 139;    # parm=1: horizontal position offset (1-58)
+use constant osdCTLframe       => 140;    # parm=1: black character frame 0=off, 1=on
 
 sub new {
-    my $classname = shift;           # What class are we constructing?
-    my $this      = {};              # Allocate new memory
+    my $classname = shift;                # What class are we constructing?
+    my $this      = {};                   # Allocate new memory
 
-    bless( $this, $classname );      # Mark it of the right type
-    $this->_init(@_);                # Call _init with remaining args
+    bless( $this, $classname );           # Mark it of the right type
+    $this->_init(@_);                     # Call _init with remaining args
     return $this;
 }
 
@@ -82,15 +81,14 @@ sub _init {
     $this->{currentpage} = 0;
     $this->{fliptimer}   = &Timer::new();
     $this->{flipping}    = 0;
-    $this->{fliparray} = [];    # Array to store list of flip-able pages
-    if (@_) {                   # Save any other initialization parameters
+    $this->{fliparray}   = [];              # Array to store list of flip-able pages
+    if (@_) {                               # Save any other initialization parameters
         my %extra = @_;
         @$this{ keys %extra } = values %extra;
     }
     $this->{PORT}  = "/dev/osd232" unless $this->{PORT};
     $this->{SPEED} = "4800"        unless $this->{SPEED};
-    &main::serial_port_create( 'osd232', $this->{PORT}, $this->{SPEED}, 'none',
-        'raw' );
+    &main::serial_port_create( 'osd232', $this->{PORT}, $this->{SPEED}, 'none', 'raw' );
     $this->reset();
 }
 
@@ -261,8 +259,7 @@ sub reset {
     $main::Serial_Ports{osd232}{object}->write( chr(osdCTLreset) );
     select undef, undef, undef, 0.02;    # delay 20ms just to be safe
     $this->{overlay} = 1 unless $this->{overlay};
-    $main::Serial_Ports{osd232}{object}
-      ->write( chr(osdCTLmode) . chr( $this->{overlay} ) );
+    $main::Serial_Ports{osd232}{object}->write( chr(osdCTLmode) . chr( $this->{overlay} ) );
     $this->clearscreen();
 }
 
@@ -306,8 +303,7 @@ set the display background color
 sub background {
     my ( $this, $color ) = @_;
 
-    $main::Serial_Ports{osd232}{object}
-      ->write( chr(osdCTLbgcolor) . chr($color) );
+    $main::Serial_Ports{osd232}{object}->write( chr(osdCTLbgcolor) . chr($color) );
 }
 
 =item C<showpage(PAGE NAME)>
@@ -573,18 +569,11 @@ sub writedisplay {
     my $outstring;
 
     foreach $line ( keys %{ $this->{LINES} } ) {
-        if ( $this->{LINES}->{$line}->{'X'} && $this->{LINES}->{$line}->{'Y'} )
-        {
-            $outstring =
-                chr(129)
-              . chr( $this->{LINES}->{$line}->{'X'} )
-              . chr( $this->{LINES}->{$line}->{'Y'} );
+        if ( $this->{LINES}->{$line}->{'X'} && $this->{LINES}->{$line}->{'Y'} ) {
+            $outstring = chr(129) . chr( $this->{LINES}->{$line}->{'X'} ) . chr( $this->{LINES}->{$line}->{'Y'} );
         }
         if ( $this->{LINES}->{$line}->{'TEXTCOLOR'} ) {
-            $outstring =
-                $outstring
-              . chr(135)
-              . chr( $this->{LINES}->{$line}->{'TEXTCOLOR'} );
+            $outstring = $outstring . chr(135) . chr( $this->{LINES}->{$line}->{'TEXTCOLOR'} );
         }
         $outstring = $outstring . $this->{LINES}->{$line}->{'TEXT'};
         $main::Serial_Ports{osd232}{object}->write($outstring);
diff --git a/lib/Door_Item.pm b/lib/Door_Item.pm
index 6ebddce8e..bd168a26f 100644
--- a/lib/Door_Item.pm
+++ b/lib/Door_Item.pm
@@ -120,14 +120,12 @@ sub set {
     }
     else {
         if ( ref $p_setby and $p_setby->can('get_set_by') ) {
-            &::print_log(
-                "Door_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
+            &::print_log( "Door_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
                   . $p_setby->get_set_by )
               if $main::Debug{occupancy};
         }
         else {
-            &::print_log(
-                "Door_Item($$self{object_name})::set($p_state, $p_setby)")
+            &::print_log("Door_Item($$self{object_name})::set($p_state, $p_setby)")
               if $main::Debug{occupancy};
         }
 
@@ -155,7 +153,7 @@ sub set {
                 $$self{m_timerCheck}->set( $$self{'inactivity_time'}, $self );
                 $$self{last_open} = $::Time;
             }
-            elsif ( $p_setby eq $$self{m_timerCheck} ) {   # Check timer expired
+            elsif ( $p_setby eq $$self{m_timerCheck} ) {    # Check timer expired
                 if ( $$self{'inactivity_action'} ) {
 
                     package main;
@@ -164,8 +162,7 @@ sub set {
                     package Door_Item;
                 }
                 else {
-                    &::print_log(
-                        "$$self{object_name} has not reported in 24 hours.");
+                    &::print_log("$$self{object_name} has not reported in 24 hours.");
                 }
                 $p_state = 'check';
             }
diff --git a/lib/Dummy_Interface.pm b/lib/Dummy_Interface.pm
index 82098b470..8dc8be08f 100644
--- a/lib/Dummy_Interface.pm
+++ b/lib/Dummy_Interface.pm
@@ -40,10 +40,7 @@ sub new {
 
     $self->firstWarning();
 
-    $self->warning(
-        "Creating dummy interface for id=$id, state=$state and interface=$interface.",
-        1
-    );
+    $self->warning( "Creating dummy interface for id=$id, state=$state and interface=$interface.", 1 );
     return $self;
 }
 
diff --git a/lib/EIB_Device.pm b/lib/EIB_Device.pm
index cd1b16ef4..0a481fc7b 100644
--- a/lib/EIB_Device.pm
+++ b/lib/EIB_Device.pm
@@ -46,10 +46,9 @@ my $EibdProtoInfo;    # Protocol specific info
 
 sub startup {
     return if $started++;
-    die
-      "Parameter eib_device has changed to eib_connection!\nPlease change ini file!\n\n"
+    die "Parameter eib_device has changed to eib_connection!\nPlease change ini file!\n\n"
       if $::config_parms{eib_device};
-    return unless my $dev = $::config_parms{eib_connection};   # Is EIB enabled?
+    return unless my $dev = $::config_parms{eib_connection};    # Is EIB enabled?
     printf " - initializing EIB connection to '$dev' ...";
     &main::print_log("Initializing EIB connection");
     if ( $dev =~ /(.+):(.+)/ ) {
@@ -75,8 +74,7 @@ sub startup {
 # Initialize BCU device
 sub initdevice {
     writedev("\x46\x01\x00\x60\x12");    # access data link layer
-    writedev("\x46\x01\x01\x16\x00")
-      ;    # set zero length address mapping table, to snoop all datagrams
+    writedev("\x46\x01\x01\x16\x00");    # set zero length address mapping table, to snoop all datagrams
 }
 
 # Reset BCU device
@@ -91,8 +89,8 @@ sub writedev {
       unless syswrite( EIB, $str, bytes::length($str) );
 }
 
-my @outqueue = ();    # Queue of messages to be sent
-my $count    = 0;     # Number of passes since last message sent
+my @outqueue = ();                       # Queue of messages to be sent
+my $count    = 0;                        # Number of passes since last message sent
 
 # Handle device I/O: Read and write messages on the bus
 sub check_for_data {
@@ -133,8 +131,7 @@ sub addr2str {
     my $b = $_[1];    # 1 if local (group) address, else physical address
     my $str;
     if ( $b == 1 ) {    # logical address used
-        $str = sprintf "%d/%d/%d", ( $a >> 11 ) & 0xf, ( $a >> 8 ) & 0x7,
-          $a & 0xff;
+        $str = sprintf "%d/%d/%d", ( $a >> 11 ) & 0xf, ( $a >> 8 ) & 0x7, $a & 0xff;
     }
     else {              # physical address used
         $str = sprintf "%d.%d.%d", $a >> 12, ( $a >> 8 ) & 0xf, $a & 0xff;
@@ -220,7 +217,7 @@ sub encode {
         str2addr( $mref->{'dst'} ),    # Destination address
         0x60 | ( $#$data + 1 ) |       # Routing, length and
           ( addrIsLogical( $mref->{'dst'} ) << 7 ),    # address type
-        0x0 | ( $APCI >> 2 ),    # TPDU type, Sequence no, APCI (msb)
+        0x0 | ( $APCI >> 2 ),                          # TPDU type, Sequence no, APCI (msb)
         ( ( $APCI & 0x3 ) << 6 ) | $$data[0],
     );
     if ( $#$data > 0 ) {
@@ -396,8 +393,7 @@ sub check_for_eibddata {
 
                 # Modify data to make it compatible to data from BCU1
                 my @tmpdat = unpack( "nna*", $buf );
-                my $data = pack "CCnnCa*", 0xbc, 0x00, $tmpdat[0], $tmpdat[1],
-                  0xe1, $tmpdat[2];
+                my $data = pack "CCnnCa*", 0xbc, 0x00, $tmpdat[0], $tmpdat[1], 0xe1, $tmpdat[2];
 
                 #print "Modified packet: ", unpack("H*",$data), "\n";
                 my $msg = decode($data);
diff --git a/lib/EIB_Items.pm b/lib/EIB_Items.pm
index 27bdcd160..05d40a595 100644
--- a/lib/EIB_Items.pm
+++ b/lib/EIB_Items.pm
@@ -82,8 +82,7 @@ sub new {
     bless $self, $class;
 
     if ( $idstr =~ /\|/ ) {
-        &main::print_log(
-            "EIB_Item: '$idstr' is a combined address vector. Ignore it")
+        &main::print_log("EIB_Item: '$idstr' is a combined address vector. Ignore it")
           if $main::config_parms{eib_errata} >= 3;
     }
     else {
@@ -188,14 +187,10 @@ sub set {
             $state = 'on';
         }
         else {
-            &main::print_log(
-                "Can't toggle EIB_Item object $self->{object_name} in state $$self{state}"
-            );
+            &main::print_log( "Can't toggle EIB_Item object $self->{object_name} in state $$self{state}" );
             return 0;
         }
-        &main::print_log(
-            "Toggling EIB_Item object $self->{object_name} from $$self{state} to $state"
-        );
+        &main::print_log( "Toggling EIB_Item object $self->{object_name} from $$self{state} to $state" );
     }
 
     $target = $self->{groupaddr} unless ( defined $target );
@@ -248,8 +243,7 @@ sub send_read_msg {
     my ( $self, $data ) = @_;
     my $msg;
 
-    &main::print_log(
-        "EIB_Item::send_read_msg: Send read message to $self->{groupaddr}")
+    &main::print_log("EIB_Item::send_read_msg: Send read message to $self->{groupaddr}")
       if $main::config_parms{eib_errata} >= 3;
 
     $msg->{'type'} = 'read';
@@ -267,8 +261,7 @@ process a message to set a value
 sub receive_write_msg {
     my ( $self, $state, $set_by, $target ) = @_;
 
-    &main::print_log(
-        "EIB_Item::receive_write_msg: new state $state set on $self")
+    &main::print_log("EIB_Item::receive_write_msg: new state $state set on $self")
       if $main::config_parms{eib_errata} >= 3;
     $self->set_receive( $state, $set_by, $target );
 }
@@ -307,26 +300,22 @@ sub receive_msg {
             if ( defined $eib_item->can("decode") ) {
                 my $state = decode $eib_item @data if ( $op ne 'read' );
 
-                &main::print_log(
-                    "EIB $op from $msg->{'src'} to $msg->{'dst'}",
-                    $op eq 'read'    ? ""
+                &main::print_log( "EIB $op from $msg->{'src'} to $msg->{'dst'}",
+                      $op eq 'read'  ? ""
                     : defined $state ? ": \"$state\""
-                    :                  ": \"[@data]\""
-                ) if $main::config_parms{eib_errata} >= 3;
+                    :                  ": \"[@data]\"" )
+                  if $main::config_parms{eib_errata} >= 3;
                 if ( $op eq 'write' ) {
-                    $eib_item->receive_write_msg( $state, $msg->{'src'},
-                        $msg->{'dst'} );
+                    $eib_item->receive_write_msg( $state, $msg->{'src'}, $msg->{'dst'} );
                 }
                 elsif ( $op eq 'reply' ) {
-                    $eib_item->receive_reply_msg( $state, $msg->{'src'},
-                        $msg->{'dst'} );
+                    $eib_item->receive_reply_msg( $state, $msg->{'src'}, $msg->{'dst'} );
                 }
             }
         } @eib_items;
     }
     else {
-        &main::print_log( "EIB $op from $msg->{'src'} to $msg->{'dst'}",
-            ". Item not found." )
+        &main::print_log( "EIB $op from $msg->{'src'} to $msg->{'dst'}", ". Item not found." )
           if $main::config_parms{eib_errata} >= 2;
     }
 }
@@ -343,8 +332,7 @@ sub start_read_timer {
     $interval = 0 + $::config_parms{eib_read_retry_interval}
       unless defined $interval;
     $self->{get_timer} = new Timer;
-    $self->{get_timer}
-      ->set( $interval, sub { EIB_Item::read_timeout($self); }, 1 );
+    $self->{get_timer}->set( $interval, sub { EIB_Item::read_timeout($self); }, 1 );
     $self->{get_timer}->start();
 }
 
@@ -474,8 +462,7 @@ translate EIS 1 data to state (on/off)
 sub decode {
     my ( $self, @data ) = @_;
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 1 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 1 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -604,10 +591,7 @@ sub new {
         $self->addStates( split ',', $main::config_parms{eib2_menu_states} );
     }
     else {
-        $self->addStates(
-            'on',  'off', 'brighten', 'dim', 'stop', '5%',
-            '30%', '60%', '100%'
-        );
+        $self->addStates( 'on', 'off', 'brighten', 'dim', 'stop', '5%', '30%', '60%', '100%' );
     }
     return $self;
 }
@@ -684,8 +668,7 @@ sub set {
         $subitem = $self->value();
     }
     else {
-        &main::print_log(
-            " $self->{object_name}: Bad EIB dimmer state \'$state\'\n");
+        &main::print_log(" $self->{object_name}: Bad EIB dimmer state \'$state\'\n");
     }
 
     $subitem->set( $state, $set_by, $target ) if ( defined $subitem );
@@ -828,8 +811,7 @@ sub set_receive {
         $dimmer->set_receive( $state, $set_by, $target );
     }
     else {
-        &main::print_log(
-            "No dimmer defined for dimmer subitem $self->{groupaddr}");
+        &main::print_log("No dimmer defined for dimmer subitem $self->{groupaddr}");
     }
 }
 
@@ -890,8 +872,7 @@ sub set {
 sub decode {
     my ( $self, @data ) = @_;
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 21 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 21 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -944,9 +925,7 @@ sub set_receive {
             delayed_read_request $value;
         }
         else {
-            &main::print_log(
-                "No dimmer value subitem for dimmer control $self->{groupaddr}"
-            );
+            &main::print_log( "No dimmer value subitem for dimmer control $self->{groupaddr}" );
         }
         $self->{dimmer_timer}->unset() if defined $self->{dimmer_timer};
     }
@@ -958,8 +937,7 @@ sub set_receive {
         $self->{dimmer_timer} = new Timer unless defined $self->{dimmer_timer};
         if ( $self->{dimmer_timer}->inactive() ) {
             my $interval = 0 + $::config_parms{eib_dimmer_timer};
-            $self->{dimmer_timer}
-              ->set( $interval, sub { EIB21_Item::dimmer_timeout($self); }, 1 );
+            $self->{dimmer_timer}->set( $interval, sub { EIB21_Item::dimmer_timeout($self); }, 1 );
         }
     }
 }
@@ -996,8 +974,7 @@ sub set_receive {
     my ( $self, $state, $set_by, $target, $read ) = @_;
 
     if ( !$read && $self->{readable} ) {
-        &main::print_log(
-            "EIB22_Item::set_receive: read_request for $self->{groupaddr}")
+        &main::print_log("EIB22_Item::set_receive: read_request for $self->{groupaddr}")
           if $main::config_parms{eib_errata} >= 3;
         $self->delayed_read_request();
     }
@@ -1045,8 +1022,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 3 ) {
-        &main::print_log(
-            "Not EIS type 3 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 3 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 3;
         return;
     }
@@ -1055,8 +1031,7 @@ sub decode {
     my $minute  = $data[2] & 0xFF;
     my $second  = $data[3] & 0xFF;
 
-    $res =
-      sprintf( "%s, %02i:%02i:%02i", $DoW[$weekday], $hour, $minute, $second );
+    $res = sprintf( "%s, %02i:%02i:%02i", $DoW[$weekday], $hour, $minute, $second );
     &main::print_log("EIS3 for $self->{groupaddr}: >$res<")
       if $main::config_parms{eib_errata} >= 3;
     return $res;
@@ -1104,8 +1079,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 3 ) {
-        &main::print_log(
-            "Not EIS type 4 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 4 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 3;
         return;
     }
@@ -1157,8 +1131,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 2 ) {
-        &main::print_log(
-            "Not EIS type 5 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 5 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1213,8 +1186,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 1 ) {
-        &main::print_log(
-            "Not EIS type 6 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 6 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1266,8 +1238,7 @@ sub set_receive {
       if $main::config_parms{eib_errata} >= 3;
 
     if ( !$read && $self->{readable} ) {
-        &main::print_log(
-            "EIB6_Item::set_receive: read_request for $self->{groupaddr}")
+        &main::print_log("EIB6_Item::set_receive: read_request for $self->{groupaddr}")
           if $main::config_parms{eib_errata} >= 3;
         $self->delayed_read_request();
     }
@@ -1313,8 +1284,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 8 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 8 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1373,14 +1343,11 @@ sub decode {
     my $res;
 
     unless ( $#data == 4 ) {
-        &main::print_log(
-            "Not EIS type 9 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 9 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
-    my $res = unpack "f", pack "L",
-      ( ( $data[1] << 24 ) | ( $data[2] << 16 ) | ( $data[3] << 8 ) |
-          $data[4] );
+    my $res = unpack "f", pack "L", ( ( $data[1] << 24 ) | ( $data[2] << 16 ) | ( $data[3] << 8 ) | $data[4] );
 
     #    &main::print_log("EIS9 for $self->{groupaddr}: >$res<");
     return $res;
@@ -1392,15 +1359,7 @@ sub encode {
     $res = unpack "L", pack "f", $state;
 
     #&main::print_log("Res: $res State: $state \n");
-    return (
-        [
-            0,
-            ( $res & 0xff000000 ) >> 24,
-            ( $res & 0xff0000 ) >> 16,
-            ( $res & 0xff00 ) >> 8,
-            $res & 0xff
-        ]
-    );
+    return ( [ 0, ( $res & 0xff000000 ) >> 24, ( $res & 0xff0000 ) >> 16, ( $res & 0xff00 ) >> 8, $res & 0xff ] );
 }
 
 =head2 EIB10_Item
@@ -1422,8 +1381,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 2 ) {
-        &main::print_log(
-            "Not EIS type 10 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 10 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1458,8 +1416,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 2 ) {
-        &main::print_log(
-            "Not EIS type 10.1 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 10.1 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1504,8 +1461,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 4 ) {
-        &main::print_log(
-            "Not EIS type 11 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 11 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1519,15 +1475,7 @@ sub decode {
 sub encode {
     my ( $self, $state ) = @_;
 
-    return (
-        [
-            0,
-            ( $state & 0xff000000 ) >> 24,
-            ( $state & 0xff0000 ) >> 16,
-            ( $state & 0xff00 ) >> 8,
-            $state & 0xff
-        ]
-    );
+    return ( [ 0, ( $state & 0xff000000 ) >> 24, ( $state & 0xff0000 ) >> 16, ( $state & 0xff00 ) >> 8, $state & 0xff ] );
 }
 
 =head2 EIB11.1_Item
@@ -1549,8 +1497,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 4 ) {
-        &main::print_log(
-            "Not EIS type 11 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 11 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1577,15 +1524,7 @@ sub encode {
     }
 
     #&main::print_log("Res: $res State: $state \n");
-    return (
-        [
-            0,
-            ( $res & 0xff000000 ) >> 24,
-            ( $res & 0xff0000 ) >> 16,
-            ( $res & 0xff00 ) >> 8,
-            $res & 0xff
-        ]
-    );
+    return ( [ 0, ( $res & 0xff000000 ) >> 24, ( $res & 0xff0000 ) >> 16, ( $res & 0xff00 ) >> 8, $res & 0xff ] );
 }
 
 =head2 EIB14_Item
@@ -1607,8 +1546,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 1 ) {
-        &main::print_log(
-            "Not EIS type 14 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 14 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1657,8 +1595,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 1 ) {
-        &main::print_log(
-            "Not EIS type 14.1 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 14.1 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1705,8 +1642,7 @@ sub set_receive {
     my ( $self, $state, $set_by, $target, $read ) = @_;
 
     if ( !$read && $self->{readable} ) {
-        &main::print_log(
-            "EIB14_1_Item::set_receive: read_request for $self->{groupaddr}")
+        &main::print_log("EIB14_1_Item::set_receive: read_request for $self->{groupaddr}")
           if $main::config_parms{eib_errata} >= 3;
         $self->delayed_read_request();
     }
@@ -1808,8 +1744,7 @@ sub set {
         $subitem = $self->{Step};
     }
     else {
-        &main::print_log(
-            " $self->{object_name}: Bad EIB drive state \'$state\'\n");
+        &main::print_log(" $self->{object_name}: Bad EIB drive state \'$state\'\n");
         return;
     }
     $subitem->set( $state, $set_by, $target );
@@ -1881,8 +1816,7 @@ sub eis_type {
 sub decode {
     my ( $self, @data ) = @_;
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 71 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 71 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1926,8 +1860,7 @@ sub eis_type {
 sub decode {
     my ( $self, @data ) = @_;
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 72 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 72 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -1957,8 +1890,7 @@ sub eis_type {
 sub decode {
     my ( $self, @data ) = @_;
     unless ( $#data == 0 ) {
-        &main::print_log(
-            "Not EIS type 73 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 73 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -2004,8 +1936,7 @@ sub decode {
     my $res;
 
     unless ( $#data == 14 ) {
-        &main::print_log(
-            "Not EIS type 15 data received for $self->{groupaddr}: \[@data\]")
+        &main::print_log("Not EIS type 15 data received for $self->{groupaddr}: \[@data\]")
           if $main::config_parms{eib_errata} >= 2;
         return;
     }
@@ -2167,8 +2098,7 @@ sub set_receive {
         $window->set_receive( $state, $set_by, $target );
     }
     else {
-        &main::print_log(
-            "No window defined for window subitem $self->{groupaddr}");
+        &main::print_log("No window defined for window subitem $self->{groupaddr}");
     }
 }
 
diff --git a/lib/Eliza.pm b/lib/Eliza.pm
index d639b0777..42f8a804e 100644
--- a/lib/Eliza.pm
+++ b/lib/Eliza.pm
@@ -426,8 +426,7 @@ sub command_interface {
     print $self->botprompt if $self->prompts_on;
 
     # Print an initial greeting
-    print
-      "$self->{initial}->[ int &{$self->{myrand}}( scalar @{ $self->{initial} } ) ]\n";
+    print "$self->{initial}->[ int &{$self->{myrand}}( scalar @{ $self->{initial} } ) ]\n";
 
     ###################################################################
     # command loop.  This loop should go on forever,
@@ -443,8 +442,7 @@ sub command_interface {
         # If the user wants to quit,
         # print out a farewell and quit.
         if ( $self->_testquit($user_input) ) {
-            $reply =
-              "$self->{final}->[ int &{$self->{myrand}}( scalar @{$self->{final}} ) ]";
+            $reply = "$self->{final}->[ int &{$self->{myrand}}( scalar @{$self->{final}} ) ]";
             print $self->botprompt if $self->prompts_on;
             print "$reply\n";
             last;
@@ -519,8 +517,7 @@ sub preprocess {
     WORD: for ( $i = 0; $i < @wordsin; $i++ ) {
         foreach $keyword ( keys %{ $self->{pre} } ) {
             if ( $wordsin[$i] =~ /\b$keyword\b/i ) {
-                ( $wordsout[$i] = $wordsin[$i] ) =~
-                  s/$keyword/$self->{pre}->{$keyword}/ig;
+                ( $wordsout[$i] = $wordsin[$i] ) =~ s/$keyword/$self->{pre}->{$keyword}/ig;
                 next WORD;
             }
         }
@@ -555,8 +552,7 @@ sub postprocess {
     WORD: for ( $i = 0; $i < @wordsin; $i++ ) {
         foreach $keyword ( keys %{ $self->{post} } ) {
             if ( $wordsin[$i] =~ /\b$keyword\b/i ) {
-                ( $wordsout[$i] = $wordsin[$i] ) =~
-                  s/$keyword/$self->{post}->{$keyword}/ig;
+                ( $wordsout[$i] = $wordsin[$i] ) =~ s/$keyword/$self->{post}->{$keyword}/ig;
                 next WORD;
             }
         }
@@ -678,10 +674,8 @@ sub transform {
       if $use_memory;
 
     my (
-        $i,           @string_parts, $string_part,   $rank,
-        $goto,        $reasmb,       $keyword,       $decomp,
-        $this_decomp, $reasmbkey,    @these_reasmbs, @decomp_matches,
-        $synonyms,    $synonym_index
+        $i,      @string_parts, $string_part, $rank,          $goto,           $reasmb,   $keyword,
+        $decomp, $this_decomp,  $reasmbkey,   @these_reasmbs, @decomp_matches, $synonyms, $synonym_index
     );
 
     # Default to a really low rank.
@@ -716,8 +710,7 @@ sub transform {
                 # the rank of that keyword.
                 $rank = $self->{keyranks}->{$keyword};
 
-                $self->debug_text(
-                    $self->debug_text . sprintf "\t$rank> $keyword" );
+                $self->debug_text( $self->debug_text . sprintf "\t$rank> $keyword" );
 
                 # Now let's check all the decomposition rules for that keyword.
                 DECOMP:
@@ -736,12 +729,10 @@ sub transform {
                         ( $synonym_index = $this_decomp ) =~ s/.*\@(\w*).*/$1/i;
                         $synonyms =
                           join( '|', @{ $self->{synon}->{$synonym_index} } );
-                        $this_decomp =~
-                          s/(.*)\@$synonym_index(.*)/$1($synonym_index\|$synonyms)$2/g;
+                        $this_decomp =~ s/(.*)\@$synonym_index(.*)/$1($synonym_index\|$synonyms)$2/g;
                     }
 
-                    $self->debug_text(
-                        $self->debug_text . sprintf "\n\t\t: $decomp" );
+                    $self->debug_text( $self->debug_text . sprintf "\n\t\t: $decomp" );
 
                     # Using the regular expression we just generated,
                     # match against the input string.  Use empty "()"'s to
@@ -752,10 +743,8 @@ sub transform {
                         # then create an array, so that we can refer to matches
                         # to individual wildcards.  Use '0' as a placeholder
                         # (we don't want to refer to any "zeroth" wildcard).
-                        @decomp_matches =
-                          ( "0", $1, $2, $3, $4, $5, $6, $7, $8, $9 );
-                        $self->debug_text( $self->debug_text
-                              . sprintf " : @decomp_matches\n" );
+                        @decomp_matches = ( "0", $1, $2, $3, $4, $5, $6, $7, $8, $9 );
+                        $self->debug_text( $self->debug_text . sprintf " : @decomp_matches\n" );
 
                         # Using the keyword and the decomposition rule,
                         # reconstruct a key for the list of reassamble rules.
@@ -764,16 +753,13 @@ sub transform {
                         # Get the list of possible reassembly rules for this key.
                         #
                         if ( defined $use_memory
-                            and
-                            $#{ $self->{reasmblist_for_memory}->{$reasmbkey} }
-                            >= 0 )
+                            and $#{ $self->{reasmblist_for_memory}->{$reasmbkey} } >= 0 )
                         {
 
                             # If this transform function was invoked with the memory flag,
                             # and there are in fact reassembly rules which are appropriate
                             # for pulling out of memory, then include them.
-                            @these_reasmbs =
-                              @{ $self->{reasmblist_for_memory}->{$reasmbkey} }
+                            @these_reasmbs = @{ $self->{reasmblist_for_memory}->{$reasmbkey} }
 
                         }
                         else {
@@ -785,18 +771,15 @@ sub transform {
                         }
 
                         # Pick out a reassembly rule at random.
-                        $reasmb = $these_reasmbs[ int &{ $self->{myrand} }
-                          ( scalar @these_reasmbs ) ];
+                        $reasmb = $these_reasmbs[ int &{ $self->{myrand} }( scalar @these_reasmbs ) ];
 
-                        $self->debug_text(
-                            $self->debug_text . sprintf "\t\t-->  $reasmb\n" );
+                        $self->debug_text( $self->debug_text . sprintf "\t\t-->  $reasmb\n" );
 
                         # If the reassembly rule we picked contains the word "goto",
                         # then we start over with a new keyword.  Set $keyword to equal
                         # that word, and start the whole loop over.
                         if ( $reasmb =~ m/^goto\s(\w*).*/i ) {
-                            $self->debug_text(
-                                $self->debug_text . sprintf "\$1 = $1\n" );
+                            $self->debug_text( $self->debug_text . sprintf "\$1 = $1\n" );
                             $goto = $keyword = $1;
                             $rank = -2;
                             redo KEYWORD;
@@ -821,9 +804,9 @@ sub transform {
 
                     $self->debug_text( $self->debug_text . sprintf "\n" );
 
-                } # End DECOMP: foreach $decomp (@{ $self->{decomplist}->{$keyword} })
+                }    # End DECOMP: foreach $decomp (@{ $self->{decomplist}->{$keyword} })
 
-            }  # End if ( ($string_part =~ /\b$keyword\b/i or $keyword eq $goto)
+            }    # End if ( ($string_part =~ /\b$keyword\b/i or $keyword eq $goto)
 
         }    # End KEYWORD: foreach $keyword (keys %{ $self->{decomplist})
 
@@ -870,8 +853,7 @@ script data only has 4 such items.
             and &{ $self->{myrand} }() <= $self->likelihood_of_using_memory )
         {
 
-            $reasmb =
-              $self->transform( shift @{ $self->memory }, "use memory" );
+            $reasmb = $self->transform( shift @{ $self->memory }, "use memory" );
 
         }
         elsif ( !$string ) {
@@ -902,9 +884,7 @@ script data only has 4 such items.
         shift @{ $self->memory }
           if $#{ $self->memory } >= $self->max_memory_size;
 
-        $self->debug_text( $self->debug_text
-              . sprintf( "\t%d item(s) in memory.\n", $#{ $self->memory } + 1 )
-        );
+        $self->debug_text( $self->debug_text . sprintf( "\t%d item(s) in memory.\n", $#{ $self->memory } + 1 ) );
 
     }    # End if ($reasmb eq "")
 
@@ -1078,8 +1058,7 @@ sub parse_script_data {
             /final/   and do { push @{ $self->{final} },   $entry; last; };
 
             /decomp/ and do {
-                die
-                  "$0: error parsing script:  decomposition rule with no keyword.\n"
+                die "$0: error parsing script:  decomposition rule with no keyword.\n"
                   if $thiskey eq "";
                 $thisdecomp = join( $;, $thiskey, $entry );
                 push @{ $self->{decomplist}->{$thiskey} }, $entry;
@@ -1087,16 +1066,14 @@ sub parse_script_data {
             };
 
             /reasmb/ and do {
-                die
-                  "$0: error parsing script:  reassembly rule with no decomposition rule.\n"
+                die "$0: error parsing script:  reassembly rule with no decomposition rule.\n"
                   if $thisdecomp eq "";
                 push @{ $self->{reasmblist}->{$thisdecomp} }, $entry;
                 last;
             };
 
             /reasm_for_memory/ and do {
-                die
-                  "$0: error parsing script:  reassembly rule with no decomposition rule.\n"
+                die "$0: error parsing script:  reassembly rule with no decomposition rule.\n"
                   if $thisdecomp eq "";
                 push @{ $self->{reasmblist_for_memory}->{$thisdecomp} }, $entry;
                 last;
diff --git a/lib/Fan_Control.pm b/lib/Fan_Control.pm
index 7a6adcfff..521c573a7 100644
--- a/lib/Fan_Control.pm
+++ b/lib/Fan_Control.pm
@@ -47,10 +47,8 @@ sub startup {
         and $main::config_parms{fancontrol_host}
         and $main::config_parms{fancontrol_port} )
     {
-        my $port =
-          "$main::config_parms{fancontrol_host}:$main::config_parms{fancontrol_port}";
-        $fan_socket =
-          new Socket_Item( undef, undef, $port, 'fancontrol', 'tcp', 'record' );
+        my $port = "$main::config_parms{fancontrol_host}:$main::config_parms{fancontrol_port}";
+        $fan_socket = new Socket_Item( undef, undef, $port, 'fancontrol', 'tcp', 'record' );
         start $fan_socket;
         &::MainLoop_pre_add_hook( \&Fan_Control::check_for_data, 'persistent' );
     }
@@ -70,8 +68,7 @@ sub check_for_data {
                 #print STDERR "Setting fan $1 to state", lc $2, "\n";
                 #&main::print_log("Setting fan $1 to state" . lc($2));
                 if ( $fan_control_lights{$1}->{'already_set'} ) {
-                    $fan_control_lights{$1}
-                      ->set_states_for_next_pass( lc($2), 'remote' );
+                    $fan_control_lights{$1}->set_states_for_next_pass( lc($2), 'remote' );
                 }
                 else {
                     $fan_control_lights{$1}->{'already_set'} = 1;
diff --git a/lib/File_Item.pm b/lib/File_Item.pm
index 1d0fbfbaa..d21b4f871 100644
--- a/lib/File_Item.pm
+++ b/lib/File_Item.pm
@@ -120,8 +120,7 @@ sub changed {
             return $self->{flag};
         }
         else {
-            return
-              $diff;   # Return number of seconds it was since the watch was set
+            return $diff;           # Return number of seconds it was since the watch was set
         }
     }
     else {
@@ -220,9 +219,8 @@ sub said {
         # On startup, point pointer to the tail of the file
         while (<$handle>) { }
         $$self{index} = tell $handle;
-        print
-          "File_Item said method for $$self{file} opened to index $$self{index}\n";
-        return;    # No new data on startup
+        print "File_Item said method for $$self{file} opened to index $$self{index}\n";
+        return;          # No new data on startup
     }
     seek $handle, $$self{index}, 0;    # Go to where the last data was read
     my $data = <$handle>;              # One record per call
diff --git a/lib/FroggyRita.pm b/lib/FroggyRita.pm
index debf3a965..c3333e4e6 100644
--- a/lib/FroggyRita.pm
+++ b/lib/FroggyRita.pm
@@ -178,14 +178,11 @@ sub Ribbit {
         }
         else {               # deal with "00" command (identification)
             &CheckIdentification($Data);
-            &::logit(
-                "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
-                "Device $FroggyFD Initialized"
-            ) if ($HaveIdent);
-            &::logit(
-                "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
-                "Device $FroggyFD Reinitialized (bad data)"
-            ) if ( $BadData > 0 );
+            &::logit( "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log", "Device $FroggyFD Initialized" )
+              if ($HaveIdent);
+            &::logit( "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
+                "Device $FroggyFD Reinitialized (bad data)" )
+              if ( $BadData > 0 );
             $self->SUPER::set( 'identify', 'serial' );
         }
 
@@ -193,8 +190,7 @@ sub Ribbit {
     else {
         my $timestamp = $main::Time_Date;
         $BadData++;
-        print
-          "FroggyRita.pm $timestamp : Invalid data received from Froggy [$Data] count=$BadData\n"
+        print "FroggyRita.pm $timestamp : Invalid data received from Froggy [$Data] count=$BadData\n"
           if ( ( $Main::Time_Startup_time + 60 ) < time() and $Data );
         &::logit(
             "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
@@ -222,10 +218,8 @@ sub new {
         init( $::Serial_Ports{$FroggyFD}{object} );
         print "FroggyRita.pm initialized FroggyRita on port $port at 300 baud\n"
           if $main::Debug{froggyrita};
-        &::logit(
-            "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
-            "Initializing FroggyRita on port $port at 300 baud"
-        );
+        &::logit( "$::config_parms{data_dir}/logs/$FroggyFD.$::Year_Month_Now.log",
+            "Initializing FroggyRita on port $port at 300 baud" );
     }
 
     my $self = {};
@@ -245,8 +239,7 @@ sub CalcData {
 
     # validate identity string
     if ( CheckSum($Data) != 0 ) {
-        print
-          "FroggyRita.pm: checksum incorrect, invalid FroggyRita Data [$Data]\n"
+        print "FroggyRita.pm: checksum incorrect, invalid FroggyRita Data [$Data]\n"
           if $main::Debug{froggyrita};
         return;
     }
@@ -276,9 +269,7 @@ sub CalcData {
         $Temp = ( 200 + $DT * ( $C6 + 50 ) / 1024 ) / 10;
     }
     else {
-        $DT =
-          ( $D2 - $UT1 ) -
-          ( ( ( $D2 - $UT1 ) / 128 ) * ( ( $D2 - $UT1 ) / 128 ) ) / 4;
+        $DT = ( $D2 - $UT1 ) - ( ( ( $D2 - $UT1 ) / 128 ) * ( ( $D2 - $UT1 ) / 128 ) ) / 4;
         $Temp = ( 200 + $DT * ( $C6 + 50 ) / 1024 + $DT / 256 ) / 10;
     }
 
@@ -308,9 +299,7 @@ sub CalcData {
     }
     else {
 
-        my $Imped =
-          ( $Rs / 1000 ) /
-          ( ( ( 2**$NbBits ) / $Hmeasure ) - 1 - ( $Rs / $Rp ) );
+        my $Imped = ( $Rs / 1000 ) / ( ( ( 2**$NbBits ) / $Hmeasure ) - 1 - ( $Rs / $Rp ) );
 
         my $A = 1.0;
 
@@ -343,15 +332,9 @@ sub CalcData {
         $D4 = -2.454383e-6;
 
         $Hum = ( $A * $A1 ) + ( $B * $A2 ) + ( $C * $A3 ) + ( $D * $A4 );
-        $Hum +=
-          $Temp * $A * $B1 +
-          $Temp * $B * $B2 +
-          $Temp * $C * $B3 +
-          $Temp * $D * $B4;
-        $Hum +=
-          $T2 * $A * $C1 + $T2 * $B * $C2 + $T2 * $C * $C3 + $T2 * $D * $C4;
-        $Hum +=
-          $T3 * $A * $D1 + $T3 * $B * $D2 + $T3 * $C * $D3 + $T3 * $D * $D4;
+        $Hum += $Temp * $A * $B1 + $Temp * $B * $B2 + $Temp * $C * $B3 + $Temp * $D * $B4;
+        $Hum += $T2 * $A * $C1 + $T2 * $B * $C2 + $T2 * $C * $C3 + $T2 * $D * $C4;
+        $Hum += $T3 * $A * $D1 + $T3 * $B * $D2 + $T3 * $C * $D3 + $T3 * $D * $D4;
 
         if ( $Hum > 100.0 ) { $Hum = 100.0 }
         if ( $Hum < 0.0 )   { $Hum = 0.0 }
@@ -376,8 +359,7 @@ sub CheckIdentification {
 
     # validate identity string
     if ( CheckSum($Identity) != 0 ) {
-        print
-          "FroggyRita.pm: Checksum incorrect, invalid identification [$Identity]\n";
+        print "FroggyRita.pm: Checksum incorrect, invalid identification [$Identity]\n";
         return;
     }
 
@@ -426,8 +408,8 @@ sub CheckSum {
     return 1 if $Str !~ /G/;
     return 2 if $Str !~ /Z/;
 
-    my $Data     = substr( $Str, 1,  -3 );   # start from second to 3rd last ..Z
-    my $CkSumStr = substr( $Str, -3, 2 );    # start from second to 3rd last ..Z
+    my $Data     = substr( $Str, 1,  -3 );    # start from second to 3rd last ..Z
+    my $CkSumStr = substr( $Str, -3, 2 );     # start from second to 3rd last ..Z
 
     my $SLen = length($Str);
     return 3 if $SLen % 2 == 1;
diff --git a/lib/Generic_Item.pm b/lib/Generic_Item.pm
index 6b4c6c2f0..37d97ad6d 100644
--- a/lib/Generic_Item.pm
+++ b/lib/Generic_Item.pm
@@ -143,8 +143,7 @@ This method is called internally whenever a property (instance variable) is chan
 
 sub property_changed {
     my ( $self, $property, $new_value, $old_value ) = @_;
-    print "s=$self: property_changed: $property ='$new_value' (was"
-      . " '$old_value')\n"
+    print "s=$self: property_changed: $property ='$new_value' (was" . " '$old_value')\n"
       if $::Debug{store};
 }
 
@@ -229,7 +228,7 @@ sub set_with_timer {
     # Reuse timer for this object if it exists
     $$self{timer} = &Timer::new() unless $$self{timer};
     my $object = $self->{object_name};
-    my $action = "set $object '$state_change', $object"; # Set set_by to itself?
+    my $action = "set $object '$state_change', $object";    # Set set_by to itself?
     &Timer::set( $$self{timer}, $time, $action );
 }
 
@@ -269,8 +268,7 @@ sub _set_process {
         else {
             $state = ( $state_current eq 'on' ) ? 'off' : 'on';
         }
-        &main::print_log( "Toggling $self->{object_name} from $state_current "
-              . "to $state" );
+        &main::print_log( "Toggling $self->{object_name} from $state_current " . "to $state" );
     }
 
     # Respond_Target is write-only from here (and its use for speech chimes
@@ -289,9 +287,7 @@ sub _set_process {
             return if $self->$setcall( $substate, $set_by, $respond ) == -1;
         }
         elsif ( $self->can('default_setstate') ) {
-            my $test =
-              $self->default_setstate( $primarystate, $substate,
-                $set_by, $respond );
+            my $test = $self->default_setstate( $primarystate, $substate, $set_by, $respond );
             return if $test and $test == -1;
         }
         elsif ( $self->can('default_setrawstate') ) {
@@ -303,8 +299,7 @@ sub _set_process {
     # Allow for default setstate methods
     else {
         if ( $self->can('default_setstate') ) {
-            my $test =
-              $self->default_setstate( $state, undef, $set_by, $respond );
+            my $test = $self->default_setstate( $state, undef, $set_by, $respond );
             return if $test and $test == -1;
         }
         elsif ( $self->can('default_setrawstate') ) {
@@ -390,9 +385,7 @@ Returns true when the object has had no state changes since the specified time.
 
 sub time_idle {
     my ( $self, $idle_spec ) = @_;
-    if ( my ( $idle_time, $idle_type, $idle_state ) =
-        $idle_spec =~ /^(\d+)\s*(D|H|M|S)*\w*\s*(\S*)/i )
-    {
+    if ( my ( $idle_time, $idle_type, $idle_state ) = $idle_spec =~ /^(\d+)\s*(D|H|M|S)*\w*\s*(\S*)/i ) {
         my $state = $self->state();
         if ( $idle_state eq undef or $idle_state eq $state ) {
             my $scale = 1;
@@ -423,29 +416,22 @@ sub restore_string {
       if defined $state;
     $restore_string .= $self->{object_name} . "->{count} = q~$self->{count}~;\n"
       if $self->{count};
-    $restore_string .=
-      $self->{object_name} . "->{set_time} =" . " q~$self->{set_time}~;\n"
+    $restore_string .= $self->{object_name} . "->{set_time} =" . " q~$self->{set_time}~;\n"
       if $self->{set_time};
     $restore_string .= $self->{object_name} . "->{states_casesensitive} = 1;\n"
       if $self->{states_casesensitive};
 
-    if ( $self->{state_log}
-        and my $state_log = join $;, @{ $self->{state_log} } )
-    {
+    if ( $self->{state_log} and my $state_log = join $;, @{ $self->{state_log} } ) {
         $state_log =~ s/\n/ /g;    # Avoid new-lines on restored vars
         $state_log =~ s/~/\\~/g;
 
-        $restore_string .= '@{'
-          . $self->{object_name}
-          . "->{state_log}} ="
-          . " split(\$;, q~$state_log~);";
+        $restore_string .= '@{' . $self->{object_name} . "->{state_log}} =" . " split(\$;, q~$state_log~);";
     }
 
     # Allow for dynamicaly/user defined save data
     for my $restore_var ( @{ $$self{restore_data} } ) {
         my $restore_value = $self->{$restore_var};
-        $restore_string .=
-          $self->{object_name} . "->{$restore_var} =" . " q~$restore_value~;\n"
+        $restore_string .= $self->{object_name} . "->{$restore_var} =" . " q~$restore_value~;\n"
           if defined $restore_value;
     }
 
@@ -477,8 +463,7 @@ sub hidden {
         $self->{hidden} = $flag;
     }
     else {    # Return it, but this currently only will work on $Reload.
-        return $self->{hidden}
-          ; # HP - really, no reason why this can't be a read-only method any time?
+        return $self->{hidden};    # HP - really, no reason why this can't be a read-only method any time?
     }
 }
 
@@ -625,13 +610,8 @@ sub respond {
     }
 
     $set_by = &main::set_by_to_target( $set_by, 1 );
-    my $automation = (
-            !$set_by
-          or $set_by =~ /usercode/i
-          or $set_by =~ /unknown/i
-          or $set_by =~ /time/i
-          or $set_by eq 'status'
-    );
+    my $automation =
+      ( !$set_by or $set_by =~ /usercode/i or $set_by =~ /unknown/i or $set_by =~ /time/i or $set_by eq 'status' );
 
     # cancel automation (regardless) if an explicit target is set
     $automation = 0 if $parms{target} or $object->{target};
@@ -1130,11 +1110,7 @@ sub set_state_log {
     $state       = '' unless defined $state;
     $set_by_name = '' unless defined $set_by_name;
     $target      = '' unless defined $target;
-    unshift(
-        @{ $$self{state_log} },
-        "$main::Time_Date $state set_by=$set_by_name"
-          . ( ($target) ? "target=$target" : '' )
-      )
+    unshift( @{ $$self{state_log} }, "$main::Time_Date $state set_by=$set_by_name" . ( ($target) ? "target=$target" : '' ) )
       if defined($state)
       or ( ref $self ) eq 'Voice_Cmd';
     pop @{ $$self{state_log} }
@@ -1161,7 +1137,7 @@ sub reset_states2 {
     $ref->{target}        = $target;
     $ref->{legacy_target} = &main::set_by_to_target($set_by)
       unless $ref->{target}
-      ; # just for old code and will be phased out along with old respond calls (done for speed in said and state_now methods)
+      ;    # just for old code and will be phased out along with old respond calls (done for speed in said and state_now methods)
 
     if (
            ( defined $state  and !defined $ref->{state_prev} )
@@ -1415,9 +1391,8 @@ sub set_web_style {
     my %valid_styles = map { $_ => 1 } qw( dropdown radio url );
 
     if ( !$valid_styles{ lc($style) } ) {
-        &main::print_log( "Invalid style ($style) passed to set_web_style.  "
-              . "Valid choices are: "
-              . join( ", ", sort keys %valid_styles ) );
+        &main::print_log(
+            "Invalid style ($style) passed to set_web_style.  " . "Valid choices are: " . join( ", ", sort keys %valid_styles ) );
         return;
     }
 
@@ -1567,12 +1542,8 @@ sub android_xml {
 
     # Add tags name, state, and optional state_log
     my @f = qw( name );
-    if (
-        (
-            ( defined $self->{states} ) && ( scalar( @{ $$self{states} } ) > 0 )
-        )
-        || ( defined $self->state() )
-      )
+    if (   ( ( defined $self->{states} ) && ( scalar( @{ $$self{states} } ) > 0 ) )
+        || ( defined $self->state() ) )
     {
         push @f, qw ( state );
     }
@@ -1612,9 +1583,7 @@ sub android_xml {
             push( @states, @{ $$self{states} } ) if defined $self->{states};
             my $numStates = scalar(@states);
             my $state     = $self->state();
-            &::print_log(
-                "android_xml: numStates: $numStates state: $state states: @states"
-            ) if $::Debug{android};
+            &::print_log( "android_xml: numStates: $numStates state: $state states: @states" ) if $::Debug{android};
             if (   ( $numStates eq 0 )
                 && ( defined $state )
                 && ( length($state) < 20 ) )
@@ -1631,8 +1600,7 @@ sub android_xml {
             foreach (@states) {
                 $_ = 'undef' unless defined $_;
                 if ( $_ eq $value ) {
-                    $attributes->{value} =
-                      encode_entities( $value, "\200-\377&<>" );
+                    $attributes->{value} = encode_entities( $value, "\200-\377&<>" );
                 }
             }
             $xml_objects .= $self->android_xml_tag( $prefix, $f, $attributes );
@@ -1641,9 +1609,7 @@ sub android_xml {
                 $_     = 'undef' unless defined $_;
                 $value = $_;
                 $value = encode_entities( $value, "\200-\377&<>" );
-                $xml_objects .=
-                  $self->android_xml_tag( $prefix, "value", $attributes,
-                    $value );
+                $xml_objects .= $self->android_xml_tag( $prefix, "value", $attributes, $value );
             }
             $prefix = '  ' x $depth;
             $xml_objects .= $prefix . "</$f>\n";
@@ -1657,9 +1623,7 @@ sub android_xml {
                 $_     = 'undef' unless defined $_;
                 $value = $_;
                 $value = encode_entities( $value, "\200-\377&<>" );
-                $xml_objects .=
-                  $self->android_xml_tag( $prefix, "value", $attributes,
-                    $value );
+                $xml_objects .= $self->android_xml_tag( $prefix, "value", $attributes, $value );
             }
             $prefix = '  ' x $depth;
             $xml_objects .= $prefix . "</$f>\n";
@@ -1667,13 +1631,11 @@ sub android_xml {
         elsif ( $f eq "name" ) {
             my $name = "";
             $name = $self->{object_name} if defined $self->{object_name};
-            $xml_objects .=
-              $self->android_xml_tag( $prefix, $f, $attributes, $name );
+            $xml_objects .= $self->android_xml_tag( $prefix, $f, $attributes, $name );
         }
         else {
             $value = "" unless defined $value;
-            $xml_objects .=
-              $self->android_xml_tag( $prefix, $f, $attributes, $value );
+            $xml_objects .= $self->android_xml_tag( $prefix, $f, $attributes, $value );
         }
     }
     return $xml_objects;
diff --git a/lib/Group.pm b/lib/Group.pm
index 92d9de888..ee7a811cd 100644
--- a/lib/Group.pm
+++ b/lib/Group.pm
@@ -116,7 +116,7 @@ sub add {
           and $ref->{states}
           and !$ref->isa('X10_Sensor')
           and !$ref->isa('X10_Item')
-          ; #***Use the first item found with states for the moment (Need to fix this to aggregate states!)
+          ;    #***Use the first item found with states for the moment (Need to fix this to aggregate states!)
 
     }
     my $count = 1;
@@ -164,12 +164,10 @@ sub set {
     if ( $state =~ /member changed/ ) {
         $state = $set_by->{state};
 
-        print
-          "Group member set: set_by=$set_by member=$set_by->{object_name} state=$state\n"
+        print "Group member set: set_by=$set_by member=$set_by->{object_name} state=$state\n"
           if $main::Debug{group};
 
-        &Generic_Item::set_states_for_next_pass( $self, "member $state",
-            $set_by );
+        &Generic_Item::set_states_for_next_pass( $self, "member $state", $set_by );
 
         # Log only when a different member fires
         # This allows us to do stuff like movement direction detection easier
@@ -196,8 +194,7 @@ sub set {
     my $item;
     my $controller;
 
-    $x10_state = grep $_ eq $state,
-      ( split ',', $main::config_parms{x10_menu_states} );
+    $x10_state = grep $_ eq $state, ( split ',', $main::config_parms{x10_menu_states} );
 
     my @fancy_controllers;    #cm11, stargate, etc.
     my @group = @{ $ref->{members} };
@@ -216,34 +213,28 @@ sub set {
       if ( $main::Debug{group} );
 
     if ($x10_state) {
-        $x10_dim_state =
-          !( $state =~ /^on$/i or $state =~ /^off$/i or $state =~ /^status/i );
+        $x10_dim_state = !( $state =~ /^on$/i or $state =~ /^off$/i or $state =~ /^status/i );
         if ( $#fancy_controllers == -1 ) {
             set_group_items( $ref, $state );
         }
         else {
 
-            my $house_codes = "ABCDEFGHIJKLMNOP";
-            my %house_code_last_ref =
-              qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
+            my $house_codes         = "ABCDEFGHIJKLMNOP";
+            my %house_code_last_ref = qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
 
             #count of X10 items in house code
-            my %house_code_item_count =
-              qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
+            my %house_code_item_count = qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
 
             #count of X10 items in house code for this group
-            my %house_code_group_item_count =
-              qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
+            my %house_code_group_item_count = qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
 
             #count of X10 appliances in house code for this group
-            my %house_code_group_appliance_count =
-              qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
+            my %house_code_group_appliance_count = qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
 
             #count of LM14's in house code for this group (these love to lock up the cm11 when sending back extended status while the cm11 is busy, so do them last) (***Not currently implemented as LM14 extended status can be turned off with config command)
-            my %house_code_group_lm14_count =
-              qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
-            my $last_ref = $group[-1];
-            my $i        = 0;
+            my %house_code_group_lm14_count = qw(A 0 B 0 C 0 D 0 E 0 F 0 G 0 H 0 I 0 J 0 K 0 L 0 M 0 N 0 O 0 P 0);
+            my $last_ref                    = $group[-1];
+            my $i                           = 0;
             my $hc;
 
             #count up all X10 items per house code
@@ -258,8 +249,7 @@ sub set {
                 }
             }
 
-            for my $object_name ( &main::list_objects_by_type('X10_Appliance') )
-            {
+            for my $object_name ( &main::list_objects_by_type('X10_Appliance') ) {
                 my $object = &main::get_object_by_name($object_name);
                 my ($house) = $object->{x10_id} =~ /^X(\S)/;
                 $house_code_item_count{$house}++;
@@ -297,7 +287,7 @@ sub set {
                 for my $hc ( keys %house_code_last_ref ) {
                     if (    $house_code_group_item_count{$hc}
                         and $house_code_last_ref{$hc} )
-                    { #Are there any items at all in this group for this house code
+                    {    #Are there any items at all in this group for this house code
                         print "House code: $hc\n" if ( $main::Debug{group} );
 
                         my $last_ref = $house_code_last_ref{$hc};
@@ -306,13 +296,11 @@ sub set {
                         #Only done if all items in group are on the same controller and there is more than one item to set for this house code (no need to optimize A1AJ to AO.)  Note that this optimization assumes that all X10 items are defined in items.mht.
 
                         if (
-                            $house_code_item_count{$hc} ==
-                            $house_code_group_item_count{$hc}
+                            $house_code_item_count{$hc} == $house_code_group_item_count{$hc}
                             and (
                                 $state eq 'off'
                                 or (    $state eq 'on'
-                                    and $house_code_group_appliance_count{$hc}
-                                    == 0 )
+                                    and $house_code_group_appliance_count{$hc} == 0 )
                             )
                             and $#fancy_controllers == 0
                             and $house_code_item_count{$hc} > 1
@@ -326,10 +314,7 @@ sub set {
                               )
                               . "\n"
                               if ( $main::Debug{group} );
-                            &Serial_Item::send_x10_data( $controller,
-                                    'X'
-                                  . $hc
-                                  . ( ( $state eq 'on' ) ? 'O' : 'P' ) );
+                            &Serial_Item::send_x10_data( $controller, 'X' . $hc . ( ( $state eq 'on' ) ? 'O' : 'P' ) );
 
                         }
                         else {
@@ -354,8 +339,7 @@ sub set {
                                 }
 
                             }
-                            elsif ($last_ref)
-                            { #may not exist if dim command and no dimmers in current house code
+                            elsif ($last_ref) {    #may not exist if dim command and no dimmers in current house code
 
                                 for my $ref (@group) {
                                     if (    substr( $$ref{x10_id}, 1, 1 ) eq $hc
@@ -447,11 +431,7 @@ sub aggregate_states {
 
 sub is_group_item {
     my $ref = shift;
-    return (
-             is_group_x10_item($ref)
-          or $ref->isa('X10_TempLinc')
-          or !$ref->isa('X10_Item')
-    );
+    return ( is_group_x10_item($ref) or $ref->isa('X10_TempLinc') or !$ref->isa('X10_Item') );
 }
 
 #x10 controllers, sensors and transmitters are not included in group processing
@@ -462,10 +442,7 @@ sub is_group_x10_item {
     my $ref;
 
     $ref = shift;
-    return (  $ref->{x10_id}
-          and length( $ref->{x10_id} ) > 2
-          and !$ref->isa('X10_Transmitter')
-          and !$ref->isa('X10_Sensor') );
+    return ( $ref->{x10_id} and length( $ref->{x10_id} ) > 2 and !$ref->isa('X10_Transmitter') and !$ref->isa('X10_Sensor') );
 
 }
 
@@ -487,8 +464,7 @@ sub can_combine {
     $ref = shift;
 
     $can_combine = 0;
-    $can_combine =
-      ( $ref->{interface} =~ /cm11|ncpuxa|homebase|stargate|lynx/i )
+    $can_combine = ( $ref->{interface} =~ /cm11|ncpuxa|homebase|stargate|lynx/i )
       if is_group_x10_item($ref);
     return $can_combine;
 }
@@ -499,9 +475,7 @@ sub set_group_item {
     my $ref   = shift;
     my $state = shift;
     print "Desired state is $state\n" if $main::Debug{group};
-    print $ref->{object_name}
-      . " has states "
-      . join( ', ', @{ $ref->{states} } ) . "\n"
+    print $ref->{object_name} . " has states " . join( ', ', @{ $ref->{states} } ) . "\n"
       if ( $ref->{states} && $main::Debug{group} );
     print "$ref->{object_name}:$state\n"
       if ( item_state_exists( $ref, $state ) && $main::Debug{group} );
@@ -552,10 +526,8 @@ sub list {
 
             # if we've already looked at this group, then we don't need or want to look at it again (avoids infinite loops)
             if ( grep { $_ == $member } @$groupList ) {
-                &::print_log( "Warning: detected group loop!  parent: "
-                      . $self->get_object_name
-                      . ", child: "
-                      . $member->get_object_name );
+                &::print_log(
+                    "Warning: detected group loop!  parent: " . $self->get_object_name . ", child: " . $member->get_object_name );
                 next;
             }
             push( @$groupList, $member );
diff --git a/lib/HARMON.pm b/lib/HARMON.pm
index c63e686b8..8099fad57 100755
--- a/lib/HARMON.pm
+++ b/lib/HARMON.pm
@@ -1,3 +1,4 @@
+
 =head1 B<HARMON>
 
 =head2 SYNOPSIS
@@ -659,7 +660,6 @@ L<Generic_Item>
 
 =cut
 
-
 package HARMON;
 
 @HARMON::ISA = ('Generic_Item');
@@ -667,338 +667,362 @@ package HARMON;
 #my %CmdMsg;
 
 my %CmdMsg = (
-"Z1_ON" => "8070C03F404F",
-"Z1_OFF" => "80709F601F10",
-"Z1_GET-PWR-STAT" => "807000003600",
-"Z1_GET-VOL-STAT" => "807000003700",
-"Z1_GET-BASS-STAT" => "807000003800",
-"Z1_GET-MUTE-STAT" => "807000003A00",
-"Z1_GET-FREQ" => "807000003400",
-"Z1_SIRIUS-TUNE-UP" => "807000003200",
-"Z1_SIRIUS-TUNE-DOWN" => "807000003300",
-"Z1_AM-BAND" => "807000001201",
-"Z1_FM-BAND" => "807000001202",
-"Z1_SIRIUS-BAND" => "807000001203",
-"Z1_VOL-UP" => "8070C7384748",
-"Z1_VOL-DOWN" => "8070C8374847",
-"Z1_MUTE" => "8070C13E414E",
-"Z1_MENU" => "807000002100",
-"Z1_UP" => "807000002200",
-"Z1_DOWN" => "807000002300",
-"Z1_LEFT" => "807000002400",
-"Z1_RIGHT" => "807000002500",
-"Z1_OK" => "807000002600",
-"Z1_0" => "807000003C00",
-"Z1_1" => "807000003D00",
-"Z1_2" => "807000003E00",
-"Z1_3" => "807000003F00",
-"Z1_4" => "807000004000",
-"Z1_5" => "807000004100",
-"Z1_6" => "807000004200",
-"Z1_7" => "807000004200",
-"Z1_8" => "807000004400",
-"Z1_9" => "807000004500",
-"Z1_SAT" => "807000000901",
-"Z1_BLURAY" => "807000000902",
-"Z1_BRIDGE" => "807000000903",
-"Z1_DVR" => "807000000904",
-"Z1_SIRIUS" => "807000000906",
-"Z1_FM" => "807000000907",
-"Z1_AM" => "807000000908",
-"Z1_TV" => "807000000909",
-"Z1_GAME" => "80700000090A",
-"Z1_MEDIA" => "80700000090B",
-"Z1_AUX" => "80700000090C",
-"Z1_INET-RADIO" => "80700000090D",
-"Z1_NETWORK" => "80700000090E",
-"Z1_SRC-A" => "80700000090F",
-"Z1_SRC-B" => "807000000910",
-"Z1_SRC-C" => "807000000911",
-"Z1_SRC-D" => "807000000912",
-"Z2_ON" => "807000000A00",
-"Z2_OFF" => "807000001B00",
-"Z2_GET-PWR-STAT" => "807000003600",
-"Z2_GET-VOL-STAT" => "807000003700",
-"Z2_GET-BASS-STAT" => "807000003800",
-"Z2_GET-MUTE-STAT" => "807000003A00",
-"Z2_GET-FREQ" => "807000003400",
-"Z2_VOL-UP" => "86762BD4ADA2",
-"Z2_VOL-DOWN" => "86762CD3AAA5",
-"Z2_MUTE" => "86762AD5ACA3",
-"Z2_MENU" => "807000002700",
-"Z2_UP" => "807000002800",
-"Z2_DOWN" => "807000002900",
-"Z2_LEFT" => "807000002A00",
-"Z2_RIGHT" => "807000002B00",
-"Z2_OK" => "807000002C00",
-"Z2_0" => "807000004600",
-"Z2_1" => "807000004700",
-"Z2_2" => "807000004800",
-"Z2_3" => "807000004900",
-"Z2_4" => "807000004A00",
-"Z2_5" => "807000004B00",
-"Z2_6" => "807000004C00",
-"Z2_7" => "807000004D00",
-"Z2_8" => "807000004E00",
-"Z2_9" => "807000004F00",
-"Z2_SAT" => "867600001B01",
-"Z2_BLURAY" => "867600001B02",
-"Z2_BRIDGE" => "867600001B03",
-"Z2_DVR" => "867600001B04",
-"Z2_SIRIUS" => "867600001B06",
-"Z2_FM" => "867600001B07",
-"Z2_AM" => "867600001B08",
-"Z2_TV" => "867600001B09",
-"Z2_GAME" => "867600001B0A",
-"Z2_MEDIA" => "867600001B0B",
-"Z2_AUX" => "867600001B0C",
-"Z2_INET-RADIO" => "867600001B0D",
-"Z2_NETWORK" => "867600001B0E",
-"Z2_SRC-A" => "867600001B0F",
-"Z2_SRC-B" => "867600001B10",
-"Z2_SRC-C" => "867600001B11",
-"Z2_SRC-D" => "867600001B12"
+    "Z1_ON"               => "8070C03F404F",
+    "Z1_OFF"              => "80709F601F10",
+    "Z1_GET-PWR-STAT"     => "807000003600",
+    "Z1_GET-VOL-STAT"     => "807000003700",
+    "Z1_GET-BASS-STAT"    => "807000003800",
+    "Z1_GET-MUTE-STAT"    => "807000003A00",
+    "Z1_GET-FREQ"         => "807000003400",
+    "Z1_SIRIUS-TUNE-UP"   => "807000003200",
+    "Z1_SIRIUS-TUNE-DOWN" => "807000003300",
+    "Z1_AM-BAND"          => "807000001201",
+    "Z1_FM-BAND"          => "807000001202",
+    "Z1_SIRIUS-BAND"      => "807000001203",
+    "Z1_VOL-UP"           => "8070C7384748",
+    "Z1_VOL-DOWN"         => "8070C8374847",
+    "Z1_MUTE"             => "8070C13E414E",
+    "Z1_MENU"             => "807000002100",
+    "Z1_UP"               => "807000002200",
+    "Z1_DOWN"             => "807000002300",
+    "Z1_LEFT"             => "807000002400",
+    "Z1_RIGHT"            => "807000002500",
+    "Z1_OK"               => "807000002600",
+    "Z1_0"                => "807000003C00",
+    "Z1_1"                => "807000003D00",
+    "Z1_2"                => "807000003E00",
+    "Z1_3"                => "807000003F00",
+    "Z1_4"                => "807000004000",
+    "Z1_5"                => "807000004100",
+    "Z1_6"                => "807000004200",
+    "Z1_7"                => "807000004200",
+    "Z1_8"                => "807000004400",
+    "Z1_9"                => "807000004500",
+    "Z1_SAT"              => "807000000901",
+    "Z1_BLURAY"           => "807000000902",
+    "Z1_BRIDGE"           => "807000000903",
+    "Z1_DVR"              => "807000000904",
+    "Z1_SIRIUS"           => "807000000906",
+    "Z1_FM"               => "807000000907",
+    "Z1_AM"               => "807000000908",
+    "Z1_TV"               => "807000000909",
+    "Z1_GAME"             => "80700000090A",
+    "Z1_MEDIA"            => "80700000090B",
+    "Z1_AUX"              => "80700000090C",
+    "Z1_INET-RADIO"       => "80700000090D",
+    "Z1_NETWORK"          => "80700000090E",
+    "Z1_SRC-A"            => "80700000090F",
+    "Z1_SRC-B"            => "807000000910",
+    "Z1_SRC-C"            => "807000000911",
+    "Z1_SRC-D"            => "807000000912",
+    "Z2_ON"               => "807000000A00",
+    "Z2_OFF"              => "807000001B00",
+    "Z2_GET-PWR-STAT"     => "807000003600",
+    "Z2_GET-VOL-STAT"     => "807000003700",
+    "Z2_GET-BASS-STAT"    => "807000003800",
+    "Z2_GET-MUTE-STAT"    => "807000003A00",
+    "Z2_GET-FREQ"         => "807000003400",
+    "Z2_VOL-UP"           => "86762BD4ADA2",
+    "Z2_VOL-DOWN"         => "86762CD3AAA5",
+    "Z2_MUTE"             => "86762AD5ACA3",
+    "Z2_MENU"             => "807000002700",
+    "Z2_UP"               => "807000002800",
+    "Z2_DOWN"             => "807000002900",
+    "Z2_LEFT"             => "807000002A00",
+    "Z2_RIGHT"            => "807000002B00",
+    "Z2_OK"               => "807000002C00",
+    "Z2_0"                => "807000004600",
+    "Z2_1"                => "807000004700",
+    "Z2_2"                => "807000004800",
+    "Z2_3"                => "807000004900",
+    "Z2_4"                => "807000004A00",
+    "Z2_5"                => "807000004B00",
+    "Z2_6"                => "807000004C00",
+    "Z2_7"                => "807000004D00",
+    "Z2_8"                => "807000004E00",
+    "Z2_9"                => "807000004F00",
+    "Z2_SAT"              => "867600001B01",
+    "Z2_BLURAY"           => "867600001B02",
+    "Z2_BRIDGE"           => "867600001B03",
+    "Z2_DVR"              => "867600001B04",
+    "Z2_SIRIUS"           => "867600001B06",
+    "Z2_FM"               => "867600001B07",
+    "Z2_AM"               => "867600001B08",
+    "Z2_TV"               => "867600001B09",
+    "Z2_GAME"             => "867600001B0A",
+    "Z2_MEDIA"            => "867600001B0B",
+    "Z2_AUX"              => "867600001B0C",
+    "Z2_INET-RADIO"       => "867600001B0D",
+    "Z2_NETWORK"          => "867600001B0E",
+    "Z2_SRC-A"            => "867600001B0F",
+    "Z2_SRC-B"            => "867600001B10",
+    "Z2_SRC-C"            => "867600001B11",
+    "Z2_SRC-D"            => "867600001B12"
 );
 
 #    Starting a new object
 sub new {
-   my ($class, $instance) = @_;
-   $instance = "HAROMN" if (!defined($instance));
-   ::print_log("Starting $instance instance of HARMON interface module");
+    my ( $class, $instance ) = @_;
+    $instance = "HAROMN" if ( !defined($instance) );
+    ::print_log("Starting $instance instance of HARMON interface module");
 
-   my $self = new Generic_Item();
-   
-      # Initialize Variables
-   $$self{instance}       = $instance;
-   $$self{reconnect_time} = $::config_parms{$instance.'_server_recon'};
-   $$self{reconnect_time} = 10 if !defined($$self{reconnect_time});
-   my $year_mon           = &::time_date_stamp( 10, time );
-   $$self{log_file}       = $::config_parms{'data_dir'}."/logs/HARMON.$year_mon.log";
-
-   bless $self, $class;
-
-   #Store Object with Instance Name
-   $self->_set_object_instance($instance);
-   return $self;
-}
+    my $self = new Generic_Item();
 
-sub get_object_by_instance{
-   my ($instance) = @_;
-   return $Interfaces{$instance};
+    # Initialize Variables
+    $$self{instance}       = $instance;
+    $$self{reconnect_time} = $::config_parms{ $instance . '_server_recon' };
+    $$self{reconnect_time} = 10 if !defined( $$self{reconnect_time} );
+    my $year_mon = &::time_date_stamp( 10, time );
+    $$self{log_file} = $::config_parms{'data_dir'} . "/logs/HARMON.$year_mon.log";
+
+    bless $self, $class;
+
+    #Store Object with Instance Name
+    $self->_set_object_instance($instance);
+    return $self;
 }
 
-sub _set_object_instance{
-   my ($self, $instance) = @_;
-   $Interfaces{$instance} = $self;
+sub get_object_by_instance {
+    my ($instance) = @_;
+    return $Interfaces{$instance};
 }
 
+sub _set_object_instance {
+    my ( $self, $instance ) = @_;
+    $Interfaces{$instance} = $self;
+}
 
 #    serial port configuration
 sub init {
 
-   my ($serial_port) = @_;
-   $serial_port->error_msg(1);
-   $serial_port->databits(8);
-   $serial_port->parity("none");
-   $serial_port->stopbits(1);
-   $serial_port->handshake('none');
-   $serial_port->datatype('raw');
-   $serial_port->dtr_active(1);
-   $serial_port->rts_active(0);
+    my ($serial_port) = @_;
+    $serial_port->error_msg(1);
+    $serial_port->databits(8);
+    $serial_port->parity("none");
+    $serial_port->stopbits(1);
+    $serial_port->handshake('none');
+    $serial_port->datatype('raw');
+    $serial_port->dtr_active(1);
+    $serial_port->rts_active(0);
 
-   select( undef, undef, undef, .100 );    # Sleep a bit
+    select( undef, undef, undef, .100 );    # Sleep a bit
 
 }
 
-
-
-
 sub serial_startup {
-   my ($instance) = @_;
-   my ($port, $BaudRate, $ip);
-
-   if ($::config_parms{$instance . '_serial_port'}) {
-      $port = $::config_parms{$instance .'_serial_port'};
-      $BaudRate = ( defined $::config_parms{$instance . '_baudrate'} ) ? $::config_parms{"$instance" . '_baudrate'} : 115200;
-      if ( &main::serial_port_create( $instance, $port, $BaudRate, 'none', 'raw' ) ) {
-         init( $::Serial_Ports{$instance}{object}, $port );
-         ::print_log("[HARMON] initializing $instance on port $port at $BaudRate baud") if $main::Debug{'HARMON'};
-         ::MainLoop_pre_add_hook( sub {check_for_data($instance, 'serial');}, 1 ) if $main::Serial_Ports{"$instance"}{object};
-      }
-   }
+    my ($instance) = @_;
+    my ( $port, $BaudRate, $ip );
+
+    if ( $::config_parms{ $instance . '_serial_port' } ) {
+        $port = $::config_parms{ $instance . '_serial_port' };
+        $BaudRate =
+          ( defined $::config_parms{ $instance . '_baudrate' } )
+          ? $::config_parms{ "$instance" . '_baudrate' }
+          : 115200;
+        if ( &main::serial_port_create( $instance, $port, $BaudRate, 'none', 'raw' ) ) {
+            init( $::Serial_Ports{$instance}{object}, $port );
+            ::print_log( "[HARMON] initializing $instance on port $port at $BaudRate baud" ) if $main::Debug{'HARMON'};
+            ::MainLoop_pre_add_hook( sub { check_for_data( $instance, 'serial' ); }, 1 )
+              if $main::Serial_Ports{"$instance"}{object};
+        }
+    }
 }
 
 sub server_startup {
-   my ($instance) = @_;
-
-   $Socket_Items{"$instance"}{recon_timer} = ::Timer::new();
-   my $ip = $::config_parms{"$instance".'_server_ip'};
-   my $port = $::config_parms{"$instance" . '_server_port'};
-   ::print_log("  HARMON.pm initializing $instance TCP session with $ip on port $port") if $main::Debug{'HARMON'};
-   $Socket_Items{"$instance"}{'socket'} = new Socket_Item($instance, undef, "$ip:$port", $instance, 'tcp', 'raw');
-   $Socket_Items{"$instance" . '_sender'}{'socket'} = new Socket_Item($instance . '_sender', undef, "$ip:$port", $instance . '_sender', 'tcp', 'rawout');
-   $Socket_Items{"$instance"}{'socket'}->start;
-   $Socket_Items{"$instance" . '_sender'}{'socket'}->start;
-   ::MainLoop_pre_add_hook( sub {HARMON::check_for_data($instance, 'tcp');}, 1 );
+    my ($instance) = @_;
+
+    $Socket_Items{"$instance"}{recon_timer} = ::Timer::new();
+    my $ip   = $::config_parms{ "$instance" . '_server_ip' };
+    my $port = $::config_parms{ "$instance" . '_server_port' };
+    ::print_log("  HARMON.pm initializing $instance TCP session with $ip on port $port")
+      if $main::Debug{'HARMON'};
+    $Socket_Items{"$instance"}{'socket'} =
+      new Socket_Item( $instance, undef, "$ip:$port", $instance, 'tcp', 'raw' );
+    $Socket_Items{ "$instance" . '_sender' }{'socket'} =
+      new Socket_Item( $instance . '_sender', undef, "$ip:$port", $instance . '_sender', 'tcp', 'rawout' );
+    $Socket_Items{"$instance"}{'socket'}->start;
+    $Socket_Items{ "$instance" . '_sender' }{'socket'}->start;
+    ::MainLoop_pre_add_hook( sub { HARMON::check_for_data( $instance, 'tcp' ); }, 1 );
 }
 
-
 sub check_for_data {
-   my ($instance, $connecttype) = @_;
-   my $self = get_object_by_instance($instance);
-   my $NewCmd;
-   my $AckMsg;
-
-   
-my %CmdAck = (
-"41565241434B020110" => "Z1_P_ON,Z2_P_OFF",
-"41565241434B020111" => "Z1_P_ON,Z2_P_ON",
-"41565241434B020100" => "Z1_P_OFF,Z2_P_OFF",
-"41565241434B020101" => "Z1_P_OFF,Z2_P_ON",
-"41565241434B0311" => "Z1_V_VOL-ACK",
-"41565241434B0202" => "Z1_V_VOL-ACK-TOG",
-"41565241434B0209" => "Z2_V_VOL-ACK",
-"41565241434B020300" => "Z1_M_MUTE-OFF",
-"41565241434B020301" => "Z1_M_MUTE-ON",
-"41565241434B020A00" => "Z2_M_MUTE-OFF",
-"41565241434B020A01" => "Z2_M_MUTE-ON",
-"41565241434B03140100" => "Z1_M_MUTE-ON,Z2_M_MUTE-OFF",
-"41565241434B03140101" => "Z1_M_MUTE-ON,Z2_M_MUTE-ON",
-"41565241434B03140001" => "Z1_M_MUTE-OFF,Z2_M_MUTE-ON",
-"41565241434B03140000" => "Z1_M_MUTE-OFF,Z2_M_MUTE-OFF",
-"41565241434B020401" => "Z1_I_SAT",
-"41565241434B020402" => "Z1_I_BLURAY",
-"41565241434B020403" => "Z1_I_BRIDGE",
-"41565241434B020404" => "Z1_I_DVR",
-"41565241434B020406" => "Z1_I_SIRIUS",
-"41565241434B020407" => "Z1_I_FM",
-"41565241434B020408" => "Z1_I_AM",
-"41565241434B020409" => "Z1_I_TV",
-"41565241434B02040A" => "Z1_I_GAME",
-"41565241434B02040B" => "Z1_I_MEDIA",
-"41565241434B02040C" => "Z1_I_AUX",
-"41565241434B02040D" => "Z1_I_INET-RADIO",
-"41565241434B02040E" => "Z1_I_NETWORK",
-"41565241434B02040F" => "Z1_I_SRC-A",
-"41565241434B020410" => "Z1_I_SRC-B",
-"41565241434B020411" => "Z1_I_SRC-C",
-"41565241434B020412" => "Z1_I_SRC-D",
-"41565241434B020801" => "Z2_I_SAT",
-"41565241434B020802" => "Z2_I_BLURAY",
-"41565241434B020803" => "Z2_I_BRIDGE",
-"41565241434B020804" => "Z2_I_DVR",
-"41565241434B020806" => "Z2_I_SIRIUS",
-"41565241434B020807" => "Z2_I_FM",
-"41565241434B020808" => "Z2_I_AM",
-"41565241434B020809" => "Z2_I_TV",
-"41565241434B02080A" => "Z2_I_GAME",
-"41565241434B02080B" => "Z2_I_MEDIA",
-"41565241434B02080C" => "Z2_I_AUX",
-"41565241434B02080D" => "Z2_I_INET-RADIO",
-"41565241434B02080E" => "Z2_I_NETWORK",
-"41565241434B02080F" => "Z2_I_SRC-A",
-"41565241434B020810" => "Z2_I_SRC-B",
-"41565241434B020811" => "Z2_I_SRC-C",
-"41565241434B020812" => "Z2_I_SRC-D"
-);
-
-   # Get the data from serial or tcp source
-   if ($connecttype eq 'serial') {
-      &main::check_for_generic_serial_data($instance);
-      $NewCmd = $main::Serial_Ports{$instance}{data};
-      $main::Serial_Ports{$instance}{data} = '';
-   }
-
-   if ($connecttype eq 'tcp') {
-      if ($Socket_Items{$instance}{'socket'}->active) {
-         $NewCmd = uc(unpack('H*', ($Socket_Items{$instance}{'socket'}->said)));
-      } else {
-         # restart the TCP connection if its lost.
-         if ($Socket_Items{$instance}{recon_timer}->inactive) {
-            ::print_log("Connection to $instance instance of HARMON was lost, I will try to reconnect in $$self{reconnect_time} seconds");
-            $Socket_Items{$instance}{recon_timer}->set($$self{reconnect_time}, sub {
-               $Socket_Items{$instance}{'socket'}->start;
-            });
-         }
-      }
-   }
-
-   # Return if nothing received
-   return if !$NewCmd;
-
-   # Prepend any prior message fragment
-   $NewCmd = $self->{IncompleteCmd} . $NewCmd if $self->{IncompleteCmd};
-   $self->{IncompleteCmd} = '';
-   my $msg;
-   my $zone_num;
-   &main::print_log("[HARMON] - Hex $NewCmd ");
-     my @NewCmds;
-     if ($NewCmd =~ /^(\w{20})..$/) { $NewCmd = $1 }
-     if ($NewCmd =~ /(\w{20})(\w{20})/) { @NewCmds = ($1,$2) }
-     else { push @NewCmds, $NewCmd } 
-     foreach $NewCmd(@NewCmds) {
-	&main::print_log("[HARMON] - Hex $NewCmd - Lenght " . (length($NewCmd)) );
-       if ((length($NewCmd)) eq "20") {
-             $AckMsg = ($CmdAck{"$NewCmd"});
-             if ($AckMsg eq '') { $AckMsg = ($CmdAck{(substr ($NewCmd, 0, 18))});} # try stripping the checksum
-             if ($AckMsg eq '') { $AckMsg = ($CmdAck{(substr ($NewCmd, 0, 16))});} # strip last 2 for vol caculations
-	     &main::print_log("[HARMON] - Ack $AckMsg - Hex $NewCmd ");
-             $AckMsg = &GetAckMsg($AckMsg,$NewCmd) if &GetAckMsg($AckMsg,$NewCmd);
-	     my @AckMsgs;
-	     if ($AckMsg =~ /,/) { @AckMsgs = split(',', $AckMsg) }
-	     else { push @AckMsgs, $AckMsg  }
-	     foreach (@AckMsgs) {
-		  &main::print_log("[HARMON] - ACK MSG $_"); 
-		  if ( $_ =~ /^Z(\d)_(\w)_VOL_(.*)/ ) { $zone_num = $1; $msg = $3; }
-                  elsif ( $_ =~ /^Z(\d)_(\w)_MUTE-(.*)/ ) { $zone_num = $1; $msg = $3; }
-		  elsif ( $_ =~ /^Z(\d)_(\w)_(.*)/ ) { $zone_num = $1; $msg = $3; } 
-		  if ($2 eq 'P') { $object_type = 'power_object'; }
-		  elsif ($2 eq 'V') { $object_type = 'volume_object'; }
-		  elsif ($2 eq 'M') { $object_type = 'mute_object'; }
-                  elsif ($2 eq 'I') { $object_type = 'input_object'; }
-		  $self->set_child_state($object_type, $zone_num, $msg);
-             	  &main::print_log("[HARMON] - ACK MSG ($msg) - Zone ($zone_num) - Object Type ($object_type)");
-	     }	
-        } 
+    my ( $instance, $connecttype ) = @_;
+    my $self = get_object_by_instance($instance);
+    my $NewCmd;
+    my $AckMsg;
+
+    my %CmdAck = (
+        "41565241434B020110"   => "Z1_P_ON,Z2_P_OFF",
+        "41565241434B020111"   => "Z1_P_ON,Z2_P_ON",
+        "41565241434B020100"   => "Z1_P_OFF,Z2_P_OFF",
+        "41565241434B020101"   => "Z1_P_OFF,Z2_P_ON",
+        "41565241434B0311"     => "Z1_V_VOL-ACK",
+        "41565241434B0202"     => "Z1_V_VOL-ACK-TOG",
+        "41565241434B0209"     => "Z2_V_VOL-ACK",
+        "41565241434B020300"   => "Z1_M_MUTE-OFF",
+        "41565241434B020301"   => "Z1_M_MUTE-ON",
+        "41565241434B020A00"   => "Z2_M_MUTE-OFF",
+        "41565241434B020A01"   => "Z2_M_MUTE-ON",
+        "41565241434B03140100" => "Z1_M_MUTE-ON,Z2_M_MUTE-OFF",
+        "41565241434B03140101" => "Z1_M_MUTE-ON,Z2_M_MUTE-ON",
+        "41565241434B03140001" => "Z1_M_MUTE-OFF,Z2_M_MUTE-ON",
+        "41565241434B03140000" => "Z1_M_MUTE-OFF,Z2_M_MUTE-OFF",
+        "41565241434B020401"   => "Z1_I_SAT",
+        "41565241434B020402"   => "Z1_I_BLURAY",
+        "41565241434B020403"   => "Z1_I_BRIDGE",
+        "41565241434B020404"   => "Z1_I_DVR",
+        "41565241434B020406"   => "Z1_I_SIRIUS",
+        "41565241434B020407"   => "Z1_I_FM",
+        "41565241434B020408"   => "Z1_I_AM",
+        "41565241434B020409"   => "Z1_I_TV",
+        "41565241434B02040A"   => "Z1_I_GAME",
+        "41565241434B02040B"   => "Z1_I_MEDIA",
+        "41565241434B02040C"   => "Z1_I_AUX",
+        "41565241434B02040D"   => "Z1_I_INET-RADIO",
+        "41565241434B02040E"   => "Z1_I_NETWORK",
+        "41565241434B02040F"   => "Z1_I_SRC-A",
+        "41565241434B020410"   => "Z1_I_SRC-B",
+        "41565241434B020411"   => "Z1_I_SRC-C",
+        "41565241434B020412"   => "Z1_I_SRC-D",
+        "41565241434B020801"   => "Z2_I_SAT",
+        "41565241434B020802"   => "Z2_I_BLURAY",
+        "41565241434B020803"   => "Z2_I_BRIDGE",
+        "41565241434B020804"   => "Z2_I_DVR",
+        "41565241434B020806"   => "Z2_I_SIRIUS",
+        "41565241434B020807"   => "Z2_I_FM",
+        "41565241434B020808"   => "Z2_I_AM",
+        "41565241434B020809"   => "Z2_I_TV",
+        "41565241434B02080A"   => "Z2_I_GAME",
+        "41565241434B02080B"   => "Z2_I_MEDIA",
+        "41565241434B02080C"   => "Z2_I_AUX",
+        "41565241434B02080D"   => "Z2_I_INET-RADIO",
+        "41565241434B02080E"   => "Z2_I_NETWORK",
+        "41565241434B02080F"   => "Z2_I_SRC-A",
+        "41565241434B020810"   => "Z2_I_SRC-B",
+        "41565241434B020811"   => "Z2_I_SRC-C",
+        "41565241434B020812"   => "Z2_I_SRC-D"
+    );
+
+    # Get the data from serial or tcp source
+    if ( $connecttype eq 'serial' ) {
+        &main::check_for_generic_serial_data($instance);
+        $NewCmd = $main::Serial_Ports{$instance}{data};
+        $main::Serial_Ports{$instance}{data} = '';
+    }
+
+    if ( $connecttype eq 'tcp' ) {
+        if ( $Socket_Items{$instance}{'socket'}->active ) {
+            $NewCmd = uc( unpack( 'H*', ( $Socket_Items{$instance}{'socket'}->said ) ) );
+        }
         else {
-         # Save partial command for next serial read
-         $self->{IncompleteCmd} = $Cmd;
-       }
-     }
+            # restart the TCP connection if its lost.
+            if ( $Socket_Items{$instance}{recon_timer}->inactive ) {
+                ::print_log(
+                    "Connection to $instance instance of HARMON was lost, I will try to reconnect in $$self{reconnect_time} seconds"
+                );
+                $Socket_Items{$instance}{recon_timer}->set(
+                    $$self{reconnect_time},
+                    sub {
+                        $Socket_Items{$instance}{'socket'}->start;
+                    }
+                );
+            }
+        }
+    }
+
+    # Return if nothing received
+    return if !$NewCmd;
+
+    # Prepend any prior message fragment
+    $NewCmd = $self->{IncompleteCmd} . $NewCmd if $self->{IncompleteCmd};
+    $self->{IncompleteCmd} = '';
+    my $msg;
+    my $zone_num;
+    &main::print_log("[HARMON] - Hex $NewCmd ");
+    my @NewCmds;
+    if ( $NewCmd =~ /^(\w{20})..$/ )     { $NewCmd  = $1 }
+    if ( $NewCmd =~ /(\w{20})(\w{20})/ ) { @NewCmds = ( $1, $2 ) }
+    else                                 { push @NewCmds, $NewCmd }
+
+    foreach $NewCmd (@NewCmds) {
+        &main::print_log( "[HARMON] - Hex $NewCmd - Lenght " . ( length($NewCmd) ) );
+        if ( ( length($NewCmd) ) eq "20" ) {
+            $AckMsg = ( $CmdAck{"$NewCmd"} );
+            if ( $AckMsg eq '' ) {
+                $AckMsg = ( $CmdAck{ ( substr( $NewCmd, 0, 18 ) ) } );
+            }    # try stripping the checksum
+            if ( $AckMsg eq '' ) {
+                $AckMsg = ( $CmdAck{ ( substr( $NewCmd, 0, 16 ) ) } );
+            }    # strip last 2 for vol caculations
+            &main::print_log("[HARMON] - Ack $AckMsg - Hex $NewCmd ");
+            $AckMsg = &GetAckMsg( $AckMsg, $NewCmd )
+              if &GetAckMsg( $AckMsg, $NewCmd );
+            my @AckMsgs;
+            if ( $AckMsg =~ /,/ ) { @AckMsgs = split( ',', $AckMsg ) }
+            else                  { push @AckMsgs, $AckMsg }
+            foreach (@AckMsgs) {
+                &main::print_log("[HARMON] - ACK MSG $_");
+                if ( $_ =~ /^Z(\d)_(\w)_VOL_(.*)/ ) {
+                    $zone_num = $1;
+                    $msg      = $3;
+                }
+                elsif ( $_ =~ /^Z(\d)_(\w)_MUTE-(.*)/ ) {
+                    $zone_num = $1;
+                    $msg      = $3;
+                }
+                elsif ( $_ =~ /^Z(\d)_(\w)_(.*)/ ) {
+                    $zone_num = $1;
+                    $msg      = $3;
+                }
+                if    ( $2 eq 'P' ) { $object_type = 'power_object'; }
+                elsif ( $2 eq 'V' ) { $object_type = 'volume_object'; }
+                elsif ( $2 eq 'M' ) { $object_type = 'mute_object'; }
+                elsif ( $2 eq 'I' ) { $object_type = 'input_object'; }
+                $self->set_child_state( $object_type, $zone_num, $msg );
+                &main::print_log( "[HARMON] - ACK MSG ($msg) - Zone ($zone_num) - Object Type ($object_type)" );
+            }
+        }
+        else {
+            # Save partial command for next serial read
+            $self->{IncompleteCmd} = $Cmd;
+        }
+    }
 }
 
-
-
-
-
 sub GetAckMsg {
- my $GAckMsg = $_[0];
- my $hex = $_[1];
- my $RetAckMsg;
-        if ($GAckMsg =~ /(Z\d)_V_VOL-ACK/) {
-                $RetAckMsg = "+".(hex((substr ((substr ($hex, 16)),0 , 2))));
-              if ($RetAckMsg > 0 and $RetAckMsg < 10) {
-                    } else {
-                         $RetAckMsg = "-".($RetAckMsg - 128);
-                    }
-                  $RetAckMsg = $1."_V_VOL_".$RetAckMsg;
-                 return $RetAckMsg;
-               }
-        return;
-      }
-
-
-
+    my $GAckMsg = $_[0];
+    my $hex     = $_[1];
+    my $RetAckMsg;
+    if ( $GAckMsg =~ /(Z\d)_V_VOL-ACK/ ) {
+        $RetAckMsg =
+          "+" . ( hex( ( substr( ( substr( $hex, 16 ) ), 0, 2 ) ) ) );
+        if ( $RetAckMsg > 0 and $RetAckMsg < 10 ) {
+        }
+        else {
+            $RetAckMsg = "-" . ( $RetAckMsg - 128 );
+        }
+        $RetAckMsg = $1 . "_V_VOL_" . $RetAckMsg;
+        return $RetAckMsg;
+    }
+    return;
+}
 
 sub set_child_state {
-   my ($self, $object_type, $zone_num, $msg) = @_;
-   my $child = $self->{$object_type}{$zone_num};
-   $child->set_receive($msg) if defined $child;
-     if ( $object_type eq 'mute_object' ) { 
-     #&main::print_log("[HARMON] - ACK MSG ($msg) - Zone ($zone_num) - Object Type ($object_type) - MUTE_CMD ". $$child{mute_cmd}); 
-        if ($$child{mute_cmd} eq 'ON' and $msg eq 'OFF' ) { $child->set('Z'.$zone_num.'_MUTE'); $$child{mute_cmd} = 0; }
-        elsif ($$child{mute_cmd} eq 'OFF' and $msg eq 'ON' ) { $child->set('Z'.$zone_num.'_MUTE'); $$child{mute_cmd} = 0; }
-     }	
+    my ( $self, $object_type, $zone_num, $msg ) = @_;
+    my $child = $self->{$object_type}{$zone_num};
+    $child->set_receive($msg) if defined $child;
+    if ( $object_type eq 'mute_object' ) {
+
+        #&main::print_log("[HARMON] - ACK MSG ($msg) - Zone ($zone_num) - Object Type ($object_type) - MUTE_CMD ". $$child{mute_cmd});
+        if ( $$child{mute_cmd} eq 'ON' and $msg eq 'OFF' ) {
+            $child->set( 'Z' . $zone_num . '_MUTE' );
+            $$child{mute_cmd} = 0;
+        }
+        elsif ( $$child{mute_cmd} eq 'OFF' and $msg eq 'ON' ) {
+            $child->set( 'Z' . $zone_num . '_MUTE' );
+            $$child{mute_cmd} = 0;
+        }
+    }
 }
 
 =item C<register()>
@@ -1008,58 +1032,60 @@ Used to associate child objects with the interface.
 =cut
 
 sub register {
-   my ($self, $object, $num) = @_;
-   if ($object->isa('HARMON_Volume')) {
-      ::print_log("Registering Child Object for Harmon volume zone $num");
-      $self->{volume_object}{$num} = $object;
-   }
-   elsif ($object->isa('HARMON_Mute')) {
-      ::print_log("Registering Child Object for Harmon mute zone $num");
-      $self->{mute_object}{$num} = $object;
-   }
-   elsif ($object->isa('HARMON_Power')) {
-      ::print_log("Registering Child Object for Harmon power zone $num");
-      $self->{power_object}{$num} = $object;
-   }
-   elsif ($object->isa('HARMON_Input')) {
-      ::print_log("Registering Child Object for Harmon input zone $num");
-      $self->{input_object}{$num} = $object;
-   }
+    my ( $self, $object, $num ) = @_;
+    if ( $object->isa('HARMON_Volume') ) {
+        ::print_log("Registering Child Object for Harmon volume zone $num");
+        $self->{volume_object}{$num} = $object;
+    }
+    elsif ( $object->isa('HARMON_Mute') ) {
+        ::print_log("Registering Child Object for Harmon mute zone $num");
+        $self->{mute_object}{$num} = $object;
+    }
+    elsif ( $object->isa('HARMON_Power') ) {
+        ::print_log("Registering Child Object for Harmon power zone $num");
+        $self->{power_object}{$num} = $object;
+    }
+    elsif ( $object->isa('HARMON_Input') ) {
+        ::print_log("Registering Child Object for Harmon input zone $num");
+        $self->{input_object}{$num} = $object;
+    }
 }
 
-
-
 sub set {
-   my ($self, $p_state, $p_setby, $p_response) = @_;
-   my $instance = $$self{instance};
-   ::print_log("[HARMON] State: $p_state - Hex: $CmdMsg{$p_state}");
-   my $cmd = ( exists $CmdMsg{$p_state} ) ? $CmdMsg{$p_state} : $p_state;
-   $cmd = "504353454E440204$cmd";
-   $cmd = pack('H*', $cmd);
-
-   #$self->debug_log(">>> Sending to HARMON receiver $p_state ($cmd)");
-   if (defined $Socket_Items{$instance}) {
-      if ($Socket_Items{$instance . '_sender'}{'socket'}->active) {
-         $Socket_Items{$instance . '_sender'}{'socket'}->set("$cmd");
-      } else {
-         # restart the TCP connection if its lost.
-         if ($Socket_Items{$instance}{recon_timer}->inactive) {
-            ::print_log("Connection to $instance sending instance of HARMON was lost, I will try to reconnect in $$self{reconnect_time} seconds");
-            $Socket_Items{$instance}{recon_timer}->set($$self{reconnect_time}, sub {
-               $Socket_Items{$instance . '_sender'}{'socket'}->start;
-               $Socket_Items{$instance . '_sender'}{'socket'}->set("$cmd");
-            });
-         }
-      }
-   }
-   else {
-      $main::Serial_Ports{$instance}{'socket'}->write("$cmd");
-   }
-   return;
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    my $instance = $$self{instance};
+    ::print_log("[HARMON] State: $p_state - Hex: $CmdMsg{$p_state}");
+    my $cmd = ( exists $CmdMsg{$p_state} ) ? $CmdMsg{$p_state} : $p_state;
+    $cmd = "504353454E440204$cmd";
+    $cmd = pack( 'H*', $cmd );
+
+    #$self->debug_log(">>> Sending to HARMON receiver $p_state ($cmd)");
+    if ( defined $Socket_Items{$instance} ) {
+        if ( $Socket_Items{ $instance . '_sender' }{'socket'}->active ) {
+            $Socket_Items{ $instance . '_sender' }{'socket'}->set("$cmd");
+        }
+        else {
+            # restart the TCP connection if its lost.
+            if ( $Socket_Items{$instance}{recon_timer}->inactive ) {
+                ::print_log(
+                    "Connection to $instance sending instance of HARMON was lost, I will try to reconnect in $$self{reconnect_time} seconds"
+                );
+                $Socket_Items{$instance}{recon_timer}->set(
+                    $$self{reconnect_time},
+                    sub {
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->start;
+                        $Socket_Items{ $instance . '_sender' }{'socket'}->set("$cmd");
+                    }
+                );
+            }
+        }
+    }
+    else {
+        $main::Serial_Ports{$instance}{'socket'}->write("$cmd");
+    }
+    return;
 }
 
-
-
 package HARMON_Power;
 @HARMON_Power::ISA = ('Generic_Item');
 
@@ -1074,47 +1100,45 @@ $zone = The zone number, usually 1
 
 =cut
 
-sub new
-{
-   my ($class,$receiver,$zone ) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $receiver = HARMON::get_object_by_instance($receiver);
-   #$$receiver{receiver_zone} = $self;
-   $receiver->register($self,$zone);
-   $$self{receiver} = $receiver;
-   $$self{zone} = $zone;
-   @{$$self{states}} = ('ON', 'OFF', 'GET-PWR-STAT');
-   return $self;
+sub new {
+    my ( $class, $receiver, $zone ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $receiver = HARMON::get_object_by_instance($receiver);
+
+    #$$receiver{receiver_zone} = $self;
+    $receiver->register( $self, $zone );
+    $$self{receiver} = $receiver;
+    $$self{zone}     = $zone;
+    @{ $$self{states} } = ( 'ON', 'OFF', 'GET-PWR-STAT' );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-        ::print_log("[HARMON::power] Received request to "
-           . $p_state . " for zone " . $self->get_object_name);
-	$p_state =~ s/ /-/g;
-        if ($p_state =~ /^GET-PWR-STAT/ ) {
-	     $p_state = "Z".$$self{zone}."_".$p_state;
-             $$self{receiver}->set($p_state)
-         }
-         elsif ($p_state =~ /^Z\d_/) {
-             $$self{receiver}->set($p_state);
-         }
-         else {
-	   $p_state = "Z".$$self{zone}."_".$p_state;
-           $$self{receiver}->set($p_state);
-         }
- # $self->SUPER::set($p_state,$p_setby);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    ::print_log( "[HARMON::power] Received request to " . $p_state . " for zone " . $self->get_object_name );
+    $p_state =~ s/ /-/g;
+    if ( $p_state =~ /^GET-PWR-STAT/ ) {
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+    elsif ( $p_state =~ /^Z\d_/ ) {
+        $$self{receiver}->set($p_state);
+    }
+    else {
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+
+    # $self->SUPER::set($p_state,$p_setby);
 }
 
-
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
     ::print_log("[HARMON::power] set to $p_state");
 }
 
-
 package HARMON_Volume;
 @HARMON_Volume::ISA = ('Generic_Item');
 
@@ -1129,44 +1153,40 @@ $zone = The zone number, usually 1
 
 =cut
 
-sub new
-{
-   my ($class,$receiver,$zone ) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $receiver = HARMON::get_object_by_instance($receiver);
-   $receiver->register($self,$zone);
-   $$self{receiver} = $receiver;
-   $$self{zone} = $zone;
-   @{$$self{states}} = ('UP', 'DOWN', 'GET-VOL-STAT');
-   return $self;
+sub new {
+    my ( $class, $receiver, $zone ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $receiver = HARMON::get_object_by_instance($receiver);
+    $receiver->register( $self, $zone );
+    $$self{receiver} = $receiver;
+    $$self{zone}     = $zone;
+    @{ $$self{states} } = ( 'UP', 'DOWN', 'GET-VOL-STAT' );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-        ::print_log("[HARMON::Volume] Received request "
-              . $p_state ." for ". $self->get_object_name ." for zone ".$$self{zone});
-		if ($p_state =~ /^GET-VOL-STAT/ ) { 
-		  $p_state = "Z".$$self{zone}."_".$p_state;
-		  $$self{receiver}->set($p_state) 
-		}
-		elsif ($p_state =~ /^Z\d_VOL-/ or $p_state =~ /^Z\d_GET-VOL-STAT/) {
-		  $$self{receiver}->set($p_state);
-		}
-		else {
-          	  $p_state = "Z".$$self{zone}."_VOL-".$p_state;
-           	  $$self{receiver}->set($p_state);
-	        }
- }
-
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    ::print_log( "[HARMON::Volume] Received request " . $p_state . " for " . $self->get_object_name . " for zone " . $$self{zone} );
+    if ( $p_state =~ /^GET-VOL-STAT/ ) {
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+    elsif ( $p_state =~ /^Z\d_VOL-/ or $p_state =~ /^Z\d_GET-VOL-STAT/ ) {
+        $$self{receiver}->set($p_state);
+    }
+    else {
+        $p_state = "Z" . $$self{zone} . "_VOL-" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+}
 
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
     ::print_log("[HARMON::power] set to $p_state");
 }
 
-
 package HARMON_Mute;
 @HARMON_Mute::ISA = ('Generic_Item');
 
@@ -1181,46 +1201,41 @@ $zone = The zone number, usually 1
 
 =cut
 
-sub new
-{
-   my ($class,$receiver,$zone ) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $receiver = HARMON::get_object_by_instance($receiver);
-   $receiver->register($self,$zone);
-   $$self{receiver} = $receiver;
-   $$self{zone} = $zone;
-   @{$$self{states}} = ('ON','OFF','MUTE','GET-MUTE-STAT');
-   return $self;
+sub new {
+    my ( $class, $receiver, $zone ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $receiver = HARMON::get_object_by_instance($receiver);
+    $receiver->register( $self, $zone );
+    $$self{receiver} = $receiver;
+    $$self{zone}     = $zone;
+    @{ $$self{states} } = ( 'ON', 'OFF', 'MUTE', 'GET-MUTE-STAT' );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-        ::print_log("[HARMON::Mute] Received request "
-              . $p_state ." for ". $self->get_object_name ." for zone ".$$self{zone});
-		if ($p_state =~ /^Z\d_MUTE/) {
-                  $$self{receiver}->set($p_state);
-                }
-		elsif ($p_state =~ /^MUTE/ or $p_state =~ /^GET-MUTE-STAT/) {
-		  $p_state = "Z".$$self{zone}."_".$p_state;
-                  $$self{receiver}->set($p_state);
-		}
-                elsif ($p_state eq 'ON' or $p_state eq 'OFF') {
-                    $$self{mute_cmd} = $p_state;
-                    $p_state = "Z".$$self{zone}."_GET-MUTE-STAT";
-                    $$self{receiver}->set($p_state);
-                 } 
- }
-
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    ::print_log( "[HARMON::Mute] Received request " . $p_state . " for " . $self->get_object_name . " for zone " . $$self{zone} );
+    if ( $p_state =~ /^Z\d_MUTE/ ) {
+        $$self{receiver}->set($p_state);
+    }
+    elsif ( $p_state =~ /^MUTE/ or $p_state =~ /^GET-MUTE-STAT/ ) {
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+    elsif ( $p_state eq 'ON' or $p_state eq 'OFF' ) {
+        $$self{mute_cmd} = $p_state;
+        $p_state = "Z" . $$self{zone} . "_GET-MUTE-STAT";
+        $$self{receiver}->set($p_state);
+    }
+}
 
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
     ::print_log("[HARMON::power] set to $p_state");
 }
 
-
-
 package HARMON_Input;
 @HARMON_Input::ISA = ('Generic_Item');
 
@@ -1235,36 +1250,37 @@ $zone = The zone number, usually 1
 
 =cut
 
-sub new
-{
-   my ($class,$receiver,$zone ) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $receiver = HARMON::get_object_by_instance($receiver);
-   $receiver->register($self,$zone);
-   $$self{receiver} = $receiver;
-   $$self{zone} = $zone;
-   @{$$self{states}} = ('SAT','BLURAY','BRIDGE','DVR','SIRIUS','FM','AM','TV','GAME','MEDIA','AUX','INET-RADIO','NETWORK','SRC-A','SRC-B','SRC-C','SRC-D');
-   return $self;
+sub new {
+    my ( $class, $receiver, $zone ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $receiver = HARMON::get_object_by_instance($receiver);
+    $receiver->register( $self, $zone );
+    $$self{receiver} = $receiver;
+    $$self{zone}     = $zone;
+    @{ $$self{states} } = (
+        'SAT',     'BLURAY', 'BRIDGE', 'DVR',   'SIRIUS', 'FM',
+        'AM',      'TV',     'GAME',   'MEDIA', 'AUX',    'INET-RADIO',
+        'NETWORK', 'SRC-A',  'SRC-B',  'SRC-C', 'SRC-D'
+    );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-        ::print_log("[HARMON::Input] Received request "
-              . $p_state ." for ". $self->get_object_name ." for zone ".$$self{zone});
-		if ($p_state =~ /^Z\d_/) {
-                  $$self{receiver}->set($p_state);
-                }
-                else {
-                  $p_state = "Z".$$self{zone}."_".$p_state;
-                  $$self{receiver}->set($p_state);
-                }
- }
-
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    ::print_log( "[HARMON::Input] Received request " . $p_state . " for " . $self->get_object_name . " for zone " . $$self{zone} );
+    if ( $p_state =~ /^Z\d_/ ) {
+        $$self{receiver}->set($p_state);
+    }
+    else {
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+}
 
 sub set_receive {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-    return $self->SUPER::set($p_state, $p_setby, $p_response);
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    return $self->SUPER::set( $p_state, $p_setby, $p_response );
     ::print_log("[HARMON::power] set to $p_state");
 }
 
@@ -1282,30 +1298,32 @@ $zone = The zone number, usually 1
 
 =cut
 
-sub new
-{
-   my ($class,$receiver,$zone ) = @_;
-   my $self = new Generic_Item();
-   bless $self,$class;
-   $receiver = HARMON::get_object_by_instance($receiver);
-   $receiver->register($self,$zone);
-   $$self{receiver} = $receiver;
-   $$self{zone} = $zone;
-   @{$$self{states}} = ('SIRIUS-TUNE-DOWN','SIRIUS-TUNE-UP','MENU','UP','DOWN','LEFT','RIGHT','OK','0','1','2','3','4','5','6','7','8','9');
-   return $self;
+sub new {
+    my ( $class, $receiver, $zone ) = @_;
+    my $self = new Generic_Item();
+    bless $self, $class;
+    $receiver = HARMON::get_object_by_instance($receiver);
+    $receiver->register( $self, $zone );
+    $$self{receiver} = $receiver;
+    $$self{zone}     = $zone;
+    @{ $$self{states} } = (
+        'SIRIUS-TUNE-DOWN', 'SIRIUS-TUNE-UP', 'MENU', 'UP', 'DOWN', 'LEFT',
+        'RIGHT', 'OK', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+    );
+    return $self;
 }
 
 sub set {
-    my ($self, $p_state, $p_setby, $p_response) = @_;
-        ::print_log("[HARMON::Control] Received request "
-              . $p_state ." for ". $self->get_object_name ." for zone ".$$self{zone});
-		if ($p_state =~ /^Z\d_(.*)/) {
-                  $$self{receiver}->set($p_state);
-		  $self->SUPER::set($1,$p_setby);
-                }
-                else {
-		  $self->SUPER::set($p_state,$p_setby);
-                  $p_state = "Z".$$self{zone}."_". $p_state;
-                  $$self{receiver}->set($p_state);
-                }
- }
+    my ( $self, $p_state, $p_setby, $p_response ) = @_;
+    ::print_log(
+        "[HARMON::Control] Received request " . $p_state . " for " . $self->get_object_name . " for zone " . $$self{zone} );
+    if ( $p_state =~ /^Z\d_(.*)/ ) {
+        $$self{receiver}->set($p_state);
+        $self->SUPER::set( $1, $p_setby );
+    }
+    else {
+        $self->SUPER::set( $p_state, $p_setby );
+        $p_state = "Z" . $$self{zone} . "_" . $p_state;
+        $$self{receiver}->set($p_state);
+    }
+}
diff --git a/lib/HVweb_Item.pm b/lib/HVweb_Item.pm
index 6a2ea90ee..211021bb8 100644
--- a/lib/HVweb_Item.pm
+++ b/lib/HVweb_Item.pm
@@ -53,14 +53,12 @@ sub add {
     $self->{$state} = $cmd;    #Homevision html tag to set item state
     $self->{defined_states} .= ","
       if ( defined( $self->{defined_states} ) );    # comma delimiter
-    $self->{defined_states} .=
-      "$state";    #List of all states defined for this item
-    $self->{state} = '?';    #Item state returned by Homeivision
-    $self->{state_info} =
-      '';    #Addt'l state info from Homeiviosn (Ex. X10 Brightness level)
+    $self->{defined_states} .= "$state";            #List of all states defined for this item
+    $self->{state}      = '?';                      #Item state returned by Homeivision
+    $self->{state_info} = '';                       #Addt'l state info from Homeiviosn (Ex. X10 Brightness level)
     $self->{status_tag} = $status_tag
-      if ($status_tag);    #Homevision html tag to read item state
-    $self->{desc} = $desc if ($desc);    #Descriptive text for this item
+      if ($status_tag);                             #Homevision html tag to read item state
+    $self->{desc} = $desc if ($desc);               #Descriptive text for this item
 }
 
 sub default_setstate {
@@ -71,8 +69,7 @@ sub default_setstate {
     my $desc = $$self{desc};
 
     if ( $cmd eq '' ) {
-        &main::print_log(
-            "(HVWEB_ITEM) Error: Command '$desc' - '$state' not defined\n");
+        &main::print_log("(HVWEB_ITEM) Error: Command '$desc' - '$state' not defined\n");
         return;
     }
 
@@ -92,9 +89,7 @@ sub default_setstate {
         $self->{state} = $state;
     }
     else {
-        &main::print_log( "(HVWEB_ITEM) '$desc' - '$state' ($cmd) Error: "
-              . $res->status_line
-              . "\n" );
+        &main::print_log( "(HVWEB_ITEM) '$desc' - '$state' ($cmd) Error: " . $res->status_line . "\n" );
     }
     return;
 }
diff --git a/lib/HomeBase.pm b/lib/HomeBase.pm
index e89aba39a..28a8fcec8 100644
--- a/lib/HomeBase.pm
+++ b/lib/HomeBase.pm
@@ -43,11 +43,9 @@ sub read_time {
 
             #print "HomeBase time string: $data\n";
             # Not sure about $second.  $wday looks like year, not 0-7??
-            my ( $year, $month, $mday, $wday, $hour, $minute, $second ) =
-              unpack( "A2A2A2A2A2A2A2", $data );
+            my ( $year, $month, $mday, $wday, $hour, $minute, $second ) = unpack( "A2A2A2A2A2A2A2", $data );
             print "Homebase time:  $hour:$minute:$second $month/$mday/$year\n";
-            return
-              wantarray
+            return wantarray
               ? ( $second, $minute, $hour, $mday, $month, $year, $wday )
               : " $hour:$minute:$second $month/$mday/$year";
         }
@@ -67,15 +65,14 @@ sub read_log {
     print "Reading HomeBase log\n";
     if ( 6 == ( $temp = $serial_port->write("##%15\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # May need to paste data together to find real line breaks
+                                                   # May need to paste data together to find real line breaks
         my @log;
         my $buffer;
 
         # Read data in a buffer string
         while ( my $data = $serial_port->input ) {
             $buffer .= $data;
-            select undef, undef, undef,
-              100 / 1000;    # Need more/less/any delay here???
+            select undef, undef, undef, 100 / 1000;    # Need more/less/any delay here???
         }
 
         # Filter out extraneous stuff before splitting into list
@@ -131,7 +128,7 @@ sub read_flags {
     print "Reading HomeBase Flags\n";
     if ( 6 == ( $temp = $serial_port->write("##%10\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # How may flags?? Best look for end of data character ... \n\n??
+                                                   # How may flags?? Best look for end of data character ... \n\n??
         my @flags;
         while ( my $data = $serial_port->input ) {
             my ( $header, $flags ) = $data =~ /(\S+?)[\n\r]+(\S+)/;
@@ -159,14 +156,13 @@ sub read_variables {
     print "Reading HomeBase Variables\n";
     if ( 6 == ( $temp = $serial_port->write("##%12\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # May need to paste data together to find real line breaks
+                                                   # May need to paste data together to find real line breaks
         my @vars;
         my $buffer;
         while ( my $data = $serial_port->input ) {
             $buffer .= $data
-              unless ( $data =~ /#/ );    # ##0 is end of list marker
-            select undef, undef, undef,
-              100 / 1000;                 # Need more/less/any delay here???
+              unless ( $data =~ /#/ );             # ##0 is end of list marker
+            select undef, undef, undef, 100 / 1000;    # Need more/less/any delay here???
         }
         @vars = split /\r\n/, $buffer;
         my $count = @vars;
@@ -194,8 +190,7 @@ this command was decoded empirically from Starate/WinEVM interaction
 
 sub set_time {
     my ($serial_port) = @_;
-    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst )
-      = localtime time;
+    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst ) = localtime time;
     $Month++;
     $Wday++;
     my $localtime = localtime time;
@@ -224,13 +219,7 @@ sub set_time {
         abs( $main::config_parms{latitude} ),
         abs( $main::config_parms{longitude} ),
         abs( $main::config_parms{time_zone} ),
-        $isdst,
-        $Year,
-        $Month,
-        $Mday,
-        $Wday,
-        $Hour,
-        $Minute
+        $isdst, $Year, $Month, $Mday, $Wday, $Hour, $Minute
     );
 
     #Checksum not required, so set it to 00
@@ -238,13 +227,7 @@ sub set_time {
     my $checksum = "00";
     print "HomeBase set_time=$set_time checksum=$checksum\n";
 
-    if (
-        32 == (
-            $temp =
-              $serial_port->write( "##%05" . $set_time . $checksum . "\r" )
-        )
-      )
-    {
+    if ( 32 == ( $temp = $serial_port->write( "##%05" . $set_time . $checksum . "\r" ) ) ) {
         print "HomeBase time has been updated to $localtime\n";
         return 1;
     }
@@ -341,8 +324,7 @@ sub read {
           if lc( $main::config_parms{debug} ) eq 'homebase';
         my ( $record, $remainder );
         while ( ( $record, $remainder ) = $serial_data =~ /(.+?)\n(.*)/ ) {
-            $serial_data =
-              $remainder;    # Might have part of the next record left over
+            $serial_data = $remainder;    # Might have part of the next record left over
             print "db HomeBase serial data3=$record remainder=$remainder.\n"
               if lc( $main::config_parms{debug} ) eq 'homebase';
 
@@ -355,12 +337,12 @@ sub read {
             my @bytes = split //, $data;
 
             return undef
-              unless $bytes[0] eq '0';    # Only look at x10 data for now
+              unless $bytes[0] eq '0';            # Only look at x10 data for now
             return undef
               unless $bytes[1] eq '0'
-              or $bytes[1] eq '1';        # Only look at receive data for now
-             # Disable using the Stargate for X10 receive if so configured.  I am using the CM11a and just use
-             # the stargate for I/O and phone control (bsobel@vipmail.com)
+              or $bytes[1] eq '1'; # Only look at receive data for now
+                                   # Disable using the Stargate for X10 receive if so configured.  I am using the CM11a and just use
+                                   # the stargate for I/O and phone control (bsobel@vipmail.com)
             return if $main::config_parms{HomeBase_DisableX10Receive};
 
             my ( $house, $device );
diff --git a/lib/Homevision.pm b/lib/Homevision.pm
index a8f23b0cf..9d57d6be9 100644
--- a/lib/Homevision.pm
+++ b/lib/Homevision.pm
@@ -63,8 +63,7 @@ sub send {
       if lc( $main::config_parms{debug} ) =~ /homevision/;
 
     if ( $data =~ /^X/ ) {
-        if ( my ( $house, $unit, $func ) = $data =~ /^X([A-P])([0-9A-F]).(.*)/ )
-        {
+        if ( my ( $house, $unit, $func ) = $data =~ /^X([A-P])([0-9A-F]).(.*)/ ) {
             $house = unpack( 'C', $house ) - 65;    #Get HV code from ASCII
 
             #           printf("House $house = %s ($house)\n", makehex($house));
@@ -77,14 +76,13 @@ sub send {
             my ($code) = &makehex( $house * 16 + $unit - 1 );
 
             {
-                $cmd .= "X" . $code . "00", last if $func eq "J"; #On
-                $cmd .= "X" . $code . "03", last if $func eq "K"; #Off
-                $cmd .= "X" . $code . "0B", last if $func eq "L"; #Brighten once
-                $cmd .= "X" . $code . "05", last if $func eq "M"; #Dim once
+                $cmd .= "X" . $code . "00", last if $func eq "J";    #On
+                $cmd .= "X" . $code . "03", last if $func eq "K";    #Off
+                $cmd .= "X" . $code . "0B", last if $func eq "L";    #Brighten once
+                $cmd .= "X" . $code . "05", last if $func eq "M";    #Dim once
 
                 #Set to level
-                $cmd .= "P" . $code . "11" . &makehex( int( $func / 6.5 ) ),
-                  last
+                $cmd .= "P" . $code . "11" . &makehex( int( $func / 6.5 ) ), last
                   if $func =~ /^[0-9]*/;
 
                 #Dim n-times
@@ -96,8 +94,7 @@ sub send {
                   if $func =~ /^\+([0-9]*)/;
 
                 #else (if it falls through to here...
-                print
-                  "Homevision::send X10, sorry I don't understand $data just yet\n";
+                print "Homevision::send X10, sorry I don't understand $data just yet\n";
                 return;
             }
         }
@@ -109,9 +106,8 @@ sub send {
 
         $cmd .= ";" . makehex($code) . "00";
     }
-    elsif ( my ( $byte1, $byte2 ) =
-        $data =~ /^IRCode([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])$/ )
-    {
+    elsif ( my ( $byte1, $byte2 ) = $data =~ /^IRCode([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])$/ ) {
+
         #Send a Homevision IR command (one that Homevision understands)
 
         $cmd .= "T" . $byte1 . $byte2 . "00";
@@ -142,19 +138,17 @@ sub send {
     my $count = 0;
     do {
         $count++;
-        select undef, undef, undef, .2; #sleep .2 seconds or until input happens
+        select undef, undef, undef, .2;    #sleep .2 seconds or until input happens
         $response .= $serial_port->input;
       } until $response =~ /(.*)(Done\r)(.*)/
-      || $count >
-      26;    #Wait up to five seconds for response (could be a long dim)
+      || $count > 26;                      #Wait up to five seconds for response (could be a long dim)
 
     if ( $2 =~ /Done/ ) {
         print "Cool, got it. Leftovers (if any): ($1, $2)\n"
           if lc( $main::config_parms{debug} ) =~ /homevision/;
     }
     else {
-        print
-          "Homevision::send() I waited for a return response for '$cmd', but it didn't come...\n";
+        print "Homevision::send() I waited for a return response for '$cmd', but it didn't come...\n";
     }
 
     #Give any leftovers to the read routine's overflow buffer:
@@ -209,8 +203,7 @@ sub send_X10 {
     #############
     #############
     #Need to wait for return code!!!!!
-    print
-      "Homevision::send_X10 checking for return code is unimplemented so far...\n";
+    print "Homevision::send_X10 checking for return code is unimplemented so far...\n";
     #############
     #############
 
@@ -252,8 +245,7 @@ sub read {
         my %table_dcodes = qw(On J    Off K    Bright L    Dim M);
 
         while ( ( $record, $remainder ) = $serial_data =~ /(.+?)\r(.*)/ ) {
-            $serial_data =
-              $remainder;    # Might have part of the next record left over
+            $serial_data = $remainder;    # Might have part of the next record left over
 
             #            print "db Homevision serial data3=$record remainder=$remainder\n" if lc($main::config_parms{debug}) =~ /homevision/;
 
@@ -261,8 +253,7 @@ sub read {
             if ( defined $main::config_parms{ECS_port} ) {
                 print "Forwarding '$record' to ECS\n"
                   if lc( $main::config_parms{debug} ) =~ /ecs/;
-                $main::Serial_Ports{'serial2'}{object}
-                  ->write("$record\r\n\001");
+                $main::Serial_Ports{'serial2'}{object}->write("$record\r\n\001");
             }
 
             #	    print "Homevision report: $record\n" if lc($main::config_parms{debug}) =~ /homevision/;
@@ -271,41 +262,31 @@ sub read {
                 my ($hvcode) = $record =~ /^([0-9A-F]*)/;
                 my $string = $record;
 
-                if ( my ( $house, $code ) =
-                    $string =~ /X-10 House\/Unit : ([A-P]) ([0-9]+)$/ )
-                {
+                if ( my ( $house, $code ) = $string =~ /X-10 House\/Unit : ([A-P]) ([0-9]+)$/ ) {
                     $code = substr( &makeX10hex($code), 1, 1 );
                     $code = chop($code);
                     print "Homevision returns: X" . $house . $code . "\n";
                     return "X" . $house . $code;
                 }
-                elsif ( my ( $house, $func ) =
-                    $string =~ /X-10 .* : ([A-P]) (.*)$/ )
-                {
-                    print "Homevision returns: X"
-                      . $house
-                      . $table_dcodes{$func} . "\n";
+                elsif ( my ( $house, $func ) = $string =~ /X-10 .* : ([A-P]) (.*)$/ ) {
+                    print "Homevision returns: X" . $house . $table_dcodes{$func} . "\n";
                     return "X" . $house . $table_dcodes{$func};
                 }
-                elsif ( my ( $input, $state ) =
-                    $string =~
-                    /Input Port Changed.*: \#([0-9A-F]+) (Low|High)/ )
-                {
+                elsif ( my ( $input, $state ) = $string =~ /Input Port Changed.*: \#([0-9A-F]+) (Low|High)/ ) {
+
                     #Digital input changed state
 
                     $input = hex($input);
                     $state = lc($state);
                     return "INPUT$input$state";
                 }
-                elsif ( my ( $one, $two ) =
-                    $string =~ /Received IR Code = ([0-9A-F]+) ([0-9A-F]+)/ )
-                {
+                elsif ( my ( $one, $two ) = $string =~ /Received IR Code = ([0-9A-F]+) ([0-9A-F]+)/ ) {
+
                     #Standard format IR code
                     return "IRCode$one$two";
                 }
-                elsif ( my ($num) =
-                    $string =~ /Matches IR Signal.*= ([0-9A-F]+)/ )
-                {
+                elsif ( my ($num) = $string =~ /Matches IR Signal.*= ([0-9A-F]+)/ ) {
+
                     #Defined format IR code
                     $num = hex($num);
                     return "IRSlot$num";
@@ -314,11 +295,10 @@ sub read {
 
                     #Ignore
                 }
-                elsif ( $hvcode eq "82" || $hvcode eq "83" || $hvcode eq "93" )
-                {
+                elsif ( $hvcode eq "82" || $hvcode eq "83" || $hvcode eq "93" ) {
+
                     #Homevision Error!
-                    print
-                      "\n********\nHomevision::read error received: $record\n********\n";
+                    print "\n********\nHomevision::read error received: $record\n********\n";
                 }
                 else {
                     print "Homevision::read unimplemented: '$record'\n"
diff --git a/lib/IR_Item.pm b/lib/IR_Item.pm
index 6e539d6c9..a445d06ae 100644
--- a/lib/IR_Item.pm
+++ b/lib/IR_Item.pm
@@ -97,8 +97,7 @@ sub check_xap {
           unless $$xap_data{'xap-header'}{class}
           and $$xap_data{'xap-header'}{class} eq 'ir.receive';
         for my $o (@objects_xap) {
-            print
-              "IR_Item xap: $$xap_data{'ir.signal'}{device} = $$xap_data{'ir.signal'}{signal}\n";
+            print "IR_Item xap: $$xap_data{'ir.signal'}{device} = $$xap_data{'ir.signal'}{signal}\n";
             next unless uc $$xap_data{'ir.signal'}{device} eq $$o{device};
             $o->SUPER::set( $$xap_data{'ir.signal'}{signal}, 'xap' );
         }
@@ -161,8 +160,7 @@ sub default_setstate {
 
         # Lets build our own delay
         if ( $command eq 'DELAY' ) {
-            select undef, undef, undef,
-              0.3;   # Give it a chance to get going before doing other commands
+            select undef, undef, undef, 0.3;    # Give it a chance to get going before doing other commands
             next;
         }
 
@@ -180,13 +178,11 @@ sub default_setstate {
             $device_prev = $$self{device};
             return
               if &main::proxy_send( 'cm17', 'send_ir', "$device $command" );
-            &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object},
-                "$device $command" );
+            &ControlX10::CM17::send_ir( $main::Serial_Ports{cm17}{object}, "$device $command" );
             $device = '';    # Use device only on the first command
         }
         elsif ( $$self{interface} eq 'homevision' ) {
-            &Homevision::send( $main::Serial_Ports{Homevision}{object},
-                $command );
+            &Homevision::send( $main::Serial_Ports{Homevision}{object}, $command );
         }
         elsif ( $$self{interface} eq 'ncpuxa' ) {
             &ncpuxa_mh::send( $main::config_parms{ncpuxa_port}, $command );
@@ -204,8 +200,7 @@ sub default_setstate {
             &ninja_mh::send( $device, $command );
         }
         elsif ( $$self{interface} eq 'xap' ) {
-            &xAP::send( 'xAP', 'IR.Transmit',
-                'IR.Signal' => { Device => $device, Signal => $command } );
+            &xAP::send( 'xAP', 'IR.Transmit', 'IR.Signal' => { Device => $device, Signal => $command } );
         }
         else {
             print "IR_Item::set Interface $$self{interface} not supported.\n";
diff --git a/lib/IR_Utils.pm b/lib/IR_Utils.pm
index c3794ab72..56dbef189 100644
--- a/lib/IR_Utils.pm
+++ b/lib/IR_Utils.pm
@@ -31,10 +31,9 @@ my $buttons =
   '0	1	2	3	4	5	6	7	8	9	VOL +	VOL -	MUTE	CH +	CH -	POWER	ENTER	TV/VCR	LAST	MENU	GUIDE	Up	Down	Left	Right	SELECT	SLEEP	PIP	DISPLAY	SWAP	MOVE	PLAY	PAUSE	REW	FFWD	STOP	REC	EXIT	SURR';
 my %devices;
 
-my $device_file = "$::config_parms{data_dir}/infrared/Devices4.csv";
-my $irp_spreadsheet =
-  "$::config_parms{data_dir}/infrared/comparison_matrix.csv";
-my $devicelib_dir = "$::config_parms{data_dir}/infrared/devicelib";
+my $device_file     = "$::config_parms{data_dir}/infrared/Devices4.csv";
+my $irp_spreadsheet = "$::config_parms{data_dir}/infrared/comparison_matrix.csv";
+my $devicelib_dir   = "$::config_parms{data_dir}/infrared/devicelib";
 
 my %protocols;
 my %protocol_names;
@@ -97,8 +96,7 @@ sub read_irp_spreadsheet {
         next unless $protocol{'Form'};
         $protocols{ $protocol{'UEIC Protocol ID'} } = {%protocol}
           if $protocol{'UEIC Protocol ID'};
-        $protocol_names{ $protocol{'Protocol Name in Devices4.xls'} } =
-          {%protocol}
+        $protocol_names{ $protocol{'Protocol Name in Devices4.xls'} } = {%protocol}
           if $protocol{'Protocol Name in Devices4.xls'};
     }
     close IRP;
@@ -146,21 +144,13 @@ sub read_dvc_file {
                 $key = uc $key;
                 $prontos{$key} = $pronto;
             }
-            elsif ( my ( $key, $device_code, $function_code ) =
-                /(.+?)\s*=\s*(\d+)\s*[,;]\s*(\d+)\s*$/ )
-            {
+            elsif ( my ( $key, $device_code, $function_code ) = /(.+?)\s*=\s*(\d+)\s*[,;]\s*(\d+)\s*$/ ) {
                 $key = uc $key;
-                ( $prontos{$key} ) =
-                  &IR_Utils::generate_pronto( $parms{protocol}, $device_code,
-                    $function_code );
+                ( $prontos{$key} ) = &IR_Utils::generate_pronto( $parms{protocol}, $device_code, $function_code );
             }
-            elsif ( my ( $key, $function_code ) =
-                /(.+?)\s*=\s*[,;]?\s*(\d+)\s*$/ )
-            {
+            elsif ( my ( $key, $function_code ) = /(.+?)\s*=\s*[,;]?\s*(\d+)\s*$/ ) {
                 $key = uc $key;
-                ( $prontos{$key} ) =
-                  &IR_Utils::generate_pronto( $parms{protocol},
-                    $parms{'device code'}, $function_code );
+                ( $prontos{$key} ) = &IR_Utils::generate_pronto( $parms{protocol}, $parms{'device code'}, $function_code );
 
                 #print "k $prontos{$key}, p $parms{protocol}, d $parms{'device code'}, f $function_code\n";
             }
@@ -198,10 +188,8 @@ sub generate_ofa_device {
     my %prontos;
     my %keys = get_ofa_keys( $type, $code );
     while ( my ( $key, $efc ) = each %keys ) {
-        my ( $protocol, $device, $function ) =
-          get_function( $type, $code, $efc );
-        print
-          "$type $code $key protocol $protocol efc $efc device $device function $function\n";
+        my ( $protocol, $device, $function ) = get_function( $type, $code, $efc );
+        print "$type $code $key protocol $protocol efc $efc device $device function $function\n";
         ( $prontos{$key}, $repeat ) =
           generate_pronto( uc $protocol, $device, $function );
     }
@@ -234,8 +222,7 @@ sub generate_pronto {
     foreach ( $protocol{'Default'}, $protocol{'Define'} ) {
         my $equation = $_;
         next unless $equation;
-        $equation =~
-          s/([A-Z])\((\d)\.\.(\d)\)/(ord pack 'b*', join '', (split '', unpack 'b8', pack 's', $1)[$2..$3])/g;
+        $equation =~ s/([A-Z])\((\d)\.\.(\d)\)/(ord pack 'b*', join '', (split '', unpack 'b8', pack 's', $1)[$2..$3])/g;
         $equation =~ s/([A-Z])/\$vars{"$1"}/g;
         eval $equation;
     }
@@ -269,9 +256,7 @@ sub generate_pronto {
                 }
 
                 # handle [1 ^100000]
-                elsif ( my ( $pulse, $duration ) =
-                    $string =~ /^(\d+)\s+\^(\d+)$/ )
-                {
+                elsif ( my ( $pulse, $duration ) = $string =~ /^(\d+)\s+\^(\d+)$/ ) {
                     push @data, abs( $pulse * $time ), 0 if $pulse;
                     $length++ if $pulse;
                     foreach ( @data[ 4 .. $#data - 1 ] ) {
@@ -329,16 +314,13 @@ sub generate_pronto {
             }
 
             # handle 25:8 (variables already substituted)
-            elsif ( my ( $inverse, $value, $width ) =
-                $part =~ /(~?)(\d*):(\d+)/ )
-            {
+            elsif ( my ( $inverse, $value, $width ) = $part =~ /(~?)(\d*):(\d+)/ ) {
                 $value = 0xff & ~( 0 + $value ) if $inverse;
                 $value = ( 0 + $value ) << ( 8 - $width )
                   if $msb and $width < 8;
                 my $format = ( $msb ? 'B' : 'b' ) . $width;
-                foreach
-                  my $bit ( split '', unpack $format, pack 'C', 0 + $value )
-                {
+                foreach my $bit ( split '', unpack $format, pack 'C', 0 + $value ) {
+
                     #print "bit $bit\n";
                     if ( $modulation eq 'PPM' ) {
                         my $phase = (
@@ -417,12 +399,10 @@ sub get_function {
         $function = 63 - $efc2obc[$efc];
     }
     elsif ( $efc_conv eq 'MSB' ) {
-        $function = unpack 'C', pack 'b8', unpack 'B8', pack 'C',
-          0 + $efc2obc[$efc];
+        $function = unpack 'C', pack 'b8', unpack 'B8', pack 'C', 0 + $efc2obc[$efc];
     }
     elsif ( $efc_conv eq '~MSB' ) {
-        $function = unpack 'C', pack 'b8', unpack 'B8', pack 'C',
-          0 + ( 255 - $efc2obc[$efc] );
+        $function = unpack 'C', pack 'b8', unpack 'B8', pack 'C', 0 + ( 255 - $efc2obc[$efc] );
     }
     elsif ( $efc_conv eq 'LSB' ) {
         $function = $efc2obc[$efc];
diff --git a/lib/Insteon.pm b/lib/Insteon.pm
index c69da753c..8597f2e9e 100755
--- a/lib/Insteon.pm
+++ b/lib/Insteon.pm
@@ -379,8 +379,7 @@ device in awake mode for a longer period of time.  See B<Mark as Manually Awake>
 
 =cut
 
-my ( @_insteon_plm, @_insteon_device, @_insteon_link, @_scannable_link,
-    $_scan_cnt, $_sync_cnt, $_sync_failure_cnt );
+my ( @_insteon_plm, @_insteon_device, @_insteon_link, @_scannable_link, $_scan_cnt, $_sync_cnt, $_sync_failure_cnt );
 my $init_complete;
 my ( @_scan_devices,      @_scan_device_failures, $current_scan_device );
 my ( @_sync_devices,      @_sync_device_failures, $current_sync_device );
@@ -408,19 +407,14 @@ sub stress_test_all {
         $_stress_test_count    = $p_count;
         $_stress_test_one_pass = $is_one_pass;
         @_stress_test_devices  = undef;
-        push @_stress_test_devices,
-          Insteon::find_members("Insteon::BaseDevice");
-        main::print_log(
-            "[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times"
-        );
+        push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
+        main::print_log( "[Insteon::Stress Test All Devices] Stress Testing All Devices $p_count times" );
     }
     if ( !@_stress_test_devices ) {
 
         #Iteration may be complete, start over from the beginning
-        $_stress_test_count =
-          ($_stress_test_one_pass) ? 0 : $_stress_test_count--;
-        push @_stress_test_devices,
-          Insteon::find_members("Insteon::BaseDevice");
+        $_stress_test_count = ($_stress_test_one_pass) ? 0 : $_stress_test_count--;
+        push @_stress_test_devices, Insteon::find_members("Insteon::BaseDevice");
     }
     if ( $_stress_test_count > 0 ) {
         my $current_stress_test_device;
@@ -435,8 +429,7 @@ sub stress_test_all {
         if ( ref $current_stress_test_device
             && $current_stress_test_device->can('stress_test') )
         {
-            $current_stress_test_device->stress_test( $run_count,
-                $complete_callback );
+            $current_stress_test_device->stress_test( $run_count, $complete_callback );
         }
     }
     else {
@@ -457,9 +450,7 @@ sub scan_all_linktables {
     my $skip_unchanged = pop(@_);
     $skip_unchanged = 0 if ( ref $skip_unchanged || !defined($skip_unchanged) );
     if ($current_scan_device) {
-        &main::print_log(
-            "[Scan all linktables] WARN: link already underway. Ignoring request for new scan ..."
-        );
+        &main::print_log( "[Scan all linktables] WARN: link already underway. Ignoring request for new scan ..." );
         return;
     }
     my @candidate_devices = ();
@@ -486,25 +477,20 @@ sub scan_all_linktables {
                       . " directly." );
             }
             elsif ( $candidate_object->is_root
-                and !( $candidate_object->isa('Insteon::InterfaceController') )
-              )
+                and !( $candidate_object->isa('Insteon::InterfaceController') ) )
             {
                 push @_scan_devices, $candidate_object;
-                &main::print_log( "[Scan all linktables] INFO1: "
-                      . $candidate_object->get_object_name
-                      . " will be scanned." )
+                &main::print_log( "[Scan all linktables] INFO1: " . $candidate_object->get_object_name . " will be scanned." )
                   if $candidate_object->debuglevel( 1, 'insteon' );
             }
             else {
-                &main::print_log( "[Scan all linktables] INFO: !!! "
-                      . $candidate_object->get_object_name
-                      . " is NOT a candidate for scanning." );
+                &main::print_log(
+                    "[Scan all linktables] INFO: !!! " . $candidate_object->get_object_name . " is NOT a candidate for scanning." );
             }
         }
     }
     else {
-        &main::print_log(
-            "[Scan all linktables] WARN: No insteon devices could be found");
+        &main::print_log("[Scan all linktables] WARN: No insteon devices could be found");
     }
     $_scan_cnt = scalar @_scan_devices;
 
@@ -521,8 +507,7 @@ the next device.
 sub _get_next_linkscan_failure {
     my ($skip_unchanged) = @_;
     push @_scan_device_failures, $current_scan_device;
-    &main::print_log(
-            "[Scan all link tables] WARN: failure occurred when scanning "
+    &main::print_log( "[Scan all link tables] WARN: failure occurred when scanning "
           . $current_scan_device->get_object_name
           . ".  Moving on..." );
     &_get_next_linkscan($skip_unchanged);
@@ -552,15 +537,13 @@ sub _get_next_linkscan {
         );
     }
     else {
-        ::print_log(
-            "[Scan all link tables] Completed scanning of all regular items.");
+        ::print_log("[Scan all link tables] Completed scanning of all regular items.");
         if ( scalar @_scan_device_failures ) {
             my $obj_list;
             for my $failed_obj (@_scan_device_failures) {
                 $obj_list .= $failed_obj->get_object_name . ", ";
             }
-            ::print_log( "[Scan all link tables] WARN, unable to "
-                  . " complete a scan of the following devices: $obj_list" );
+            ::print_log( "[Scan all link tables] WARN, unable to " . " complete a scan of the following devices: $obj_list" );
         }
     }
 }
@@ -586,11 +569,8 @@ sub sync_all_links {
 
     # iterate over all registered objects and compare whether the link tables match defined scene linkages in known Insteon_Links
     for my $obj ( &Insteon::find_members('Insteon::BaseController') ) {
-        my %sync_req =
-          ( 'sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0 );
-        &main::print_log( "[Sync all links] Adding "
-              . $obj->get_object_name
-              . " to sync queue" );
+        my %sync_req = ( 'sync_object' => $obj, 'audit_mode' => ($audit_mode) ? 1 : 0 );
+        &main::print_log( "[Sync all links] Adding " . $obj->get_object_name . " to sync queue" );
         push @_sync_devices, \%sync_req;
     }
 
@@ -658,8 +638,7 @@ the failed device to the module global variable @_sync_device_failures.
 sub _get_next_linksync_failure {
     push @_sync_device_failures, $current_sync_device
       unless ( grep { $current_sync_device == $_ } @_sync_device_failures );
-    &main::print_log(
-            "[Sync all links] WARN: failure occurred when syncing links for "
+    &main::print_log( "[Sync all links] WARN: failure occurred when syncing links for "
           . $current_sync_device->get_object_name
           . ". Resuming sync queue if it exists." );
     my $num_sync_queue = @{ $$current_sync_device{sync_queue} };
@@ -686,8 +665,7 @@ sub ping_all {
         $_ping_count   = $p_count;
         @_ping_devices = ();
         push @_ping_devices, Insteon::find_members("Insteon::BaseDevice");
-        main::print_log(
-            "[Insteon::Ping All Devices] Ping All Devices $p_count times");
+        main::print_log("[Insteon::Ping All Devices] Ping All Devices $p_count times");
     }
     if (@_ping_devices) {
         my $current_ping_device;
@@ -754,13 +732,8 @@ sub log_all_ADLB_status {
         my $count        = 0;
         foreach my $current_log_ALDB_device (@_log_ALDB_devices) {
             $count++;
-            if (
-                $current_log_ALDB_device->is_root
-                and !(
-                    $current_log_ALDB_device->isa(
-                        'Insteon::InterfaceController')
-                )
-              )
+            if ( $current_log_ALDB_device->is_root
+                and !( $current_log_ALDB_device->isa('Insteon::InterfaceController') ) )
             {
                 &main::print_log( "[log all device ALDB status] Now logging: "
                       . $current_log_ALDB_device->get_object_name()
@@ -770,17 +743,13 @@ sub log_all_ADLB_status {
             else {
                 main::print_log( "[log all device ALDB status] INFO: !!! "
                       . $current_log_ALDB_device->get_object_name
-                      . " is NOT a candidate for logging ($count of $log_ALDB_cnt)"
-                );
+                      . " is NOT a candidate for logging ($count of $log_ALDB_cnt)" );
             }
         }
-        main::print_log(
-            "[log all device ALDB status] All devices have completed logging");
+        main::print_log("[log all device ALDB status] All devices have completed logging");
     }
     else {
-        main::print_log(
-            "[log all device ALDB status] WARN: No insteon devices could be found"
-        );
+        main::print_log( "[log all device ALDB status] WARN: No insteon devices could be found" );
     }
 }
 
@@ -861,29 +830,21 @@ sub print_all_message_stats {
         }
 
         #Calculate the averages
-        $retry_average =
-          sprintf( "%.1f", ( $retry_count_log / $outgoing_count_log ) + 1 )
+        $retry_average = sprintf( "%.1f", ( $retry_count_log / $outgoing_count_log ) + 1 )
           if ( $outgoing_count_log > 0 );
-        $fail_percentage =
-          sprintf( "%.1f", ( $fail_count_log / $outgoing_count_log ) * 100 )
+        $fail_percentage = sprintf( "%.1f", ( $fail_count_log / $outgoing_count_log ) * 100 )
           if ( $outgoing_count_log > 0 );
-        $corrupt_percentage =
-          sprintf( "%.1f", ( $corrupt_count_log / $incoming_count_log ) * 100 )
+        $corrupt_percentage = sprintf( "%.1f", ( $corrupt_count_log / $incoming_count_log ) * 100 )
           if ( $incoming_count_log > 0 );
-        $dupe_percentage =
-          sprintf( "%.1f", ( $dupe_count_log / $incoming_count_log ) * 100 )
+        $dupe_percentage = sprintf( "%.1f", ( $dupe_count_log / $incoming_count_log ) * 100 )
           if ( $incoming_count_log > 0 );
-        $avg_hops_left =
-          sprintf( "%.1f", ( $hops_left_count / $incoming_count_log ) )
+        $avg_hops_left = sprintf( "%.1f", ( $hops_left_count / $incoming_count_log ) )
           if ( $incoming_count_log > 0 );
-        $avg_max_hops =
-          sprintf( "%.1f", ( $max_hops_count / $incoming_count_log ) )
+        $avg_max_hops = sprintf( "%.1f", ( $max_hops_count / $incoming_count_log ) )
           if ( $incoming_count_log > 0 );
-        $avg_out_hops =
-          sprintf( "%.1f", ( $outgoing_hop_count / $outgoing_count_log ) )
+        $avg_out_hops = sprintf( "%.1f", ( $outgoing_hop_count / $outgoing_count_log ) )
           if ( $outgoing_count_log > 0 );
-        $curr_hops_avg =
-          sprintf( "%.1f", ( $default_hop_count / $device_count ) )
+        $curr_hops_avg = sprintf( "%.1f", ( $default_hop_count / $device_count ) )
           if ( $device_count > 0 );
         ::print_log( "[Insteon] Average Network Statistics:\n"
               . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops Unk_Error\n"
@@ -895,8 +856,7 @@ sub print_all_message_stats {
               . sprintf( "%9s",  $avg_hops_left )
               . sprintf( "%9s",  $avg_max_hops )
               . sprintf( "%9s",  $avg_max_hops - $avg_hops_left )
-              . sprintf( "%10s", &Insteon::active_interface->corrupt_count_log )
-              . "\n"
+              . sprintf( "%10s", &Insteon::active_interface->corrupt_count_log ) . "\n"
               . "   Out    Fail   %Fail Retry AvgSend Avg_Hops CurrHops\n"
               . sprintf( "%6s", $outgoing_count_log )
               . sprintf( "%8s", $fail_count_log )
@@ -905,14 +865,10 @@ sub print_all_message_stats {
               . sprintf( "%8s", $retry_average )
               . sprintf( "%9s", $avg_out_hops )
               . sprintf( "%9s", $curr_hops_avg ) );
-        main::print_log(
-            "[Insteon::Print_All_Message_Stats] All devices have completed logging"
-        );
+        main::print_log( "[Insteon::Print_All_Message_Stats] All devices have completed logging" );
     }
     else {
-        main::print_log(
-            "[Insteon::Print_All_Message_Stats] WARN: No insteon devices could be found"
-        );
+        main::print_log( "[Insteon::Print_All_Message_Stats] WARN: No insteon devices could be found" );
     }
 }
 
@@ -933,13 +889,10 @@ sub reset_all_message_stats {
             $current_log_device->reset_message_stats
               if $current_log_device->can('reset_message_stats');
         }
-        main::print_log(
-            "[Insteon::Reset_All_Message_Stats] All devices have been reset");
+        main::print_log("[Insteon::Reset_All_Message_Stats] All devices have been reset");
     }
     else {
-        main::print_log(
-            "[Insteon::Reset_All_Message_Stats] WARN: No insteon devices could be found"
-        );
+        main::print_log( "[Insteon::Reset_All_Message_Stats] WARN: No insteon devices could be found" );
     }
 }
 
@@ -984,8 +937,7 @@ sub init {
     $trigger_code = '&Insteon::scan_all_linktables()';
 
     # Create/update trigger for a nightly link table scan
-    &main::trigger_set( $trigger_event, $trigger_code, $trigger_type,
-        'scan insteon link tables', 1 );
+    &main::trigger_set( $trigger_event, $trigger_code, $trigger_type, 'scan insteon link tables', 1 );
     #################################################################
 
     @_insteon_plm    = ();
@@ -1029,21 +981,15 @@ sub generate_voice_commands {
         my $voice_cmds = $object->get_voice_cmds();
 
         #Initialize the voice command with all of the possible device commands
-        $object_string .= "$object_name_v  = new Voice_Cmd '$command ["
-          . join( ",", sort keys %$voice_cmds ) . "]';\n";
+        $object_string .= "$object_name_v  = new Voice_Cmd '$command [" . join( ",", sort keys %$voice_cmds ) . "]';\n";
 
         #Tie the proper routine to each voice command
         foreach ( keys %$voice_cmds ) {
-            $object_string .=
-                "$object_name_v -> tie_event('"
-              . $voice_cmds->{$_}
-              . "', '$_');\n\n";
+            $object_string .= "$object_name_v -> tie_event('" . $voice_cmds->{$_} . "', '$_');\n\n";
         }
 
         #Add this object to the list of Insteon Voice Commands on the Web Interface
-        $object_string .=
-          ::store_object_data( $object_name_v, 'Voice_Cmd', 'Insteon',
-            'Insteon_PLM_commands' );
+        $object_string .= ::store_object_data( $object_name_v, 'Voice_Cmd', 'Insteon', 'Insteon_PLM_commands' );
     }
 
     #Evaluate the resulting object generating string
@@ -1169,21 +1115,18 @@ sub check_all_aldb_versions {
         if ( $ALDB_device->is_root
             and !( $ALDB_device->isa('Insteon::InterfaceController') ) )
         {
-            main::print_log( "[Insteon] DEBUG4 Checking aldb version for "
-                  . $ALDB_device->get_object_name()
-                  . " ($count of $ALDB_cnt)" )
+            main::print_log(
+                "[Insteon] DEBUG4 Checking aldb version for " . $ALDB_device->get_object_name() . " ($count of $ALDB_cnt)" )
               if ( $ALDB_device->debuglevel( 4, 'insteon' ) );
             $ALDB_device->check_aldb_version();
         }
         else {
-            main::print_log( "[Insteon] DEBUG4 "
-                  . $ALDB_device->get_object_name
-                  . " does not have its own aldb ($count of $ALDB_cnt)" )
+            main::print_log(
+                "[Insteon] DEBUG4 " . $ALDB_device->get_object_name . " does not have its own aldb ($count of $ALDB_cnt)" )
               if ( $ALDB_device->debuglevel( 4, 'insteon' ) );
         }
     }
-    main::print_log(
-        "[Insteon] DEBUG4 Checking aldb version of all devices completed")
+    main::print_log("[Insteon] DEBUG4 Checking aldb version of all devices completed")
       if ( $main::Debug{insteon} >= 4 );
 }
 
@@ -1197,17 +1140,13 @@ sub check_thermo_versions {
         if (   $thermo_device->isa('Insteon::Thermostat')
             && $thermo_device->get_root()->engine_version eq "I2CS" )
         {
-            main::print_log( "[Insteon] DEBUG4 Setting thermostat "
-                  . $thermo_device->get_object_name()
-                  . " to i2CS" )
+            main::print_log( "[Insteon] DEBUG4 Setting thermostat " . $thermo_device->get_object_name() . " to i2CS" )
               if ( $thermo_device->debuglevel( 4, 'insteon' ) );
             bless $thermo_device, 'Insteon::Thermo_i2CS';
             $thermo_device->init();
         }
         else {
-            main::print_log( "[Insteon] DEBUG4 Setting thermostat "
-                  . $thermo_device->get_object_name()
-                  . " to i1" )
+            main::print_log( "[Insteon] DEBUG4 Setting thermostat " . $thermo_device->get_object_name() . " to i1" )
               if ( $thermo_device->debuglevel( 4, 'insteon' ) );
             bless $thermo_device, 'Insteon::Thermo_i1';
         }
@@ -1288,8 +1227,7 @@ sub _active_interface {
     if ( !( $$self{active_interface} ) and $interface ) {
         &main::print_log("[Insteon] Setting up initialization hooks")
           if $main::Debug{insteon};
-        &main::MainLoop_pre_add_hook( \&Insteon::BaseInterface::check_for_data,
-            1 );
+        &main::MainLoop_pre_add_hook( \&Insteon::BaseInterface::check_for_data, 1 );
         &main::Reload_post_add_hook( \&Insteon::check_all_aldb_versions, 1 );
         &main::Reload_post_add_hook( \&Insteon::BaseInterface::poll_all, 1 );
         $init_complete = 0;
diff --git a/lib/Insteon/AllLinkDatabase.pm b/lib/Insteon/AllLinkDatabase.pm
index ebcd2bc66..2f4414b43 100644
--- a/lib/Insteon/AllLinkDatabase.pm
+++ b/lib/Insteon/AllLinkDatabase.pm
@@ -159,18 +159,14 @@ sub query_aldb_delta {
         && $self->health ne "unchanged"
         && $self->health ne "empty" )
     {
-        &::print_log( "[Insteon::AllLinkDatabase] WARN The link table for "
-              . $self->{device}->get_object_name
-              . " has changed." );
+        &::print_log( "[Insteon::AllLinkDatabase] WARN The link table for " . $self->{device}->get_object_name . " has changed." );
         if ( defined $self->{_aldb_changed_callback} ) {
 
             package main;
             my $callback = $self->{_aldb_changed_callback};
             $self->{_aldb_changed_callback} = undef;
             eval($callback);
-            &::print_log( "[Insteon::AllLinkDatabase] "
-                  . $self->{device}->get_object_name
-                  . ": error during scan callback $@" )
+            &::print_log( "[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@" )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
@@ -180,9 +176,7 @@ sub query_aldb_delta {
         && ( ( &main::get_tickcount - $self->scandatetime() ) <= 2000 ) )
     {
         #if we just did a aldb_query less than 2 seconds ago, don't repeat
-        &::print_log( "[Insteon::AllLinkDatabase] The link table for "
-              . $self->{device}->get_object_name
-              . " is unchanged." );
+        &::print_log( "[Insteon::AllLinkDatabase] The link table for " . $self->{device}->get_object_name . " is unchanged." );
 
         #Further extend Scan Time in case of serial aldb requests
         $self->scandatetime(&main::get_tickcount);
@@ -192,18 +186,14 @@ sub query_aldb_delta {
             my $callback = $self->{_aldb_unchanged_callback};
             $self->{_aldb_unchanged_callback} = undef;
             eval($callback);
-            &::print_log( "[Insteon::AllLinkDatabase] "
-                  . $self->{device}->get_object_name
-                  . ": error during scan callback $@" )
+            &::print_log( "[Insteon::AllLinkDatabase] " . $self->{device}->get_object_name . ": error during scan callback $@" )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
         }
     }
     else {
-        my $message =
-          new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-            'status_request' );
+        my $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'status_request' );
         if ( defined( $$self{_failure_callback} ) ) {
             $message->failure_callback( $$self{_failure_callback} );
         }
@@ -280,10 +270,7 @@ sub restore_string {
           . $$self{device}->get_object_name
           . "->_aldb;\n";
         $restore_string .=
-            $$self{device}->get_object_name
-          . "->_aldb->restore_aldb(q~$aldb~) if "
-          . $$self{device}->get_object_name
-          . "->_aldb;\n";
+          $$self{device}->get_object_name . "->_aldb->restore_aldb(q~$aldb~) if " . $$self{device}->get_object_name . "->_aldb;\n";
     }
     return $restore_string;
 }
@@ -330,9 +317,7 @@ sub restore_aldb {
             }
             elsif ( scalar %aldb_record ) {
                 next unless $deviceid;
-                my $aldbkey =
-                  $self->get_linkkey( $deviceid, $groupid,
-                    $is_controller, $subaddress );
+                my $aldbkey = $self->get_linkkey( $deviceid, $groupid, $is_controller, $subaddress );
                 %{ $$self{aldb}{$aldbkey} } = %aldb_record;
             }
         }
@@ -392,36 +377,26 @@ sub delete_link {
         ## Check whether ALDB has changed
         $self->{callback_parms} = \%link_parms;
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::AllLinkDatabase::delete_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'ok')";
+          '&Insteon::AllLinkDatabase::delete_link(' . $$self{device}->{object_name} . "->_aldb, 'ok')";
         $$self{_aldb_changed_callback} =
-            '&Insteon::AllLinkDatabase::delete_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'fail')";
+          '&Insteon::AllLinkDatabase::delete_link(' . $$self{device}->{object_name} . "->_aldb, 'fail')";
         $self->query_aldb_delta("check");
     }
     elsif ( $link_parms{aldb_check} eq "fail" ) {
-        &::print_log(
-            "[Insteon::AllLinkDatabase] WARN: Link NOT deleted, please rescan this device and sync again."
-        );
+        &::print_log( "[Insteon::AllLinkDatabase] WARN: Link NOT deleted, please rescan this device and sync again." );
         if ( $link_parms{callback} ) {
 
             package main;
             eval( $link_parms{callback} );
             &::print_log(
-                "[Insteon::AllLinkDatabase] failure occurred in callback eval for "
-                  . $$self{device}->get_object_name . ":"
-                  . $@ )
+                "[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
         }
     }
     elsif ( $link_parms{address} && $link_parms{aldb_check} eq "ok" ) {
-        &main::print_log(
-            "[Insteon::AllLinkDatabase] Now deleting link [0x$link_parms{address}]"
-        );
+        &main::print_log( "[Insteon::AllLinkDatabase] Now deleting link [0x$link_parms{address}]" );
         $$self{_mem_activity} = 'delete';
         $$self{pending_aldb}{address} = $link_parms{address};
         if ( $self->isa('Insteon::ALDB_i1') ) {
@@ -444,15 +419,11 @@ sub delete_link {
         my $subaddress = ( $link_parms{data3} ) ? $link_parms{data3} : '00';
 
         # get the address via lookup into the hash
-        my $key =
-          $self->get_linkkey( $deviceid, $groupid, $is_controller,
-            $subaddress );
+        my $key = $self->get_linkkey( $deviceid, $groupid, $is_controller, $subaddress );
         my $address = $$self{aldb}{$key}{address};
         if ($address) {
-            &main::print_log(
-                "[Insteon::AllLinkDatabase] Now deleting link [0x$address] with the following data"
-                  . " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress"
-            );
+            &main::print_log( "[Insteon::AllLinkDatabase] Now deleting link [0x$address] with the following data"
+                  . " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress" );
 
             # now, alter the flags byte such that the in_use flag is set to 0
             $$self{_mem_activity}               = 'delete';
@@ -472,15 +443,12 @@ sub delete_link {
             &main::print_log( '[Insteon::AllLinkDatabase] WARN: ('
                   . $$self{device}->get_object_name
                   . ') attempt to delete link that does not exist!'
-                  . " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress"
-            );
+                  . " deviceid=$deviceid, groupid=$groupid, is_controller=$is_controller, subaddress=$subaddress" );
             if ( $link_parms{callback} ) {
 
                 package main;
                 eval( $link_parms{callback} );
-                &::print_log(
-                    "[Insteon::AllLinkDatabase] error encountered during delete_link callback: "
-                      . $@ )
+                &::print_log( "[Insteon::AllLinkDatabase] error encountered during delete_link callback: " . $@ )
                   if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
                 package Insteon::AllLinkDataBase;
@@ -518,13 +486,10 @@ sub delete_orphan_links {
                   . "Orphan Links' directly on the device to do this." );
         }
         elsif ( $self->health eq 'empty' ) {
-            ::print_log(
-                "[Insteon::AllLinkDatabase] Skipping $selfname, because it has no links"
-            );
+            ::print_log( "[Insteon::AllLinkDatabase] Skipping $selfname, because it has no links" );
         }
         else {
-            ::print_log(
-                "[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because the link table is: "
+            ::print_log( "[Insteon::AllLinkDatabase] Delete orphan links: skipping $selfname because the link table is: "
                   . $self->health
                   . ". Please rescan the link table of this device and rerun delete "
                   . "orphans if necessary" );
@@ -535,9 +500,7 @@ sub delete_orphan_links {
 
                 package main;
                 eval($failure_callback);
-                &::print_log(
-                    "[Insteon::AllLinkDatabase] error in delete orphans failure callback: "
-                      . $@ )
+                &::print_log( "[Insteon::AllLinkDatabase] error in delete orphans failure callback: " . $@ )
                   if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
                 package Insteon::AllLinkDatabase;
@@ -557,8 +520,7 @@ sub delete_orphan_links {
 
         # Define delete request
         my %delete_req = (
-            callback =>
-              "$selfname->_aldb->_process_delete_queue($is_batch_mode)",
+            callback         => "$selfname->_aldb->_process_delete_queue($is_batch_mode)",
             failure_callback => $failure_callback
         );
 
@@ -578,9 +540,8 @@ sub delete_orphan_links {
 
         # Initialize Variables
         my (
-            $linked_device, $plm_scene,     $controller_object,
-            $link_defined,  $controller_id, $responder_id,
-            $recip_data3,   $group_object,  $data3_object
+            $linked_device, $plm_scene,   $controller_object, $link_defined, $controller_id,
+            $responder_id,  $recip_data3, $group_object,      $data3_object
         );
         my $group         = lc $$self{aldb}{$linkkey}{group};
         my $is_controller = $$self{aldb}{$linkkey}{is_controller};
@@ -616,8 +577,7 @@ sub delete_orphan_links {
 
         # Is the linked device defined in MH?
         if ( !ref $linked_device ) {
-            $delete_req{cause} =
-              "no device with deviceid: $deviceid could be found";
+            $delete_req{cause} = "no device with deviceid: $deviceid could be found";
             push @{ $$self{delete_queue} }, \%delete_req;
             next LINKKEY;
         }
@@ -628,8 +588,7 @@ sub delete_orphan_links {
         {
             $plm_scene = Insteon::get_object( '000000', $group );
             if ( !ref $plm_scene && $group ne '01' && $group ne '00' ) {
-                $delete_req{cause} =
-                  "no plm scene for group $group could be found";
+                $delete_req{cause} = "no plm scene for group $group could be found";
                 push @{ $$self{delete_queue} }, \%delete_req;
                 next LINKKEY;
             }
@@ -637,10 +596,8 @@ sub delete_orphan_links {
 
         # Is this link defined in MH? 3-Step Process
         # Define variables based on type of link
-        $controller_id =
-          ($is_controller) ? $self_id : lc $linked_device->device_id;
-        $responder_id =
-          ($is_controller) ? lc $linked_device->device_id : $self_id;
+        $controller_id = ($is_controller) ? $self_id : lc $linked_device->device_id;
+        $responder_id = ($is_controller) ? lc $linked_device->device_id : $self_id;
         $controller_object = Insteon::get_object( $controller_id, $group );
         $controller_object = $plm_scene if ( ref $plm_scene );
 
@@ -662,10 +619,7 @@ sub delete_orphan_links {
 
                 #Ask self what we should have in data3
                 #For rspndr, D3 = rspndr group; For ctrlr, D3 = ctrlr group
-                my $link_data3 =
-                  $$self{device}
-                  ->link_data3( ( $is_controller ? $group : $member->group ),
-                    $is_controller );
+                my $link_data3 = $$self{device}->link_data3( ( $is_controller ? $group : $member->group ), $is_controller );
                 if ( $data3 eq $link_data3 ) {
                     $link_defined = 1;
                     $recip_data3 = ($is_controller) ? $member->group : $group;
@@ -719,8 +673,7 @@ sub delete_orphan_links {
         # Do not delete links to deaf devices
         if ( $linked_device->is_deaf ) {
             $delete_req{skip} =
-              "$selfname -- Skipping check for reciprocal links on deaf device "
-              . $linked_device->get_object_name;
+              "$selfname -- Skipping check for reciprocal links on deaf device " . $linked_device->get_object_name;
             next LINKKEY;
         }
 
@@ -741,21 +694,13 @@ sub delete_orphan_links {
         if ( $linked_device->isa("Insteon_PLM")
             and !$is_controller && ( $group eq '00' || $group eq '01' ) )
         {
-            $delete_req{skip} =
-              "$selfname -- Skipping check for reciprocal controller link on PLM for group 00 or 01.";
+            $delete_req{skip} = "$selfname -- Skipping check for reciprocal controller link on PLM for group 00 or 01.";
             next LINKKEY;
         }
 
         # Does a reciprocal link exist?
-        if (
-            !$linked_device->has_link(
-                $$self{device}, $group,
-                ($is_controller) ? 0 : 1, lc $recip_data3
-            )
-          )
-        {
-            $delete_req{cause} = "no reciprocal link was found on "
-              . $linked_device->get_object_name;
+        if ( !$linked_device->has_link( $$self{device}, $group, ($is_controller) ? 0 : 1, lc $recip_data3 ) ) {
+            $delete_req{cause} = "no reciprocal link was found on " . $linked_device->get_object_name;
             push @{ $$self{delete_queue} }, \%delete_req;
         }
 
@@ -766,13 +711,11 @@ sub delete_orphan_links {
         my $audit_text = "(AUDIT)" if ($audit_mode);
         my $log_text;
         if ( $delete_req{skip} ) {
-            $log_text =
-              "[Insteon::AllLinkDatabase] $audit_text " . $delete_req{skip};
+            $log_text = "[Insteon::AllLinkDatabase] $audit_text " . $delete_req{skip};
             splice @{ $$self{delete_queue} }, $index, 1;
         }
         else {
-            $log_text =
-              "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
+            $log_text = "[Insteon::AllLinkDatabase] $audit_text Deleting the following link on $selfname because ";
             $log_text .= $delete_req{cause} . "\n";
             PRINT: for ( keys %delete_req ) {
                 next PRINT
@@ -782,16 +725,12 @@ sub delete_orphan_links {
                 $log_text .= "$_ = $delete_req{$_}; ";
             }
             if ( $delete_req{deviceid} ) {
-                my $reciprocal_object =
-                  Insteon::get_object( $delete_req{deviceid}, '01' );
+                my $reciprocal_object = Insteon::get_object( $delete_req{deviceid}, '01' );
                 if ( !$delete_req{is_controller} ) {
-                    $reciprocal_object =
-                      Insteon::get_object( $delete_req{deviceid},
-                        $delete_req{group} );
+                    $reciprocal_object = Insteon::get_object( $delete_req{deviceid}, $delete_req{group} );
                 }
                 if ( ref $reciprocal_object ) {
-                    $log_text .= "linked device name= "
-                      . $reciprocal_object->get_object_name;
+                    $log_text .= "linked device name= " . $reciprocal_object->get_object_name;
                 }
             }
             $index++;
@@ -802,9 +741,7 @@ sub delete_orphan_links {
         @{ $$self{delete_queue} } = ();
     }
     else {
-        ::print_log(
-            "[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname"
-        );
+        ::print_log( "[Insteon::AllLinkDatabase] ## Begin processing delete queue for: $selfname" );
     }
     if ( !$$self{device}->isa('Insteon_PLM') ) {
         $self->_process_delete_queue($is_batch_mode);
@@ -828,10 +765,7 @@ sub _process_delete_queue {
                     "[Insteon::AllLinkDatabase] (#$num_in_queue) "
                   . $$self{device}->get_object_name
                   . " now deleting orphaned link w/ details: "
-                  . (
-                    ( $delete_req{is_controller} ) ? "controller" : "responder"
-                  )
-                  . ", "
+                  . ( ( $delete_req{is_controller} ) ? "controller" : "responder" ) . ", "
                   . (
                     ( $delete_req{object} )
                     ? "device=" . $delete_req{object}->get_object_name
@@ -851,8 +785,7 @@ sub _process_delete_queue {
               . " links" )
           if $self->{device}->debuglevel( 1, 'insteon' );
         if ($is_batch_mode) {
-            $$self{device}->interface->_aldb->_process_delete_queue(
-                $$self{delete_queue_processed} );
+            $$self{device}->interface->_aldb->_process_delete_queue( $$self{delete_queue_processed} );
         }
     }
 }
@@ -964,19 +897,13 @@ sub get_first_empty_address {
                 $high_address = $new_address;
             }
         }
-        $first_address =
-          ( $high_address > 0 ) ? sprintf( '%04x', $high_address - 8 ) : 0;
+        $first_address = ( $high_address > 0 ) ? sprintf( '%04x', $high_address - 8 ) : 0;
         main::print_log(
-            "[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address ["
-              . $first_address
-              . "]" )
+            "[Insteon::AllLinkDatabase] DEBUG4: No empty link entries; using next lowest link address [" . $first_address . "]" )
           if $self->{device}->debuglevel( 4, 'insteon' );
     }
     else {
-        main::print_log(
-                "[Insteon::AllLinkDatabase] DEBUG4: Found empty address ["
-              . $first_address
-              . "] in empty array" )
+        main::print_log( "[Insteon::AllLinkDatabase] DEBUG4: Found empty address [" . $first_address . "] in empty array" )
           if $self->{device}->debuglevel( 4, 'insteon' );
     }
 
@@ -1032,27 +959,19 @@ sub add_link {
         ## Check whether ALDB has changed
         $self->{callback_parms} = \%link_parms;
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::AllLinkDatabase::add_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'ok')";
+          '&Insteon::AllLinkDatabase::add_link(' . $$self{device}->{object_name} . "->_aldb, 'ok')";
         $$self{_aldb_changed_callback} =
-            '&Insteon::AllLinkDatabase::add_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'fail')";
+          '&Insteon::AllLinkDatabase::add_link(' . $$self{device}->{object_name} . "->_aldb, 'fail')";
         $self->query_aldb_delta("check");
     }
     elsif ( $link_parms{aldb_check} eq "fail" ) {
-        &::print_log(
-            "[Insteon::AllLinkDatabase] WARN: Link NOT added, please rescan this device and sync again."
-        );
+        &::print_log( "[Insteon::AllLinkDatabase] WARN: Link NOT added, please rescan this device and sync again." );
         if ( $link_parms{callback} ) {
 
             package main;
             eval( $link_parms{callback} );
             &::print_log(
-                "[Insteon::AllLinkDatabase] failure occurred in callback eval for "
-                  . $$self{device}->get_object_name . ":"
-                  . $@ )
+                "[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
@@ -1069,9 +988,7 @@ sub add_link {
             package main;
             eval( $link_parms{callback} );
             &::print_log(
-                "[Insteon::AllLinkDatabase] failure occurred in callback eval for "
-                  . $$self{device}->get_object_name . ":"
-                  . $@ )
+                "[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
@@ -1082,17 +999,16 @@ sub add_link {
         # strip optional % sign to append on_level
         my $on_level = $link_parms{on_level};
         $on_level =~ s/(\d)%?/$1/;
-        $on_level = '100' unless defined($on_level); # 100% == on is the default
-              # strip optional s (seconds) to append ramp_rate
+        $on_level = '100' unless defined($on_level);    # 100% == on is the default
+                                                        # strip optional s (seconds) to append ramp_rate
         my $ramp_rate = $link_parms{ramp_rate};
         $ramp_rate =~ s/(\d)s?/$1/;
-        $ramp_rate = '0.1' unless $ramp_rate;    # 0.1s is the default
-              # get the first available memory location
+        $ramp_rate = '0.1' unless $ramp_rate;           # 0.1s is the default
+                                                        # get the first available memory location
         my $address = $self->get_first_empty_address();
 
         if ($address) {
-            &::print_log(
-                    "[Insteon::AllLinkDatabase] DEBUG2: adding link record to "
+            &::print_log( "[Insteon::AllLinkDatabase] DEBUG2: adding link record to "
                   . $$self{device}->get_object_name
                   . " light level controlled by "
                   . $insteon_object->get_object_name
@@ -1114,14 +1030,12 @@ sub add_link {
 
             #data3 is defined above
             $$self{_mem_activity} = 'add';
-            $self->_write_link( $address, $device_id, $group, $is_controller,
-                $data1, $data2, $data3 );
+            $self->_write_link( $address, $device_id, $group, $is_controller, $data1, $data2, $data3 );
 
             # TO-DO: ensure that pop'd address is restored back to queue if the transaction fails
         }
         else {
-            &::print_log(
-                "[Insteon::AllLinkDatabase] ERROR: adding link record failed because "
+            &::print_log( "[Insteon::AllLinkDatabase] ERROR: adding link record failed because "
                   . $$self{device}->get_object_name
                   . " does not have a record of the first empty ALDB record."
                   . " Please rescan this device's link table" )
@@ -1131,9 +1045,7 @@ sub add_link {
 
                 package main;
                 eval( $$self{_success_callback} );
-                &::print_log(
-                    "[Insteon::AllLinkDatabase] WARN1: Error encountered during callback: "
-                      . $@ )
+                &::print_log( "[Insteon::AllLinkDatabase] WARN1: Error encountered during callback: " . $@ )
                   if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
                 package Insteon::AllLinkDatabase;
@@ -1197,27 +1109,19 @@ sub update_link {
         ## Check whether ALDB has changed
         $self->{callback_parms} = \%link_parms;
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::AllLinkDatabase::update_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'ok')";
+          '&Insteon::AllLinkDatabase::update_link(' . $$self{device}->{object_name} . "->_aldb, 'ok')";
         $$self{_aldb_changed_callback} =
-            '&Insteon::AllLinkDatabase::update_link('
-          . $$self{device}->{object_name}
-          . "->_aldb, 'fail')";
+          '&Insteon::AllLinkDatabase::update_link(' . $$self{device}->{object_name} . "->_aldb, 'fail')";
         $self->query_aldb_delta("check");
     }
     elsif ( $link_parms{aldb_check} eq "fail" ) {
-        &::print_log(
-            "[Insteon::AllLinkDatabase] WARN: Cannot update link, please rescan this device and sync again."
-        );
+        &::print_log( "[Insteon::AllLinkDatabase] WARN: Cannot update link, please rescan this device and sync again." );
         if ( $link_parms{callback} ) {
 
             package main;
             eval( $link_parms{callback} );
             &::print_log(
-                "[Insteon::AllLinkDatabase] failure occurred in callback eval for "
-                  . $$self{device}->get_object_name . ":"
-                  . $@ )
+                "[Insteon::AllLinkDatabase] failure occurred in callback eval for " . $$self{device}->get_object_name . ":" . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
@@ -1226,12 +1130,10 @@ sub update_link {
     elsif ( defined $$self{aldb}{$key} && $link_parms{aldb_check} eq "ok" ) {
         my $address = $$self{aldb}{$key}{address};
         $$self{_mem_activity} = 'update';
-        $self->_write_link( $address, $deviceid, $group, $is_controller,
-            $data1, $data2, $data3 );
+        $self->_write_link( $address, $deviceid, $group, $is_controller, $data1, $data2, $data3 );
     }
     else {
-        &::print_log(
-            "[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
+        &::print_log( "[Insteon::AllLinkDatabase] ERROR: updating link record failed because "
               . $$self{device}->get_object_name
               . " does not have an existing ALDB entry key=$key" )
           if $self->{device}->debuglevel( 1, 'insteon' );
@@ -1240,9 +1142,7 @@ sub update_link {
 
             package main;
             eval( $$self{_success_callback} );
-            &::print_log(
-                "[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: "
-                  . $@ )
+            &::print_log( "[Insteon::AllLinkDatabase] WARN1: Error encountered during ack callback: " . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::AllLinkDatabase;
@@ -1262,9 +1162,7 @@ sub log_alllink_table {
     my ($self) = @_;
     my %aldb;
 
-    &::print_log( "[Insteon::AllLinkDatabase] Link table for "
-          . $$self{device}->get_object_name . " is: "
-          . $self->health );
+    &::print_log( "[Insteon::AllLinkDatabase] Link table for " . $$self{device}->get_object_name . " is: " . $self->health );
 
     # We want to log links sorted by ALDB address. Since the ALDB
     # addresses are scattered throughout the %{$$self{aldb}} hash,
@@ -1307,22 +1205,18 @@ sub log_alllink_table {
                 $log_msg .= "holds a duplicate entry";
             }
             else {
-                my ($key) = keys %{ $aldb{$address} };    # There's only 1 key
-                my $aldb_entry = $aldb{$address}{$key};
+                my ($key)         = keys %{ $aldb{$address} };      # There's only 1 key
+                my $aldb_entry    = $aldb{$address}{$key};
                 my $is_controller = $aldb_entry->{is_controller};
                 my $device;
 
-                if (
-                    $$self{device}->interface()->device_id()
-                    && ( $$self{device}->interface()->device_id() eq
-                        $aldb_entry->{deviceid} )
-                  )
+                if ( $$self{device}->interface()->device_id()
+                    && ( $$self{device}->interface()->device_id() eq $aldb_entry->{deviceid} ) )
                 {
                     $device = $$self{device}->interface;
                 }
                 else {
-                    $device =
-                      &Insteon::get_object( $aldb_entry->{deviceid}, '01' );
+                    $device = &Insteon::get_object( $aldb_entry->{deviceid}, '01' );
                 }
                 my $object_name =
                   ($device)
@@ -1332,9 +1226,7 @@ sub log_alllink_table {
                 my $on_level = 'unknown';
                 if ( defined $aldb_entry->{data1} ) {
                     if ( $aldb_entry->{data1} ) {
-                        $on_level = int(
-                            ( hex( $aldb_entry->{data1} ) * 100 / 255 ) + .5 )
-                          . "%";
+                        $on_level = int( ( hex( $aldb_entry->{data1} ) * 100 / 255 ) + .5 ) . "%";
                     }
                     else {
                         $on_level = '0%';
@@ -1353,10 +1245,7 @@ sub log_alllink_table {
                         $on_level = $on_level eq '0%' ? 'off' : 'on';
                     }
                     else {
-                        $ramp_rate =
-                          &Insteon::DimmableLight::get_ramp_from_code(
-                            $aldb_entry->{data2} )
-                          . "s";
+                        $ramp_rate = &Insteon::DimmableLight::get_ramp_from_code( $aldb_entry->{data2} ) . "s";
                     }
                 }
 
@@ -1377,9 +1266,7 @@ sub log_alllink_table {
         }
     }
     else {
-        main::print_log( "[Insteon::AllLinkDatabase] The link table is "
-              . $self->health
-              . " and will not be listed" );
+        main::print_log( "[Insteon::AllLinkDatabase] The link table is " . $self->health . " and will not be listed" );
     }
 }
 
@@ -1471,8 +1358,7 @@ sub new {
 
 sub _on_poke {
     my ( $self, %msg ) = @_;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'peek' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'peek' );
     if (   ( $$self{_mem_activity} eq 'update' )
         or ( $$self{_mem_activity} eq 'add' ) )
     {
@@ -1528,10 +1414,8 @@ sub _on_poke {
         elsif ( $$self{_mem_action} eq 'aldb_data3' ) {
             ## update the aldb records w/ the changes that were made
             my $aldbkey = $self->get_linkkey(
-                $$self{pending_aldb}{deviceid},
-                $$self{pending_aldb}{group},
-                $$self{pending_aldb}{is_controller},
-                $$self{pending_aldb}{data3}
+                $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
             );
             $$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
             $$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
@@ -1543,7 +1427,7 @@ sub _on_poke {
                   $$self{pending_aldb}{is_controller};
                 $$self{aldb}{$aldbkey}{deviceid} =
                   lc $$self{pending_aldb}{deviceid};
-                $$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
+                $$self{aldb}{$aldbkey}{group}   = lc $$self{pending_aldb}{group};
                 $$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
                 $self->health("unchanged");
             }
@@ -1569,9 +1453,7 @@ sub _on_poke {
                 or $$self{device}->isa('Insteon::KeyPadLinc') )
             {
                 # update from eeprom--only a kpl issue
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'do_read_ee' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'do_read_ee' );
                 $self->_send_cmd($message);
             }
 
@@ -1582,8 +1464,7 @@ sub _on_poke {
     elsif ( $$self{_mem_activity} eq 'update_flags' ) {
 
         # update from eeprom--only a kpl issue
-        $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-            'do_read_ee' );
+        $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'do_read_ee' );
         $message->failure_callback( $$self{_failure_callback} );
         $self->_send_cmd($message);
     }
@@ -1599,10 +1480,8 @@ sub _on_poke {
         $self->delete_duplicate_link_address( $$self{pending_aldb}{address} );
         if ( exists $$self{pending_aldb}{deviceid} ) {
             my $key = $self->get_linkkey(
-                $$self{pending_aldb}{deviceid},
-                $$self{pending_aldb}{group},
-                $$self{pending_aldb}{is_controller},
-                $$self{pending_aldb}{data3}
+                $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
             );
             delete $$self{aldb}{$key};
         }
@@ -1617,8 +1496,7 @@ sub _on_poke {
                   . "links for "
                   . $$self{device}->get_object_name
                   . " now asking device to reread settings from memory." );
-            $message = new Insteon::InsteonMessage( 'insteon_send',
-                $$self{device}, 'do_read_ee' );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'do_read_ee' );
             $message->failure_callback( $$self{_failure_callback} );
             $self->_send_cmd($message);
         }
@@ -1627,8 +1505,7 @@ sub _on_poke {
             $$self{_mem_lsb} = '49' if ( $$self{_mem_lsb} eq '48' );
             $$self{_mem_lsb} = sprintf( "%02X", hex( $$self{_mem_lsb} ) + 1 );
             $message->extra( $$self{_mem_lsb} );
-            $message->failure_callback( $$self{_failure_callback} )
-              ;    #KRK again not sure this exists
+            $message->failure_callback( $$self{_failure_callback} );    #KRK again not sure this exists
             $self->_send_cmd($message);
         }
     }
@@ -1636,12 +1513,9 @@ sub _on_poke {
 
 sub _on_peek {
     my ( $self, %msg ) = @_;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'peek' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'peek' );
     if ( $msg{is_extended} ) {
-        &::print_log( "[Insteon::ALDB_i1]: extended peek for "
-              . $$self{device}->{object_name} . " is "
-              . $msg{extra} )
+        &::print_log( "[Insteon::ALDB_i1]: extended peek for " . $$self{device}->{object_name} . " is " . $msg{extra} )
           if $self->{device}->debuglevel( 1, 'insteon' );
     }
     else {
@@ -1652,8 +1526,7 @@ sub _on_peek {
                 # if the device is responding to the peek, then init the link table
                 #   if at the very start of a scan
                 if (    lc $$self{_mem_msb} eq '0f'
-                    and lc $$self{_mem_lsb} eq 'f8'
-                    && !$$self{_stress_test_act} )
+                    and lc $$self{_mem_lsb} eq 'f8' && !$$self{_stress_test_act} )
                 {
                     # reinit the aldb hash as there will be a new one
                     $$self{aldb} = undef;
@@ -1704,9 +1577,7 @@ sub _on_peek {
                 if ( $$self{_stress_test_act}
                     && !( $$self{pending_aldb}{highwater} ) )
                 {
-                    ::print_log(
-                        "[Insteon::ALDB_i1] You need to create a link on this device before running stress_test"
-                    );
+                    ::print_log( "[Insteon::ALDB_i1] You need to create a link on this device before running stress_test" );
                     $$self{_mem_activity}    = undef;
                     $$self{_mem_action}      = undef;
                     $$self{_stress_test_act} = 0;
@@ -1715,8 +1586,7 @@ sub _on_peek {
                 elsif ( !( $$self{pending_aldb}{highwater} ) ) {
 
                     # since this is the last unused memory location, then add it to the empty list
-                    $self->add_empty_address(
-                        $$self{_mem_msb} . $$self{_mem_lsb} );
+                    $self->add_empty_address( $$self{_mem_msb} . $$self{_mem_lsb} );
                     $$self{_mem_action} = undef;
 
                     # clear out mem_activity flag
@@ -1731,9 +1601,7 @@ sub _on_peek {
                         $self->health("unchanged");
                     }
 
-                    &::print_log( "[Insteon::ALDB_i1] "
-                          . $$self{device}->get_object_name
-                          . " completed link memory scan" )
+                    &::print_log( "[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " completed link memory scan" )
                       if $self->{device}->debuglevel( 1, 'insteon' );
                     $self->health("unchanged");
 
@@ -1753,11 +1621,9 @@ sub _on_peek {
                     $self->_send_cmd($message);
                 }
                 else {
-                    $self->add_empty_address(
-                        $$self{_mem_msb} . $$self{_mem_lsb} );
+                    $self->add_empty_address( $$self{_mem_msb} . $$self{_mem_lsb} );
                     if ( $$self{_mem_activity} eq 'scan' ) {
-                        my $newaddress = sprintf( "%04X",
-                            hex( $$self{_mem_msb} . $$self{_mem_lsb} ) - 8 );
+                        my $newaddress = sprintf( "%04X", hex( $$self{_mem_msb} . $$self{_mem_lsb} ) - 8 );
                         $$self{pending_aldb} = undef;
                         $self->_peek($newaddress);
                     }
@@ -1771,17 +1637,13 @@ sub _on_peek {
                 my $flag =
                   ( $$self{pending_aldb}{is_controller} ) ? 'E2' : 'A2';
                 $$self{pending_aldb}{flag} = $flag;
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra($flag);
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
             }
             elsif ( $$self{_mem_activity} eq 'delete' ) {
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra('02');
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
@@ -1804,9 +1666,7 @@ sub _on_peek {
                 $message->extra( $$self{_mem_lsb} );
             }
             else {
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra( $$self{pending_aldb}{group} );
             }
             $message->failure_callback( $$self{_failure_callback} );
@@ -1830,9 +1690,7 @@ sub _on_peek {
             }
             elsif ( $$self{_mem_activity} eq 'add' ) {
                 my $devid = substr( $$self{pending_aldb}{deviceid}, 0, 2 );
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra($devid);
             }
             $message->failure_callback( $$self{_failure_callback} );
@@ -1856,9 +1714,7 @@ sub _on_peek {
             }
             elsif ( $$self{_mem_activity} eq 'add' ) {
                 my $devid = substr( $$self{pending_aldb}{deviceid}, 2, 2 );
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra($devid);
             }
             $message->failure_callback( $$self{_failure_callback} );
@@ -1884,9 +1740,7 @@ sub _on_peek {
             }
             elsif ( $$self{_mem_activity} eq 'add' ) {
                 my $devid = substr( $$self{pending_aldb}{deviceid}, 4, 2 );
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra($devid);
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
@@ -1914,9 +1768,7 @@ sub _on_peek {
                 or $$self{_mem_activity} eq 'add' )
             {
                 # poke the new value
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra( $$self{pending_aldb}{data1} );
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
@@ -1944,9 +1796,7 @@ sub _on_peek {
                 or $$self{_mem_activity} eq 'add' )
             {
                 # poke the new value
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra( $$self{pending_aldb}{data2} );
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
@@ -1975,18 +1825,15 @@ sub _on_peek {
 
                         # save pending_aldb and then clear it out
                         my $aldbkey = $self->get_linkkey(
-                            $$self{pending_aldb}{deviceid},
-                            $$self{pending_aldb}{group},
-                            $$self{pending_aldb}{is_controller},
-                            $$self{pending_aldb}{data3}
+                            $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                            $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
                         );
 
                         # check for duplicates
                         if ( exists $$self{aldb}{$aldbkey}
                             && $$self{aldb}{$aldbkey}{inuse} )
                         {
-                            $self->add_duplicate_link_address(
-                                $$self{pending_aldb}{address} );
+                            $self->add_duplicate_link_address( $$self{pending_aldb}{address} );
                         }
                         else {
                             %{ $$self{aldb}{$aldbkey} } =
@@ -1994,11 +1841,9 @@ sub _on_peek {
                         }
                     }
                     else {
-                        $self->add_empty_address(
-                            $$self{pending_aldb}{address} );
+                        $self->add_empty_address( $$self{pending_aldb}{address} );
                     }
-                    my $newaddress = sprintf( "%04X",
-                        hex( $$self{pending_aldb}{address} ) - 8 );
+                    my $newaddress = sprintf( "%04X", hex( $$self{pending_aldb}{address} ) - 8 );
                     $$self{pending_aldb} = undef;
                     $self->_peek($newaddress);
                 }
@@ -2007,9 +1852,7 @@ sub _on_peek {
                 or $$self{_mem_activity} eq 'add' )
             {
                 # poke the new value
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra( $$self{pending_aldb}{data3} );
                 $message->failure_callback( $$self{_failure_callback} );
                 $self->_send_cmd($message);
@@ -2019,9 +1862,7 @@ sub _on_peek {
             my $device   = $$self{device};
             my $on_level = $$device{_onlevel};
             $on_level = &Insteon::DimmableLight::convert_level($on_level);
-            $message =
-              new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                'poke' );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
             $message->extra($on_level);
             $message->failure_callback( $$self{_failure_callback} );
             $self->_send_cmd($message);
@@ -2030,18 +1871,14 @@ sub _on_peek {
             my $device    = $$self{device};
             my $ramp_rate = $$device{_ramprate};
             $ramp_rate = '1f' unless $ramp_rate;
-            $message =
-              new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                'poke' );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
             $message->extra($ramp_rate);
             $message->failure_callback( $$self{_failure_callback} );
             $self->_send_cmd($message);
         }
         elsif ( $$self{_mem_action} eq 'update_flags' ) {
             my $flags = $$self{_operating_flags};
-            $message =
-              new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                'poke' );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
             $message->extra($flags);
             $message->failure_callback( $$self{_failure_callback} );
             $self->_send_cmd($message);
@@ -2052,24 +1889,18 @@ sub _on_peek {
             $byte = '00' if $byte eq '';
             $byte = sprintf( "%02X", $byte );
             if ( uc( $msg{extra} ) ne uc($byte) ) {
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-                    'poke' );
+                $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'poke' );
                 $message->extra($byte);
-                $message->failure_callback( $$self{_failure_callback} )
-                  ;    #KRK, I don't think this is set
+                $message->failure_callback( $$self{_failure_callback} );    #KRK, I don't think this is set
                 $self->_send_cmd($message);
             }
             else {
                 if ( $$self{_mem_lsb} eq '51' ) {
-                    ::print_log(
-                        "[Insteon::KeyPadLinc] Successfully wrote IntraDevice "
+                    ::print_log( "[Insteon::KeyPadLinc] Successfully wrote IntraDevice "
                           . "links for "
                           . $$self{device}->get_object_name
-                          . " now asking device to reread settings from memory."
-                    );
-                    $message = new Insteon::InsteonMessage( 'insteon_send',
-                        $$self{device}, 'do_read_ee' );
+                          . " now asking device to reread settings from memory." );
+                    $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'do_read_ee' );
                     $message->failure_callback( $$self{_failure_callback} );
                     $self->_send_cmd($message);
                 }
@@ -2079,17 +1910,14 @@ sub _on_peek {
                     $$self{_mem_lsb} =
                       sprintf( "%02X", hex( $$self{_mem_lsb} ) + 1 );
                     $message->extra( $$self{_mem_lsb} );
-                    $message->failure_callback( $$self{_failure_callback} )
-                      ;    #KRK again not sure this exists
+                    $message->failure_callback( $$self{_failure_callback} );    #KRK again not sure this exists
                     $self->_send_cmd($message);
                 }
             }
         }
         else {
-            ::print_log( "[Insteon::ALDB_i1] "
-                  . $$self{device}->get_object_name
-                  . ": unhandled _mem_action="
-                  . $$self{_mem_action} )
+            ::print_log(
+                "[Insteon::ALDB_i1] " . $$self{device}->get_object_name . ": unhandled _mem_action=" . $$self{_mem_action} )
               if $self->{device}->debuglevel( 1, 'insteon' );
         }
     }
@@ -2110,13 +1938,9 @@ sub update_local_properties {
     }
     else {
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::ALDB_i1::update_local_properties('
-          . $$self{device}->{object_name}
-          . "->_aldb, 1)";
+          '&Insteon::ALDB_i1::update_local_properties(' . $$self{device}->{object_name} . "->_aldb, 1)";
         $$self{_aldb_changed_callback} =
-            '&Insteon::ALDB_i1::update_local_properties('
-          . $$self{device}->{object_name}
-          . "->_aldb, 1)";
+          '&Insteon::ALDB_i1::update_local_properties(' . $$self{device}->{object_name} . "->_aldb, 1)";
         $self->query_aldb_delta("check");
     }
 }
@@ -2137,13 +1961,9 @@ sub update_flags {
     }
     else {
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::ALDB_i1::update_flags('
-          . $$self{device}->{object_name}
-          . "->_aldb, '$flags', 1)";
+          '&Insteon::ALDB_i1::update_flags(' . $$self{device}->{object_name} . "->_aldb, '$flags', 1)";
         $$self{_aldb_changed_callback} =
-            '&Insteon::ALDB_i1::update_flags('
-          . $$self{device}->{object_name}
-          . "->_aldb, '$flags', 1)";
+          '&Insteon::ALDB_i1::update_flags(' . $$self{device}->{object_name} . "->_aldb, '$flags', 1)";
         $self->query_aldb_delta("check");
     }
 }
@@ -2166,13 +1986,9 @@ sub update_intradevice_links {
     }
     else {
         $$self{_aldb_unchanged_callback} =
-            '&Insteon::ALDB_i1::update_intradevice_links('
-          . $$self{device}->{object_name}
-          . "->_aldb, '', 1)";
+          '&Insteon::ALDB_i1::update_intradevice_links(' . $$self{device}->{object_name} . "->_aldb, '', 1)";
         $$self{_aldb_changed_callback} =
-            '&Insteon::ALDB_i1::update_intradevice_links('
-          . $$self{device}->{object_name}
-          . "->_aldb, '', 1)";
+          '&Insteon::ALDB_i1::update_intradevice_links(' . $$self{device}->{object_name} . "->_aldb, '', 1)";
         $self->query_aldb_delta("check");
     }
 }
@@ -2193,14 +2009,11 @@ sub get_link_record {
 }
 
 sub _write_link {
-    my ( $self, $address, $deviceid, $group, $is_controller, $data1, $data2,
-        $data3 )
-      = @_;
+    my ( $self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3 ) = @_;
     if ($address) {
         &::print_log( "[Insteon::ALDB_i1] "
               . $$self{device}->get_object_name
-              . " address: $address found for device: $deviceid and group: $group"
-        );
+              . " address: $address found for device: $deviceid and group: $group" );
 
         # change address for start of change to be address + offset
         if ( $$self{_mem_activity} eq 'update' ) {
@@ -2210,9 +2023,9 @@ sub _write_link {
         $$self{pending_aldb}{deviceid}      = lc $deviceid;
         $$self{pending_aldb}{group}         = lc $group;
         $$self{pending_aldb}{is_controller} = $is_controller;
-        $$self{pending_aldb}{data1} = ( defined $data1 ) ? lc $data1 : '00';
-        $$self{pending_aldb}{data2} = ( defined $data2 ) ? lc $data2 : '00';
-        $$self{pending_aldb}{data3} = ( defined $data3 ) ? lc $data3 : '00';
+        $$self{pending_aldb}{data1}         = ( defined $data1 ) ? lc $data1 : '00';
+        $$self{pending_aldb}{data2}         = ( defined $data2 ) ? lc $data2 : '00';
+        $$self{pending_aldb}{data3}         = ( defined $data3 ) ? lc $data3 : '00';
         $self->_peek($address);
     }
     else {
@@ -2224,9 +2037,7 @@ sub _write_link {
 
             package main;
             eval( $$self{_success_callback} );
-            &::print_log(
-                "[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: "
-                  . $@ )
+            &::print_log( "[Insteon::ALDB_i1] WARN1: Error encountered during ack callback: " . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::ALDB_i1;
@@ -2239,9 +2050,7 @@ sub _peek {
     my $msb = substr( $address, 0, 2 );
     my $lsb = substr( $address, 2, 2 );
     if ($extended) {
-        my $message =
-          $self->device->derive_message( 'peek', 'insteon_ext_send',
-            $lsb . "0000000000000000000000000000" );
+        my $message = $self->device->derive_message( 'peek', 'insteon_ext_send', $lsb . "0000000000000000000000000000" );
         $self->interface->queue_message($message);
 
     }
@@ -2249,13 +2058,8 @@ sub _peek {
         $$self{_mem_lsb}    = $lsb;
         $$self{_mem_msb}    = $msb;
         $$self{_mem_action} = 'aldb_peek';
-        &::print_log( "[Insteon::ALDB_i1] "
-              . $$self{device}->get_object_name
-              . " accessing memory at location: 0x"
-              . $address );
-        my $message =
-          new Insteon::InsteonMessage( 'insteon_send', $$self{device},
-            'set_address_msb' );
+        &::print_log( "[Insteon::ALDB_i1] " . $$self{device}->get_object_name . " accessing memory at location: 0x" . $address );
+        my $message = new Insteon::InsteonMessage( 'insteon_send', $$self{device}, 'set_address_msb' );
         $message->extra($msb);
         $message->failure_callback( $$self{_failure_callback} );
         $self->_send_cmd($message);
@@ -2386,8 +2190,7 @@ sub on_read_write_aldb {
             $clear_message = 0;
         }
         elsif ( length( $msg{extra} ) < 30 ) {
-            &::print_log(
-                "[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
+            &::print_log( "[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
                   . $$self{device}->get_object_name . " [0x"
                   . $$self{_mem_msb}
                   . $$self{_mem_lsb}
@@ -2402,13 +2205,10 @@ sub on_read_write_aldb {
             #resend logic will kick in
             $clear_message = 0;
         }
-        elsif ( $$self{_mem_msb}
-            . $$self{_mem_lsb} ne '0000'
-            and $$self{_mem_msb}
-            . $$self{_mem_lsb} ne substr( $msg{extra}, 6, 4 ) )
+        elsif ( $$self{_mem_msb} . $$self{_mem_lsb} ne '0000'
+            and $$self{_mem_msb} . $$self{_mem_lsb} ne substr( $msg{extra}, 6, 4 ) )
         {
-            ::print_log(
-                "[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
+            ::print_log( "[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
                   . " address received did not match address requested: "
                   . $$self{device}->get_object_name . " [0x"
                   . $$self{_mem_msb}
@@ -2433,9 +2233,8 @@ sub on_read_write_aldb {
         else {
             # init the link table if at the very start of a scan
             if ( lc $$self{_mem_msb} eq '00' and lc $$self{_mem_lsb} eq '00' ) {
-                main::print_log(
-                    "[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure"
-                ) if $self->{device}->debuglevel( 4, 'insteon' );
+                main::print_log( "[Insteon::ALDB_i2] DEBUG4: Start of scan; initializing aldb structure" )
+                  if $self->{device}->debuglevel( 4, 'insteon' );
 
                 # reinit the aldb hash as there will be a new one
                 $$self{aldb} = undef;
@@ -2476,8 +2275,7 @@ sub on_read_write_aldb {
                 #highwater is set for every entry that has been used before
                 #highwater being 0 indicates entry has never been used (i.e. top of list)
                 # since this is the last unused memory location, then add it to the empty list
-                &::print_log(
-                    "[Insteon::ALDB_i2] WARNING: highwater not set but marked inuse: "
+                &::print_log( "[Insteon::ALDB_i2] WARNING: highwater not set but marked inuse: "
                       . $$self{device}->get_object_name . " [0x"
                       . $$self{_mem_msb}
                       . $$self{_mem_lsb}
@@ -2486,8 +2284,7 @@ sub on_read_write_aldb {
                       . $$self{_mem_action} )
                   if ( ( $$self{pending_aldb}{inuse} )
                     and $self->{device}->debuglevel( 3, 'insteon' ) );
-                main::print_log(
-                    "[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
+                main::print_log( "[Insteon::ALDB_i2] DEBUG4: scan done; adding last address ["
                       . $$self{_mem_msb}
                       . $$self{_mem_lsb}
                       . "] to empty array" )
@@ -2520,8 +2317,7 @@ sub on_read_write_aldb {
             else    #($$self{pending_aldb}{highwater})
             {
                 unless ( $$self{pending_aldb}{inuse} ) {
-                    main::print_log(
-                        "[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
+                    main::print_log( "[Insteon::ALDB_i2] DEBUG4: inuse flag == false; adding address ["
                           . $$self{_mem_msb}
                           . $$self{_mem_lsb}
                           . "] to empty array" )
@@ -2542,28 +2338,23 @@ sub on_read_write_aldb {
 
                     # save pending_aldb and then clear it out
                     my $aldbkey = $self->get_linkkey(
-                        $$self{pending_aldb}{deviceid},
-                        $$self{pending_aldb}{group},
-                        $$self{pending_aldb}{is_controller},
-                        $$self{pending_aldb}{data3}
+                        $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                        $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
                     );
 
                     # check for duplicates
                     if ( exists $$self{aldb}{$aldbkey}
                         && $$self{aldb}{$aldbkey}{inuse} )
                     {
-                        main::print_log(
-                            "[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
+                        main::print_log( "[Insteon::ALDB_i2] DEBUG4: duplicate link found; adding address ["
                               . $$self{_mem_msb}
                               . $$self{_mem_lsb}
                               . "] to duplicates array" )
                           if $self->{device}->debuglevel( 4, 'insteon' );
-                        $self->add_duplicate_link_address(
-                            $$self{pending_aldb}{address} );
+                        $self->add_duplicate_link_address( $$self{pending_aldb}{address} );
                     }
                     else {
-                        main::print_log(
-                            "[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
+                        main::print_log( "[Insteon::ALDB_i2] DEBUG4: active link found; adding address ["
                               . $$self{_mem_msb}
                               . $$self{_mem_lsb}
                               . "] to aldb" )
@@ -2573,9 +2364,7 @@ sub on_read_write_aldb {
                 }
 
                 #keep going; request the next record
-                $self->send_read_aldb(
-                    sprintf( "%04x", hex( $$self{pending_aldb}{address} ) - 8 )
-                );
+                $self->send_read_aldb( sprintf( "%04x", hex( $$self{pending_aldb}{address} ) - 8 ) );
 
             }    #($$self{pending_aldb}{highwater})
         }    #else $msg{extra} !< 30
@@ -2584,10 +2373,8 @@ sub on_read_write_aldb {
         unless ( $$self{_mem_activity} eq 'delete' ) {
             ## update the aldb records w/ the changes that were made
             my $aldbkey = $self->get_linkkey(
-                $$self{pending_aldb}{deviceid},
-                $$self{pending_aldb}{group},
-                $$self{pending_aldb}{is_controller},
-                $$self{pending_aldb}{data3}
+                $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
             );
             $$self{aldb}{$aldbkey}{data1} = $$self{pending_aldb}{data1};
             $$self{aldb}{$aldbkey}{data2} = $$self{pending_aldb}{data2};
@@ -2599,7 +2386,7 @@ sub on_read_write_aldb {
                   $$self{pending_aldb}{is_controller};
                 $$self{aldb}{$aldbkey}{deviceid} =
                   lc $$self{pending_aldb}{deviceid};
-                $$self{aldb}{$aldbkey}{group} = lc $$self{pending_aldb}{group};
+                $$self{aldb}{$aldbkey}{group}   = lc $$self{pending_aldb}{group};
                 $$self{aldb}{$aldbkey}{address} = $$self{pending_aldb}{address};
             }
             $$self{_mem_activity} = undef;
@@ -2624,14 +2411,11 @@ sub on_read_write_aldb {
             $self->add_empty_address( $$self{pending_aldb}{address} );
 
             # and, remove from the duplicates list (if it is a member)
-            $self->delete_duplicate_link_address(
-                $$self{pending_aldb}{address} );
+            $self->delete_duplicate_link_address( $$self{pending_aldb}{address} );
             if ( exists $$self{pending_aldb}{deviceid} ) {
                 my $key = $self->get_linkkey(
-                    $$self{pending_aldb}{deviceid},
-                    $$self{pending_aldb}{group},
-                    $$self{pending_aldb}{is_controller},
-                    $$self{pending_aldb}{data3}
+                    $$self{pending_aldb}{deviceid},      $$self{pending_aldb}{group},
+                    $$self{pending_aldb}{is_controller}, $$self{pending_aldb}{data3}
                 );
                 delete $$self{aldb}{$key};
             }
@@ -2642,10 +2426,8 @@ sub on_read_write_aldb {
         }
     }
     else {
-        main::print_log( "[Insteon::ALDB_i2] "
-              . $$self{device}->get_object_name
-              . ": unhandled _mem_action="
-              . $$self{_mem_action} )
+        main::print_log(
+            "[Insteon::ALDB_i2] " . $$self{device}->get_object_name . ": unhandled _mem_action=" . $$self{_mem_action} )
           if $self->{device}->debuglevel( 1, 'insteon' );
         $clear_message = 0;
     }
@@ -2653,18 +2435,13 @@ sub on_read_write_aldb {
 }
 
 sub _write_link {
-    my ( $self, $address, $deviceid, $group, $is_controller, $data1, $data2,
-        $data3 )
-      = @_;
+    my ( $self, $address, $deviceid, $group, $is_controller, $data1, $data2, $data3 ) = @_;
     if ($address) {
         &::print_log( "[Insteon::ALDB_i2] "
               . $$self{device}->get_object_name
-              . " writing address: $address for device: $deviceid and group: $group"
-        );
+              . " writing address: $address for device: $deviceid and group: $group" );
 
-        my $message =
-          new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device},
-            'read_write_aldb' );
+        my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device}, 'read_write_aldb' );
 
         #cmd2.00.write_aldb_record.addr_msb.addr_lsb.byte_count.d6-d14 bytes to write
         my $message_extra = '00' . '00' . '02';
@@ -2711,9 +2488,7 @@ sub _write_link {
 
             package main;
             eval( $$self{_success_callback} );
-            &::print_log(
-                "[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: "
-                  . $@ )
+            &::print_log( "[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::ALDB_i2;
@@ -2727,13 +2502,9 @@ sub _write_delete {
     my ( $self, $address ) = @_;
 
     if ($address) {
-        &::print_log( "[Insteon::ALDB_i2] "
-              . $$self{device}->get_object_name
-              . " writing address as deleted: $address" );
+        &::print_log( "[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " writing address as deleted: $address" );
 
-        my $message =
-          new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device},
-            'read_write_aldb' );
+        my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device}, 'read_write_aldb' );
 
         #cmd2.00.write_aldb_record.addr_msb.addr_mid.addr_lsb.byte_count.d6-d14 bytes to write
         my $message_extra = '00' . '00' . '02';
@@ -2764,16 +2535,13 @@ sub _write_delete {
         $self->_send_cmd($message);
     }
     else {
-        &::print_log( "[Insteon::ALDB_i2] WARN: "
-              . $$self{device}->get_object_name
-              . " write_delete failure: no address available" );
+        &::print_log(
+            "[Insteon::ALDB_i2] WARN: " . $$self{device}->get_object_name . " write_delete failure: no address available" );
         if ( $$self{_success_callback} ) {
 
             package main;
             eval( $$self{_success_callback} );
-            &::print_log(
-                "[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: "
-                  . $@ )
+            &::print_log( "[Insteon::ALDB_i2] WARN1: Error encountered during ack callback: " . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon::ALDB_i2;
@@ -2793,19 +2561,11 @@ sub send_read_aldb {
     $$self{_mem_msb} = substr( $address, 0, 2 );
     $$self{_mem_lsb} = substr( $address, 2, 2 );
     $$self{_mem_action} = 'aldb_i2read';
-    main::print_log( "[Insteon::ALDB_i2] "
-          . $$self{device}->get_object_name
-          . " reading ALDB at location: 0x"
-          . $address );
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device},
-        'read_write_aldb' );
+    main::print_log( "[Insteon::ALDB_i2] " . $$self{device}->get_object_name . " reading ALDB at location: 0x" . $address );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $$self{device}, 'read_write_aldb' );
 
     #cmd2.00.read_aldb_record.addr_msb.addr_lsb.record_count(0 for all).d6-d14 unused
-    $message->extra( "00" . "00" . "00"
-          . $$self{_mem_msb}
-          . $$self{_mem_lsb} . "01"
-          . "000000000000000000" );
+    $message->extra( "00" . "00" . "00" . $$self{_mem_msb} . $$self{_mem_lsb} . "01" . "000000000000000000" );
     $message->failure_callback( $$self{_failure_callback} );
     $self->_send_cmd($message);
 }
@@ -2941,9 +2701,7 @@ sub restore_linktable {
                 $subaddress    = $value if ( $key eq 'data3' );
                 $link_record{$key} = $value if $key and defined($value);
             }
-            my $linkkey =
-              $self->get_linkkey( $deviceid, $groupid, $is_controller,
-                $subaddress );
+            my $linkkey = $self->get_linkkey( $deviceid, $groupid, $is_controller, $subaddress );
             %{ $$self{aldb}{ lc $linkkey } } = %link_record;
         }
     }
@@ -2989,19 +2747,14 @@ sub log_alllink_table {
             $linked_name = $linked_object->get_object_name;
         }
         else {
-            $linked_name =
-                uc substr( $deviceid, 0, 2 ) . '.'
-              . uc substr( $deviceid, 2, 2 ) . '.'
-              . uc substr( $deviceid, 4, 2 );
+            $linked_name = uc substr( $deviceid, 0, 2 ) . '.' . uc substr( $deviceid, 2, 2 ) . '.' . uc substr( $deviceid, 4, 2 );
         }
         &::print_log(
             "[Insteon::ALDB_PLM] "
               . (
                 ($is_controller)
                 ? "cntlr($controller_name) record to " . $linked_name
-                : "responder record to "
-                  . $linked_name
-                  . "($$self{aldb}{$linkkey}{group})"
+                : "responder record to " . $linked_name . "($$self{aldb}{$linkkey}{group})"
               )
               . " (d1=$$self{aldb}{$linkkey}{data1}, d2=$$self{aldb}{$linkkey}{data2}, "
               . "d3=$$self{aldb}{$linkkey}{data3})"
@@ -3027,10 +2780,7 @@ sub parse_alllink {
         $link{data1} = substr( $data, 10, 2 );
         $link{data2} = substr( $data, 12, 2 );
         $link{data3} = substr( $data, 14, 2 );
-        my $key = $self->get_linkkey(
-            $link{deviceid},      $link{group},
-            $link{is_controller}, $link{data3}
-        );
+        my $key = $self->get_linkkey( $link{deviceid}, $link{group}, $link{is_controller}, $link{data3} );
         %{ $$self{aldb}{ lc $key } } = %link;
     }
 }
@@ -3043,10 +2793,8 @@ Sends the request for the first alllink entry on the PLM.
 
 sub get_first_alllink {
     my ($self) = @_;
-    $self->health('changed')
-      ;    # set as corrupt and allow acknowledge to set otherwise
-    $$self{device}->queue_message(
-        new Insteon::InsteonMessage( 'all_link_first_rec', $$self{device} ) );
+    $self->health('changed');    # set as corrupt and allow acknowledge to set otherwise
+    $$self{device}->queue_message( new Insteon::InsteonMessage( 'all_link_first_rec', $$self{device} ) );
 }
 
 =item C<get_next_alllink()>
@@ -3057,8 +2805,7 @@ Sends the request for the next alllink entry on the PLM.
 
 sub get_next_alllink {
     my ($self) = @_;
-    $$self{device}->queue_message(
-        new Insteon::InsteonMessage( 'all_link_next_rec', $$self{device} ) );
+    $$self{device}->queue_message( new Insteon::InsteonMessage( 'all_link_next_rec', $$self{device} ) );
 }
 
 =item C<delete_orphan_links()>
@@ -3072,8 +2819,7 @@ code, or links which are only half-links..
 sub delete_orphan_links {
     my ( $self, $audit_mode ) = @_;
 
-    &::print_log(
-        "[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
+    &::print_log("[Insteon::ALDB_PLM] #### NOW BEGINNING DELETE ORPHAN LINKS ####");
     @{ $$self{_delete_device_failures} } = ();
 
     $self->SUPER::delete_orphan_links($audit_mode);
@@ -3083,8 +2829,7 @@ sub delete_orphan_links {
 
         #Match on real objects only
         if ( ( $obj->is_root ) ) {
-            my %delete_req =
-              ( 'root_object' => $obj, 'audit_mode' => $audit_mode );
+            my %delete_req = ( 'root_object' => $obj, 'audit_mode' => $audit_mode );
             push @{ $$self{delete_queue} }, \%delete_req;
         }
     }
@@ -3099,31 +2844,26 @@ sub _process_delete_queue {
     if ($num_in_queue) {
         my $delete_req_ptr   = shift( @{ $$self{delete_queue} } );
         my %delete_req       = %$delete_req_ptr;
-        my $failure_callback = $$self{device}->get_object_name
-          . "->_aldb->_process_delete_queue_failure";
+        my $failure_callback = $$self{device}->get_object_name . "->_aldb->_process_delete_queue_failure";
 
         # distinguish between deleting PLM links and processing delete orphans for a root item
         if ( $delete_req{'root_object'} ) {
-            $$self{current_delete_device} =
-              $delete_req{'root_object'}->get_object_name;
+            $$self{current_delete_device} = $delete_req{'root_object'}->get_object_name;
             my $is_batch_mode = 1;
             $delete_req{'root_object'}
-              ->delete_orphan_links( ( $delete_req{'audit_mode'} ) ? 1 : 0,
-                $failure_callback, $is_batch_mode );
+              ->delete_orphan_links( ( $delete_req{'audit_mode'} ) ? 1 : 0, $failure_callback, $is_batch_mode );
         }
         else {
             $$self{current_delete_device} = $$self{device}->get_object_name;
             &::print_log(
                 "[Insteon::ALDB_PLM] now deleting orphaned link w/ details: "
                   . (
-                    ( $delete_req{is_controller} )
-                    ? "controller($delete_req{data3})"
+                    ( $delete_req{is_controller} ) ? "controller($delete_req{data3})"
                     : "responder"
                   )
                   . ", "
                   . (
-                    ( $delete_req{object} )
-                    ? "object=" . $delete_req{object}->get_object_name
+                    ( $delete_req{object} ) ? "object=" . $delete_req{object}->get_object_name
                     : "deviceid=$delete_req{deviceid}"
                   )
                   . ", group=$delete_req{group}"
@@ -3141,12 +2881,9 @@ sub _process_delete_queue {
             for my $failed_obj ( @{ $$self{_delete_device_failures} } ) {
                 $obj_list .= $failed_obj . ", ";
             }
-            ::print_log( "[Insteon::ALDB_PLM] However, some failures were "
-                  . "noted with the following devices: $obj_list" );
+            ::print_log( "[Insteon::ALDB_PLM] However, some failures were " . "noted with the following devices: $obj_list" );
         }
-        ::print_log(
-            "[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted."
-        );
+        ::print_log( "[Insteon::ALDB_PLM] A total of $$self{delete_queue_processed} orphaned link records were deleted." );
         ::print_log("[Insteon::ALDB_PLM] #### END DELETE ORPHAN LINKS ####");
     }
 }
@@ -3154,8 +2891,7 @@ sub _process_delete_queue {
 sub _process_delete_queue_failure {
     my ($self) = @_;
     push @{ $$self{_delete_device_failures} }, $$self{current_delete_device};
-    ::print_log(
-        "[Insteon::ALDB_PLM] WARN: failure occurred when deleting orphan links from: "
+    ::print_log( "[Insteon::ALDB_PLM] WARN: failure occurred when deleting orphan links from: "
           . $$self{current_delete_device}
           . ".  Moving on..." );
     $self->health('changed');
@@ -3183,13 +2919,11 @@ sub delete_link {
     }
     my $num_deleted    = 0;
     my $insteon_object = $link_parms{object};
-    my $deviceid =
-      ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
-    my $group = $link_parms{group};
-    my $is_controller = ( $link_parms{is_controller} ) ? 1 : 0;
-    my $subaddress = ( defined $link_parms{data3} ) ? $link_parms{data3} : '00';
-    my $linkkey =
-      $self->get_linkkey( $deviceid, $group, $is_controller, $subaddress );
+    my $deviceid       = ($insteon_object) ? $insteon_object->device_id : $link_parms{deviceid};
+    my $group          = $link_parms{group};
+    my $is_controller  = ( $link_parms{is_controller} ) ? 1 : 0;
+    my $subaddress     = ( defined $link_parms{data3} ) ? $link_parms{data3} : '00';
+    my $linkkey        = $self->get_linkkey( $deviceid, $group, $is_controller, $subaddress );
 
     if ( defined $$self{aldb}{$linkkey} ) {
         my $cmd = '80'
@@ -3201,8 +2935,7 @@ sub delete_link {
           . $$self{aldb}{$linkkey}{data3};
         delete $$self{aldb}{$linkkey};
         $num_deleted = 1;
-        my $message =
-          new Insteon::InsteonMessage( 'all_link_manage_rec', $$self{device} );
+        my $message = new Insteon::InsteonMessage( 'all_link_manage_rec', $$self{device} );
         $$self{_success_callback} =
           ( $link_parms{callback} ) ? $link_parms{callback} : undef;
         $$self{_failure_callback} =
@@ -3213,10 +2946,8 @@ sub delete_link {
         $$self{device}->queue_message($message);
     }
     else {
-        &::print_log(
-                "[Insteon::ALDB_PLM] no entry in linktable could be found for: "
-              . "deviceid=$deviceid, group=$group, is_controller=$is_controller, subaddress=$subaddress"
-        );
+        &::print_log( "[Insteon::ALDB_PLM] no entry in linktable could be found for: "
+              . "deviceid=$deviceid, group=$group, is_controller=$is_controller, subaddress=$subaddress" );
         if ( $link_parms{callback} ) {
 
             package main;
@@ -3259,19 +2990,15 @@ sub add_link {
     }
     my $is_controller = ( $link_parms{is_controller} ) ? 1 : 0;
     my $subaddress = ( defined $link_parms{data3} ) ? $link_parms{data3} : '00';
-    my $linkkey =
-      $self->get_linkkey( $device_id, $group, $is_controller, $subaddress );
+    my $linkkey = $self->get_linkkey( $device_id, $group, $is_controller, $subaddress );
     if ( defined $$self{aldb}{$linkkey} ) {
-        &::print_log(
-            "[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
-              . "deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress"
-        );
+        &::print_log( "[Insteon::ALDB_PLM] WARN: attempt to add link to PLM that already exists! "
+              . "deviceid=$device_id, group=$group, is_controller=$is_controller, subaddress=$subaddress" );
         if ( $link_parms{callback} ) {
 
             package main;
             eval( $link_parms{callback} );
-            &::print_log(
-                "[Insteon::ALDB_PLM] error in add link callback: " . $@ )
+            &::print_log( "[Insteon::ALDB_PLM] error in add link callback: " . $@ )
               if $@ and $self->{device}->debuglevel( 1, 'insteon' );
 
             package Insteon_PLM;
@@ -3301,14 +3028,7 @@ sub add_link {
         # from looking at manually linked records, data1 and data2 are both 00 for responder records
         # and, data1 is 01 and usually data2 is 00 for controller records
 
-        my $cmd =
-            $control_code
-          . $flags
-          . $group
-          . $device_id
-          . $data1
-          . $data2
-          . $data3;
+        my $cmd = $control_code . $flags . $group . $device_id . $data1 . $data2 . $data3;
         $$self{aldb}{$linkkey}{flags}         = lc $flags;
         $$self{aldb}{$linkkey}{group}         = lc $group;
         $$self{aldb}{$linkkey}{is_controller} = $is_controller;
@@ -3318,8 +3038,7 @@ sub add_link {
         $$self{aldb}{$linkkey}{data3}         = lc $data3;
         $$self{aldb}{$linkkey}{inuse}         = 1;
         $self->health('unchanged') if ( $self->health() eq 'empty' );
-        my $message =
-          new Insteon::InsteonMessage( 'all_link_manage_rec', $$self{device} );
+        my $message = new Insteon::InsteonMessage( 'all_link_manage_rec', $$self{device} );
         $message->interface_data($cmd);
         $$self{_success_callback} =
           ( $link_parms{callback} ) ? $link_parms{callback} : undef;
@@ -3343,11 +3062,8 @@ during a scan of the ALDB, so use this routine with caution.
 =cut
 
 sub add_link_to_hash {
-    my ( $self, $flags, $group, $is_controller,
-        $device_id, $data1, $data2, $data3 )
-      = @_;
-    my $linkkey =
-      $self->get_linkkey( $device_id, $group, $is_controller, $data3 );
+    my ( $self, $flags, $group, $is_controller, $device_id, $data1, $data2, $data3 ) = @_;
+    my $linkkey = $self->get_linkkey( $device_id, $group, $is_controller, $data3 );
     $$self{aldb}{$linkkey}{flags}         = lc $flags;
     $$self{aldb}{$linkkey}{group}         = lc $group;
     $$self{aldb}{$linkkey}{is_controller} = $is_controller;
@@ -3369,8 +3085,7 @@ or false if it does not.  Generally called as part of C<delete_orphan_links()>.
 
 sub has_link {
     my ( $self, $insteon_object, $group, $is_controller, $data3 ) = @_;
-    my $key = $self->get_linkkey( $insteon_object->device_id,
-        $group, $is_controller, $data3 );
+    my $key = $self->get_linkkey( $insteon_object->device_id, $group, $is_controller, $data3 );
 
     my $found = 0;
     $found++ if ( defined $$self{aldb}{$key} );
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
index a868a01f1..a9abc3c85 100644
--- a/lib/Insteon/BaseInsteon.pm
+++ b/lib/Insteon/BaseInsteon.pm
@@ -56,7 +56,7 @@ state of either ON or OFF.
 sub derive_link_state {
     my ( $self, $p_state ) = @_;
     $p_state = $self if !( ref $self );    #Old code made direct calls
-          #Convert Relative State to Absolute State
+                                           #Convert Relative State to Absolute State
     if ( $p_state =~ /^([+-])(\d+)/ ) {
         my $rel_state  = $1 . $2;
         my $curr_state = '100';
@@ -122,8 +122,7 @@ sub new {
     $$self{is_acknowledged} = 0;
     $$self{max_queue_time}  = $::config_parms{'Insteon_PLM_max_queue_time'};
     $$self{max_queue_time}  = 10
-      unless $$self{max_queue_time}
-      ;    # 10 seconds is max time allowed in command stack
+      unless $$self{max_queue_time};    # 10 seconds is max time allowed in command stack
     @{ $$self{command_stack} } = ();
     $$self{_onlevel}          = undef;
     $$self{is_responder}      = 1;
@@ -271,10 +270,8 @@ Returns the highest hop count of the past 20 hop counts
 sub default_hop_count {
     my ( $self, $hop_count ) = @_;
     if ( defined($hop_count) ) {
-        ::print_log( "[Insteon::BaseObject] DEBUG3: Adding hop count of "
-              . $hop_count
-              . " to hop_array of "
-              . $self->get_object_name )
+        ::print_log(
+            "[Insteon::BaseObject] DEBUG3: Adding hop count of " . $hop_count . " to hop_array of " . $self->get_object_name )
           if $self->debuglevel( 3, 'insteon' );
         if ( !$$self{hop_array} || !( @{ $$self{hop_array} } ) ) {
             unshift( @{ $$self{hop_array} }, $$self{default_hop_count} );
@@ -383,31 +380,23 @@ sub set {
         my $setby_name = $p_setby;
         $setby_name = $p_setby->get_object_name()
           if ( ref $p_setby and $p_setby->can('get_object_name') );
-        if ( ref $p_setby and $p_setby eq $self )
-        {    #If set by device, update MH state,
+        if ( ref $p_setby and $p_setby eq $self ) {    #If set by device, update MH state,
             my $derived_state = $self->derive_link_state($p_state);
-            &::print_log( "[Insteon::BaseObject] "
-                  . $self->get_object_name()
-                  . "::set_receive($derived_state, $setby_name)" )
+            &::print_log( "[Insteon::BaseObject] " . $self->get_object_name() . "::set_receive($derived_state, $setby_name)" )
               if $self->debuglevel( 1, 'insteon' );
             $self->set_receive( $derived_state, $p_setby, $p_response );
             $self->set_linked_devices($p_state);
         }
-        elsif ( ref $p_setby and $p_setby eq $self->interface )
-        {    #If set by interface, this was a manual status_request response
-            &::print_log( "[Insteon::BaseObject] "
-                  . $self->get_object_name()
-                  . "::set_receive($p_state, $setby_name)" )
+        elsif ( ref $p_setby and $p_setby eq $self->interface ) {    #If set by interface, this was a manual status_request response
+            &::print_log( "[Insteon::BaseObject] " . $self->get_object_name() . "::set_receive($p_state, $setby_name)" )
               if $self->debuglevel( 1, 'insteon' );
             $self->set_receive( $p_state, $p_setby, $p_response );
         }
-        else {    # Not called by device, send set command
+        else {                                                       # Not called by device, send set command
             if ( $self->is_responder ) {
                 my $message = $self->derive_message($p_state);
                 $self->_send_cmd($message);
-                &::print_log( "[Insteon::BaseObject] "
-                      . $self->get_object_name()
-                      . "::set($p_state, $setby_name)" )
+                &::print_log( "[Insteon::BaseObject] " . $self->get_object_name() . "::set($p_state, $setby_name)" )
                   if $self->debuglevel( 1, 'insteon' );
                 $self->is_acknowledged(0);
                 $$self{pending_state}    = $p_state;
@@ -415,17 +404,14 @@ sub set {
                 $$self{pending_response} = $p_response;
             }
             else {
-                ::print_log( "[Insteon::BaseObject] "
-                      . $self->get_object_name()
-                      . " is not a responder and cannot be set to a state." );
+                ::print_log(
+                    "[Insteon::BaseObject] " . $self->get_object_name() . " is not a responder and cannot be set to a state." );
             }
         }
-        $self->level($p_state) if $self->can('level');  # update the level value
+        $self->level($p_state) if $self->can('level');    # update the level value
     }
     else {
-        &::print_log(
-            "[Insteon::BaseObject] failed state validation with state=$p_state"
-        );
+        &::print_log( "[Insteon::BaseObject] failed state validation with state=$p_state" );
     }
 }
 
@@ -439,8 +425,7 @@ sub is_acknowledged {
     my ( $self, $p_ack ) = @_;
     if ( defined $p_ack ) {
         if ($p_ack) {
-            $self->set_receive( $$self{pending_state}, $$self{pending_setby},
-                $$self{pending_response} )
+            $self->set_receive( $$self{pending_state}, $$self{pending_setby}, $$self{pending_response} )
               if defined $$self{pending_state};
         }
         else {
@@ -484,7 +469,7 @@ sub set_receive {
     }
     else {
         $$self{set_milliseconds} = $curr_milli;
-        $self->level($p_state) if $self->can('level');  # update the level value
+        $self->level($p_state) if $self->can('level');    # update the level value
         $self->SUPER::set( $p_state, $p_setby, $p_response );
     }
 }
@@ -565,11 +550,10 @@ sub derive_message {
     if ( $self->isa("Insteon::BaseController") ) {
 
         # only send out as all-link if the link originates from the plm
-        if ( $self->isa("Insteon::InterfaceController") )
-        {    # return the size of the command stack
+        if ( $self->isa("Insteon::InterfaceController") ) {    # return the size of the command stack
             $message = new Insteon::InsteonMessage( 'all_link_send', $self );
         }
-        elsif ( $self->is_root ) {    # return the size of the command stack
+        elsif ( $self->is_root ) {                             # return the size of the command stack
             $message = new Insteon::InsteonMessage( 'insteon_send', $self );
         }
         else {
@@ -599,8 +583,7 @@ sub derive_message {
                 $level   = 0;
             }
             else {
-                $level =
-                  ( $self->isa('Insteon::DimmableLight') ) ? $1 * 2.55 : 255;
+                $level = ( $self->isa('Insteon::DimmableLight') ) ? $1 * 2.55 : 255;
                 $command = 'on';
             }
         }
@@ -728,19 +711,16 @@ sub _is_info_request {
                 $self->_aldb->{pending_aldb}{address} =
                   $self->_aldb->get_first_empty_address();
                 if ( $self->_aldb->isa('Insteon::ALDB_i1') ) {
-                    $self->_aldb->_peek( $self->_aldb->{pending_aldb}{address},
-                        0 );
+                    $self->_aldb->_peek( $self->_aldb->{pending_aldb}{address}, 0 );
                 }
                 else {
-                    $self->_aldb->_write_delete(
-                        $self->_aldb->{pending_aldb}{address} );
+                    $self->_aldb->_write_delete( $self->_aldb->{pending_aldb}{address} );
                 }
             }
             else {
                 $self->_aldb->aldb_delta( $msg{cmd_code} );
                 $self->_aldb->scandatetime(&main::get_tickcount);
-                &::print_log(
-                        "[Insteon::BaseObject] The Link Table Version for "
+                &::print_log( "[Insteon::BaseObject] The Link Table Version for "
                       . $self->{object_name}
                       . " has been updated to version number "
                       . $self->_aldb->aldb_delta() );
@@ -752,9 +732,7 @@ sub _is_info_request {
         }
         elsif ( $self->_aldb->{aldb_delta_action} eq 'check' ) {
             if ( $self->_aldb->aldb_delta() eq $msg{cmd_code} ) {
-                &::print_log( "[Insteon::BaseObject] The link table for "
-                      . $self->{object_name}
-                      . " is unchanged." );
+                &::print_log( "[Insteon::BaseObject] The link table for " . $self->{object_name} . " is unchanged." );
 
                 #Link Table Scan Successful, Record Current Time
                 $self->_aldb->scandatetime(&main::get_tickcount);
@@ -764,9 +742,7 @@ sub _is_info_request {
                 }
             }
             else {
-                &::print_log( "[Insteon::BaseObject] WARN The link table for "
-                      . $self->{object_name}
-                      . " has changed." );
+                &::print_log( "[Insteon::BaseObject] WARN The link table for " . $self->{object_name} . " has changed." );
                 $self->_aldb->health('changed');
                 if ( defined $self->_aldb->{_aldb_changed_callback} ) {
                     $callback = $self->_aldb->{_aldb_changed_callback};
@@ -781,9 +757,7 @@ sub _is_info_request {
 
             package main;
             eval($callback);
-            &::print_log( "[Insteon::BaseObject] "
-                  . $self->get_object_name
-                  . ": error during scan callback $@" )
+            &::print_log( "[Insteon::BaseObject] " . $self->get_object_name . ": error during scan callback $@" )
               if $@ and $self->debuglevel( 1, 'insteon' );
 
             package Insteon::BaseObject;
@@ -883,15 +857,12 @@ sub _process_message {
             }
             elsif ( $pending_cmd eq 'ping' ) {
                 $corrupt_cmd = 1
-                  if (
-                    $msg{cmd_code} ne $self->message_type_hex($pending_cmd) );
+                  if ( $msg{cmd_code} ne $self->message_type_hex($pending_cmd) );
                 $corrupt_cmd = 1
                   if ( $msg{extra} ne sprintf( "%02d", $$self{ping_count} ) );
                 if ( !$corrupt_cmd ) {
                     $self->_process_command_stack(%msg);
-                    &::print_log(
-                        "[Insteon::BaseObject] received ping acknowledgement from "
-                          . $self->{object_name} )
+                    &::print_log( "[Insteon::BaseObject] received ping acknowledgement from " . $self->{object_name} )
                       if $self->debuglevel( 1, 'insteon' );
                     $self->ping();
                     $clear_message = 1;
@@ -899,12 +870,9 @@ sub _process_message {
             }
             elsif ( $pending_cmd eq 'linking_mode' ) {
                 $corrupt_cmd = 1
-                  if (
-                    $msg{cmd_code} ne $self->message_type_hex($pending_cmd) );
+                  if ( $msg{cmd_code} ne $self->message_type_hex($pending_cmd) );
                 if ( !$corrupt_cmd ) {
-                    &::print_log(
-                        "[Insteon::BaseObject] received linking mode ACK from "
-                          . $self->{object_name} )
+                    &::print_log( "[Insteon::BaseObject] received linking mode ACK from " . $self->{object_name} )
                       if $self->debuglevel( 1, 'insteon' );
                     $self->interface->_set_timeout( 'xmit', 2000 );
                     $clear_message = 0;
@@ -926,8 +894,7 @@ sub _process_message {
 
                 # signal receipt of message to the command stack in case commands are queued
                 $self->_process_command_stack(%msg);
-                &::print_log(
-                    "[Insteon::BaseObject] received command/state (awaiting) acknowledge from "
+                &::print_log( "[Insteon::BaseObject] received command/state (awaiting) acknowledge from "
                       . $self->{object_name}
                       . ": $pending_cmd and data: $msg{extra}" )
                   if $self->debuglevel( 1, 'insteon' );
@@ -940,16 +907,14 @@ sub _process_message {
 
             # signal receipt of message to the command stack in case commands are queued
             $self->_process_command_stack(%msg);
-            &::print_log(
-                "[Insteon::BaseObject] received command/state acknowledge from "
+            &::print_log( "[Insteon::BaseObject] received command/state acknowledge from "
                   . $self->{object_name} . ": "
                   . ( ( $msg{command} ) ? $msg{command} : "(unknown)" )
                   . " and data: $msg{extra}" )
               if $self->debuglevel( 1, 'insteon' );
         }
         if ($corrupt_cmd) {
-            main::print_log(
-                    "[Insteon::BaseObject] WARN: received a message from "
+            main::print_log( "[Insteon::BaseObject] WARN: received a message from "
                   . $self->get_object_name
                   . " in response to a "
                   . $pending_cmd
@@ -965,18 +930,16 @@ sub _process_message {
         #Default to clearing message transaction for NAK
         $clear_message = 1;
         if ( $self->isa('Insteon::BaseLight') ) {
-            &::print_log(
-                    "[Insteon::BaseObject] WARN!! encountered a nack message ("
+            &::print_log( "[Insteon::BaseObject] WARN!! encountered a nack message ("
                   . $self->get_nack_msg_for( $msg{extra} )
                   . ") for "
                   . $self->{object_name}
                   . ".  It may be unplugged, have a burned out bulb, or this may be a new I2CS "
-                  . "type device that must first be manually linked to the PLM using the set button."
-            ) if $self->debuglevel( 1, 'insteon' );
+                  . "type device that must first be manually linked to the PLM using the set button." )
+              if $self->debuglevel( 1, 'insteon' );
         }
         else {
-            &::print_log(
-                    "[Insteon::BaseObject] WARN!! encountered a nack message ("
+            &::print_log( "[Insteon::BaseObject] WARN!! encountered a nack message ("
                   . $self->get_nack_msg_for( $msg{extra} )
                   . ") for "
                   . $self->{object_name}
@@ -987,15 +950,13 @@ sub _process_message {
         $self->_process_command_stack(%msg);
         if ( $p_setby->active_message->failure_callback ) {
             main::print_log(
-                "[Insteon::BaseObject] WARN: Now calling message failure callback: "
-                  . $p_setby->active_message->failure_callback )
+                "[Insteon::BaseObject] WARN: Now calling message failure callback: " . $p_setby->active_message->failure_callback )
               if $self->debuglevel( 1, 'insteon' );
             $self->failure_reason('NAK');
 
             package main;
             eval $p_setby->active_message->failure_callback;
-            main::print_log(
-                "[Insteon::BaseObject] problem w/ retry callback: $@")
+            main::print_log("[Insteon::BaseObject] problem w/ retry callback: $@")
               if $@;
 
             package Insteon::BaseObject;
@@ -1045,9 +1006,7 @@ sub _process_message {
         if ( $msg{type} eq 'alllink' ) {
             if ( $msg{command} eq 'link_cleanup_report' ) {
                 if ( $msg{extra} == 0 ) {
-                    ::print_log(
-                        "[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for "
-                          . $self->{object_name} )
+                    ::print_log( "[Insteon::BaseObject] DEBUG Received AllLink Cleanup Success for " . $self->{object_name} )
                       if $self->debuglevel( 1, 'insteon' );
                 }
                 else {
@@ -1069,8 +1028,7 @@ sub _process_message {
                 #the maximum hop length for a direct message and an ACK
                 #PLM is the +1
                 my $timeout = ( scalar(@links) + 1 ) * 300;
-                ::print_log(
-                    "[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages "
+                ::print_log( "[Insteon::BaseObject] DEBUG3 Delaying any outgoing messages "
                       . "by $timeout milliseconds to avoid collision with subsequent cleanup "
                       . "messages from "
                       . $self->get_object_name )
@@ -1082,8 +1040,7 @@ sub _process_message {
             if ( ( $self->state eq $p_state or $self->state_final eq $p_state )
                 and $$self{_pending_cleanup} )
             {
-                ::print_log(
-                    "[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for "
+                ::print_log( "[Insteon::BaseObject] Ignoring Received Direct AllLink Cleanup Message for "
                       . $self->{object_name}
                       . " since AllLink Broadcast Message was Received." )
                   if $self->debuglevel( 1, 'insteon' );
@@ -1094,9 +1051,7 @@ sub _process_message {
             $$self{_pending_cleanup} = 0;
         }
         else {
-            main::print_log(
-                "[Insteon::BaseObject] Ignoring unsupported command from "
-                  . $self->{object_name} )
+            main::print_log( "[Insteon::BaseObject] Ignoring unsupported command from " . $self->{object_name} )
               if $self->debuglevel( 1, 'insteon' );
             $self->corrupt_count_log(1) if $self->can('corrupt_count_log');
         }
@@ -1106,10 +1061,9 @@ sub _process_message {
 
 sub _process_command_stack {
     my ( $self, %ackmsg ) = @_;
-    if (%ackmsg)
-    {    # which may also be something that can be interpretted as a "nack"
-            # determine whether to unset awaiting_ack
-            # for now, be "dumb" and just unset it
+    if (%ackmsg) {    # which may also be something that can be interpretted as a "nack"
+                      # determine whether to unset awaiting_ack
+                      # for now, be "dumb" and just unset it
         $$self{awaiting_ack} = 0;
     }
     if ( !( $$self{awaiting_ack} ) && $self->is_awake ) {
@@ -1163,8 +1117,7 @@ sub _process_command_stack {
 
             package main;
             eval($callback);
-            &::print_log(
-                "[Insteon::BaseObject] error in queue timer callback: " . $@ )
+            &::print_log( "[Insteon::BaseObject] error in queue timer callback: " . $@ )
               if $@ and $self->debuglevel( 1, 'insteon' );
 
             package Insteon::BaseObject;
@@ -1272,10 +1225,7 @@ sub get_voice_cmds {
     # for deaf devices, the device level is the only version of sync links
     # so add an audit command
     if ( $self->is_deaf && $self->is_root ) {
-        %voice_cmds = (
-            %voice_cmds,
-            '(AUDIT) sync links' => $self->get_object_name . '->sync_links(1)'
-        );
+        %voice_cmds = ( %voice_cmds, '(AUDIT) sync links' => $self->get_object_name . '->sync_links(1)' );
     }
     return \%voice_cmds;
 }
@@ -1497,12 +1447,9 @@ sub new {
     }
 
     $self->restore_data(
-        'devcat',             'firmware',
-        'level',              'retry_count_log',
-        'fail_count_log',     'outgoing_count_log',
-        'incoming_count_log', 'corrupt_count_log',
-        'dupe_count_log',     'hops_left_count',
-        'max_hops_count',     'outgoing_hop_count',
+        'devcat',         'firmware',           'level',              'retry_count_log',
+        'fail_count_log', 'outgoing_count_log', 'incoming_count_log', 'corrupt_count_log',
+        'dupe_count_log', 'hops_left_count',    'max_hops_count',     'outgoing_hop_count',
         'awake_time'
     );
 
@@ -1515,8 +1462,7 @@ sub new {
     $$self{is_acknowledged} = 0;
     $$self{max_queue_time}  = $::config_parms{'Insteon_PLM_max_queue_time'};
     $$self{max_queue_time}  = 10
-      unless $$self{max_queue_time}
-      ;    # 10 seconds is max time allowed in command stack
+      unless $$self{max_queue_time};    # 10 seconds is max time allowed in command stack
     @{ $$self{command_stack} } = ();
     $$self{_onlevel}           = undef;
     $$self{retry_count_log}    = 0;
@@ -1629,9 +1575,8 @@ sub link_to_interface {
     my ( $self, $p_group, $p_data3, $step ) = @_;
     $p_group = $self->group unless ( defined $p_group );
     $p_data3 = $self->group unless ( defined $p_data3 );
-    my $success_callback_prefix =
-      $self->get_object_name . "->link_to_interface(\"$p_group\",\"$p_data3\",";
-    my $success_callback = "";
+    my $success_callback_prefix = $self->get_object_name . "->link_to_interface(\"$p_group\",\"$p_data3\",";
+    my $success_callback        = "";
     my $failure_callback =
         '::print_log("[Insteon::BaseInsteon] Error: The Link_To_Interface '
       . 'routine failed for device: '
@@ -1639,8 +1584,7 @@ sub link_to_interface {
     $step = 0 if ( $step eq '' );
     if ( $step == 0 ) {    #If NAK on get_engine, then this is an I2CS device
         $success_callback = $success_callback_prefix . "\"1\")";
-        $failure_callback = $self->get_object_name
-          . "->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
+        $failure_callback = $self->get_object_name . "->link_to_interface_i2cs(\"$p_group\",\"$p_data3\")";
         $self->get_engine_version( $success_callback, $failure_callback );
     }
     elsif ( $step == 1 ) {    #Add Controller Link from object->PLM
@@ -1659,8 +1603,7 @@ sub link_to_interface {
         else {
             &main::print_log( "[Insteon::BaseInsteon] Error: This item, "
                   . $self->get_object_name
-                  . ", does not have an ALDB object.  Linking is not permitted."
-            );
+                  . ", does not have an ALDB object.  Linking is not permitted." );
         }
     }
     elsif ( $step == 2 ) {    #Add Responder Link to PLM for object->PLM
@@ -1672,8 +1615,7 @@ sub link_to_interface {
           . "callback=$success_callback failure_callback=$failure_callback";
         $self->interface->add_link($link_info);
     }
-    elsif ( $step == 3 )
-    {    #Add surrogate responder link on device if surrogate exists
+    elsif ( $step == 3 ) {    #Add surrogate responder link on device if surrogate exists
         if ( ref $$self{surrogate} ) {
             $success_callback = $success_callback_prefix . "\"4\")";
             my $surrogate_group = $$self{surrogate}->group;
@@ -1689,13 +1631,10 @@ sub link_to_interface {
         }
         else {
             ::print_log(
-                '[Insteon::BaseInsteon] Link_To_Interface successfully completed'
-                  . ' for device '
-                  . $self->get_object_name );
+                '[Insteon::BaseInsteon] Link_To_Interface successfully completed' . ' for device ' . $self->get_object_name );
         }
     }
-    elsif ( $step == 4 )
-    {    #Add surrogate controller link on PLM if surrogate exists
+    elsif ( $step == 4 ) {    #Add surrogate controller link on PLM if surrogate exists
         $success_callback = $success_callback_prefix . "\"5\")";
         my $surrogate_group = $$self{surrogate}->group;
         my %link_info       = (
@@ -1709,10 +1648,7 @@ sub link_to_interface {
         $self->interface->add_link(%link_info);
     }
     elsif ( $step == 5 ) {
-        ::print_log(
-            '[Insteon::BaseInsteon] Link_To_Interface successfully completed'
-              . ' for device '
-              . $self->get_object_name );
+        ::print_log( '[Insteon::BaseInsteon] Link_To_Interface successfully completed' . ' for device ' . $self->get_object_name );
     }
 }
 
@@ -1728,9 +1664,8 @@ faile.  As such, this should likely only be used if necessary.
 
 sub link_to_interface_i2cs {
     my ( $self, $p_group, $p_data3, $step ) = @_;
-    my $success_callback_prefix = $self->get_object_name
-      . "->link_to_interface_i2cs('$p_group','$p_data3',";
-    my $success_callback = "";
+    my $success_callback_prefix = $self->get_object_name . "->link_to_interface_i2cs('$p_group','$p_data3',";
+    my $success_callback        = "";
     my $failure_callback =
         "::print_log('[Insteon::BaseInsteon] Error Link_To_Interface_I2CS "
       . "routine failed for device: "
@@ -1738,30 +1673,24 @@ sub link_to_interface_i2cs {
     $step = 0 if ( $step eq '' );
     if ( $step == 0 ) {    #Put PLM into initiate linking mode
         $success_callback = $success_callback_prefix . "'1')";
-        $self->interface()
-          ->initiate_linking_as_controller( '00', $success_callback,
-            $failure_callback );
+        $self->interface()->initiate_linking_as_controller( '00', $success_callback, $failure_callback );
     }
     elsif ( $step == 1 ) {    #Ask device to respond to link request
         $success_callback = $success_callback_prefix . "'2')";
-        $self->enter_linking_mode( $p_group, $success_callback,
-            $failure_callback );
+        $self->enter_linking_mode( $p_group, $success_callback, $failure_callback );
     }
     elsif ( $step == 2 ) {    #Insert Link Record in PLM, Scan Device link table
-            #Insert the record into MH cache of the PLM's link table
+                              #Insert the record into MH cache of the PLM's link table
         my $device_id = $self->device_id;
         my $data1     = substr( $self->devcat, 0, 2 );
         my $data2     = substr( $self->devcat, 2, 2 );
         my $data3     = $self->firmware;
-        $self->interface()
-          ->_aldb->add_link_to_hash( 'E2', '00', '1',
-            $device_id, $data1, $data2, $data3 );
+        $self->interface()->_aldb->add_link_to_hash( 'E2', '00', '1', $device_id, $data1, $data2, $data3 );
 
         #Scan device to get an accurate link table
         #return to normal link_to_interface routine if successful
-        $success_callback_prefix =
-          $self->get_object_name . "->link_to_interface('$p_group','$p_data3',";
-        $success_callback = $success_callback_prefix . "'1')";
+        $success_callback_prefix = $self->get_object_name . "->link_to_interface('$p_group','$p_data3',";
+        $success_callback        = $success_callback_prefix . "'1')";
         $self->scan_link_table( $success_callback, $failure_callback );
     }
 }
@@ -1784,13 +1713,10 @@ sub unlink_to_interface {
 
     #It is possible to nest all of the callbacks in at once, but the quoting
     #becomes very complicated and happers readability
-    my $success_callback_prefix =
-      $self->get_object_name . "->unlink_to_interface('$p_group',";
-    my $success_callback = "";
+    my $success_callback_prefix = $self->get_object_name . "->unlink_to_interface('$p_group',";
+    my $success_callback        = "";
     my $failure_callback =
-        "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface "
-      . "failed for device: "
-      . $self->get_object_name . "')";
+      "::print_log('[Insteon::BaseInsteon] ERROR: Unlink_To_Interface " . "failed for device: " . $self->get_object_name . "')";
     $step = 0 if ( $step eq '' );
     if ( $step == 0 ) {    #Delete link on the device
         if ( $self->_aldb ) {
@@ -1807,8 +1733,7 @@ sub unlink_to_interface {
         else {
             &main::print_log( "[BaseInsteon] This item "
                   . $self->get_object_name
-                  . " does not have an ALDB object.  Unlinking is not permitted."
-            );
+                  . " does not have an ALDB object.  Unlinking is not permitted." );
         }
     }
     elsif ( $step == 1 ) {    #Delete link on the PLM
@@ -1821,7 +1746,7 @@ sub unlink_to_interface {
             failure_callback => $failure_callback
         );
     }
-    elsif ( $step == 2 ) {  #Delete surrogate link on device if surrogate exists
+    elsif ( $step == 2 ) {    #Delete surrogate link on device if surrogate exists
         if ( ref $$self{surrogate} ) {
             $success_callback = $success_callback_prefix . "'3')";
             my $surrogate_group = $$self{surrogate}->group;
@@ -1836,9 +1761,8 @@ sub unlink_to_interface {
             $self->_aldb->delete_link(%link_info);
         }
         else {
-            ::print_log( "[Insteon::BaseInsteon] Unlink_To_Interface"
-                  . " successfully completed for device "
-                  . $self->get_object_name );
+            ::print_log(
+                "[Insteon::BaseInsteon] Unlink_To_Interface" . " successfully completed for device " . $self->get_object_name );
         }
     }
     elsif ( $step == 3 ) {    #Delete surrogate link on PLM if surrogate exists
@@ -1855,9 +1779,8 @@ sub unlink_to_interface {
         $self->interface->delete_link(%link_info);
     }
     elsif ( $step == 4 ) {
-        ::print_log( "[Insteon::BaseInsteon] Unlink_To_Interface"
-              . " successfully completed for device "
-              . $self->get_object_name );
+        ::print_log(
+            "[Insteon::BaseInsteon] Unlink_To_Interface" . " successfully completed for device " . $self->get_object_name );
     }
 }
 
@@ -1880,9 +1803,7 @@ sub enter_linking_mode {
     $group = '01' unless $group;
     my $extra = sprintf( "%02x", $group );
     $extra .= '0' x ( 30 - length $extra );
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'linking_mode',
-        $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'linking_mode', $extra );
     $message->success_callback($success_callback);
     $message->failure_callback($failure_callback);
     $self->_send_cmd($message);
@@ -1898,30 +1819,25 @@ sub set_operating_flag {
     my ( $self, $flag ) = @_;
 
     if ( !( exists( $$self{operating_flags}{$flag} ) ) ) {
-        &::print_log(
-            "[Insteon::BaseDevice] $flag is not a support operating flag");
+        &::print_log("[Insteon::BaseDevice] $flag is not a support operating flag");
         return;
     }
 
     if ( $self->is_root and !( $self->isa('Insteon::InterfaceController') ) ) {
         my $message;
         if ( ref $self->_aldb && $self->_aldb->isa('Insteon::ALDB_i2') ) {
-            $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-                'set_operating_flags' );
-            $message->extra( $$self{operating_flags}{$flag}
-                  . "0000000000000000000000000000" );
+            $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'set_operating_flags' );
+            $message->extra( $$self{operating_flags}{$flag} . "0000000000000000000000000000" );
         }
         else {
-            $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-                'set_operating_flags' );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'set_operating_flags' );
             $message->extra( $$self{operating_flags}{$flag} );
         }
         $self->_send_cmd($message);
     }
     else {
-        &::print_log( "[Insteon::BaseDevice] "
-              . $self->get_object_name
-              . " is either not a root device or is a plm controlled scene" );
+        &::print_log(
+            "[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene" );
         return;
     }
 }
@@ -1938,16 +1854,14 @@ sub get_operating_flag {
     if ( $self->is_root and !( $self->isa('Insteon::InterfaceController') ) ) {
 
         # TO-DO: check devcat to determine if the action is supported by the device
-        my $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-            'get_operating_flags' );
+        my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'get_operating_flags' );
         $self->_send_cmd($message);
 
         #		$self->_send_cmd('command' => 'get_operating_flags');
     }
     else {
-        &::print_log( "[Insteon::BaseDevice] "
-              . $self->get_object_name
-              . " is either not a root device or is a plm controlled scene" );
+        &::print_log(
+            "[Insteon::BaseDevice] " . $self->get_object_name . " is either not a root device or is a plm controlled scene" );
         return;
     }
 }
@@ -1993,8 +1907,9 @@ Returns true if the object is the base object, generally group 01, on the device
 
 sub is_root {
     my ($self) = @_;
-    return ( ( $self->group eq '01' )
-          and !( $self->isa('Insteon::InterfaceController') ) ) ? 1 : 0;
+    return ( ( $self->group eq '01' ) and !( $self->isa('Insteon::InterfaceController') ) )
+      ? 1
+      : 0;
 }
 
 =item C<get_root()>
@@ -2010,8 +1925,7 @@ sub get_root {
     }
     else {
         my $root_obj = &Insteon::get_object( $self->device_id, '01' );
-        ::print_log(
-                "[Insteon::BaseDevice] ERROR! Cannot find the root object for "
+        ::print_log( "[Insteon::BaseDevice] ERROR! Cannot find the root object for "
               . $self->get_object_name
               . ". Please check your mht file to make sure "
               . "that device id "
@@ -2033,8 +1947,7 @@ sub has_link {
     my ( $self, $insteon_object, $group, $is_controller, $subaddress ) = @_;
     my $aldb = $self->get_root()->_aldb;
     if ($aldb) {
-        return $aldb->has_link( $insteon_object, $group, $is_controller,
-            $subaddress );
+        return $aldb->has_link( $insteon_object, $group, $is_controller, $subaddress );
     }
     else {
         return 0;
@@ -2152,8 +2065,7 @@ sub log_aldb_status {
     my $hop_array;
     $hop_array = join( "", @{ $$self{hop_array} } )
       if ( defined( $$self{hop_array} ) );
-    main::print_log(
-        "     Hop Count: " . $self->default_hop_count() . " :: [$hop_array]" );
+    main::print_log( "     Hop Count: " . $self->default_hop_count() . " :: [$hop_array]" );
     main::print_log( "Engine Version: " . $self->engine_version() );
     my $aldb = $self->get_root()->_aldb;
     if ($aldb) {
@@ -2176,8 +2088,7 @@ your own risk. [GL]
 sub remote_set_button_tap {
     my ( $self, $p_number_taps ) = @_;
     my $taps = ( $p_number_taps =~ /2/ ) ? '02' : '01';
-    my $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-        'remote_set_button_tap' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'remote_set_button_tap' );
     $message->extra($taps);
     $self->_send_cmd($message);
 
@@ -2194,8 +2105,7 @@ This will trigger tied_events.
 sub request_status {
     my ( $self, $requestor ) = @_;
     $$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'status_request' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'status_request' );
     $self->_send_cmd($message);
 
     #	$self->_send_cmd('command' => 'status_request', 'is_synchronous' => 1);
@@ -2214,11 +2124,9 @@ Returns: nothing
 sub get_engine_version {
     my ( $self, $success_callback, $failure_callback ) = @_;
 
-    my $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-        'get_engine_version' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'get_engine_version' );
     my $self_object_name = $self->get_object_name;
-    $message->failure_callback(
-        "$self_object_name->_get_engine_version_failure();$failure_callback");
+    $message->failure_callback("$self_object_name->_get_engine_version_failure();$failure_callback");
     $message->success_callback($success_callback);
     $self->_send_cmd($message);
 }
@@ -2238,9 +2146,7 @@ sub _get_engine_version_failure {
     my ($self) = @_;
     my $failure_reason = $self->failure_reason();
 
-    main::print_log(
-            "[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: "
-          . "failure reason: $failure_reason" )
+    main::print_log( "[Insteon::BaseDevice::_get_engine_version_failure] DEBUG4: " . "failure reason: $failure_reason" )
       if $self->debuglevel( 4, 'insteon' );
 
     if ( $failure_reason eq 'NAK' ) {
@@ -2288,13 +2194,11 @@ sub ping {
         my $message;
         my $extra = sprintf( "%02d", $$self{ping_count} );
         if ( uc( $self->engine_version ) eq 'I1' ) {
-            $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-                'ping', $extra );
+            $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'ping', $extra );
         }
         else {
             my $extra = $extra . '0' x 28;
-            $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-                'ping', $extra );
+            $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'ping', $extra );
         }
         ::print_log( "[Insteon::BaseDevice] Sending ping request to "
               . $self->get_object_name . " "
@@ -2304,15 +2208,13 @@ sub ping {
         $self->_send_cmd($message);
     }
     else {
-        ::print_log( "[Insteon::BaseDevice] Completed ping queue for "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::BaseDevice] Completed ping queue for " . $self->get_object_name );
         if ( defined $$self{ping_callback} ) {
             my $complete_callback = $$self{ping_callback};
 
             package main;
             eval($complete_callback);
-            &::print_log(
-                "[Insteon::BaseDevice] error in ping callback: " . $@ )
+            &::print_log( "[Insteon::BaseDevice] error in ping callback: " . $@ )
               if $@ and $self->debuglevel( 1, 'insteon' );
 
             package Insteon::BaseDevice;
@@ -2329,8 +2231,7 @@ Used to set the led staatus of SwitchLinc companion leds.
 
 sub set_led_status {
     my ( $self, $status_mask ) = @_;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'set_led_status' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'set_led_status' );
     $message->extra($status_mask);
     $self->_send_cmd($message);
 
@@ -2404,8 +2305,7 @@ by calling C<devcat()>.
 
 sub get_devcat {
     my ($self) = @_;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'id_request' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'id_request' );
     $self->_send_cmd($message);
 }
 
@@ -2455,8 +2355,7 @@ does nothing.
 
 sub delete_orphan_links {
     my ( $self, $audit_mode, $failure_callback, $is_batch_mode ) = @_;
-    return $self->_aldb->delete_orphan_links( $audit_mode, $failure_callback,
-        $is_batch_mode )
+    return $self->_aldb->delete_orphan_links( $audit_mode, $failure_callback, $is_batch_mode )
       if $self->_aldb;
 }
 
@@ -2582,10 +2481,9 @@ sub stress_test {
               . " iterations left" );
         my $aldb = $self->get_root()->_aldb;
         if ($aldb) {
-            $$aldb{_mem_activity}    = 'scan';
-            $$aldb{_stress_test_act} = 1;
-            $$aldb{_failure_callback} =
-              $self->get_object_name . '->stress_test()';
+            $$aldb{_mem_activity}     = 'scan';
+            $$aldb{_stress_test_act}  = 1;
+            $$aldb{_failure_callback} = $self->get_object_name . '->stress_test()';
             if ( $aldb->isa('Insteon::ALDB_i1') ) {
                 $aldb->_peek('0FF8');
             }
@@ -2605,15 +2503,13 @@ sub stress_test {
         $$self{stress_test_count}--;
     }
     else {
-        &::print_log( "[Insteon::BaseDevice] Stress Test Complete for "
-              . $self->get_object_name );
+        &::print_log( "[Insteon::BaseDevice] Stress Test Complete for " . $self->get_object_name );
         if ( defined $$self{stress_test_callback} ) {
             $complete_callback = $$self{stress_test_callback};
 
             package main;
             eval($complete_callback);
-            &::print_log(
-                "[Insteon::BaseDevice] error in stress_test callback: " . $@ )
+            &::print_log( "[Insteon::BaseDevice] error in stress_test callback: " . $@ )
               if $@ and $self->debuglevel( 1, 'insteon' );
 
             package Insteon::BaseDevice;
@@ -2842,35 +2738,27 @@ sub print_message_stats {
     $self = $self->get_root;
     my $object_name   = $self->get_object_name;
     my $retry_average = 0;
-    $retry_average = sprintf( "%.1f",
-        ( $$self{retry_count_log} / $$self{outgoing_count_log} ) + 1 )
+    $retry_average = sprintf( "%.1f", ( $$self{retry_count_log} / $$self{outgoing_count_log} ) + 1 )
       if ( $$self{outgoing_count_log} > 0 );
     my $fail_percentage = 0;
-    $fail_percentage = sprintf( "%.1f",
-        ( $$self{fail_count_log} / $$self{outgoing_count_log} ) * 100 )
+    $fail_percentage = sprintf( "%.1f", ( $$self{fail_count_log} / $$self{outgoing_count_log} ) * 100 )
       if ( $$self{outgoing_count_log} > 0 );
     my $corrupt_percentage = 0;
-    $corrupt_percentage = sprintf( "%.1f",
-        ( $$self{corrupt_count_log} / $$self{incoming_count_log} ) * 100 )
+    $corrupt_percentage = sprintf( "%.1f", ( $$self{corrupt_count_log} / $$self{incoming_count_log} ) * 100 )
       if ( $$self{incoming_count_log} > 0 );
     my $dupe_percentage = 0;
-    $dupe_percentage = sprintf( "%.1f",
-        ( $$self{dupe_count_log} / $$self{incoming_count_log} ) * 100 )
+    $dupe_percentage = sprintf( "%.1f", ( $$self{dupe_count_log} / $$self{incoming_count_log} ) * 100 )
       if ( $$self{incoming_count_log} > 0 );
     my $avg_hops_left = 0;
-    $avg_hops_left = sprintf( "%.1f",
-        ( $$self{hops_left_count} / $$self{incoming_count_log} ) )
+    $avg_hops_left = sprintf( "%.1f", ( $$self{hops_left_count} / $$self{incoming_count_log} ) )
       if ( $$self{incoming_count_log} > 0 );
     my $avg_max_hops = 0;
-    $avg_max_hops =
-      sprintf( "%.1f", ( $$self{max_hops_count} / $$self{incoming_count_log} ) )
+    $avg_max_hops = sprintf( "%.1f", ( $$self{max_hops_count} / $$self{incoming_count_log} ) )
       if ( $$self{incoming_count_log} > 0 );
     my $avg_out_hops = 0;
-    $avg_out_hops = sprintf( "%.1f",
-        ( $$self{outgoing_hop_count} / $$self{outgoing_count_log} ) )
+    $avg_out_hops = sprintf( "%.1f", ( $$self{outgoing_hop_count} / $$self{outgoing_count_log} ) )
       if ( $$self{outgoing_count_log} > 0 );
-    ::print_log(
-            "[Insteon::BaseDevice] Message statistics for $object_name:\n"
+    ::print_log( "[Insteon::BaseDevice] Message statistics for $object_name:\n"
           . "    In Corrupt %Corrpt  Dupe   %Dupe HopsLeft Max_Hops Act_Hops\n"
           . sprintf( "%6s", $$self{incoming_count_log} )
           . sprintf( "%8s", $$self{corrupt_count_log} )
@@ -2946,8 +2834,7 @@ sub check_aldb_version {
 
         package main;
         eval($restore_string);
-        &::print_log(
-            "[Insteon::BaseDevice] error in eval creating ALDB object: " . $@ )
+        &::print_log( "[Insteon::BaseDevice] error in eval creating ALDB object: " . $@ )
           if $@ and $self->debuglevel( 1, 'insteon' );
 
         package Insteon::BaseDevice;
@@ -2978,10 +2865,9 @@ sub get_voice_cmds {
     if ( $self->is_root ) {
         %voice_cmds = (
             %voice_cmds,
-            'status'             => "$object_name->request_status",
-            'get engine version' => "$object_name->get_engine_version",
-            'scan link table'    => "$object_name->scan_link_table(\""
-              . '\$self->log_alllink_table' . "\")",
+            'status'              => "$object_name->request_status",
+            'get engine version'  => "$object_name->get_engine_version",
+            'scan link table'     => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
             'print message stats' => "$object_name->print_message_stats",
             'reset message stats' => "$object_name->reset_message_stats",
             'run stress test'     => "$object_name->stress_test(5)",
@@ -2991,10 +2877,9 @@ sub get_voice_cmds {
         if ( $self->is_deaf ) {
             %voice_cmds = (
                 %voice_cmds,
-                'delete orphan links' => "$object_name->delete_orphan_links(0)",
-                '(AUDIT) delete orphan links' =>
-                  "$object_name->delete_orphan_links(1)",
-                'mark as manually awake' => "$object_name->manual_awake(240)"
+                'delete orphan links'         => "$object_name->delete_orphan_links(0)",
+                '(AUDIT) delete orphan links' => "$object_name->delete_orphan_links(1)",
+                'mark as manually awake'      => "$object_name->manual_awake(240)"
             );
         }
     }
@@ -3111,9 +2996,7 @@ sub sync_all_links {
     my $device_id = $self->device_id();
     my ( $subgroup_object, $group, $dec_group );
 
-    ::print_log( "[Insteon::MultigroupDevice] Sync All Links on device "
-          . $self->get_object_name
-          . " starting ..." );
+    ::print_log( "[Insteon::MultigroupDevice] Sync All Links on device " . $self->get_object_name . " starting ..." );
 
     # Find all subgroup items check groups from 02 - FF;
     for ( $dec_group = 01; $dec_group <= 255; $dec_group++ ) {
@@ -3124,10 +3007,7 @@ sub sync_all_links {
                 'sync_object' => $subgroup_object,
                 'audit_mode'  => ($audit_mode) ? 1 : 0
             );
-            ::print_log( "[Insteon::MultigroupDevice] "
-                  . "Adding "
-                  . $subgroup_object->get_object_name
-                  . " to sync queue." );
+            ::print_log( "[Insteon::MultigroupDevice] " . "Adding " . $subgroup_object->get_object_name . " to sync queue." );
             push @{ $$self{_sync_devices} }, \%sync_req;
         }
     }
@@ -3160,32 +3040,22 @@ sub _get_next_linksync {
     if ($current_sync_device) {
         ::print_log( "[Insteon::MultigroupDevice] Now syncing: "
               . $current_sync_device->get_object_name . " ("
-              . ( $$self{_sync_cnt} - scalar @{ $$self{_sync_devices} } )
-              . " of "
+              . ( $$self{_sync_cnt} - scalar @{ $$self{_sync_devices} } ) . " of "
               . $$self{_sync_cnt}
               . ")" );
         $current_sync_device->sync_links(
             $sync_req{'audit_mode'},
             $self->get_object_name . '->_get_next_linksync()',
-            $self->get_object_name
-              . '->_get_next_linksync_failure('
-              . $current_sync_device->get_object_name . ')'
+            $self->get_object_name . '->_get_next_linksync_failure(' . $current_sync_device->get_object_name . ')'
         );
     }
     else {
-        ::print_log(
-                "[Insteon::MultigroupDevice] All links have completed syncing "
-              . "on device "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::MultigroupDevice] All links have completed syncing " . "on device " . $self->get_object_name );
         my $_sync_failure_cnt = scalar @{ $$self{_sync_device_failures} };
         if ($_sync_failure_cnt) {
-            ::print_log(
-                "[Insteon::MultigroupDevice] However, some failures were noted:"
-            );
+            ::print_log( "[Insteon::MultigroupDevice] However, some failures were noted:" );
             for my $failed_obj ( @{ $$self{_sync_device_failures} } ) {
-                ::print_log(
-                    "[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
-                      . $failed_obj->get_object_name );
+                ::print_log( "[Insteon::MultigroupDevice] WARN: failure occurred when syncing " . $failed_obj->get_object_name );
             }
         }
     }
@@ -3202,8 +3072,7 @@ sub _get_next_linksync_failure {
     my ( $self, $current_sync_device ) = @_;
     $self = $self->get_root();
     push @{ $$self{_sync_device_failures} }, $current_sync_device;
-    ::print_log(
-            "[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
+    ::print_log( "[Insteon::MultigroupDevice] WARN: failure occurred when syncing "
           . $current_sync_device->get_object_name
           . ".  Moving on..." );
     $self->_get_next_linksync();
@@ -3341,16 +3210,14 @@ sub sync_links {
 
     # Intialize Variables
     @{ $$self{sync_queue} } = ();    # reset the work queue
-    $$self{sync_queue_callback} = ($callback) ? $callback : undef;
-    $$self{sync_queue_failure_callback} =
-      ($failure_callback) ? $failure_callback : undef;
-    $$self{sync_queue_failure} = undef;
+    $$self{sync_queue_callback}         = ($callback)         ? $callback         : undef;
+    $$self{sync_queue_failure_callback} = ($failure_callback) ? $failure_callback : undef;
+    $$self{sync_queue_failure}          = undef;
     my $self_link_name   = $self->get_object_name;
     my $interface_object = Insteon::active_interface();
     my $interface_name   = $interface_object->get_object_name;
     my $insteon_object   = $self->get_root;
-    ::print_log(
-            "[Insteon::BaseController] WARN!! A device w/ insteon address: "
+    ::print_log( "[Insteon::BaseController] WARN!! A device w/ insteon address: "
           . $self->device_id
           . ":01 could not be found. "
           . "Please double check your items.mht file." )
@@ -3362,8 +3229,7 @@ sub sync_links {
     # Warn if device is deaf or ALDB out of sync
     my $insteon_object_is_syncable = 1;
     if ( $insteon_object->is_deaf && $skip_deaf ) {
-        ::print_log(
-            "[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
+        ::print_log( "[Insteon::BaseController] $self_link_name is deaf, only responder links will be added to devices "
               . "controlled by this device.  To sync links on this device, put it in awake mode and run the 'Sync Links' "
               . "command on this specific device." );
         $insteon_object_is_syncable = 0;
@@ -3371,8 +3237,7 @@ sub sync_links {
     elsif ($insteon_object->_aldb->health ne 'unchanged'
         && $insteon_object->_aldb->health ne 'empty' )
     {
-        ::print_log(
-            "[Insteon::BaseController] WARN! The ALDB of $self_link_name is "
+        ::print_log( "[Insteon::BaseController] WARN! The ALDB of $self_link_name is "
               . $insteon_object->_aldb->health
               . ", links will be added to devices "
               . "linked to this device, but no links will be added to $self_link_name.  Please rescan this device and attempt "
@@ -3382,12 +3247,9 @@ sub sync_links {
     }
 
     # 1. Does a controller link exist for Device-> PLM
-    if (
-        !$insteon_object->isa('Insteon_PLM')
-        && !$insteon_object->has_link( $self->interface, $self->group, 1,
-            $self->group )
-        && $insteon_object_is_syncable
-      )
+    if (   !$insteon_object->isa('Insteon_PLM')
+        && !$insteon_object->has_link( $self->interface, $self->group, 1, $self->group )
+        && $insteon_object_is_syncable )
     {
         my %link_req = (
             member           => $insteon_object,
@@ -3399,21 +3261,12 @@ sub sync_links {
             failure_callback => $failure_callback,
             data3            => $self->group
         );
-        $link_req{cause} =
-          "Adding controller record to $self_link_name for $interface_name";
+        $link_req{cause} = "Adding controller record to $self_link_name for $interface_name";
         push @{ $$self{sync_queue} }, \%link_req;
     }
 
     # 2. Does a responder link exist on the PLM
-    if (
-        (
-            !$insteon_object->isa('Insteon_PLM')
-            && !$self->interface->has_link(
-                $insteon_object, $self->group, 0, '00'
-            )
-        )
-      )
-    {
+    if ( ( !$insteon_object->isa('Insteon_PLM') && !$self->interface->has_link( $insteon_object, $self->group, 0, '00' ) ) ) {
         my %link_req = (
             member           => $self->interface,
             cmd              => 'add',
@@ -3424,8 +3277,7 @@ sub sync_links {
             failure_callback => $failure_callback,
             data3            => '00'
         );
-        $link_req{cause} =
-          "Adding responder record to $interface_name from $self_link_name";
+        $link_req{cause} = "Adding responder record to $interface_name from $self_link_name";
         push @{ $$self{sync_queue} }, \%link_req;
     }
 
@@ -3451,24 +3303,20 @@ sub sync_links {
         $tgt_ramp_rate = '0' unless defined $tgt_ramp_rate;
         $tgt_on_level =~ s/(\d+)%?/$1/;
         $tgt_ramp_rate =~ s/(\d)s?/$1/;
-        my $resp_aldbkey =
-          $member_root->_aldb->get_linkkey( $insteon_object->device_id,
-            $self->group, '0', $member->group );
+        my $resp_aldbkey = $member_root->_aldb->get_linkkey( $insteon_object->device_id, $self->group, '0', $member->group );
 
         # If this is an attempt to create a link between two objects on the same
         # device, then skip.  Currently, a KPL can do this with a seperate
         # routine, but IntraDevice links are not allowed by any other known device
         if ( $member_root eq $insteon_object ) {
-            ::print_log(
-                "[Insteon::Sync_Links] Skipping intralink to $member_name.")
+            ::print_log("[Insteon::Sync_Links] Skipping intralink to $member_name.")
               if $insteon_object->debuglevel( 2, 'insteon' );
             next MEMBER;
         }
 
         # 3. Does the responder link exist
         if (
-            !$member_root->has_link( $insteon_object, $self->group, 0,
-                $member->group )
+            !$member_root->has_link( $insteon_object, $self->group, 0, $member->group )
             && (   $member_root->_aldb->health eq 'unchanged'
                 || $member_root->_aldb->health eq 'empty' )
           )
@@ -3485,8 +3333,7 @@ sub sync_links {
                 failure_callback => $failure_callback,
                 data3            => $member->group
             );
-            $link_req{cause} =
-              "Adding responder record to $member_name from $self_link_name";
+            $link_req{cause} = "Adding responder record to $member_name from $self_link_name";
             push @{ $$self{sync_queue} }, \%link_req;
             $has_link = 0;
         }
@@ -3520,8 +3367,7 @@ sub sync_links {
             my $data2             = $$member_aldb{aldb}{$resp_aldbkey}{data2};
             my $cur_on_level      = hex($data1) / 2.55;
             my $raw_cur_ramp_rate = $data2;
-            my $raw_tgt_ramp_rate =
-              Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
+            my $raw_tgt_ramp_rate = Insteon::DimmableLight::convert_ramp($tgt_ramp_rate);
             if ( $raw_cur_ramp_rate ne $raw_tgt_ramp_rate ) {
                 $requires_update = 1;
                 $cause .= "Ramp rate ";
@@ -3570,20 +3416,13 @@ sub sync_links {
                 failure_callback => $failure_callback,
                 data3            => $member->group
             );
-            $link_req{cause} =
-              "Updating responder record on $member_name " . "to fix $cause";
+            $link_req{cause} = "Updating responder record on $member_name " . "to fix $cause";
             push @{ $$self{sync_queue} }, \%link_req;
         }
 
         # 5. Does the controller link on this device exist
-        if (
-            !(
-                $insteon_object->has_link(
-                    $member, $self->group, 1, $self->group
-                )
-            )
-            && $insteon_object_is_syncable
-          )
+        if ( !( $insteon_object->has_link( $member, $self->group, 1, $self->group ) )
+            && $insteon_object_is_syncable )
         {
             my %link_req = (
                 member           => $insteon_object,
@@ -3595,8 +3434,7 @@ sub sync_links {
                 failure_callback => $failure_callback,
                 data3            => $self->group
             );
-            $link_req{cause} =
-              "Adding controller record to $self_link_name for $member_name";
+            $link_req{cause} = "Adding controller record to $self_link_name for $member_name";
             push @{ $$self{sync_queue} }, \%link_req;
         }
     }
@@ -3604,9 +3442,7 @@ sub sync_links {
     my $num_sync_queue = @{ $$self{sync_queue} };
     my $index          = 0;
     if ( !($num_sync_queue) ) {
-        &::print_log(
-            "[Insteon::BaseController] Nothing to do when syncing links for "
-              . $self->get_object_name )
+        &::print_log( "[Insteon::BaseController] Nothing to do when syncing links for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
     }
     foreach ( @{ $$self{sync_queue} } ) {
@@ -3668,15 +3504,13 @@ sub _process_sync_queue {
 
         package main;
         eval($callback);
-        ::print_log(
-            "[Insteon::BaseController] ERROR in sync links callback: " . $@ )
+        ::print_log( "[Insteon::BaseController] ERROR in sync links callback: " . $@ )
           if $@ and $self->debuglevel( 1, 'insteon' );
 
         package Insteon::BaseController;
     }
     else {
-        ::print_log( "[Insteon::BaseController] Completed sync links for: "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::BaseController] Completed sync links for: " . $self->get_object_name );
         if ( $$self{deaf_sync_queue_flag} ) {
             ::print_log( "[Insteon::BaseController] Links on "
                   . $self->get_object_name
@@ -3700,9 +3534,8 @@ sub _build_deaf_sync_queue {
     my $self_link_name = $self->get_object_name;
     $$self{deaf_sync_queue_flag} = 1;    #Sync requests are pending
     %link_req = (
-        callback => "$self_link_name->_process_deaf_sync_queue()",
-        failure_callback =>
-          "$self_link_name->_process_deaf_sync_queue_failure()"
+        callback         => "$self_link_name->_process_deaf_sync_queue()",
+        failure_callback => "$self_link_name->_process_deaf_sync_queue_failure()"
     );
     push @{ $$self{deaf_sync_queue} }, \%link_req;
 }
@@ -3722,12 +3555,9 @@ sub _process_deaf_sync_queue {
         }
     }
     else {
-        ::print_log( "[Insteon::BaseController] Completed the delayed "
-              . "sync links request on "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::BaseController] Completed the delayed " . "sync links request on " . $self->get_object_name );
         if ( $$self{deaf_sync_queue_failure} ) {
-            ::print_log( "[Insteon::BaseController] However, some "
-                  . "failures occured." );
+            ::print_log( "[Insteon::BaseController] However, some " . "failures occured." );
         }
         $$self{deaf_sync_queue_flag}    = 0;
         $$self{deaf_sync_queue_failure} = 0;
@@ -3866,12 +3696,10 @@ sub update_members {
                 $device = $member;
             }
             if ($device) {
-                my %current_record =
-                  $device->get_link_record( $self->device_id . $self->group );
+                my %current_record = $device->get_link_record( $self->device_id . $self->group );
                 if (%current_record) {
-                    &::print_log(
-                        "[Insteon::BaseController] remote record: $current_record{data1}"
-                    ) if $self->debuglevel( 1, 'insteon' );
+                    &::print_log( "[Insteon::BaseController] remote record: $current_record{data1}" )
+                      if $self->debuglevel( 1, 'insteon' );
                 }
             }
         }
@@ -3898,13 +3726,11 @@ sub initiate_linking_as_controller {
 
                 # if they are Light_Items, then set them to manual to avoid automation
                 #   while manually setting light parameters
-                $member->manual( 1, 120, 120 );   # 120 seconds should be enough
+                $member->manual( 1, 120, 120 );    # 120 seconds should be enough
             }
         }
     }
-    $self->interface()
-      ->initiate_linking_as_controller( $p_group, $success_callback,
-        $failure_callback );
+    $self->interface()->initiate_linking_as_controller( $p_group, $success_callback, $failure_callback );
 }
 
 =item C<find_members([type])>
@@ -3992,8 +3818,7 @@ package Insteon::InterfaceController;
 
 use strict;
 
-@Insteon::InterfaceController::ISA =
-  ( 'Insteon::BaseController', 'Insteon::BaseObject' );
+@Insteon::InterfaceController::ISA = ( 'Insteon::BaseController', 'Insteon::BaseObject' );
 
 =item C<new()>
 
@@ -4064,11 +3889,10 @@ sub get_voice_cmds {
     my $group       = $self->group;
     my %voice_cmds  = (
         %{ $self->SUPER::get_voice_cmds },
-        'on'  => "$object_name->set(\"on\")",
-        'off' => "$object_name->set(\"off\")",
-        'initiate linking as controller' =>
-          "$object_name->initiate_linking_as_controller(\"$group\")",
-        'cancel linking' => "$object_name->interface()->cancel_linking"
+        'on'                             => "$object_name->set(\"on\")",
+        'off'                            => "$object_name->set(\"off\")",
+        'initiate linking as controller' => "$object_name->initiate_linking_as_controller(\"$group\")",
+        'cancel linking'                 => "$object_name->interface()->cancel_linking"
     );
     return \%voice_cmds;
 }
diff --git a/lib/Insteon/BaseInterface.pm b/lib/Insteon/BaseInterface.pm
index d714b922d..d880aab6b 100644
--- a/lib/Insteon/BaseInterface.pm
+++ b/lib/Insteon/BaseInterface.pm
@@ -50,23 +50,18 @@ sub poll_all {
     my $scan_at_startup = $main::config_parms{Insteon_PLM_scan_at_startup};
     $scan_at_startup = 1 unless defined $scan_at_startup;
     if ( $scan_at_startup && $main::Save{mh_exit} ne 'normal' ) {
-        ::print_log(
-                "[Insteon] Skipping startup scan because MisterHouse did not "
-              . "exit cleanly." );
+        ::print_log( "[Insteon] Skipping startup scan because MisterHouse did not " . "exit cleanly." );
         $scan_at_startup = 0;
     }
     my $plm = &Insteon::active_interface();
     if ( defined $plm ) {
         if ( !( $plm->device_id ) and !( $$plm{_id_check} ) ) {
             $$plm{_id_check} = 1;
-            $plm->queue_message(
-                new Insteon::InsteonMessage( 'plm_info', $plm ) );
+            $plm->queue_message( new Insteon::InsteonMessage( 'plm_info', $plm ) );
         }
         if ($scan_at_startup) {
 
-            for my $insteon_device (
-                &Insteon::find_members('Insteon::BaseDevice') )
-            {
+            for my $insteon_device ( &Insteon::find_members('Insteon::BaseDevice') ) {
                 if (    $insteon_device
                     and $insteon_device->is_root
                     and $insteon_device->is_responder )
@@ -171,8 +166,7 @@ within L<Insteon::AllLinkDatabase|Insteon::AllLinkDatabase>.  Generally called a
 sub has_link {
     my ( $self, $insteon_object, $group, $is_controller, $subaddress ) = @_;
     if ( $self->_aldb ) {
-        return $self->_aldb->has_link( $insteon_object, $group, $is_controller,
-            $subaddress );
+        return $self->_aldb->has_link( $insteon_object, $group, $is_controller, $subaddress );
     }
     return 0;
 }
@@ -299,8 +293,7 @@ sub queue_message {
         if ( $self->_is_duplicate( $message->interface_data )
             && !( $message->isa('Insteon::X10Message') ) )
         {
-            ::print_log( "[Insteon::BaseInterface] WARN queuing a "
-                  . "duplicate command already in queue." )
+            ::print_log( "[Insteon::BaseInterface] WARN queuing a " . "duplicate command already in queue." )
               if $self->debuglevel( 1, 'insteon' );
         }
         if (    $setby
@@ -308,8 +301,7 @@ sub queue_message {
             and $setby->can('set_retry_timeout')
             and $setby->get_object_name )
         {
-            $message->callback(
-                $setby->get_object_name . "->set_retry_timeout()" );
+            $message->callback( $setby->get_object_name . "->set_retry_timeout()" );
         }
         unshift( @{ $$self{command_stack2} }, $message );
     }
@@ -340,24 +332,20 @@ sub process_queue {
     else
 
       #we dont transmit on top of another xmit
-    { # no transmission is progress that has not already been acked or nacked by the PLM
+    {    # no transmission is progress that has not already been acked or nacked by the PLM
             # get pending command record
         my $pending_message = $self->active_message;
 
-        if ( !($pending_message) )
-        {    # no prior message remains; so, get one from the queue
+        if ( !($pending_message) ) {    # no prior message remains; so, get one from the queue
             $pending_message = pop( @{ $$self{command_stack2} } );
             $self->active_message($pending_message) if $pending_message;
         }
 
-        if ($pending_message)
-        {    # a message exists to be sent (whether previously sent or queued)
+        if ($pending_message) {         # a message exists to be sent (whether previously sent or queued)
 
-            if ( $self->active_message->send($self) == 0 )
-            {    # this only occurs if the retry count has been exceeded
-                    # which also means that there wasn't a message actually sent
-                &::print_log(
-                        "[Insteon::BaseInterface] WARN: number of retries ("
+            if ( $self->active_message->send($self) == 0 ) {    # this only occurs if the retry count has been exceeded
+                                                                # which also means that there wasn't a message actually sent
+                &::print_log( "[Insteon::BaseInterface] WARN: number of retries ("
                       . $self->active_message->send_attempts
                       . ") for "
                       . $self->active_message->to_string()
@@ -394,18 +382,14 @@ sub process_queue {
                 $self->clear_active_message();
 
                 if ($callback) {
-                    &::print_log(
-                        "[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: "
-                          . $callback )
+                    &::print_log( "[Insteon::BaseInterface] WARN: Message Timeout:  Now calling callback: " . $callback )
                       if $self->debuglevel( 1, 'insteon' );
                     $setby->failure_reason('timeout')
                       if ( defined($setby) and $setby->can('failure_reason') );
 
                     package main;
                     eval $callback;
-                    &::print_log(
-                        "[Insteon::BaseInterface] problem w/ retry callback: $@"
-                    ) if $@;
+                    &::print_log( "[Insteon::BaseInterface] problem w/ retry callback: $@" ) if $@;
 
                     package Insteon::BaseInterface;
                 }
@@ -505,8 +489,7 @@ with C<enable_monitor_mode>.
 
 sub plm_get_config {
     my ($self) = @_;
-    $self->queue_message(
-        new Insteon::InsteonMessage( 'plm_get_config', $self ) );
+    $self->queue_message( new Insteon::InsteonMessage( 'plm_get_config', $self ) );
 }
 
 sub plm_config {
@@ -565,10 +548,7 @@ Prints output to log.
 
 sub on_interface_info_received {
     my ($self) = @_;
-    &::print_log( "[Insteon_PLM] PLM id: "
-          . $self->device_id
-          . " firmware: "
-          . $self->firmware )
+    &::print_log( "[Insteon_PLM] PLM id: " . $self->device_id . " firmware: " . $self->firmware )
       if $self->debuglevel( 1, 'insteon' );
     $self->clear_active_message();
 }
@@ -587,8 +567,7 @@ sub on_standard_insteon_received {
     return if $self->_is_duplicate_received( $message_data, %msg );
     if (%msg) {
         my $wait_time;
-        my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
-          . "with $msg{hopsleft} hops left, ";
+        my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received " . "with $msg{hopsleft} hops left, ";
         if (   !$msg{is_ack}
             && !$msg{is_nack}
             && $msg{type} ne 'alllink'
@@ -603,8 +582,7 @@ sub on_standard_insteon_received {
         #Standard msgs should only take 50 millis, but in practice additional
         #time has been required. Extra 50 millis helps prevent dupes
         $wait_time = ( $wait_time * 100 ) + 50;
-        $wait_message .=
-          "delaying next transmit by $wait_time milliseconds to avoid collisions.";
+        $wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
         ::print_log($wait_message)
           if ( $self->debuglevel( 3, 'insteon' ) && $wait_time > 50 );
         $self->_set_timeout( 'xmit', $wait_time );
@@ -623,34 +601,27 @@ sub on_standard_insteon_received {
                 $msg{command} = $object->message_type( $msg{cmd_code} );
                 &::print_log( "[Insteon::BaseInterface] Received message from: "
                       . $object->get_object_name
-                      . "; command: $msg{command}; type: $msg{type}; group: $msg{group}"
-                  )
+                      . "; command: $msg{command}; type: $msg{type}; group: $msg{group}" )
                   if ( !( $msg{is_ack} or $msg{is_nack} ) )
                   and $self->debuglevel( 1, 'insteon' );
             }
             if ( $msg{is_ack} or $msg{is_nack} ) {
-                main::print_log(
-                    "[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
-                      . "Device command:$msg{command}; type:$msg{type}; group: $msg{group}"
-                ) if $self->debuglevel( 3, 'insteon' );
+                main::print_log( "[Insteon::BaseInterface] DEBUG3: PLM command:insteon_received; "
+                      . "Device command:$msg{command}; type:$msg{type}; group: $msg{group}" )
+                  if $self->debuglevel( 3, 'insteon' );
 
                 # need to confirm that this message corresponds to the current active one before clearing it
                 # TO-DO!!! This is a brute force and poor compare technique; needs to be replaced by full compare
-                if ( $self->active_message && ref $self->active_message->setby )
-                {
+                if ( $self->active_message && ref $self->active_message->setby ) {
                     if ( $self->active_message->send_attempts == 0 ) {
-                        &main::print_log(
-                            "[Insteon::BaseInterface] WARN: received ACK/NACK message for "
+                        &main::print_log( "[Insteon::BaseInterface] WARN: received ACK/NACK message for "
                               . $object->get_object_name
                               . " but cannot correlate to sent message "
-                              . "(active but send attempts = 0).  IGNORING received message!!"
-                        );
+                              . "(active but send attempts = 0).  IGNORING received message!!" );
                     }
                     elsif ( $msg{type} eq 'direct' ) {
-                        if (
-                            lc $self->active_message->setby->device_id eq
-                            lc $msg{source} )
-                        {
+                        if ( lc $self->active_message->setby->device_id eq lc $msg{source} ) {
+
                             # prevent re-processing transmit queue until after clearing occurs
                             $self->transmit_in_progress(1);
 
@@ -658,18 +629,13 @@ sub on_standard_insteon_received {
                             # Object will return true if this is the end of the send transaction
                             if ( $object->_process_message( $self, %msg ) ) {
                                 if ( $self->active_message->success_callback ) {
-                                    main::print_log(
-                                        "[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
-                                          . $self->active_message
-                                          ->success_callback )
+                                    main::print_log( "[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+                                          . $self->active_message->success_callback )
                                       if $object->debuglevel( 4, 'insteon' );
 
                                     package main;
-                                    eval
-                                      $self->active_message->success_callback;
-                                    ::print_log(
-                                        "[Insteon::BaseInterface] problem w/ success callback: $@"
-                                    ) if $@;
+                                    eval $self->active_message->success_callback;
+                                    ::print_log( "[Insteon::BaseInterface] problem w/ success callback: $@" ) if $@;
 
                                     package Insteon::BaseInterface;
                                 }
@@ -677,8 +643,7 @@ sub on_standard_insteon_received {
                             }
                         }
                         else {
-                            &main::print_log(
-                                "[Insteon::BaseInterface] WARN: deviceid of "
+                            &main::print_log( "[Insteon::BaseInterface] WARN: deviceid of "
                                   . "active message != received message source ("
                                   . $object->get_object_name()
                                   . "). IGNORING received message!!" );
@@ -689,43 +654,30 @@ sub on_standard_insteon_received {
                         }
                     }
                     elsif ( $msg{type} eq 'cleanup' ) {
-                        my $group_object =
-                          &Insteon::get_object( '000000', $msg{extra} );
+                        my $group_object = &Insteon::get_object( '000000', $msg{extra} );
                         if ($group_object) {
 
                             # prevent re-processing transmit queue until after clearing occurs
                             $self->transmit_in_progress(1);
 
                             # Don't clear active message as ACK is only one of many
-                            if (
-                                (
-                                    $msg{extra} ==
-                                    $self->active_message->setby->group
-                                )
-                              )
-                            {
-                                &main::print_log(
-                                    "[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
+                            if ( ( $msg{extra} == $self->active_message->setby->group ) ) {
+                                &main::print_log( "[Insteon::BaseInterface] DEBUG3: Cleanup message received for scene "
                                       . $group_object->get_object_name
                                       . " from "
                                       . $object->get_object_name )
                                   if $group_object->debuglevel( 3, 'insteon' );
                             }
-                            elsif ( $self->active_message->command_type eq
-                                'all_link_direct_cleanup'
-                                && lc( $self->active_message->setby->device_id )
-                                eq $msg{source} )
+                            elsif ( $self->active_message->command_type eq 'all_link_direct_cleanup'
+                                && lc( $self->active_message->setby->device_id ) eq $msg{source} )
                             {
-                                &::print_log(
-                                    "[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with "
-                                      . $self->active_message->setby
-                                      ->get_object_name )
+                                &::print_log( "[Insteon::BaseInterface] DEBUG2: ALL-Linking Direct Completed with "
+                                      . $self->active_message->setby->get_object_name )
                                   if $group_object->debuglevel( 2, 'insteon' );
                                 $self->clear_active_message();
                             }
                             else {
-                                &main::print_log(
-                                    "[Insteon::BaseInterface] DEBUG3: Cleanup message received from "
+                                &main::print_log( "[Insteon::BaseInterface] DEBUG3: Cleanup message received from "
                                       . $object->get_object_name
                                       . " for scene "
                                       . $group_object->get_object_name
@@ -751,8 +703,7 @@ sub on_standard_insteon_received {
                                   . " PLM Scene." );
                         }
                         else {
-                            &main::print_log(
-                                "[Insteon::BaseInterface] ERROR: received cleanup message from "
+                            &main::print_log( "[Insteon::BaseInterface] ERROR: received cleanup message from "
                                   . $object->get_object_name
                                   . " that does not correspond to a valid PLM group. Corrupted message is assumed "
                                   . "and will be skipped! Was group "
@@ -763,8 +714,7 @@ sub on_standard_insteon_received {
                     }
                     else    #not direct or cleanup
                     {
-                        &main::print_log(
-                            "[Insteon::BaseInterface] ERROR: received ACK/NACK message from "
+                        &main::print_log( "[Insteon::BaseInterface] ERROR: received ACK/NACK message from "
                               . $object->get_object_name
                               . " but unable to process $msg{type} message type."
                               . " IGNORING received message!!" );
@@ -776,11 +726,9 @@ sub on_standard_insteon_received {
                 else        #does not correspond to current active message
                 {
                     if ( $msg{type} eq 'direct' ) {
-                        &main::print_log(
-                            "[Insteon::BaseInterface] WARN: received insteon ACK/NACK message from "
+                        &main::print_log( "[Insteon::BaseInterface] WARN: received insteon ACK/NACK message from "
                               . $object->get_object_name
-                              . " but cannot correlate to sent message! IGNORING received message!!"
-                        );
+                              . " but cannot correlate to sent message! IGNORING received message!!" );
                     }
                     elsif ( $msg{type} eq 'cleanup' ) {
 
@@ -788,16 +736,14 @@ sub on_standard_insteon_received {
                         #   in the Insteon_PLM handler for cleanup messages.
                         #   however, if the virtual handler was not invoked due to receipt of the broadcast message
                         #   then, the above cleanup handler would be run
-                        my $plm_group_obj =
-                          Insteon::get_object( '000000', $msg{extra} );
+                        my $plm_group_obj = Insteon::get_object( '000000', $msg{extra} );
                         my $group_name = $msg{extra};
                         $group_name = $plm_group_obj->get_object_name
                           if ( ref $plm_group_obj );
                         $plm_group_obj = $self if ( !ref $plm_group_obj );
-                        &main::print_log(
-                            "[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
-                              . "PLM controller group: $group_name. Ignoring as this has already been processed"
-                        ) if $plm_group_obj->debuglevel( 3, 'insteon' );
+                        &main::print_log( "[Insteon::BaseInterface] DEBUG3: received cleanup message responding to "
+                              . "PLM controller group: $group_name. Ignoring as this has already been processed" )
+                          if $plm_group_obj->debuglevel( 3, 'insteon' );
                     }
                     else {
                         # ask the object to process the received message and update its state
@@ -819,8 +765,7 @@ sub on_standard_insteon_received {
         }
         else {
             &::print_log(
-                "[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}"
-            );
+                "[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}" );
             $self->corrupt_count_log(1);
         }
 
@@ -841,8 +786,7 @@ sub on_extended_insteon_received {
     return if $self->_is_duplicate_received( $message_data, %msg );
     if (%msg) {
         my $wait_time;
-        my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received "
-          . "with $msg{hopsleft} hops left, ";
+        my $wait_message = "[Insteon::BaseInterface] DEBUG3: Message received " . "with $msg{hopsleft} hops left, ";
         if (   !$msg{is_ack}
             && !$msg{is_nack}
             && $msg{type} ne 'alllink'
@@ -857,8 +801,7 @@ sub on_extended_insteon_received {
         #Standard msgs should only take 108 millis, but in practice additional
         #time has been required. Extra 50 millis helps prevent dupes
         $wait_time = ( $wait_time * 200 ) + 50;
-        $wait_message .=
-          "delaying next transmit by $wait_time milliseconds to avoid collisions.";
+        $wait_message .= "delaying next transmit by $wait_time milliseconds to avoid collisions.";
         ::print_log($wait_message)
           if ( $self->debuglevel( 3, 'insteon' ) && $wait_time > 50 );
         $self->_set_timeout( 'xmit', $wait_time );
@@ -875,35 +818,24 @@ sub on_extended_insteon_received {
             $object->last_contact(time);
             if ( $msg{type} ne 'broadcast' ) {
                 $msg{command} = $object->message_type( $msg{cmd_code} );
-                main::print_log(
-                    "[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
-                      . "Device command:$msg{command}; type:$msg{type}; group: $msg{group}"
-                  )
-                  if (
-                    (
-                        !( $msg{is_ack} or $msg{is_nack} )
-                        and $self->debuglevel( 1, 'insteon' )
-                    )
-                    or $self->debuglevel( 3, 'insteon' )
-                  );
+                main::print_log( "[Insteon::BaseInterface] DEBUG: PLM command:insteon_ext_received; "
+                      . "Device command:$msg{command}; type:$msg{type}; group: $msg{group}" )
+                  if ( ( !( $msg{is_ack} or $msg{is_nack} ) and $self->debuglevel( 1, 'insteon' ) )
+                    or $self->debuglevel( 3, 'insteon' ) );
             }
-            &::print_log( "[Insteon::BaseInterface] Processing message for "
-                  . $object->get_object_name )
+            &::print_log( "[Insteon::BaseInterface] Processing message for " . $object->get_object_name )
               if $object->debuglevel( 3, 'insteon' );
             if ( $object->_process_message( $self, %msg ) ) {
                 if ( ref $self->active_message
                     && $self->active_message->success_callback )
                 {
-                    main::print_log(
-                        "[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
+                    main::print_log( "[Insteon::BaseInterface] DEBUG4: Now calling message success callback: "
                           . $self->active_message->success_callback )
                       if $object->debuglevel( 4, 'insteon' );
 
                     package main;
                     eval $self->active_message->success_callback;
-                    ::print_log(
-                        "[Insteon::BaseInterface] problem w/ success callback: $@"
-                    ) if $@;
+                    ::print_log( "[Insteon::BaseInterface] problem w/ success callback: $@" ) if $@;
 
                     package Insteon::BaseInterface;
                 }
@@ -918,8 +850,7 @@ sub on_extended_insteon_received {
         }
         else {
             &::print_log(
-                "[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}"
-            );
+                "[Insteon::BaseInterface] Warn! Unable to locate object for source: $msg{source} and group: $msg{group}" );
         }
 
         # treat the message as legitimate even if an object match did not occur
@@ -1076,18 +1007,16 @@ sub _is_duplicate_received {
             #taking for messages to arrive.
             $object->default_hop_count( $msg{maxhops} - $msg{hopsleft} )
               if $object->can('default_hop_count');
-            ::print_log(
-                "[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
+            ::print_log( "[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
                   . $message_data
                   . ", from "
                   . $object->get_object_name )
               if $object->debuglevel( 1, 'insteon' );
         }
         else {
-            ::print_log(
-                "[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
-                  . " from an unknown device.  Id: $msg{source} Grp: $msg{group}"
-            ) if $main::Debug{'insteon'};
+            ::print_log( "[Insteon::BaseInterface] WARN! Dropped duplicate incoming message "
+                  . " from an unknown device.  Id: $msg{source} Grp: $msg{group}" )
+              if $main::Debug{'insteon'};
         }
     }
     else {
@@ -1114,34 +1043,25 @@ sub get_voice_cmds {
     my ($self)      = @_;
     my $object_name = $self->get_object_name;
     my %voice_cmds  = (
-        'plm - complete linking as responder' =>
-          "$object_name->complete_linking_as_responder",
-        'plm - initiate linking as controller' =>
-          "$object_name->initiate_linking_as_controller",
-        'plm - initiate unlinking' =>
-          "$object_name->initiate_unlinking_as_controller",
-        'plm - cancel linking'      => "$object_name->cancel_linking",
-        'plm - log links'           => "$object_name->log_alllink_table",
-        'plm - scan PLM link table' => "$object_name->scan_link_table(\""
-          . '\$self->log_alllink_table' . "\")",
-        'global - scan changed device link tables' =>
-          "Insteon::scan_all_linktables(1)",
-        'global - delete orphan links' => "$object_name->delete_orphan_links",
-        'global - audit delete orphan links' =>
-          "$object_name->delete_orphan_links(1)",
-        'global - force scan all device link tables' =>
-          "Insteon::scan_all_linktables",
-        'global - sync all links'       => "Insteon::sync_all_links(0)",
-        'global - audit sync all links' => "Insteon::sync_all_links(1)",
-        'global - print all message stats' =>
-          "Insteon::print_all_message_stats",
-        'global - reset all message stats' =>
-          "Insteon::reset_all_message_stats",
-        'global - stress test ALL devices' => "Insteon::stress_test_all(5,1)",
-        'global - ping test ALL devices'   => "Insteon::ping_all(5)",
-        'global - log all device ALDB status' => "Insteon::log_all_ADLB_status",
-        'plm - enable monitor mode'  => "$object_name->enable_monitor_mode(1)",
-        'plm - disable monitor mode' => "$object_name->enable_monitor_mode(0)",
+        'plm - complete linking as responder'        => "$object_name->complete_linking_as_responder",
+        'plm - initiate linking as controller'       => "$object_name->initiate_linking_as_controller",
+        'plm - initiate unlinking'                   => "$object_name->initiate_unlinking_as_controller",
+        'plm - cancel linking'                       => "$object_name->cancel_linking",
+        'plm - log links'                            => "$object_name->log_alllink_table",
+        'plm - scan PLM link table'                  => "$object_name->scan_link_table(\"" . '\$self->log_alllink_table' . "\")",
+        'global - scan changed device link tables'   => "Insteon::scan_all_linktables(1)",
+        'global - delete orphan links'               => "$object_name->delete_orphan_links",
+        'global - audit delete orphan links'         => "$object_name->delete_orphan_links(1)",
+        'global - force scan all device link tables' => "Insteon::scan_all_linktables",
+        'global - sync all links'                    => "Insteon::sync_all_links(0)",
+        'global - audit sync all links'              => "Insteon::sync_all_links(1)",
+        'global - print all message stats'           => "Insteon::print_all_message_stats",
+        'global - reset all message stats'           => "Insteon::reset_all_message_stats",
+        'global - stress test ALL devices'           => "Insteon::stress_test_all(5,1)",
+        'global - ping test ALL devices'             => "Insteon::ping_all(5)",
+        'global - log all device ALDB status'        => "Insteon::log_all_ADLB_status",
+        'plm - enable monitor mode'                  => "$object_name->enable_monitor_mode(1)",
+        'plm - disable monitor mode'                 => "$object_name->enable_monitor_mode(0)",
     );
     return \%voice_cmds;
 }
diff --git a/lib/Insteon/Controller.pm b/lib/Insteon/Controller.pm
index 0dc4f1060..c69064c3d 100644
--- a/lib/Insteon/Controller.pm
+++ b/lib/Insteon/Controller.pm
@@ -56,8 +56,7 @@ package Insteon::RemoteLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::RemoteLinc::ISA =
-  ( 'Insteon::DimmableLight', 'Insteon::MultigroupDevice' );
+@Insteon::RemoteLinc::ISA = ( 'Insteon::DimmableLight', 'Insteon::MultigroupDevice' );
 
 my %message_types = (
     %Insteon::BaseDevice::message_types,
@@ -107,8 +106,7 @@ sub set_awake_time {
     my $root  = $self->get_root();
     my $extra = '000102' . $awake . '0000000000000000000000';
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -132,8 +130,7 @@ sub get_extended_info {
     my $root  = $self->get_root();
     my $extra = '000100000000000000000000000000';
     $$root{_ext_set_get_action} = "get";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     if ($no_retry) {
         $message->retry_count(1);
     }
@@ -160,9 +157,7 @@ sub set_battery_timer {
     my ( $self, $minutes ) = @_;
     my $root = $self->get_root();
     $$root{battery_timer} = sprintf( "%u", $minutes );
-    ::print_log( "[Insteon::RemoteLinc] Set battery timer to "
-          . $$root{battery_timer}
-          . " minutes" );
+    ::print_log( "[Insteon::RemoteLinc] Set battery timer to " . $$root{battery_timer} . " minutes" );
     return;
 }
 
@@ -176,8 +171,7 @@ sub _is_battery_time_expired {
     my ($self) = @_;
     my $root = $self->get_root();
     if ( $$root{battery_timer} > 0
-        && ( time - $$root{last_battery_time} ) >
-        ( $$root{battery_timer} * 60 ) )
+        && ( time - $$root{last_battery_time} ) > ( $$root{battery_timer} * 60 ) )
     {
         return 1;
     }
@@ -224,9 +218,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        main::print_log(
-            "[Insteon::RemoteLinc] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::RemoteLinc] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             main::print_log("[Insteon::RemoteLinc] Clearing active message")
@@ -257,9 +249,8 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         else {
-            main::print_log( "[Insteon::RemoteLinc] WARN: Corrupt Extended "
-                  . "Set/Get Data Received for "
-                  . $self->get_object_name )
+            main::print_log(
+                "[Insteon::RemoteLinc] WARN: Corrupt Extended " . "Set/Get Data Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
         }
     }
diff --git a/lib/Insteon/Energy.pm b/lib/Insteon/Energy.pm
index 9693427d9..3ff9cda74 100644
--- a/lib/Insteon/Energy.pm
+++ b/lib/Insteon/Energy.pm
@@ -107,8 +107,7 @@ sub _set_parameters {
     $$self{_ext_set_get_action} = 'set';
     my $extra = "000002" . $trigger_bytes . $delay_byte . $threshold_byte;
     $extra .= '0' x ( 30 - length $extra );
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $self->_send_cmd($message);
 }
 
@@ -121,8 +120,7 @@ These reported parameters are printed to the log and cached in MH.
 
 sub request_parameters {
     my ($self) = @_;
-    $$self{_ext_set_get_success_callback} =
-      $self->get_object_name . "->print_parameters();";
+    $$self{_ext_set_get_success_callback} = $self->get_object_name . "->print_parameters();";
     $self->_get_parameters();
 }
 
@@ -152,8 +150,7 @@ sub _get_parameters {
     my ($self) = @_;
     $$self{_ext_set_get_action} = 'get';
     my $extra .= '0' x 30;
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $self->_send_cmd($message);
 }
 
@@ -177,13 +174,10 @@ sub set_trigger {
 
     #Round to nearest .5 Value
     $trigger_watts = int( ( $trigger_watts * 2 ) + 0.5 ) / 2;
-    ::print_log( "[Insteon::SynchroLinc] Setting Trigger to "
-          . $trigger_watts
-          . " watts." );
+    ::print_log( "[Insteon::SynchroLinc] Setting Trigger to " . $trigger_watts . " watts." );
 
     #Set Callback
-    $$self{_ext_set_get_success_callback} =
-      $self->get_object_name . "->_set_parameters($trigger_watts,'','');";
+    $$self{_ext_set_get_success_callback} = $self->get_object_name . "->_set_parameters($trigger_watts,'','');";
     $self->_get_parameters();
 }
 
@@ -216,13 +210,10 @@ sub set_delay {
 
     #Round to nearest .15 Value
     $delay_seconds = int( ( $delay_seconds / 0.15 ) + 0.5 ) * .15;
-    ::print_log( "[Insteon::SynchroLinc] Setting Delay to "
-          . $delay_seconds
-          . " seconds." );
+    ::print_log( "[Insteon::SynchroLinc] Setting Delay to " . $delay_seconds . " seconds." );
 
     #Set Callback
-    $$self{_ext_set_get_success_callback} =
-      $self->get_object_name . "->_set_parameters('','',$delay_seconds);";
+    $$self{_ext_set_get_success_callback} = $self->get_object_name . "->_set_parameters('','',$delay_seconds);";
     $self->_get_parameters();
 }
 
@@ -250,13 +241,10 @@ sub set_threshold {
 
     #Round to nearest .5 Value
     $threshold_watts = int( ( $threshold_watts * 2 ) + 0.5 ) / 2;
-    ::print_log( "[Insteon::SynchroLinc] Setting Threshold to "
-          . $threshold_watts
-          . " watts." );
+    ::print_log( "[Insteon::SynchroLinc] Setting Threshold to " . $threshold_watts . " watts." );
 
     #Set Callback
-    $$self{_ext_set_get_success_callback} =
-      $self->get_object_name . "->_set_parameters('',$threshold_watts,'');";
+    $$self{_ext_set_get_success_callback} = $self->get_object_name . "->_set_parameters('',$threshold_watts,'');";
     $self->_get_parameters();
 }
 
@@ -288,8 +276,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        ::print_log( "[Insteon::SynchroLinc] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        ::print_log( "[Insteon::SynchroLinc] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             ::print_log("[Insteon::SynchroLinc] Clearing active message.")
@@ -302,9 +289,7 @@ sub _process_message {
     elsif ( $msg{command} eq "extended_set_get" && $msg{is_extended} ) {
         if ( substr( $msg{extra}, 0, 6 ) eq "000001" ) {
             $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-            main::print_log( "[Insteon::SynchroLinc] Extended Set/Get Data "
-                  . "Received for "
-                  . $self->get_object_name )
+            main::print_log( "[Insteon::SynchroLinc] Extended Set/Get Data " . "Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
 
             #D3+D4 = trigger, D5 = delay, D6 = threshold
@@ -323,8 +308,7 @@ sub _process_message {
 
                 package main;
                 eval( $$self{_ext_set_get_success_callback} );
-                &::print_log(
-                    "[Insteon::SynchroLinc] Error in Get/Set Callback: " . $@ )
+                &::print_log( "[Insteon::SynchroLinc] Error in Get/Set Callback: " . $@ )
                   if $@ and $self->debuglevel( 1, 'insteon' );
 
                 package Insteon::SynchroLinc;
@@ -356,10 +340,7 @@ sub get_voice_cmds {
     my $object_name = $self->get_object_name;
     my %voice_cmds  = ( %{ $self->SUPER::get_voice_cmds } );
     if ( $self->is_root ) {
-        %voice_cmds = (
-            %{ $self->SUPER::get_voice_cmds },
-            'request parameters' => "$object_name->request_parameters()"
-        );
+        %voice_cmds = ( %{ $self->SUPER::get_voice_cmds }, 'request parameters' => "$object_name->request_parameters()" );
     }
     return \%voice_cmds;
 }
@@ -486,8 +467,7 @@ sub set {
         $self->request_status();
     }
     elsif ( $p_setby ne $self ) {
-        ::print_log(
-            "[Insteon::iMeter] failed state validation with state=$p_state");
+        ::print_log("[Insteon::iMeter] failed state validation with state=$p_state");
     }
 }
 
@@ -504,9 +484,7 @@ command
 sub request_status {
     my ( $self, $requestor ) = @_;
     my $extra = '00';
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'imeter_query',
-        $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'imeter_query', $extra );
     $self->_send_cmd($message);
     return;
 }
@@ -539,8 +517,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #Don't clear until data packet received
-        ::print_log(
-            "[Insteon::iMeter] ACK Received for " . $self->get_object_name )
+        ::print_log( "[Insteon::iMeter] ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
     }
     elsif ( $msg{command} eq "imeter_query" && $msg{is_extended} ) {
@@ -560,14 +537,12 @@ sub _process_message {
 
                 # 1 Accumulated energy is equal to: 65535 watts/AC Cycle.
                 # 65535 is the maximum value of a 16 bit number.
-                $$self{'accumenergy'} = sprintf( "%.2f",
-                    ( $intenergy * 65535 ) / ( 1000 * 60.0 * 60.0 * 60.0 ) );
+                $$self{'accumenergy'} = sprintf( "%.2f", ( $intenergy * 65535 ) / ( 1000 * 60.0 * 60.0 * 60.0 ) );
             }
             ::print_log( "[Insteon::iMeter] received status for "
                   . $self->get_object_name
                   . ". Current Usage: $$self{'power'}/watts "
-                  . "Accumulated Usage: $$self{'accumenergy'}/kWh Hops left: $msg{hopsleft}"
-            );
+                  . "Accumulated Usage: $$self{'accumenergy'}/kWh Hops left: $msg{hopsleft}" );
 
             #Forced setby to be $Self as nothing can control iMeter
             $self->Generic_Item::set( $$self{'power'}, $self );
@@ -622,9 +597,7 @@ Resets the accumulated usage on the device to 0.
 sub reset_accumulated_usage {
     my ($self) = @_;
     $$self{'accumenergy'} = 0;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'imeter_reset',
-        '00' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'imeter_reset', '00' );
     $self->_send_cmd($message);
     return $$self{'accumenergy'};
 }
@@ -662,9 +635,8 @@ sub get_voice_cmds {
     if ( $self->is_root ) {
         %voice_cmds = (
             %{ $self->SUPER::get_voice_cmds },
-            'log accumulated usage' => "$object_name->log_accumulated_usage()",
-            'reset accumulated usage' =>
-              "$object_name->reset_accumulated_usage()",
+            'log accumulated usage'   => "$object_name->log_accumulated_usage()",
+            'reset accumulated usage' => "$object_name->reset_accumulated_usage()",
         );
     }
     return \%voice_cmds;
diff --git a/lib/Insteon/IOLinc.pm b/lib/Insteon/IOLinc.pm
index a120c0c5f..8f7db890c 100755
--- a/lib/Insteon/IOLinc.pm
+++ b/lib/Insteon/IOLinc.pm
@@ -151,8 +151,8 @@ sub new {
     $$self{operating_flags} = \%operating_flags;
     bless $self, $class;
     $self->restore_data( 'momentary_time', 'relay_mode' );
-    $$self{momentary_time} = 20 unless defined( $$self{momentary_time} );
-    $$self{relay_mode} = 'latching' unless defined( $$self{relay_mode} );
+    $$self{momentary_time} = 20         unless defined( $$self{momentary_time} );
+    $$self{relay_mode}     = 'latching' unless defined( $$self{relay_mode} );
     $$self{momentary_timer} = new Timer;
     return $self;
 }
@@ -175,30 +175,21 @@ sub set {
         if ( $p_state eq $$self{child_state}
             && ( $curr_milli - $$self{child_set_milliseconds} < $window ) )
         {
-            ::print_log( "[Insteon::IOLinc] Received duplicate "
-                  . $self->get_object_name
-                  . " sensor "
-                  . $p_state
-                  . " message, ignoring." )
+            ::print_log(
+                "[Insteon::IOLinc] Received duplicate " . $self->get_object_name . " sensor " . $p_state . " message, ignoring." )
               if $self->debuglevel( 1, 'insteon' );
             $self->dupe_count_log(1) if $self->can('dupe_count_log');
         }
         else {
-            ::print_log( "[Insteon::IOLinc] Received "
-                  . $self->get_object_name
-                  . " sensor "
-                  . $p_state
-                  . " message." )
+            ::print_log( "[Insteon::IOLinc] Received " . $self->get_object_name . " sensor " . $p_state . " message." )
               if $self->debuglevel( 1, 'insteon' );
             $$self{child_state}            = $p_state;
             $$self{child_set_milliseconds} = $curr_milli;
             if ( ref $$self{child_sensor} ) {
-                $$self{child_sensor}
-                  ->set_receive( $p_state, $p_setby, $p_respond );
+                $$self{child_sensor}->set_receive( $p_state, $p_setby, $p_respond );
             }
             if ( ref $$self{child_door} ) {
-                $$self{child_door}
-                  ->set_receive( $p_state, $p_setby, $p_respond );
+                $$self{child_door}->set_receive( $p_state, $p_setby, $p_respond );
             }
         }
     }
@@ -222,9 +213,7 @@ sub request_sensor_status {
     my ( $self, $requestor ) = @_;
     $$self{child_status_request_pending} = $self->group;
     $$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'status_request',
-        '01' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'status_request', '01' );
     $self->_send_cmd($message);
 }
 
@@ -263,14 +252,10 @@ sub _is_info_request {
         $is_info_request++;
         my $output = "";
         my $flags  = hex( $msg{extra} );
-        $output .=
-          ( $flags & 0x01 ) ? "Program Lock: On; " : "Program Lock: Off; ";
-        $output .=
-          ( $flags & 0x02 ) ? "Transmit Led: On; " : "Transmit Led: Off; ";
-        $output .=
-          ( $flags & 0x04 ) ? "Relay Linked: On; " : "Relay Linked: Off; ";
-        $output .=
-          ( $flags & 0x20 ) ? "X10 Reverse: On; " : "X10 Reverse: Off; ";
+        $output .= ( $flags & 0x01 ) ? "Program Lock: On; " : "Program Lock: Off; ";
+        $output .= ( $flags & 0x02 ) ? "Transmit Led: On; " : "Transmit Led: Off; ";
+        $output .= ( $flags & 0x04 ) ? "Relay Linked: On; " : "Relay Linked: Off; ";
+        $output .= ( $flags & 0x20 ) ? "X10 Reverse: On; "  : "X10 Reverse: Off; ";
         $output .=
           ( $flags & 0x40 )
           ? "Trigger Reverse: On; "
@@ -299,8 +284,7 @@ sub _is_info_request {
         ::print_log("[Insteon::IOLinc] Device Settings are: $output");
     }
     else {
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 }
@@ -332,8 +316,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        main::print_log( "[Insteon::IOLinc] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::IOLinc] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             main::print_log("[Insteon::IOLinc] Clearing active message")
@@ -359,16 +342,13 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         else {
-            main::print_log( "[Insteon::IOLinc] WARN: Corrupt Extended "
-                  . "Set/Get Data Received for "
-                  . $self->get_object_name )
+            main::print_log( "[Insteon::IOLinc] WARN: Corrupt Extended " . "Set/Get Data Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
         }
     }
     elsif ( $msg{command} eq "set_operating_flags" && $msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log( "[Insteon::IOLinc] Acknowledged flag set for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::IOLinc] Acknowledged flag set for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $clear_message = 1;
         $self->_process_command_stack(%msg);
@@ -398,7 +378,7 @@ sub is_acknowledged {
         #as this will only trigger if the device actually acknowledges the
         #state change
         my $object_name = $self->get_object_name();
-        my $action = $object_name . '->set_receive(OFF,' . $object_name . ')';
+        my $action      = $object_name . '->set_receive(OFF,' . $object_name . ')';
 
         #While the IOLinc can do momentary times down to .2 seconds, the timer
         #module can only do 1 second increments.  I figure this slight
@@ -406,9 +386,7 @@ sub is_acknowledged {
         my $time = int( ( $$self{momentary_time} / 10 ) + 0.5 );
         $time = 1 unless ( $time >= 1 );
         $$self{momentary_timer}->set( $time, $action );
-        ::print_log(
-                "[Insteon::IOLinc] Relay in momentary mode, resetting state "
-              . "of $object_name to OFF in $time second(s)" )
+        ::print_log( "[Insteon::IOLinc] Relay in momentary mode, resetting state " . "of $object_name to OFF in $time second(s)" )
           if $self->debuglevel( 1, 'insteon' );
     }
     return $self->SUPER::is_acknowledged($p_ack);
@@ -431,14 +409,11 @@ sub set_momentary_time {
     if ( $momentary_time <= 255 ) {
         $momentary_time = 2 if $momentary_time <= 1;    #Can't set to 1 or 0
         ::print_log(
-                "[Insteon::IOLinc] Setting Momentary Time to $momentary_time "
-              . "tenths of a second for "
-              . $self->get_object_name )
+            "[Insteon::IOLinc] Setting Momentary Time to $momentary_time " . "tenths of a second for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
     }
     else {
-        ::print_log(
-            "[Insteon::IOLinc] WARN Invalid Momentary Time of $momentary_time "
+        ::print_log( "[Insteon::IOLinc] WARN Invalid Momentary Time of $momentary_time "
               . "tenths of a second for "
               . $self->get_object_name );
     }
@@ -448,8 +423,7 @@ sub set_momentary_time {
     $extra .= sprintf( "%02x", $momentary_time );
     $extra .= '0000000000000000000000';
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     $$self{momentary_time} = $momentary_time;
     return;
@@ -468,8 +442,7 @@ sub get_momentary_time {
     my $root   = $self->get_root();
     my $extra  = '000000000000000000000000000000';
     $$root{_ext_set_get_action} = "get";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -600,14 +573,11 @@ sub get_voice_cmds {
         'unlink relay from sensor' => "$object_name->set_relay_linked(0)",
         'reverse sensor output'    => "$object_name->set_trigger_reverse(1)",
         'unreverse sensor output'  => "$object_name->set_trigger_reverse(0)",
-        'set relay to latching' => "$object_name->set_relay_mode(\"Latching\")",
-        'set relay to momentary a' =>
-          "$object_name->set_relay_mode(\"Momentary_A\")",
-        'set relay to momentary b' =>
-          "$object_name->set_relay_mode(\"Momentary_B\")",
-        'set relay to momentary c' =>
-          "$object_name->set_relay_mode(\"Momentary_C\")",
-        'print settings to log' => "$object_name->get_operating_flag"
+        'set relay to latching'    => "$object_name->set_relay_mode(\"Latching\")",
+        'set relay to momentary a' => "$object_name->set_relay_mode(\"Momentary_A\")",
+        'set relay to momentary b' => "$object_name->set_relay_mode(\"Momentary_B\")",
+        'set relay to momentary c' => "$object_name->set_relay_mode(\"Momentary_C\")",
+        'print settings to log'    => "$object_name->get_operating_flag"
     );
 
     #Remove generic status command
@@ -791,10 +761,7 @@ Triggers the relay if the set request state differs from the current state.
 
 sub set {
     my ( $self, $p_state, $p_setby, $p_respond ) = @_;
-    main::print_log( "[Insteon::IOlinc_door] set method called. current state: "
-          . $self->state
-          . " set to state: "
-          . $p_state )
+    main::print_log( "[Insteon::IOlinc_door] set method called. current state: " . $self->state . " set to state: " . $p_state )
       if $self->debuglevel( 1, 'insteon' );
 
     $$self{parent}->set("on") if ( $p_state ne $self->state );
diff --git a/lib/Insteon/Irrigation.pm b/lib/Insteon/Irrigation.pm
index d5be15eb5..480ceae6e 100755
--- a/lib/Insteon/Irrigation.pm
+++ b/lib/Insteon/Irrigation.pm
@@ -90,11 +90,9 @@ sub new {
     $$self{pump_enabled}          = undef;
     $$self{valve_is_running}      = undef;
     $self->restore_data(
-        'active_valve_id',    'active_program_number',
-        'program_is_running', 'pump_enabled',
-        'valve_is_running',   'timer_0',
-        'timer_1',            'timer_2',
-        'timer_3',            'timer_4'
+        'active_valve_id',  'active_program_number', 'program_is_running', 'pump_enabled',
+        'valve_is_running', 'timer_0',               'timer_1',            'timer_2',
+        'timer_3',          'timer_4'
     );
     $$self{message_types} = \%message_types;
     $$self{status_timer}  = new Timer;
@@ -111,9 +109,7 @@ device is printed to the log and stores the result in memory.
 sub request_status {
     my ( $self, $requestor ) = @_;
     my $subcmd = '02';
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control',
-        $subcmd );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control', $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -142,13 +138,11 @@ sub set_valve {
         $cmd = 'sprinkler_valve_off';
     }
     unless ( $cmd and $subcmd ) {
-        &::print_log(
-            "Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)"
-        ) if $self->debuglevel( 1, 'insteon' );
+        &::print_log( "Insteon::Irrigation] ERROR: You must specify a valve number and a valid state (ON or OFF)" )
+          if $self->debuglevel( 1, 'insteon' );
         return;
     }
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -171,13 +165,11 @@ sub set_program {
         $cmd = 'sprinkler_program_off';
     }
     unless ( $cmd and $subcmd ) {
-        &::print_log(
-            "Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)"
-        ) if $self->debuglevel( 1, 'insteon' );
+        &::print_log( "Insteon::Irrigation] ERROR: You must specify a program number and a valid state (ON or OFF)" )
+          if $self->debuglevel( 1, 'insteon' );
         return;
     }
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -258,10 +250,9 @@ the proper times.
 sub get_timers() {
     my ( $self, $program ) = @_;
     $program = 0 unless ( defined $program );
-    my $cmd = 'sprinkler_timers_request';
-    my $subcmd = sprintf( "%02X", $program );
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
+    my $cmd     = 'sprinkler_timers_request';
+    my $subcmd  = sprintf( "%02X", $program );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, $cmd, $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -296,8 +287,7 @@ sub set_timers() {
         $extra .= sprintf( "%02X", $time );
     }
     $extra .= '0' x ( 30 - length $extra );
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_ext_send', $self, $cmd, $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, $cmd, $extra );
     $self->_send_cmd($message);
     return;
 }
@@ -323,8 +313,7 @@ sub _is_info_request {
     }
     else {
         #Check if this was a generic info_request
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 
@@ -338,11 +327,9 @@ sub _process_status {
     $$self{'program_is_running'}    = ( $val >> 5 ) & 1;
     $$self{'pump_enabled'}          = ( $val >> 6 ) & 1;
     $$self{'valve_is_running'}      = ( $val >> 7 ) & 1;
-    &::print_log(
-            "[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
+    &::print_log( "[Insteon::Irrigation] active_valve_id: $$self{'active_valve_id'},"
           . " valve_is_running: $$self{'valve_is_running'}, active_program: $$self{'active_program_number'},"
-          . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}"
-    );
+          . " program_is_running: $$self{'program_is_running'}, pump_enabled: $$self{'pump_enabled'}" );
 
     # Set a timer to check the status of the device after we expect the timer
     # for the current valve to run out.
@@ -353,7 +340,7 @@ sub _process_status {
           if ( $$self{'program_is_running'} );
         my $time = $self->_valve_timer( $program, $$self{'active_valve_id'} );
         $time = ( $time * 60 ) + 5;    #Add 5 seconds to allow things to happen.
-             #Only set the timer if it is something worthwhile ie actually set.
+                                       #Only set the timer if it is something worthwhile ie actually set.
         $$self{status_timer}->set( $time, $action ) if $time > 5;
     }
 
@@ -378,9 +365,7 @@ sub _process_status {
         $program_status = 'on'
           if ( $$self{'program_is_running'} && $p == $program );
         if ( ref $$self{ 'child_program_' . $p }
-            && (
-                lc( $$self{ 'child_program_' . $p }->state ) ne
-                $program_status ) )
+            && ( lc( $$self{ 'child_program_' . $p }->state ) ne $program_status ) )
         {
             $$self{ 'child_program_' . $p }->set_receive($program_status);
         }
@@ -439,17 +424,12 @@ sub _process_message {
             $self->get_timers( $program + 1 );
         }
         else {
-            my $output =
-                "[Insteon::Irrigation] The timers for "
-              . $self->get_object_name
-              . " are:\n";
-            $output .= "      Program 0:      Program 1:      Program 2:      "
-              . "Program 3:      Program 4:\n";
+            my $output = "[Insteon::Irrigation] The timers for " . $self->get_object_name . " are:\n";
+            $output .= "      Program 0:      Program 1:      Program 2:      " . "Program 3:      Program 4:\n";
             for ( my $i_v = 1; $i_v <= 8; $i_v++ ) {
                 $output .= '  ';
                 for ( my $i_p = 0; $i_p <= 4; $i_p++ ) {
-                    $output .= "     Valve $i_v:"
-                      . sprintf( "% 3d", $self->_valve_timer( $i_p, $i_v, ) );
+                    $output .= "     Valve $i_v:" . sprintf( "% 3d", $self->_valve_timer( $i_p, $i_v, ) );
                 }
                 $output .= "\n";
             }
@@ -476,8 +456,7 @@ sub _valve_timer {
         substr( $$self{ 'timer_' . $program }, ( ( $valve - 1 ) * 3 ), 3 ) =
           sprintf( "%03d", $time );
     }
-    return
-      int( substr( $$self{ 'timer_' . $program }, ( ( $valve - 1 ) * 3 ), 3 ) );
+    return int( substr( $$self{ 'timer_' . $program }, ( ( $valve - 1 ) * 3 ), 3 ) );
 }
 
 =item C<enable_pump(boolean)>
@@ -496,12 +475,9 @@ sub enable_pump {
         ::print_log("[Insteon::Irrigation] Enabling valve 8 pump feature.");
     }
     else {
-        ::print_log(
-            "[Insteon::Irrigation] Setting valve 8 to act as regular valve.");
+        ::print_log("[Insteon::Irrigation] Setting valve 8 to act as regular valve.");
     }
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control',
-        $subcmd );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control', $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -528,9 +504,7 @@ sub enable_status {
     else {
         ::print_log("[Insteon::Irrigation] Disabling valve status messages.");
     }
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control',
-        $subcmd );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'sprinkler_control', $subcmd );
     $self->_send_cmd($message);
     return;
 }
@@ -614,31 +588,21 @@ sub set {
     my ( $self, $p_state, $p_setby, $p_response ) = @_;
     if ( $p_state =~ /(on|off)/i ) {
         $p_state = $1;
-        ::print_log( "[Insteon::Irrigation] Received request to set "
-              . $self->get_object_name
-              . " $p_state." );
+        ::print_log( "[Insteon::Irrigation] Received request to set " . $self->get_object_name . " $p_state." );
         $$self{parent}->set_valve( $$self{valve}, $p_state );
     }
     elsif ( $p_state =~ /(\d+)/ ) {
         $p_state = $1;
-        ::print_log( "[Insteon::Irrigation] Received request to set "
-              . $self->get_object_name
-              . " ON for $p_state minutes." );
+        ::print_log( "[Insteon::Irrigation] Received request to set " . $self->get_object_name . " ON for $p_state minutes." );
         $$self{parent}->set_valve( $$self{valve}, 'on' );
 
         #Set timer to turn off
-        my $action =
-            $$self{parent}->get_object_name
-          . "->set_valve("
-          . $$self{valve}
-          . ", 'off')";
-        my $time = ( $p_state * 60 );
+        my $action = $$self{parent}->get_object_name . "->set_valve(" . $$self{valve} . ", 'off')";
+        my $time   = ( $p_state * 60 );
         $$self{state_timer}->set( $time, $action );
     }
     else {
-        ::print_log( "[Insteon::Irrigation] Cannot set "
-              . $self->get_object_name
-              . " to unknown state of $p_state." );
+        ::print_log( "[Insteon::Irrigation] Cannot set " . $self->get_object_name . " to unknown state of $p_state." );
     }
 }
 
@@ -710,15 +674,11 @@ sub set {
     my ( $self, $p_state, $p_setby, $p_response ) = @_;
     if ( $p_state =~ /(on|off)/i ) {
         $p_state = $1;
-        ::print_log( "[Insteon::Irrigation] Received request to set "
-              . $self->get_object_name
-              . " $p_state." );
+        ::print_log( "[Insteon::Irrigation] Received request to set " . $self->get_object_name . " $p_state." );
         $$self{parent}->set_program( $$self{program}, $p_state );
     }
     else {
-        ::print_log( "[Insteon::Irrigation] Cannot set "
-              . $self->get_object_name
-              . " to unknown state of $p_state." );
+        ::print_log( "[Insteon::Irrigation] Cannot set " . $self->get_object_name . " to unknown state of $p_state." );
     }
 }
 
diff --git a/lib/Insteon/Lighting.pm b/lib/Insteon/Lighting.pm
index f986a9147..964c093d6 100644
--- a/lib/Insteon/Lighting.pm
+++ b/lib/Insteon/Lighting.pm
@@ -269,8 +269,7 @@ sub new {
     bless $self, $class;
 
     if ( $main::config_parms{insteon_menu_states} ) {
-        $self->set_states(
-            split( ',', $main::config_parms{insteon_menu_states} ) );
+        $self->set_states( split( ',', $main::config_parms{insteon_menu_states} ) );
     }
 
     return $self;
@@ -345,16 +344,13 @@ sub update_local_properties {
         #Queue Ramp Rate First
         my $extra = '000005' . $self->local_ramprate();
         $extra .= '0' x ( 30 - length $extra );
-        my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-            'extended_set_get', $extra );
+        my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
         $self->_send_cmd($message);
 
         #Now queue on level
-        $extra = '000006'
-          . ::Insteon::DimmableLight::convert_level( $self->local_onlevel() );
+        $extra = '000006' . ::Insteon::DimmableLight::convert_level( $self->local_onlevel() );
         $extra .= '0' x ( 30 - length $extra );
-        $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-            'extended_set_get', $extra );
+        $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
         $self->_send_cmd($message);
     }
 }
@@ -416,10 +412,7 @@ sub get_voice_cmds {
     my $object_name         = $self->get_object_name;
     my $insteon_menu_states = $main::config_parms{insteon_menu_states}
       if $main::config_parms{insteon_menu_states};
-    my %voice_cmds = (
-        %{ $self->SUPER::get_voice_cmds },
-        'update onlevel/ramprate' => "$object_name->update_local_properties"
-    );
+    my %voice_cmds = ( %{ $self->SUPER::get_voice_cmds }, 'update onlevel/ramprate' => "$object_name->update_local_properties" );
     if ($insteon_menu_states) {
         foreach my $state ( split( /,/, $insteon_menu_states ) ) {
             $voice_cmds{$state} = "$object_name->set(\"$state\")";
@@ -636,11 +629,11 @@ sub link_data3 {
     my $link_data3 = $self->SUPER::link_data3( $group, $is_controller );
 
     if ( !$is_controller ) {    #is_responder
-            #For I2CS devices the default data3 for responder links is 01.
-            #This is to support the I2CS In-LineLinc Relay.  There may be more
-            #permutations of the 00 vs. 01 problem and I1 devices may have
-            #the same requirement.  This code is a work in progress as more
-            #information is gathered about Relay type devices.
+                                #For I2CS devices the default data3 for responder links is 01.
+                                #This is to support the I2CS In-LineLinc Relay.  There may be more
+                                #permutations of the 00 vs. 01 problem and I1 devices may have
+                                #the same requirement.  This code is a work in progress as more
+                                #information is gathered about Relay type devices.
         if ( $self->can('engine_version') && $self->engine_version eq 'I2CS' ) {
 
             #Default to 01 if no group was supplied
@@ -771,8 +764,7 @@ package Insteon::KeyPadLincRelay;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::KeyPadLincRelay::ISA =
-  ( 'Insteon::BaseLight', 'Insteon::MultigroupDevice' );
+@Insteon::KeyPadLincRelay::ISA = ( 'Insteon::BaseLight', 'Insteon::MultigroupDevice' );
 
 our %operating_flags = (
     'program_lock_on'   => '00',
@@ -819,10 +811,8 @@ sub set {
             $$self{surrogate}->set( $p_state, $p_setby, $p_respond );
         }
         else {
-            ::print_log(
-                "[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
-                  . "unless you have defined a reverse link with the \"surrogate\" keyword"
-            );
+            ::print_log( "[Insteon::KeyPadLinc] You may not directly attempt to set a keypadlinc's button "
+                  . "unless you have defined a reverse link with the \"surrogate\" keyword" );
         }
     }
     else {
@@ -894,22 +884,15 @@ sub get_voice_cmds {
     if ( $self->is_root ) {
         %voice_cmds = (
             %voice_cmds,
-            'set 8 button - backlight dim' =>
-              "$object_name->update_flags(\"0a\")",
-            'set 8 button - backlight off' =>
-              "$object_name->update_flags(\"06\")",
-            'set 8 button - backlight normal' =>
-              "$object_name->update_flags(\"02\")",
-            'set 6 button - backlight dim' =>
-              "$object_name->update_flags(\"08\")",
-            'set 6 button - backlight off' =>
-              "$object_name->update_flags(\"04\")",
-            'set 6 button - backlight normal' =>
-              "$object_name->update_flags(\"00\")",
-            'sync all device links'       => "$object_name->sync_all_links()",
-            'AUDIT sync all device links' => "$object_name->sync_all_links(1)",
-            'sync intradevice links' =>
-              "$object_name->sync_intradevice_links()",
+            'set 8 button - backlight dim'    => "$object_name->update_flags(\"0a\")",
+            'set 8 button - backlight off'    => "$object_name->update_flags(\"06\")",
+            'set 8 button - backlight normal' => "$object_name->update_flags(\"02\")",
+            'set 6 button - backlight dim'    => "$object_name->update_flags(\"08\")",
+            'set 6 button - backlight off'    => "$object_name->update_flags(\"04\")",
+            'set 6 button - backlight normal' => "$object_name->update_flags(\"00\")",
+            'sync all device links'           => "$object_name->sync_all_links()",
+            'AUDIT sync all device links'     => "$object_name->sync_all_links(1)",
+            'sync intradevice links'          => "$object_name->sync_intradevice_links()",
         );
     }
     return \%voice_cmds;
@@ -1009,10 +992,8 @@ sub sync_intradevice_links {
     my %byte_hash;    #Key is the lsb of the byte location
     my $lsb;          #used to store the lsb address
 
-    ::print_log( '[Insteon::KeyPadLinc] '
-          . $self->get_object_name
-          . 'will be '
-          . 'programmed with the following IntraDevice Links:' );
+    ::print_log(
+        '[Insteon::KeyPadLinc] ' . $self->get_object_name . 'will be ' . 'programmed with the following IntraDevice Links:' );
 
     # Find all subgroup items check groups from 1 - 8;
     for ( my $dec_group = 1; $dec_group <= 8; $dec_group++ ) {
@@ -1022,7 +1003,7 @@ sub sync_intradevice_links {
 
             #SubGroup Object Exists, Now Look for IntraDevice Link on Object
             foreach my $member_ref ( keys %{ $$subgroup_object{members} } ) {
-                my $member = $$subgroup_object{members}{$member_ref}{object};
+                my $member       = $$subgroup_object{members}{$member_ref}{object};
                 my $member_group = hex( $member->group );
                 my $member_root  = $member->get_root;
                 if ( $member_root eq $self ) {
@@ -1043,8 +1024,7 @@ sub sync_intradevice_links {
                         $link_type = "TURN OFF";
                     }
                     ::print_log(
-                            "[Insteon::KeyPadLinc] Group $member_group will "
-                          . "$link_type when Group $dec_group is pressed." );
+                        "[Insteon::KeyPadLinc] Group $member_group will " . "$link_type when Group $dec_group is pressed." );
                 }
             }
         }
@@ -1090,23 +1070,16 @@ sub _write_intradevice_links {
     # Define our callbacks
     my $next_group = ( $sub == 2 ) ? $group : $group + 1;
     my $next_sub   = ( $sub == 2 ) ? 3      : 2;
-    my $success_callback = $self->get_object_name
-      . "->_write_intradevice_links('',$next_group,$next_sub)";
+    my $success_callback = $self->get_object_name . "->_write_intradevice_links('',$next_group,$next_sub)";
     my $failure_callback =
-        "::print_log('[Insteon::KeyPadLinc] ERROR - Syncing"
-      . "IntraDevice Links to "
-      . $self->get_object_name
-      . " failed.')";
+      "::print_log('[Insteon::KeyPadLinc] ERROR - Syncing" . "IntraDevice Links to " . $self->get_object_name . " failed.')";
     if ( $group == 8 && $sub == 3 ) {
         $success_callback =
-            "::print_log('[Insteon::KeyPadLinc] Successfully wrote "
-          . "IntraDevice links for "
-          . $self->get_object_name . "')";
+          "::print_log('[Insteon::KeyPadLinc] Successfully wrote " . "IntraDevice links for " . $self->get_object_name . "')";
     }
 
     # Now write values to device
-    my $extra =
-      "00" . sprintf( "%02X", $group ) . "0" . $sub . sprintf( "%02X", $mask );
+    my $extra = "00" . sprintf( "%02X", $group ) . "0" . $sub . sprintf( "%02X", $mask );
     my $message = $self->simple_message( 'extended_set_get', $extra );
     $message->failure_callback($failure_callback);
     $message->success_callback($success_callback);
@@ -1118,8 +1091,7 @@ sub simple_message {
     my ( $self, $type, $extra ) = @_;
     my $message;
     $extra .= '0' x ( 30 - length $extra );
-    $message =
-      new Insteon::InsteonMessage( 'insteon_ext_send', $self, $type, $extra );
+    $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, $type, $extra );
     return $message;
 }
 
@@ -1176,8 +1148,7 @@ package Insteon::KeyPadLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::KeyPadLinc::ISA =
-  ( 'Insteon::KeyPadLincRelay', 'Insteon::DimmableLight' );
+@Insteon::KeyPadLinc::ISA = ( 'Insteon::KeyPadLincRelay', 'Insteon::DimmableLight' );
 
 =item C<new()>
 
@@ -1347,13 +1318,11 @@ sub enable_blink_traffic {
     my $name = $self->get_object_name;
 
     if ($is_true) {
-        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to"
-              . " blink on traffic." );
+        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to" . " blink on traffic." );
         $self->set_operating_flag('blink_traffic');
     }
     else {
-        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to"
-              . " not blink on traffic." );
+        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to" . " not blink on traffic." );
         $self->set_operating_flag('no_blink_traffic');
     }
 }
@@ -1370,13 +1339,11 @@ sub enable_blink_error {
     my $name = $self->get_object_name;
 
     if ($is_true) {
-        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to"
-              . " blink on error." );
+        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to" . " blink on error." );
         $self->set_operating_flag('blink_error');
     }
     else {
-        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to"
-              . " not blink on error." );
+        ::print_log( "[Insteon::MicroSwitch] Setting LED on $name to" . " not blink on error." );
         $self->set_operating_flag('no_blink_error');
     }
 }
@@ -1393,13 +1360,11 @@ sub enable_beep_button {
     my $name = $self->get_object_name;
 
     if ($is_true) {
-        ::print_log( "[Insteon::MicroSwitch] Setting $name to"
-              . " beep on button press." );
+        ::print_log( "[Insteon::MicroSwitch] Setting $name to" . " beep on button press." );
         $self->set_operating_flag('beep_button');
     }
     else {
-        ::print_log( "[Insteon::MicroSwitch] Setting $name to"
-              . " not beep on button press." );
+        ::print_log( "[Insteon::MicroSwitch] Setting $name to" . " not beep on button press." );
         $self->set_operating_flag('no_beep_button');
     }
 }
@@ -1415,8 +1380,7 @@ sub led_level {
     return unless defined $level;
     my $name = $self->get_object_name;
 
-    ::print_log(
-        "[Insteon::MicroSwitch] Setting LED level of $name to" . " $level." );
+    ::print_log( "[Insteon::MicroSwitch] Setting LED level of $name to" . " $level." );
 
     #For whatever reason 100% = 127 and 50% = 64
     $level = $level * 1.28;
@@ -1425,8 +1389,7 @@ sub led_level {
 
     my $extra = '000107' . sprintf( '%02X', $level );
     $extra .= '0' x ( 30 - length $extra );
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $self->_send_cmd($message);
 }
 
@@ -1450,28 +1413,20 @@ sub get_voice_cmds {
     if ( $self->is_root ) {
         %voice_cmds = (
             %voice_cmds,
-            'set latching mode' => "$object_name->set_mode(\"latching\")",
-            'set single momentary mode' =>
-              "$object_name->set_mode(\"single_momentary\")",
-            'set dual momentary mode' =>
-              "$object_name->set_mode(\"dual_momentary\")",
-            'set to 3-way' => "$object_name->enable_3_way(1)",
-            'set to 1-way' => "$object_name->enable_3_way(0)",
-            'set LED to blink on traffic' =>
-              "$object_name->enable_blink_traffic(1)",
-            'set LED to not blink on traffic' =>
-              "$object_name->enable_blink_traffic(0)",
-            'set LED to blink on error' =>
-              "$object_name->enable_blink_error(1)",
-            'set LED to not blink on error' =>
-              "$object_name->enable_blink_error(0)",
-            'set device to beep on button press' =>
-              "$object_name->enable_beep_button(1)",
-            'set device to not beep on button press' =>
-              "$object_name->enable_beep_button(0)",
-            'set LED to 100%' => "$object_name->led_level(100)",
-            'set LED to 50%'  => "$object_name->led_level(50)",
-            'set LED to 0%'   => "$object_name->led_level(\"0\")",
+            'set latching mode'                      => "$object_name->set_mode(\"latching\")",
+            'set single momentary mode'              => "$object_name->set_mode(\"single_momentary\")",
+            'set dual momentary mode'                => "$object_name->set_mode(\"dual_momentary\")",
+            'set to 3-way'                           => "$object_name->enable_3_way(1)",
+            'set to 1-way'                           => "$object_name->enable_3_way(0)",
+            'set LED to blink on traffic'            => "$object_name->enable_blink_traffic(1)",
+            'set LED to not blink on traffic'        => "$object_name->enable_blink_traffic(0)",
+            'set LED to blink on error'              => "$object_name->enable_blink_error(1)",
+            'set LED to not blink on error'          => "$object_name->enable_blink_error(0)",
+            'set device to beep on button press'     => "$object_name->enable_beep_button(1)",
+            'set device to not beep on button press' => "$object_name->enable_beep_button(0)",
+            'set LED to 100%'                        => "$object_name->led_level(100)",
+            'set LED to 50%'                         => "$object_name->led_level(50)",
+            'set LED to 0%'                          => "$object_name->led_level(\"0\")",
         );
     }
     return \%voice_cmds;
@@ -1524,8 +1479,7 @@ package Insteon::MicroSwitch;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::MicroSwitch::ISA =
-  ( 'Insteon::MicroSwitchRelay', 'Insteon::DimmableLight' );
+@Insteon::MicroSwitch::ISA = ( 'Insteon::MicroSwitchRelay', 'Insteon::DimmableLight' );
 
 =item C<new()>
 
@@ -1593,8 +1547,7 @@ package Insteon::FanLinc;
 use strict;
 use Insteon::BaseInsteon;
 
-@Insteon::FanLinc::ISA =
-  ( 'Insteon::DimmableLight', 'Insteon::MultigroupDevice' );
+@Insteon::FanLinc::ISA = ( 'Insteon::DimmableLight', 'Insteon::MultigroupDevice' );
 
 =item C<new()>
 
@@ -1635,9 +1588,7 @@ sub derive_message {
         }
         $command = ::Insteon::DimmableLight::convert_level($command);
         my $extra = $command . "0200000000000000000000000000";
-        my $message =
-          new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'on',
-            $extra );
+        my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'on', $extra );
         return $message;
     }
 }
@@ -1660,8 +1611,7 @@ sub request_status {
         my $parent = $self->get_root();
         $$parent{child_status_request_pending} = $self->group;
         $$self{m_status_request_pending} = ($requestor) ? $requestor : 1;
-        my $message = new Insteon::InsteonMessage( 'insteon_send', $parent,
-            'status_request', '03' );
+        my $message = new Insteon::InsteonMessage( 'insteon_send', $parent, 'status_request', '03' );
         $parent->_send_cmd($message);
     }
 }
@@ -1693,8 +1643,7 @@ sub _is_info_request {
         delete( $$parent{child_status_request_pending} );
     }
     else {
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 }
@@ -1712,19 +1661,14 @@ sub is_acknowledged {
     my $parent = $self->get_root();
     if ( $p_ack && $$parent{child_pending_state} ) {
         my $child_obj = Insteon::get_object( $self->device_id, '02' );
-        $child_obj->set_receive(
-            $$child_obj{pending_state},
-            $$child_obj{pending_setby},
-            $$child_obj{pending_response}
-        ) if defined $$child_obj{pending_state};
+        $child_obj->set_receive( $$child_obj{pending_state}, $$child_obj{pending_setby}, $$child_obj{pending_response} )
+          if defined $$child_obj{pending_state};
         $$child_obj{is_acknowledged}  = $p_ack;
         $$child_obj{pending_state}    = undef;
         $$child_obj{pending_setby}    = undef;
         $$child_obj{pending_response} = undef;
         $$parent{child_pending_state} = undef;
-        &::print_log(
-            "[Insteon::FanLinc] received command/state acknowledge from "
-              . $child_obj->{object_name} )
+        &::print_log( "[Insteon::FanLinc] received command/state acknowledge from " . $child_obj->{object_name} )
           if $self->debuglevel( 1, 'insteon' );
         return $$self{is_acknowledged};
     }
@@ -1877,8 +1821,7 @@ sub enable_linking_on_powerup {
         $self->set_operating_flag('linking_on_powerup_on');
     }
     else {
-        ::print_log(
-            "[Insteon::BulbLinc] Disabling Linking on Startup on $name");
+        ::print_log("[Insteon::BulbLinc] Disabling Linking on Startup on $name");
         $self->set_operating_flag('linking_on_powerup_off');
     }
 }
@@ -1903,10 +1846,8 @@ sub get_voice_cmds {
     if ( $self->is_root ) {
         %voice_cmds = (
             %voice_cmds,
-            'set linking on powerup on' =>
-              "$object_name->enable_linking_on_powerup(1)",
-            'set linking on powerup off' =>
-              "$object_name->enable_linking_on_powerup(0)"
+            'set linking on powerup on'  => "$object_name->enable_linking_on_powerup(1)",
+            'set linking on powerup off' => "$object_name->enable_linking_on_powerup(0)"
         );
     }
     return \%voice_cmds;
diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
index 416019c8b..a7fe35842 100644
--- a/lib/Insteon/Message.pm
+++ b/lib/Insteon/Message.pm
@@ -209,12 +209,8 @@ sub send {
     if ( $self->send_attempts < $self->retry_count ) {
 
         if ( $self->send_attempts > 0 ) {
-            if (
-                (
-                    ref $self->setby && $self->setby->debuglevel( 1, 'insteon' )
-                )
-                || ( ( !ref $self->setby ) && $::Debug{'insteon'} )
-              )
+            if (   ( ref $self->setby && $self->setby->debuglevel( 1, 'insteon' ) )
+                || ( ( !ref $self->setby ) && $::Debug{'insteon'} ) )
             {
                 ::print_log( "[Insteon::BaseMessage] WARN: now resending "
                       . $self->to_string()
@@ -231,16 +227,14 @@ sub send {
                 $self->setby->retry_count_log(1)
                   if $self->setby->can('retry_count_log');
                 if ( $self->setby->default_hop_count < 3 ) {
-                    $self->setby->default_hop_count(
-                        $self->setby->default_hop_count + 1 );
+                    $self->setby->default_hop_count( $self->setby->default_hop_count + 1 );
                 }
             }
             elsif (defined( $$self{no_hop_increase} )
                 && ref $self->setby
                 && $self->setby->isa('Insteon::BaseObject') )
             {
-                &main::print_log(
-                        "[Insteon::BaseMessage] Hop count not increased for "
+                &main::print_log( "[Insteon::BaseMessage] Hop count not increased for "
                       . $self->setby->get_object_name
                       . " because no_hop_increase flag was set." )
                   if $self->setby->debuglevel( 1, 'insteon' );
@@ -745,21 +739,17 @@ sub _derive_interface_data {
             }
         }
     }
-    $cmd .=
-      unpack( "H*",
-        pack( "C", $self->setby->message_type_code( $self->command ) ) );
+    $cmd .= unpack( "H*", pack( "C", $self->setby->message_type_code( $self->command ) ) );
     if ( $self->extra ) {
         $cmd .= $self->extra;
     }
-    elsif ( $self->command_type eq 'insteon_send' )
-    {    # auto append '00' if no extra defined for a standard insteon send
+    elsif ( $self->command_type eq 'insteon_send' ) {    # auto append '00' if no extra defined for a standard insteon send
         $cmd .= '00';
     }
 
     if ( $self->command_type eq 'insteon_ext_send' and $$self{add_crc16} ) {
         if ( length($cmd) < 40 ) {
-            main::print_log( "[Insteon::InsteonMessage] WARN: insert_crc16 "
-                  . "failed; cmd to short: $cmd" );
+            main::print_log( "[Insteon::InsteonMessage] WARN: insert_crc16 " . "failed; cmd to short: $cmd" );
         }
         else {
             $cmd =
@@ -775,12 +765,10 @@ sub _derive_interface_data {
         #           0123456789012345678901234567890123456789
         #          '2042d31f2e000107110000000000000000000000'
         if ( length($cmd) < 40 ) {
-            main::print_log( "[Insteon::InsteonMessage] WARN: insert_checksum "
-                  . "failed; cmd to short: $cmd" );
+            main::print_log( "[Insteon::InsteonMessage] WARN: insert_checksum " . "failed; cmd to short: $cmd" );
         }
         else {
-            $cmd = substr( $cmd, 0, 38 )
-              . calculate_checksum( substr( $cmd, 8, 30 ) );
+            $cmd = substr( $cmd, 0, 38 ) . calculate_checksum( substr( $cmd, 8, 30 ) );
         }
     }
 
@@ -1086,8 +1074,7 @@ sub generate_commands {
     my $uc = lc( substr( $p_setby->{x10_id}, 2, 1 ) );
 
     if ( $hc eq undef ) {
-        &main::print_log(
-            "[Insteon::Message] Object:$p_setby Doesnt have an x10 id (yet)");
+        &main::print_log("[Insteon::Message] Object:$p_setby Doesnt have an x10 id (yet)");
         return undef;
     }
 
@@ -1098,21 +1085,10 @@ sub generate_commands {
     else {
 
         #Every X10 message starts with the House and unit code
-        $msg = substr(
-            unpack(
-                "H*", pack( "C", $x10_house_codes{ substr( $id, 1, 1 ) } )
-            ),
-            1, 1
-        );
-        $msg .= substr(
-            unpack( "H*", pack( "C", $x10_unit_codes{ substr( $id, 2, 1 ) } ) ),
-            1, 1
-        );
+        $msg = substr( unpack( "H*", pack( "C", $x10_house_codes{ substr( $id, 1, 1 ) } ) ), 1, 1 );
+        $msg .= substr( unpack( "H*", pack( "C", $x10_unit_codes{ substr( $id, 2, 1 ) } ) ), 1, 1 );
         $msg .= "00";
-        &main::print_log( "[Insteon_PLM] x10 sending code: "
-              . uc( $hc . $uc )
-              . " as insteon msg: "
-              . $msg )
+        &main::print_log( "[Insteon_PLM] x10 sending code: " . uc( $hc . $uc ) . " as insteon msg: " . $msg )
           if ( ref $p_setby && $p_setby->debuglevel( 1, 'insteon' ) );
 
         push @data, $msg;
@@ -1126,12 +1102,7 @@ sub generate_commands {
 
     #	&::print_log("PLM:PAIR:$id:$spos:$ecmd:");
     for ( my $pos = $spos; $pos < length($id); $pos++ ) {
-        $msg = substr(
-            unpack(
-                "H*", pack( "C", $x10_house_codes{ substr( $id, $pos, 1 ) } )
-            ),
-            1, 1
-        );
+        $msg = substr( unpack( "H*", pack( "C", $x10_house_codes{ substr( $id, $pos, 1 ) } ) ), 1, 1 );
         $pos++;
 
         #look for an explicit command
@@ -1144,19 +1115,11 @@ sub generate_commands {
         }
         else {
             $x10_arg = $x10_commands{ substr( $id, $pos, 1 ) };
-            $msg .= substr(
-                unpack(
-                    "H*", pack( "C", $x10_commands{ substr( $id, $pos, 1 ) } )
-                ),
-                1, 1
-            );
+            $msg .= substr( unpack( "H*", pack( "C", $x10_commands{ substr( $id, $pos, 1 ) } ) ), 1, 1 );
         }
         $msg .= "80";
 
-        &main::print_log( "[Insteon_PLM] x10 sending code: "
-              . uc( $hc . $x10_arg )
-              . " as insteon msg: "
-              . $msg )
+        &main::print_log( "[Insteon_PLM] x10 sending code: " . uc( $hc . $x10_arg ) . " as insteon msg: " . $msg )
           if ( ref $p_setby && $p_setby->debuglevel( 1, 'insteon' ) );
 
         push @data, $msg;
diff --git a/lib/Insteon/MessageDecoder.pm b/lib/Insteon/MessageDecoder.pm
index 69c92073d..68d08cf7d 100644
--- a/lib/Insteon/MessageDecoder.pm
+++ b/lib/Insteon/MessageDecoder.pm
@@ -116,8 +116,7 @@ my %plmcmdlen = (
     '0258' => [ 3,  3 ],
     '0260' => [ 2,  9 ],
     '0261' => [ 5,  6 ],
-    '0262' => [ 8,  9, 22, 23 ]
-    ,    # could get 9 or 23 (Standard or Extended Message received)
+    '0262' => [ 8,  9, 22, 23 ],    # could get 9 or 23 (Standard or Extended Message received)
     '0263' => [ 4,  5 ],
     '0264' => [ 4,  5 ],
     '0265' => [ 2,  3 ],
@@ -317,8 +316,7 @@ my %insteonCmd = (
         Cmd2Value => '0x02',
         Cmd2Name  => 'i2CS'
     },
-    'SD0f' =>
-      { Cmd1Name => 'Ping', Cmd2Flag => 'NA', Cmd2Value => '', Cmd2Name => '' },
+    'SD0f' => { Cmd1Name => 'Ping', Cmd2Flag => 'NA', Cmd2Value => '', Cmd2Name => '' },
     'SD10' => {
         Cmd1Name  => 'ID Request',
         Cmd2Flag  => 'NA',
@@ -1818,25 +1816,15 @@ sub plm_decode {
             else {
                 #include the STX for historical reasons
                 $plm_cmd_id = substr( $plm_string, 0, 4 );
-                $plm_message .=
-                    sprintf( "%20s: (", "PLM Command" )
-                  . $plm_cmd_id . ") "
-                  . $plmcmd2string{$plm_cmd_id} . "\n";
-                if (
-                    length($plm_string) <
-                    $plmcmdlen{ uc($plm_cmd_id) }->[0] * 2 )
-                {
-                    $plm_message .=
-                      "        Message length too short for PLM command.  Not parsed\n";
+                $plm_message .= sprintf( "%20s: (", "PLM Command" ) . $plm_cmd_id . ") " . $plmcmd2string{$plm_cmd_id} . "\n";
+                if ( length($plm_string) < $plmcmdlen{ uc($plm_cmd_id) }->[0] * 2 ) {
+                    $plm_message .= "        Message length too short for PLM command.  Not parsed\n";
                     $abort++;
                 }
-                elsif (
-                    length($plm_string) > $plmcmdlen{ uc($plm_cmd_id) }->[0] * 2
-                    and length($plm_string) <
-                    $plmcmdlen{ uc($plm_cmd_id) }->[1] * 2 )
+                elsif ( length($plm_string) > $plmcmdlen{ uc($plm_cmd_id) }->[0] * 2
+                    and length($plm_string) < $plmcmdlen{ uc($plm_cmd_id) }->[1] * 2 )
                 {
-                    $plm_message .=
-                      "        Message length too short for PLM command.  Not parsed\n";
+                    $plm_message .= "        Message length too short for PLM command.  Not parsed\n";
                     $abort++;
                 }
                 elsif ( substr( $plm_string, 2, 1 ) == '5' ) {
@@ -1863,13 +1851,10 @@ sub plm_decode {
                   . substr( $plm_string, 10, 2 ) . ":"
                   . substr( $plm_string, 12, 2 ) . ":"
                   . substr( $plm_string, 14, 2 ) . "\n";
-                $plm_message .= sprintf( "%24s: ", 'Message Flags' )
-                  . substr( $plm_string, 16, 2 ) . "\n";
-                $plm_message .=
-                  insteon_message_flags_decode( substr( $plm_string, 16, 2 ) );
+                $plm_message .= sprintf( "%24s: ", 'Message Flags' ) . substr( $plm_string, 16, 2 ) . "\n";
+                $plm_message .= insteon_message_flags_decode( substr( $plm_string, 16, 2 ) );
                 my $flag_ext = hex( substr( $plm_string, 16, 1 ) ) & 0b0001;
-                $plm_message .= sprintf( "%24s: ", 'Insteon Message' )
-                  . substr( $plm_string, 18, ( $flag_ext ? 32 : 4 ) ) . "\n";
+                $plm_message .= sprintf( "%24s: ", 'Insteon Message' ) . substr( $plm_string, 18, ( $flag_ext ? 32 : 4 ) ) . "\n";
                 $plm_message .= insteon_decode( substr( $plm_string, 16 ) );
             }
             elsif ( $plm_cmd_id eq '0251' ) {
@@ -1883,48 +1868,35 @@ sub plm_decode {
                   . substr( $plm_string, 10, 2 ) . ":"
                   . substr( $plm_string, 12, 2 ) . ":"
                   . substr( $plm_string, 14, 2 ) . "\n";
-                $plm_message .= sprintf( "%24s: ", 'Message Flags' )
-                  . substr( $plm_string, 16, 2 ) . "\n";
-                $plm_message .=
-                  insteon_message_flags_decode( substr( $plm_string, 16, 2 ) );
+                $plm_message .= sprintf( "%24s: ", 'Message Flags' ) . substr( $plm_string, 16, 2 ) . "\n";
+                $plm_message .= insteon_message_flags_decode( substr( $plm_string, 16, 2 ) );
                 my $flag_ext = hex( substr( $plm_string, 16, 1 ) ) & 0b0001;
-                $plm_message .= sprintf( "%24s: ", 'Insteon Message' )
-                  . substr( $plm_string, 18, ( $flag_ext ? 32 : 4 ) ) . "\n";
+                $plm_message .= sprintf( "%24s: ", 'Insteon Message' ) . substr( $plm_string, 18, ( $flag_ext ? 32 : 4 ) ) . "\n";
                 $plm_message .= insteon_decode( substr( $plm_string, 16 ) );
             }
             elsif ( $plm_cmd_id eq '0252' ) {
-                $plm_message .= sprintf( "%20s: ", 'X10 Message' )
-                  . substr( $plm_string, 4, 4 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'X10 Message' ) . substr( $plm_string, 4, 4 ) . "\n";
                 $plm_message .= plm_x10_decode( substr( $plm_string, 4, 4 ) );
             }
             elsif ( $plm_cmd_id eq '0253' ) {
-                my @link_string = (
-                    'PLM is Responder',
-                    'PLM is Controller',
-                    'All-Link deleted'
-                );
+                my @link_string = ( 'PLM is Responder', 'PLM is Controller', 'All-Link deleted' );
                 $plm_message .=
                     sprintf( "%20s: (", 'Link Code' )
                   . substr( $plm_string, 4, 2 ) . ") "
                   . $link_string[ substr( $plm_string, 4, 2 ) ] . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 6, 2 ) . "\n";
                 $plm_message .=
                     sprintf( "%20s: ", 'Linked Device' )
                   . substr( $plm_string, 8,  2 ) . ":"
                   . substr( $plm_string, 10, 2 ) . ":"
                   . substr( $plm_string, 12, 2 ) . "\n";
                 $plm_message .=
-                    sprintf( "%20s: ", 'Device Category' )
-                  . substr( $plm_string, 14, 2 ) . ":"
-                  . substr( $plm_string, 16, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'Firmware' )
-                  . substr( $plm_string, 18, 2 ) . "\n";
+                  sprintf( "%20s: ", 'Device Category' ) . substr( $plm_string, 14, 2 ) . ":" . substr( $plm_string, 16, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Firmware' ) . substr( $plm_string, 18, 2 ) . "\n";
             }
             elsif ( $plm_cmd_id eq '0254' ) {
                 my @buttons = ( 'SET Button ', 'Button 2 ', 'Button 3 ' );
-                my @button_event =
-                  ( '', '', 'Tapped', 'Held 3 seconds', 'Released' );
+                my @button_event = ( '', '', 'Tapped', 'Held 3 seconds', 'Released' );
                 $plm_message .=
                     sprintf( "%20s: (", 'Button Event' )
                   . substr( $plm_string, 4, 2 ) . ") "
@@ -1936,8 +1908,7 @@ sub plm_decode {
                 #Nothing else to do
             }
             elsif ( $plm_cmd_id eq '0256' ) {
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 4, 2 ) . "\n";
                 $plm_message .=
                     sprintf( "%20s: ", 'Device' )
                   . substr( $plm_string, 6,  2 ) . ":"
@@ -1945,25 +1916,18 @@ sub plm_decode {
                   . substr( $plm_string, 10, 2 ) . "\n";
             }
             elsif ( $plm_cmd_id eq '0257' ) {
-                $plm_message .= sprintf( "%20s: ", 'All-Link Flags' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Flags' ) . substr( $plm_string, 4, 2 ) . "\n";
                 my $flags = hex( substr( $plm_string, 4, 2 ) );
-                $plm_message .= sprintf( "%20s: Record is ", 'Bit 7' )
-                  . ( $flags & 0b10000000 ? 'in use' : 'available' ) . "\n";
-                $plm_message .= sprintf( "%20s: PLM is ", 'Bit 6' )
-                  . ( $flags & 0b01000000 ? 'controller' : 'responder' ) . "\n";
-                $plm_message .=
-                    sprintf( "%20s: ACK is ", 'Bit 5' )
-                  . ( $flags & 0b00100000 ? 'required' : 'not required' )
-                  . "\n";
+                $plm_message .= sprintf( "%20s: Record is ", 'Bit 7' ) . ( $flags & 0b10000000 ? 'in use' : 'available' ) . "\n";
+                $plm_message .= sprintf( "%20s: PLM is ", 'Bit 6' ) . ( $flags & 0b01000000 ? 'controller' : 'responder' ) . "\n";
+                $plm_message .= sprintf( "%20s: ACK is ", 'Bit 5' ) . ( $flags & 0b00100000 ? 'required' : 'not required' ) . "\n";
                 $plm_message .= sprintf( "%20s: Record has ", 'Bit 1' )
                   . (
                     $flags & 0b00000001
                     ? 'been used before'
                     : 'not been used before'
                   ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 6, 2 ) . "\n";
                 $plm_message .=
                     sprintf( "%20s: ", 'Linked Device' )
                   . substr( $plm_string, 8,  2 ) . ":"
@@ -1971,12 +1935,9 @@ sub plm_decode {
                   . substr( $plm_string, 12, 2 ) . "\n";
 
                 #XXXX				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,14,6)."\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' )
-                  . substr( $plm_string, 14, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' )
-                  . substr( $plm_string, 16, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Data' )
-                  . substr( $plm_string, 18, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' ) . substr( $plm_string, 14, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' ) . substr( $plm_string, 16, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Data' ) . substr( $plm_string, 18, 2 ) . "\n";
 
                 #TODO:  Find insteon information for link data decode
             }
@@ -1984,12 +1945,10 @@ sub plm_decode {
                 $plm_message .=
                     sprintf( "%20s: (", 'Status Byte' )
                   . substr( $plm_string, 4, 2 ) . ") "
-                  . ( substr( $plm_string, 4, 2 ) eq '06' ? "ACK" : "NACK" )
-                  . "\n";
+                  . ( substr( $plm_string, 4, 2 ) eq '06' ? "ACK" : "NACK" ) . "\n";
             }
             else {
-                $plm_message .= sprintf( "%20s: (", 'Undefined Cmd Data' )
-                  . substr( $plm_string, 4 ) . ")\n";
+                $plm_message .= sprintf( "%20s: (", 'Undefined Cmd Data' ) . substr( $plm_string, 4 ) . ")\n";
             }
             $finished++;
         }
@@ -2008,18 +1967,14 @@ sub plm_decode {
                         sprintf( "%20s: ", 'Device Category' )
                       . substr( $plm_string, 10, 2 ) . ":"
                       . substr( $plm_string, 12, 2 ) . "\n";
-                    $plm_message .= sprintf( "%20s: ", 'Firmware' )
-                      . substr( $plm_string, 14, 2 ) . "\n";
+                    $plm_message .= sprintf( "%20s: ", 'Firmware' ) . substr( $plm_string, 14, 2 ) . "\n";
                 }
                 $plm_ack_pos = 16;
             }
             elsif ( $plm_cmd_id eq '0261' ) {
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' )
-                  . substr( $plm_string, 8, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' ) . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' ) . substr( $plm_string, 8, 2 ) . "\n";
                 $plm_ack_pos = 10;
 
                 #TODO:  look up insteon information for all-link command1 / command2 decode
@@ -2030,19 +1985,15 @@ sub plm_decode {
                   . substr( $plm_string, 4, 2 ) . ":"
                   . substr( $plm_string, 6, 2 ) . ":"
                   . substr( $plm_string, 8, 2 ) . "\n";
-                $plm_message .= sprintf( "%24s: ", 'Message Flags' )
-                  . substr( $plm_string, 10, 2 ) . "\n";
-                $plm_message .=
-                  insteon_message_flags_decode( substr( $plm_string, 10, 2 ) );
+                $plm_message .= sprintf( "%24s: ", 'Message Flags' ) . substr( $plm_string, 10, 2 ) . "\n";
+                $plm_message .= insteon_message_flags_decode( substr( $plm_string, 10, 2 ) );
                 my $flag_ext = hex( substr( $plm_string, 10, 1 ) ) & 0b0001;
-                $plm_message .= sprintf( "%24s: ", 'Insteon Message' )
-                  . substr( $plm_string, 12, ( $flag_ext ? 32 : 4 ) ) . "\n";
+                $plm_message .= sprintf( "%24s: ", 'Insteon Message' ) . substr( $plm_string, 12, ( $flag_ext ? 32 : 4 ) ) . "\n";
                 $plm_message .= insteon_decode( substr( $plm_string, 10 ) );
                 $plm_ack_pos = $flag_ext ? 44 : 16;
             }
             elsif ( $plm_cmd_id eq '0263' ) {
-                $plm_message .= sprintf( "%20s: ", 'X10 Message' )
-                  . substr( $plm_string, 4, 4 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'X10 Message' ) . substr( $plm_string, 4, 4 ) . "\n";
                 $plm_message .= plm_x10_decode( substr( $plm_string, 4, 4 ) );
                 $plm_ack_pos = 8;
             }
@@ -2057,8 +2008,7 @@ sub plm_decode {
                     sprintf( "%20s: (", 'Link Code' )
                   . substr( $plm_string, 4, 2 ) . ") "
                   . $link_string{ substr( $plm_string, 4, 2 ) } . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 6, 2 ) . "\n";
                 $plm_ack_pos = 8;
             }
             elsif ( $plm_cmd_id eq '0265' ) {
@@ -2066,19 +2016,15 @@ sub plm_decode {
             }
             elsif ( $plm_cmd_id eq '0266' ) {
                 $plm_message .=
-                    sprintf( "%20s: ", 'Device Category' )
-                  . substr( $plm_string, 4, 2 ) . ":"
-                  . substr( $plm_string, 6, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'Firmware' )
-                  . substr( $plm_string, 8, 2 ) . "\n";
+                  sprintf( "%20s: ", 'Device Category' ) . substr( $plm_string, 4, 2 ) . ":" . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Firmware' ) . substr( $plm_string, 8, 2 ) . "\n";
                 $plm_ack_pos = 10;
             }
             elsif ( $plm_cmd_id eq '0267' ) {
                 $plm_ack_pos = 4;
             }
             elsif ( $plm_cmd_id eq '0268' ) {
-                $plm_message .= sprintf( "%20s: ", 'Command2 Data' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Command2 Data' ) . substr( $plm_string, 4, 2 ) . "\n";
                 $plm_ack_pos = 6;
             }
             elsif ( $plm_cmd_id eq '0269' ) {
@@ -2088,17 +2034,15 @@ sub plm_decode {
                 $plm_ack_pos = 4;
             }
             elsif ( $plm_cmd_id eq '026b' ) {
-                $plm_message .= sprintf( "%20s: (", 'PLM Config Flags' )
-                  . substr( $plm_string, 4, 2 ) . ")\n";
+                $plm_message .= sprintf( "%20s: (", 'PLM Config Flags' ) . substr( $plm_string, 4, 2 ) . ")\n";
                 my $flags = hex( substr( $plm_string, 4, 2 ) );
-                $plm_message .= sprintf( "%20s: Automatic Linking ", 'Bit 7' )
-                  . ( $flags & 0b10000000 ? 'Disabled' : 'Enabled' ) . "\n";
-                $plm_message .= sprintf( "%20s: Monitor Mode ", 'Bit 6' )
-                  . ( $flags & 0b01000000 ? 'Enabled' : 'Disabled' ) . "\n";
-                $plm_message .= sprintf( "%20s: Automatic LED ", 'Bit 5' )
-                  . ( $flags & 0b00100000 ? 'Disabled' : 'Enabled' ) . "\n";
-                $plm_message .= sprintf( "%20s: Deadman Feature ", 'Bit 4' )
-                  . ( $flags & 0b00010000 ? 'Disabled' : 'Enabled' ) . "\n";
+                $plm_message .=
+                  sprintf( "%20s: Automatic Linking ", 'Bit 7' ) . ( $flags & 0b10000000 ? 'Disabled' : 'Enabled' ) . "\n";
+                $plm_message .= sprintf( "%20s: Monitor Mode ", 'Bit 6' ) . ( $flags & 0b01000000 ? 'Enabled' : 'Disabled' ) . "\n";
+                $plm_message .=
+                  sprintf( "%20s: Automatic LED ", 'Bit 5' ) . ( $flags & 0b00100000 ? 'Disabled' : 'Enabled' ) . "\n";
+                $plm_message .=
+                  sprintf( "%20s: Deadman Feature ", 'Bit 4' ) . ( $flags & 0b00010000 ? 'Disabled' : 'Enabled' ) . "\n";
                 $plm_ack_pos = 6;
             }
             elsif ( $plm_cmd_id eq '026c' ) {
@@ -2123,25 +2067,18 @@ sub plm_decode {
                     sprintf( "%20s: (", 'Control code' )
                   . substr( $plm_string, 4, 2 ) . ") "
                   . $control_string{ substr( $plm_string, 4, 2 ) } . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Flags' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Flags' ) . substr( $plm_string, 6, 2 ) . "\n";
                 my $flags = hex( substr( $plm_string, 6, 2 ) );
-                $plm_message .= sprintf( "%20s: Record is ", 'Bit 7' )
-                  . ( $flags & 0b10000000 ? 'in use' : 'available' ) . "\n";
-                $plm_message .= sprintf( "%20s: PLM is ", 'Bit 6' )
-                  . ( $flags & 0b01000000 ? 'controller' : 'responder' ) . "\n";
-                $plm_message .=
-                    sprintf( "%20s: ACK is ", 'Bit 5' )
-                  . ( $flags & 0b00100000 ? 'required' : 'not required' )
-                  . "\n";
+                $plm_message .= sprintf( "%20s: Record is ", 'Bit 7' ) . ( $flags & 0b10000000 ? 'in use' : 'available' ) . "\n";
+                $plm_message .= sprintf( "%20s: PLM is ", 'Bit 6' ) . ( $flags & 0b01000000 ? 'controller' : 'responder' ) . "\n";
+                $plm_message .= sprintf( "%20s: ACK is ", 'Bit 5' ) . ( $flags & 0b00100000 ? 'required' : 'not required' ) . "\n";
                 $plm_message .= sprintf( "%20s: Record has ", 'Bit 1' )
                   . (
                     $flags & 0b00000001
                     ? 'been used before'
                     : 'not been used before'
                   ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Group' )
-                  . substr( $plm_string, 8, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Group' ) . substr( $plm_string, 8, 2 ) . "\n";
                 $plm_message .=
                     sprintf( "%20s: ", 'Linked Device' )
                   . substr( $plm_string, 10, 2 ) . ":"
@@ -2149,26 +2086,20 @@ sub plm_decode {
                   . substr( $plm_string, 14, 2 ) . "\n";
 
                 #				$plm_message .= sprintf("%20s: ",'Link Data').substr($plm_string,16,6)."\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' )
-                  . substr( $plm_string, 16, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' )
-                  . substr( $plm_string, 18, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'All-Link Data' )
-                  . substr( $plm_string, 20, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command1' ) . substr( $plm_string, 16, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Command2' ) . substr( $plm_string, 18, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'All-Link Data' ) . substr( $plm_string, 20, 2 ) . "\n";
                 $plm_ack_pos = 22;
 
                 #TODO:  Find insteon information for link data decode
             }
             elsif ( $plm_cmd_id eq '0270' ) {
-                $plm_message .= sprintf( "%20s: ", 'Command2 Data' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Command2 Data' ) . substr( $plm_string, 4, 2 ) . "\n";
                 $plm_ack_pos = 6;
             }
             elsif ( $plm_cmd_id eq '0271' ) {
-                $plm_message .= sprintf( "%20s: ", 'Command1 Data' )
-                  . substr( $plm_string, 4, 2 ) . "\n";
-                $plm_message .= sprintf( "%20s: ", 'Command2 Data' )
-                  . substr( $plm_string, 6, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Command1 Data' ) . substr( $plm_string, 4, 2 ) . "\n";
+                $plm_message .= sprintf( "%20s: ", 'Command2 Data' ) . substr( $plm_string, 6, 2 ) . "\n";
                 $plm_ack_pos = 8;
             }
             elsif ( $plm_cmd_id eq '0272' ) {
@@ -2176,28 +2107,23 @@ sub plm_decode {
             }
             elsif ( $plm_cmd_id eq '0273' ) {
                 if ( length($plm_string) > 4 ) {
-                    $plm_message .= sprintf( "%20s: (", 'PLM Config Flags' )
-                      . substr( $plm_string, 4, 2 ) . ")\n";
+                    $plm_message .= sprintf( "%20s: (", 'PLM Config Flags' ) . substr( $plm_string, 4, 2 ) . ")\n";
                     my $flags = hex( substr( $plm_string, 4, 2 ) );
                     $plm_message .=
-                      sprintf( "%20s: Automatic Linking ", 'Bit 7' )
-                      . ( $flags & 0b10000000 ? 'Disabled' : 'Enabled' ) . "\n";
-                    $plm_message .= sprintf( "%20s: Monitor Mode ", 'Bit 6' )
-                      . ( $flags & 0b01000000 ? 'Enabled' : 'Disabled' ) . "\n";
-                    $plm_message .= sprintf( "%20s: Automatic LED ", 'Bit 5' )
-                      . ( $flags & 0b00100000 ? 'Disabled' : 'Enabled' ) . "\n";
-                    $plm_message .= sprintf( "%20s: Deadman Feature ", 'Bit 4' )
-                      . ( $flags & 0b00010000 ? 'Disabled' : 'Enabled' ) . "\n";
-                    $plm_message .= sprintf( "%20s: ", 'Spare 1' )
-                      . substr( $plm_string, 6, 2 ) . "\n";
-                    $plm_message .= sprintf( "%20s: ", 'Spare 2' )
-                      . substr( $plm_string, 8, 2 ) . "\n";
+                      sprintf( "%20s: Automatic Linking ", 'Bit 7' ) . ( $flags & 0b10000000 ? 'Disabled' : 'Enabled' ) . "\n";
+                    $plm_message .=
+                      sprintf( "%20s: Monitor Mode ", 'Bit 6' ) . ( $flags & 0b01000000 ? 'Enabled' : 'Disabled' ) . "\n";
+                    $plm_message .=
+                      sprintf( "%20s: Automatic LED ", 'Bit 5' ) . ( $flags & 0b00100000 ? 'Disabled' : 'Enabled' ) . "\n";
+                    $plm_message .=
+                      sprintf( "%20s: Deadman Feature ", 'Bit 4' ) . ( $flags & 0b00010000 ? 'Disabled' : 'Enabled' ) . "\n";
+                    $plm_message .= sprintf( "%20s: ", 'Spare 1' ) . substr( $plm_string, 6, 2 ) . "\n";
+                    $plm_message .= sprintf( "%20s: ", 'Spare 2' ) . substr( $plm_string, 8, 2 ) . "\n";
                 }
                 $plm_ack_pos = 10;
             }
             else {
-                $plm_message .= sprintf( "%20s: (", 'Undefined Cmd Data' )
-                  . substr( $plm_string, 4 ) . ")\n";
+                $plm_message .= sprintf( "%20s: (", 'Undefined Cmd Data' ) . substr( $plm_string, 4 ) . ")\n";
                 $plm_ack_pos = 255;
             }
 
@@ -2271,14 +2197,11 @@ sub insteon_message_flags_decode {
 
     my $flag_msg = hex( substr( $flags_string, 0, 1 ) ) >> 1;
     my $flag_ext = hex( substr( $flags_string, 0, 1 ) ) & 0b0001;
-    $flags_message .= sprintf( "%28s: (%03b) ", 'Message Type', $flag_msg )
-      . $message_string{$flag_msg} . "\n";
-    $flags_message .= sprintf( "%28s: (%01b) ", 'Message Length', $flag_ext )
-      . ( $flag_ext ? 'Extended Length' : 'Standard Length' ) . "\n";
-    $flags_message .= sprintf( "%28s: %d\n",
-        'Hops Left', hex( substr( $flags_string, 1, 1 ) ) >> 2 );
-    $flags_message .= sprintf( "%28s: %d\n",
-        'Max Hops', hex( substr( $flags_string, 1, 1 ) ) & 0b0011 );
+    $flags_message .= sprintf( "%28s: (%03b) ", 'Message Type', $flag_msg ) . $message_string{$flag_msg} . "\n";
+    $flags_message .=
+      sprintf( "%28s: (%01b) ", 'Message Length', $flag_ext ) . ( $flag_ext ? 'Extended Length' : 'Standard Length' ) . "\n";
+    $flags_message .= sprintf( "%28s: %d\n", 'Hops Left', hex( substr( $flags_string, 1, 1 ) ) >> 2 );
+    $flags_message .= sprintf( "%28s: %d\n", 'Max Hops',  hex( substr( $flags_string, 1, 1 ) ) & 0b0011 );
     return ($flags_message);
 }
 
@@ -2333,36 +2256,30 @@ sub insteon_decode {
     if ( $msg_type == 0 ) {
 
         #SD/ED: Standard/Extended Direct
-        $insteon_message .= insteon_decode_cmd( ( $extended ? 'ED' : 'SD' ),
-            $cmd1, $cmd2, $extended, $data );
+        $insteon_message .= insteon_decode_cmd( ( $extended ? 'ED' : 'SD' ), $cmd1, $cmd2, $extended, $data );
     }
     elsif ( $msg_type == 1 or $msg_type == 5 ) {
 
         #SDA/EDA: Standard/Extended Direct ACK/NACK
-        $insteon_message .= insteon_decode_cmd( ( $extended ? 'EDA' : 'SDA' ),
-            $cmd1, $cmd2, $extended, $data );
+        $insteon_message .= insteon_decode_cmd( ( $extended ? 'EDA' : 'SDA' ), $cmd1, $cmd2, $extended, $data );
     }
     elsif ( $msg_type == 6 ) {
 
         #SA: Standard All-Link Broadcast
-        $insteon_message .=
-          insteon_decode_cmd( 'SA', $cmd1, $cmd2, $extended, $data );
+        $insteon_message .= insteon_decode_cmd( 'SA', $cmd1, $cmd2, $extended, $data );
     }
     elsif ( $msg_type == 2 ) {
 
         #SC: Standard Direct Cleanup
-        $insteon_message .=
-          insteon_decode_cmd( 'SC', $cmd1, $cmd2, $extended, $data );
+        $insteon_message .= insteon_decode_cmd( 'SC', $cmd1, $cmd2, $extended, $data );
     }
     elsif ( $msg_type == 3 or $msg_type == 7 ) {
 
         #SCA: Standard Direct Cleanup ACK/NACK
-        $insteon_message .=
-          insteon_decode_cmd( 'SCA', $cmd1, $cmd2, $extended, $data );
+        $insteon_message .= insteon_decode_cmd( 'SCA', $cmd1, $cmd2, $extended, $data );
     }
     else {
-        $insteon_message .=
-          sprintf( "%28s: ", '' ) . "Insteon message type not decoded\n";
+        $insteon_message .= sprintf( "%28s: ", '' ) . "Insteon message type not decoded\n";
     }
 
     return $insteon_message;
@@ -2391,10 +2308,7 @@ sub insteon_decode_cmd {
         if ( !defined($cmdDecoder1) ) {
 
             #still not found so quit trying to decode
-            $insteon_message .=
-                sprintf( "%28s: ", 'Cmd 1' )
-              . $cmd1
-              . " Insteon command not decoded\n";
+            $insteon_message .= sprintf( "%28s: ", 'Cmd 1' ) . $cmd1 . " Insteon command not decoded\n";
             $insteon_message .= sprintf( "%28s: ", 'Cmd 2' ) . $cmd2 . "\n";
             $insteon_message .= sprintf( "%28s: ", 'D1-D14' ) . $Data . "\n"
               if ($extended);
@@ -2422,51 +2336,32 @@ sub insteon_decode_cmd {
         if ( !defined($cmdDecoder2) ) {
 
             #still not found so don't decode
-            $insteon_message .=
-                sprintf( "%28s: ", 'Cmd 1' )
-              . $cmd1
-              . " Insteon command not decoded\n";
+            $insteon_message .= sprintf( "%28s: ", 'Cmd 1' ) . $cmd1 . " Insteon command not decoded\n";
             $insteon_message .= sprintf( "%28s: ", 'Cmd 2' ) . $cmd2 . "\n";
             $insteon_message .= sprintf( "%28s: ", 'D1-D14' ) . $Data . "\n"
               if ($extended);
         }
         else {
-            $insteon_message .=
-                sprintf( "%28s: (", 'Cmd 1' )
-              . $cmd1 . ") "
-              . $cmdDecoder2->{'Cmd1Name'} . "\n";
-            $insteon_message .=
-                sprintf( "%28s: (", 'Cmd 2' )
-              . $cmd2 . ") "
-              . $cmdDecoder2->{'Cmd2Name'} . "\n";
-            $insteon_message .= sprintf( "%28s: ", 'D1-D14' ) . $Data . "\n"
+            $insteon_message .= sprintf( "%28s: (", 'Cmd 1' ) . $cmd1 . ") " . $cmdDecoder2->{'Cmd1Name'} . "\n";
+            $insteon_message .= sprintf( "%28s: (", 'Cmd 2' ) . $cmd2 . ") " . $cmdDecoder2->{'Cmd2Name'} . "\n";
+            $insteon_message .= sprintf( "%28s: ",  'D1-D14' ) . $Data . "\n"
               if ($extended);
         }
     }
     elsif ( $cmdDecoder1->{'Cmd2Flag'} eq 'Value' ) {
-        $insteon_message .=
-            sprintf( "%28s: (", 'Cmd 1' )
-          . $cmd1 . ") "
-          . $cmdDecoder1->{'Cmd1Name'} . "\n";
-        $insteon_message .=
-            sprintf( "%28s: (", 'Cmd 2' )
-          . $cmd2 . ") "
-          . $cmdDecoder1->{'Cmd2Name'} . "\n";
-        $insteon_message .= sprintf( "%28s: ", 'D1-D14' ) . $Data . "\n"
+        $insteon_message .= sprintf( "%28s: (", 'Cmd 1' ) . $cmd1 . ") " . $cmdDecoder1->{'Cmd1Name'} . "\n";
+        $insteon_message .= sprintf( "%28s: (", 'Cmd 2' ) . $cmd2 . ") " . $cmdDecoder1->{'Cmd2Name'} . "\n";
+        $insteon_message .= sprintf( "%28s: ",  'D1-D14' ) . $Data . "\n"
           if ($extended);
     }
     elsif ( $cmdDecoder1->{'Cmd2Flag'} eq 'NA' ) {
-        $insteon_message .=
-            sprintf( "%28s: (", 'Cmd 1' )
-          . $cmd1 . ") "
-          . $cmdDecoder1->{'Cmd1Name'} . "\n";
-        $insteon_message .= sprintf( "%28s: ", 'Cmd 2' ) . $cmd2 . "\n";
-        $insteon_message .= sprintf( "%28s: ", 'D1-D14' ) . $Data . "\n"
+        $insteon_message .= sprintf( "%28s: (", 'Cmd 1' ) . $cmd1 . ") " . $cmdDecoder1->{'Cmd1Name'} . "\n";
+        $insteon_message .= sprintf( "%28s: ",  'Cmd 2' ) . $cmd2 . "\n";
+        $insteon_message .= sprintf( "%28s: ",  'D1-D14' ) . $Data . "\n"
           if ($extended);
     }
     else {
-        $insteon_message .= "Parse database has undefined Cmd2Flag: "
-          . $cmdDecoder1->{'Cmd2Flag'};
+        $insteon_message .= "Parse database has undefined Cmd2Flag: " . $cmdDecoder1->{'Cmd2Flag'};
     }
 
     return $insteon_message;
diff --git a/lib/Insteon/PLMTerminal.pl b/lib/Insteon/PLMTerminal.pl
index 7580f9d91..19215bd7c 100755
--- a/lib/Insteon/PLMTerminal.pl
+++ b/lib/Insteon/PLMTerminal.pl
@@ -133,9 +133,8 @@ =head1 SEE ALSO
 $device->stopbits(1);
 $device->dtr_active(1) or warn "Could not set dtr_active(1)";
 $device->handshake("none");
-$device->read_char_time(0);    # don't wait for each character
-$device->read_const_time(RX_BLOCKTIME)
-  ;    # wait RX_BLOCKTIME (ms) per unfulfilled "read" call
+$device->read_char_time(0);                # don't wait for each character
+$device->read_const_time(RX_BLOCKTIME);    # wait RX_BLOCKTIME (ms) per unfulfilled "read" call
 $device->write_settings || die "Could not set up port\n";
 print "Done setting port parameters\n";
 
@@ -165,9 +164,7 @@ sub handler_ctlc {
         #Check to see if an entire message was received
         if ( plmValidMessage($RxMessage) ) {
             print "PLM=>" . unpack( 'H*', $RxMessage ) . "\n";
-            print Insteon::MessageDecoder::plm_decode(
-                unpack( 'H*', $RxMessage ) )
-              . "\n";
+            print Insteon::MessageDecoder::plm_decode( unpack( 'H*', $RxMessage ) ) . "\n";
             $RxMessage = '';
             $RxTimeout = RX_TIMEOUT;
         }
@@ -180,8 +177,7 @@ sub handler_ctlc {
     if ( $RxTimeout == 0 ) {
         print("RX Timeout; command not parsed\n");
         print( "Dumping:  " . unpack( 'H*', $RxMessage ) . "\n" );
-        print Insteon::MessageDecoder::plm_decode( unpack( 'H*', $RxMessage ) )
-          . "\n";
+        print Insteon::MessageDecoder::plm_decode( unpack( 'H*', $RxMessage ) ) . "\n";
 
         $RxMessage = '';
         $RxTimeout = RX_TIMEOUT;
@@ -192,7 +188,7 @@ sub handler_ctlc {
     #  but print a new line for visual separation
     my $key;
     while ( defined( $key = ReadKey(-1) ) ) {
-        if ( ( $key eq "\n" or $key eq "\r" ) and $TxMessage ne '' ) {   # enter
+        if ( ( $key eq "\n" or $key eq "\r" ) and $TxMessage ne '' ) {    # enter
             $TxMessage = insertChecksum($TxMessage)
               if ( !$parms->{'nochecksum'} );
             print "\nPLM<=" . $TxMessage . "\n";
@@ -234,7 +230,7 @@ sub plmValidMessage {
         '58' => 3,
         '60' => 9,
         '61' => 6,
-        '62' => 23,  # could get 9 or 23 (Standard or Extended Message received)
+        '62' => 23,    # could get 9 or 23 (Standard or Extended Message received)
         '63' => 5,
         '64' => 5,
         '65' => 3,
diff --git a/lib/Insteon/Security.pm b/lib/Insteon/Security.pm
index 97fef7f71..ce7d22e73 100644
--- a/lib/Insteon/Security.pm
+++ b/lib/Insteon/Security.pm
@@ -149,8 +149,7 @@ sub get_extended_info {
     my $root  = $self->get_root();
     my $extra = '000000000000000000000000000000';
     $$root{_ext_set_get_action} = "get";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     if ($no_retry) {
         $message->retry_count(1);
     }
@@ -180,9 +179,7 @@ sub set_query_timer {
     my ( $self, $minutes ) = @_;
     my $root = $self->get_root();
     $$root{query_timer} = sprintf( "%u", $minutes );
-    ::print_log( "[Insteon::MotionSensor] Set query timer to "
-          . $$root{query_timer}
-          . " minutes" );
+    ::print_log( "[Insteon::MotionSensor] Set query timer to " . $$root{query_timer} . " minutes" );
     return;
 }
 
@@ -202,14 +199,12 @@ MisterHouse.
 sub set_led_brightness {
     my ( $self, $value ) = @_;
     my $root = $self->get_root();
-    ::print_log(
-        "[Insteon::MotionSensor] Setting LED Brightness to $value of 255");
+    ::print_log("[Insteon::MotionSensor] Setting LED Brightness to $value of 255");
     $value = sprintf( "%02x", $value );
     my $extra = '000002' . $value;
     $extra .= '0' x ( 30 - length $extra );
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -238,14 +233,12 @@ sub set_timeout {
     my $root = $self->get_root();
     $value = ( sprintf( "%d", ( $value / 30 ) ) - 1 );
     my $readable_value = ( $value + 1 ) * 30;
-    ::print_log(
-        "[Insteon::MotionSensor] Setting timeout to $readable_value seconds.");
+    ::print_log("[Insteon::MotionSensor] Setting timeout to $readable_value seconds.");
     $value = sprintf( "%02x", $value );
     my $extra = '000003' . $value;
     $extra .= '0' x ( 30 - length $extra );
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -271,15 +264,12 @@ MisterHouse.
 sub set_light_sensitivity {
     my ( $self, $value ) = @_;
     my $root = $self->get_root();
-    ::print_log(
-        "[Insteon::MotionSensor] Setting light sensitivity level to $value of 255."
-    );
+    ::print_log( "[Insteon::MotionSensor] Setting light sensitivity level to $value of 255." );
     $value = sprintf( "%02x", $value );
     my $extra = '000004' . $value;
     $extra .= '0' x ( 30 - length $extra );
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -411,9 +401,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        main::print_log(
-            "[Insteon::MotionSensor] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::MotionSensor] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             if ( defined( $$root{_set_bit_action} ) ) {
@@ -424,8 +412,7 @@ sub _process_message {
                 $$root{_set_bit_action} = undef;
             }
             else {
-                main::print_log(
-                    "[Insteon::MotionSensor] Clearing active message")
+                main::print_log("[Insteon::MotionSensor] Clearing active message")
                   if $self->debuglevel( 1, 'insteon' );
             }
             $clear_message = 1;
@@ -484,10 +471,7 @@ sub _process_message {
                     my $extra = '000005' . $bitflags;
                     $extra .= '0' x ( 30 - length $extra );
                     $$root{_ext_set_get_action} = "set";
-                    my $message = new Insteon::InsteonMessage(
-                        'insteon_ext_send', $root,
-                        'extended_set_get', $extra
-                    );
+                    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
                     $root->_send_cmd($message);
                 }
                 else {
@@ -503,9 +487,8 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         else {
-            main::print_log( "[Insteon::MotionSensor] WARN: Unknown Extended "
-                  . "Set/Get Data Message Received for "
-                  . $self->get_object_name )
+            main::print_log(
+                "[Insteon::MotionSensor] WARN: Unknown Extended " . "Set/Get Data Message Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
         }
     }
@@ -817,8 +800,7 @@ sub set_awake_time {
     my $root  = $self->get_root();
     my $extra = '000102' . $awake . '0000000000000000000000';
     $$root{_ext_set_get_action} = "set";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     $root->_send_cmd($message);
     return;
 }
@@ -836,8 +818,7 @@ sub get_extended_info {
     my $root  = $self->get_root();
     my $extra = '000100000000000000000000000000';
     $$root{_ext_set_get_action} = "get";
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $root, 'extended_set_get', $extra );
     if ($no_retry) {
         $message->retry_count(1);
     }
@@ -873,9 +854,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        main::print_log(
-            "[Insteon::TriggerLinc] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::TriggerLinc] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             main::print_log("[Insteon::TriggerLinc] Clearing active message")
@@ -891,18 +870,14 @@ sub _process_message {
 
             #D3 = Awake Time;
             my $awake = ( hex( substr( $msg{extra}, 6, 2 ) ) );
-            main::print_log( "[Insteon::TriggerLinc] The awake seconds "
-                  . "for device "
-                  . $self->get_object_name
-                  . " is set to: "
-                  . $awake );
+            main::print_log(
+                "[Insteon::TriggerLinc] The awake seconds " . "for device " . $self->get_object_name . " is set to: " . $awake );
             $clear_message = 1;
             $self->_process_command_stack(%msg);
         }
         else {
-            main::print_log( "[Insteon::TriggerLinc] WARN: Corrupt Extended "
-                  . "Set/Get Data Received for "
-                  . $self->get_object_name )
+            main::print_log(
+                "[Insteon::TriggerLinc] WARN: Corrupt Extended " . "Set/Get Data Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
         }
     }
diff --git a/lib/Insteon/Thermostat.pm b/lib/Insteon/Thermostat.pm
index bc2aa3092..f252f6e04 100755
--- a/lib/Insteon/Thermostat.pm
+++ b/lib/Insteon/Thermostat.pm
@@ -204,9 +204,7 @@ Causes thermostat to return mode; detected as state change if mode changes
 sub poll_mode {
     my ($self) = @_;
     $$self{_control_action} = "mode";
-    my $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, 'thermostat_control',
-        '02' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'thermostat_control', '02' );
     $self->_send_cmd($message);
     return;
 }
@@ -232,8 +230,7 @@ sub fan {
         $state = 'fan_auto';
     }
     else {
-        main::print_log(
-            "[Insteon::Thermostat] ERROR: Invalid Fan state: $state");
+        main::print_log("[Insteon::Thermostat] ERROR: Invalid Fan state: $state");
         return ();
     }
     $self->_send_cmd( $self->simple_message( 'thermostat_control', $fan ) );
@@ -250,15 +247,10 @@ sub cool_setpoint {
     main::print_log("[Insteon::Thermostat] Cool setpoint -> $temp")
       if $self->debuglevel( 1, 'insteon' );
     if ( $temp !~ /^\d+$/ ) {
-        main::print_log(
-            "[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
+        main::print_log("[Insteon::Thermostat] ERROR: cool_setpoint $temp not numeric");
         return;
     }
-    $self->_send_cmd(
-        $self->simple_message(
-            'thermostat_setpoint_cool', sprintf( '%02X', ( $temp * 2 ) )
-        )
-    );
+    $self->_send_cmd( $self->simple_message( 'thermostat_setpoint_cool', sprintf( '%02X', ( $temp * 2 ) ) ) );
 }
 
 =item C<heat_setpoint()>
@@ -272,15 +264,10 @@ sub heat_setpoint {
     main::print_log("[Insteon::Thermostat] Heat setpoint -> $temp")
       if $self->debuglevel( 1, 'insteon' );
     if ( $temp !~ /^\d+$/ ) {
-        main::print_log(
-            "[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
+        main::print_log("[Insteon::Thermostat] ERROR: heat_setpoint $temp not numeric");
         return;
     }
-    $self->_send_cmd(
-        $self->simple_message(
-            'thermostat_setpoint_heat', sprintf( '%02X', ( $temp * 2 ) )
-        )
-    );
+    $self->_send_cmd( $self->simple_message( 'thermostat_setpoint_heat', sprintf( '%02X', ( $temp * 2 ) ) ) );
 }
 
 =item C<poll_temp()>
@@ -292,8 +279,7 @@ Causes thermostat to return temp; detected as state change.
 sub poll_temp {
     my ($self) = @_;
     $$self{_zone_action} = "temp";
-    my $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-        'thermostat_get_zone_info', '00' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'thermostat_get_zone_info', '00' );
     $self->_send_cmd($message);
     return;
 }
@@ -324,8 +310,7 @@ sub poll_setpoint {
     my ($self) = @_;
     $self->poll_mode();
     $$self{_zone_action} = "setpoint";
-    my $message = new Insteon::InsteonMessage( 'insteon_send', $self,
-        'thermostat_get_zone_info', '20' );
+    my $message = new Insteon::InsteonMessage( 'insteon_send', $self, 'thermostat_get_zone_info', '20' );
     $self->_send_cmd($message);
     return;
 }
@@ -415,9 +400,8 @@ sub _is_info_request {
     my $is_info_request = ( $cmd eq 'thermostat_get_zone_info' ) ? 1 : 0;
     if ($is_info_request) {
         my $val = $msg{extra};
-        main::print_log(
-            "[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val"
-        ) if $self->debuglevel( 1, 'insteon' );
+        main::print_log( "[Insteon::Thermostat] Processing is_info_request for $cmd with value: $val" )
+          if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_zone_action} eq "temp" ) {
             $val = ( hex $val ) / 2;    # returned value is twice the real value
             if ( exists $$self{'temp'} and ( $$self{'temp'} != $val ) ) {
@@ -427,7 +411,7 @@ sub _is_info_request {
         }
         elsif ( $$self{_zone_action} eq 'setpoint' ) {
             $val = ( hex $val ) / 2;    # returned value is twice the real value
-              # in auto modes, expect direct message with cool_setpoint to follow
+                                        # in auto modes, expect direct message with cool_setpoint to follow
             if ( $self->get_mode() eq 'auto' or 'program_auto' ) {
                 $self->_heat_sp($val);
                 $$self{'m_pending_setpoint'} = 1;
@@ -445,8 +429,7 @@ sub _is_info_request {
     else    #This was not a thermostat info_request
     {
         #Check if this was a generic info_request
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 
@@ -471,9 +454,7 @@ sub _process_message {
     }
     elsif ( $msg{command} eq "thermostat_setpoint_cool" && $msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-            "[Insteon::Thermostat] Received ACK of cool setpoint " . "for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermostat] Received ACK of cool setpoint " . "for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->_cool_sp( ( hex( $msg{extra} ) / 2 ) );
         $clear_message = 1;
@@ -481,9 +462,7 @@ sub _process_message {
     }
     elsif ( $msg{command} eq "thermostat_setpoint_heat" && $msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-            "[Insteon::Thermostat] Received ACK of heat setpoint " . "for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermostat] Received ACK of heat setpoint " . "for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->_heat_sp( ( hex( $msg{extra} ) / 2 ) );
         $clear_message = 1;
@@ -493,9 +472,8 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         # we got our cool setpoint in auto mode
-        main::print_log(
-            "[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}"
-        ) if $self->debuglevel( 1, 'insteon' );
+        main::print_log( "[Insteon::Thermostat] Processing data for $msg{command} with value: $msg{extra}" )
+          if $self->debuglevel( 1, 'insteon' );
         my $val = ( hex $msg{extra} ) / 2;
         $self->_cool_sp($val);
         $$self{m_setpoint_pending} = 0;
@@ -534,12 +512,10 @@ sub parent_event {
         $$self{child_status}->set_receive( $self->get_status(), $self );
     }
     elsif ( $p_state eq 'low_humid_setpoint_change' ) {
-        $$self{child_setpoint_humid_l}
-          ->set_receive( $self->get_low_humid_sp(), $self );
+        $$self{child_setpoint_humid_l}->set_receive( $self->get_low_humid_sp(), $self );
     }
     elsif ( $p_state eq 'high_humid_setpoint_change' ) {
-        $$self{child_setpoint_humid_h}
-          ->set_receive( $self->get_high_humid_sp(), $self );
+        $$self{child_setpoint_humid_h}->set_receive( $self->get_high_humid_sp(), $self );
     }
 }
 
@@ -615,8 +591,7 @@ sub mode {
         $mode = "0c";
     }
     else {
-        main::print_log(
-            "[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
+        main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
         return ();
     }
     $$self{_control_action} = "mode";
@@ -628,9 +603,8 @@ sub _is_info_request {
     my $is_info_request;
     if ( $cmd eq 'thermostat_control' && $$self{_control_action} eq "mode" ) {
         my $val = $msg{extra};
-        main::print_log(
-            "[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val"
-        ) if $self->debuglevel( 1, 'insteon' );
+        main::print_log( "[Insteon::Thermo_i1] Processing is_info_request for $cmd with value: $val" )
+          if $self->debuglevel( 1, 'insteon' );
         if ( $val eq '00' ) {
             $self->_mode('off');
         }
@@ -664,8 +638,7 @@ sub _is_info_request {
     else    #This was not a thermo_1 info_request
     {
         #Check if this was a generic info_request
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 }
@@ -674,8 +647,7 @@ sub _is_info_request {
 sub simple_message {
     my ( $self, $type, $extra ) = @_;
     my $message;
-    $message =
-      new Insteon::InsteonMessage( 'insteon_send', $self, $type, $extra );
+    $message = new Insteon::InsteonMessage( 'insteon_send', $self, $type, $extra );
     return $message;
 }
 
@@ -708,8 +680,7 @@ B<Insteon::Thermostat>
 package Insteon::Thermo_i2CS;
 use strict;
 
-@Insteon::Thermo_i2CS::ISA =
-  ( 'Insteon::Thermostat', 'Insteon::MultigroupDevice' );
+@Insteon::Thermo_i2CS::ISA = ( 'Insteon::Thermostat', 'Insteon::MultigroupDevice' );
 
 our %message_types = (
     %Insteon::Thermostat::message_types,
@@ -726,10 +697,7 @@ sub init {
     $$self{message_types} = \%message_types;
 
     #Set saved state unique to i2CS devices
-    $self->restore_data(
-        'humid',         'cooling',       'heating', 'humidifying',
-        'dehumidifying', 'high_humid_sp', 'low_humid_sp'
-    );
+    $self->restore_data( 'humid', 'cooling', 'heating', 'humidifying', 'dehumidifying', 'high_humid_sp', 'low_humid_sp' );
     if ( $self->group eq '01' ) {
         $self->tie_event('$object->_cooling("$state")');
     }
@@ -757,12 +725,9 @@ sub derive_link_state {
     if ( $self->group eq '01' ) {
         $link_state = 'off';    #default to off if bad state
         my @allowed_states = (
-            'on',                        'off',
-            'temp_change',               'status_change',
-            'humid_change',              'high_humid_setpoint_change',
-            'low_humid_setpoint_change', 'heat_setpoint_change',
-            'cool_setpoint_change',      'fan_mode_change',
-            'mode_change'
+            'on',                   'off',                        'temp_change',               'status_change',
+            'humid_change',         'high_humid_setpoint_change', 'low_humid_setpoint_change', 'heat_setpoint_change',
+            'cool_setpoint_change', 'fan_mode_change',            'mode_change'
         );
         if ( grep( /$p_state/i, @allowed_states ) ) {
             $link_state = $p_state;
@@ -782,9 +747,7 @@ sub sync_links {
     if ( !$audit_mode && ref $bcast_obj && $self->is_root ) {
 
         #Make sure thermostat is set to broadcast changes
-        ::print_log(
-            "[Insteon::Thermo_i2CS] (sync_links) Enabling thermostat broadcast setting."
-        ) unless $audit_mode;
+        ::print_log( "[Insteon::Thermo_i2CS] (sync_links) Enabling thermostat broadcast setting." ) unless $audit_mode;
         my $extra = "000008";
         my $message = $self->simple_message( 'extended_set_get', $extra );
         $$self{_ext_set_get_action} = 'set';
@@ -792,8 +755,7 @@ sub sync_links {
     }
 
     # Call the main sync_links code
-    return $self->SUPER::sync_links( $audit_mode, $callback,
-        $failure_callback );
+    return $self->SUPER::sync_links( $audit_mode, $callback, $failure_callback );
 }
 
 =item C<_poll_simple()>
@@ -842,11 +804,8 @@ Prints the currently known status to the log as a text string.
 
 sub print_status() {
     my ($self) = @_;
-    my $root = $self->get_root();
-    my $output =
-        "[Insteon:Thermo_i2CS] The status of "
-      . $root->get_object_name
-      . " is:\n";
+    my $root   = $self->get_root();
+    my $output = "[Insteon:Thermo_i2CS] The status of " . $root->get_object_name . " is:\n";
     $output .= "Mode: ";
     $output .= $root->get_mode();
     $output .= "; Status: ";
@@ -866,9 +825,9 @@ sub print_status() {
     $output        .= "; Cool SP: ";
     $output        .= $root->get_cool_sp();
     $output        .= "; High Humid SP: ";
-    $output .= $root->get_high_humid_sp();
-    $output .= "; Low Humid SP: ";
-    $output .= $root->get_low_humid_sp();
+    $output        .= $root->get_high_humid_sp();
+    $output        .= "; Low Humid SP: ";
+    $output        .= $root->get_low_humid_sp();
     ::print_log($output);
 }
 
@@ -886,12 +845,10 @@ sub get_humid() {
 sub request_status {
     my ($self) = @_;
     $self = $self->get_root();
-    my $self_name = $self->get_object_name;
-    my $failure_callback =
-      "::print_log('[Insteon:Thermo_i2CS] ERROR: Failed to get status for $self_name.');";
-    my $print_callback = $self_name . "->print_status";
-    my $humid_callback = $self_name
-      . "->_poll_humid_setpoints(\'$print_callback\', \"$failure_callback\")";
+    my $self_name        = $self->get_object_name;
+    my $failure_callback = "::print_log('[Insteon:Thermo_i2CS] ERROR: Failed to get status for $self_name.');";
+    my $print_callback   = $self_name . "->print_status";
+    my $humid_callback   = $self_name . "->_poll_humid_setpoints(\'$print_callback\', \"$failure_callback\")";
     $self->_poll_simple( $humid_callback, $failure_callback );
 }
 
@@ -915,9 +872,7 @@ sub _process_message {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
 
         #If this was a get request don't clear until data packet received
-        main::print_log(
-            "[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Extended Set/Get ACK Received for " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         if ( $$self{_ext_set_get_action} eq 'set' ) {
             main::print_log("[Insteon::Thermo_i2CS] Clearing active message")
@@ -927,10 +882,7 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         elsif ( $$self{_ext_set_get_action} eq 'set_high_humid' ) {
-            main::print_log(
-                    "[Insteon::Thermostat] Received ACK of high humid setpoint "
-                  . "for "
-                  . $self->get_object_name )
+            main::print_log( "[Insteon::Thermostat] Received ACK of high humid setpoint " . "for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
             $self->_high_humid_sp( $$self{_high_humid_pending} );
             $clear_message              = 1;
@@ -939,10 +891,7 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         elsif ( $$self{_ext_set_get_action} eq 'set_low_humid' ) {
-            main::print_log(
-                    "[Insteon::Thermostat] Received ACK of low humid setpoint "
-                  . "for "
-                  . $self->get_object_name )
+            main::print_log( "[Insteon::Thermostat] Received ACK of low humid setpoint " . "for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
             $self->_low_humid_sp( $$self{_low_humid_pending} );
             $clear_message              = 1;
@@ -954,9 +903,7 @@ sub _process_message {
     elsif ( $msg{command} eq "extended_set_get" && $msg{is_extended} ) {
         if ( substr( $msg{extra}, 0, 4 ) eq "0201" ) {
             $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-            main::print_log( "[Insteon::Thermo_i2CS] Extended Set/Get Data "
-                  . "Received for "
-                  . $self->get_object_name )
+            main::print_log( "[Insteon::Thermo_i2CS] Extended Set/Get Data " . "Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
 
             #0 = 2				#14 = Cool SP
@@ -984,22 +931,16 @@ sub _process_message {
                 my $message;
                 my $extra;
                 my @time_array = localtime(time);
-                my @req_items  = (
-                    $time_array[6], $time_array[2],
-                    $time_array[1], $time_array[0]
-                );
-                my $time_str = '';
+                my @req_items  = ( $time_array[6], $time_array[2], $time_array[1], $time_array[0] );
+                my $time_str   = '';
                 foreach (@req_items) {
                     $time_str .= sprintf( "%02x", $_ );
                 }
-                $extra =
-                  $extra . "0202" . $time_str . substr( $msg{extra}, 12, 18 );
+                $extra = $extra . "0202" . $time_str . substr( $msg{extra}, 12, 18 );
 
                 #This will include the prior CRC16 message, but it will
                 #get overwritten with the correct value in Message.pm
-                $message =
-                  new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-                    'extended_set_get', $extra );
+                $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
                 $$message{add_crc16}        = 1;
                 $$self{_ext_set_get_action} = 'set';
                 $$self{sync_time}           = undef;
@@ -1040,51 +981,38 @@ sub _process_message {
             $self->_process_command_stack(%msg);
         }
         else {
-            main::print_log( "[Insteon::Thermo_i2CS] WARN: Unknown Extended "
-                  . "Set/Get Data Received for "
-                  . $self->get_object_name )
+            main::print_log(
+                "[Insteon::Thermo_i2CS] WARN: Unknown Extended " . "Set/Get Data Received for " . $self->get_object_name )
               if $self->debuglevel( 1, 'insteon' );
         }
     }
     elsif ( $msg{command} eq "status_temp" && !$msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-            "[Insteon::Thermo_i2CS] Received Temp Change Message " . "from "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Received Temp Change Message " . "from " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->hex_short_temp( $msg{extra} );
     }
     elsif ( $msg{command} eq "status_mode" && !$msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-            "[Insteon::Thermo_i2CS] Received Mode Change Message " . "from "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Received Mode Change Message " . "from " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->status_mode( $msg{extra} );
     }
     elsif ( $msg{command} eq "status_cool" && !$msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-                "[Insteon::Thermo_i2CS] Received Cool Setpoint Change Message "
-              . "from "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Received Cool Setpoint Change Message " . "from " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->hex_cool( $msg{extra} );
     }
     elsif ( $msg{command} eq "status_humid" && !$msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-            "[Insteon::Thermo_i2CS] Received Humidity Change Message " . "from "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Received Humidity Change Message " . "from " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->hex_humid( $msg{extra} );
     }
     elsif ( $msg{command} eq "status_heat" && !$msg{is_ack} ) {
         $self->default_hop_count( $msg{maxhops} - $msg{hopsleft} );
-        main::print_log(
-                "[Insteon::Thermo_i2CS] Received Heat Setpoint Change Message "
-              . "from "
-              . $self->get_object_name )
+        main::print_log( "[Insteon::Thermo_i2CS] Received Heat Setpoint Change Message " . "from " . $self->get_object_name )
           if $self->debuglevel( 1, 'insteon' );
         $self->hex_heat( $msg{extra} );
     }
@@ -1099,9 +1027,8 @@ sub _is_info_request {
     my $is_info_request;
     if ( $cmd eq 'thermostat_control' && $$self{_control_action} eq "mode" ) {
         my $val = $msg{extra};
-        main::print_log(
-            "[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val"
-        ) if $self->debuglevel( 1, 'insteon' );
+        main::print_log( "[Insteon::Thermo_i2CS] Processing is_info_request for $cmd with value: $val" )
+          if $self->debuglevel( 1, 'insteon' );
         if ( $val eq '09' ) {
             $self->_mode('Off');
         }
@@ -1123,8 +1050,7 @@ sub _is_info_request {
     else    #This was not a thermo_i2CS info_request
     {
         #Check if this was a generic info_request
-        $is_info_request =
-          $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
+        $is_info_request = $self->SUPER::_is_info_request( $cmd, $ack_setby, %msg );
     }
     return $is_info_request;
 }
@@ -1333,8 +1259,7 @@ sub mode {
         $mode = "0a" if $self->_aldb->isa('Insteon::ALDB_i2');
     }
     else {
-        main::print_log(
-            "[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
+        main::print_log("[Insteon::Thermostat] ERROR: Invalid Mode state: $state");
         return ();
     }
     $$self{_control_action} = "mode";
@@ -1346,8 +1271,7 @@ sub simple_message {
     my ( $self, $type, $extra ) = @_;
     my $message;
     $extra = $extra . "0000000000000000000000000000";
-    $message =
-      new Insteon::InsteonMessage( 'insteon_ext_send', $self, $type, $extra );
+    $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, $type, $extra );
     return $message;
 }
 
@@ -1375,24 +1299,19 @@ Sets the high humidity setpoint.
 
 sub high_humid_setpoint {
     my ( $self, $value ) = @_;
-    main::print_log(
-        "[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value")
+    main::print_log("[Insteon::Thermo_i2CS] Setting high humid setpoint -> $value")
       if $self->debuglevel( 1, 'insteon' );
     if ( $value !~ /^\d+$/ ) {
-        main::print_log(
-            "[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
+        main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
         return;
     }
     if ( $value > 99 || $value < 1 ) {
-        main::print_log(
-            "[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value"
-        );
+        main::print_log( "[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value" );
         return;
     }
     my $extra = "00000B" . sprintf( "%02x", $value );
     $extra .= '0' x ( 30 - length $extra );
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $$self{_ext_set_get_action} = 'set_high_humid';
     $$self{_high_humid_pending} = $value;
     $self->_send_cmd($message);
@@ -1406,24 +1325,19 @@ Sets the low humidity setpoint.
 
 sub low_humid_setpoint {
     my ( $self, $value ) = @_;
-    main::print_log(
-        "[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value")
+    main::print_log("[Insteon::Thermo_i2CS] Setting low humid setpoint -> $value")
       if $self->debuglevel( 1, 'insteon' );
     if ( $value !~ /^\d+$/ ) {
-        main::print_log(
-            "[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
+        main::print_log("[Insteon::Thermo_i2CS] ERROR: Setpoint $value not numeric");
         return;
     }
     if ( $value > 99 || $value < 1 ) {
-        main::print_log(
-            "[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value"
-        );
+        main::print_log( "[Insteon::Thermo_i2CS] ERROR: Setpoint must be between 1-99, not $value" );
         return;
     }
     my $extra = "00000C" . sprintf( "%02x", $value );
     $extra .= '0' x ( 30 - length $extra );
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $$self{_ext_set_get_action} = 'set_low_humid';
     $$self{_low_humid_pending}  = $value;
     $self->_send_cmd($message);
@@ -1439,8 +1353,7 @@ sub _poll_humid_setpoints {
     my ( $self, $success_callback, $failure_callback ) = @_;
     my $extra = "00000001";
     $extra .= '0' x ( 30 - length $extra );
-    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self,
-        'extended_set_get', $extra );
+    my $message = new Insteon::InsteonMessage( 'insteon_ext_send', $self, 'extended_set_get', $extra );
     $$self{_ext_set_get_action} = 'get';
     $message->failure_callback($failure_callback);
     $message->success_callback($success_callback);
@@ -1513,8 +1426,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Off', 'Heat', 'Cool', 'Auto', 'Program' );
     $$self{parent}{child_mode} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "mode_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "mode_change" );
     return $self;
 }
 
@@ -1527,10 +1439,7 @@ sub set {
         }
     }
     if ($found_state) {
-        ::print_log( "[Insteon::Thermo_i2CS] Received set mode request to "
-              . $p_state
-              . " for device "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::Thermo_i2CS] Received set mode request to " . $p_state . " for device " . $self->get_object_name );
         $$self{parent}->mode($p_state);
     }
 }
@@ -1578,8 +1487,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Auto', 'On' );
     $$self{parent}{child_fan} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "fan_mode_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "fan_mode_change" );
     return $self;
 }
 
@@ -1592,10 +1500,7 @@ sub set {
         }
     }
     if ($found_state) {
-        ::print_log( "[Insteon::Thermo_i2CS] Received set fan to "
-              . $p_state
-              . " for device "
-              . $self->get_object_name );
+        ::print_log( "[Insteon::Thermo_i2CS] Received set fan to " . $p_state . " for device " . $self->get_object_name );
         $$self{parent}->fan($p_state);
     }
 }
@@ -1642,8 +1547,7 @@ sub new {
     bless $self, $class;
     $$self{parent} = $parent;
     $$self{parent}{child_temp} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "temp_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "temp_change" );
     return $self;
 }
 
@@ -1689,8 +1593,7 @@ sub new {
     bless $self, $class;
     $$self{parent} = $parent;
     $$self{parent}{child_humidity} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "humid_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "humid_change" );
     return $self;
 }
 
@@ -1737,8 +1640,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Cooler', 'Warmer' );
     $$self{parent}{child_setpoint_h} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "heat_setpoint_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "heat_setpoint_change" );
     return $self;
 }
 
@@ -1752,10 +1654,7 @@ sub set {
     }
     if ($found_state) {
         ::print_log(
-                "[Insteon::Thermo_i2CS] Received request to set heat setpoint "
-              . $p_state
-              . " for device "
-              . $self->get_object_name );
+            "[Insteon::Thermo_i2CS] Received request to set heat setpoint " . $p_state . " for device " . $self->get_object_name );
         if ( lc($p_state) eq 'cooler' ) {
             $$self{parent}->heat_setpoint( $$self{parent}->get_heat_sp - 1 );
         }
@@ -1808,8 +1707,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Cooler', 'Warmer' );
     $$self{parent}{child_setpoint_c} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "cool_setpoint_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "cool_setpoint_change" );
     return $self;
 }
 
@@ -1823,10 +1721,7 @@ sub set {
     }
     if ($found_state) {
         ::print_log(
-                "[Insteon::Thermo_i2CS] Received request to set cool setpoint "
-              . $p_state
-              . " for device "
-              . $self->get_object_name );
+            "[Insteon::Thermo_i2CS] Received request to set cool setpoint " . $p_state . " for device " . $self->get_object_name );
         if ( lc($p_state) eq 'cooler' ) {
             $$self{parent}->cool_setpoint( $$self{parent}->get_cool_sp - 1 );
         }
@@ -1879,8 +1774,7 @@ sub new {
     bless $self, $class;
     $$self{parent} = $parent;
     $$self{parent}{child_status} = $self;
-    $$self{parent}
-      ->tie_event( '$object->parent_event("$state")', "status_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "status_change" );
     return $self;
 }
 
@@ -1927,8 +1821,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Lower', 'Higher' );
     $$self{parent}{child_setpoint_humid_h} = $self;
-    $$self{parent}->tie_event( '$object->parent_event("$state")',
-        "high_humid_setpoint_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "high_humid_setpoint_change" );
     return $self;
 }
 
@@ -1941,18 +1834,15 @@ sub set {
         }
     }
     if ($found_state) {
-        ::print_log(
-            "[Insteon::Thermo_i2CS] Received request to set high humidity setpoint to "
+        ::print_log( "[Insteon::Thermo_i2CS] Received request to set high humidity setpoint to "
               . $p_state
               . " for device "
               . $self->get_object_name );
         if ( lc($p_state) eq 'lower' ) {
-            $$self{parent}
-              ->high_humid_setpoint( $$self{parent}->get_high_humid_sp - 1 );
+            $$self{parent}->high_humid_setpoint( $$self{parent}->get_high_humid_sp - 1 );
         }
         elsif ( lc($p_state) eq 'higher' ) {
-            $$self{parent}
-              ->high_humid_setpoint( $$self{parent}->get_high_humid_sp + 1 );
+            $$self{parent}->high_humid_setpoint( $$self{parent}->get_high_humid_sp + 1 );
         }
     }
 }
@@ -2000,8 +1890,7 @@ sub new {
     $$self{parent} = $parent;
     @{ $$self{states} } = ( 'Lower', 'Higher' );
     $$self{parent}{child_setpoint_humid_l} = $self;
-    $$self{parent}->tie_event( '$object->parent_event("$state")',
-        "low_humid_setpoint_change" );
+    $$self{parent}->tie_event( '$object->parent_event("$state")', "low_humid_setpoint_change" );
     return $self;
 }
 
@@ -2014,18 +1903,15 @@ sub set {
         }
     }
     if ($found_state) {
-        ::print_log(
-            "[Insteon::Thermo_i2CS] Received request to set low humidity setpoint to "
+        ::print_log( "[Insteon::Thermo_i2CS] Received request to set low humidity setpoint to "
               . $p_state
               . " for device "
               . $self->get_object_name );
         if ( lc($p_state) eq 'lower' ) {
-            $$self{parent}
-              ->low_humid_setpoint( $$self{parent}->get_low_humid_sp - 1 );
+            $$self{parent}->low_humid_setpoint( $$self{parent}->get_low_humid_sp - 1 );
         }
         elsif ( lc($p_state) eq 'higher' ) {
-            $$self{parent}
-              ->low_humid_setpoint( $$self{parent}->get_low_humid_sp + 1 );
+            $$self{parent}->low_humid_setpoint( $$self{parent}->get_low_humid_sp + 1 );
         }
     }
 }
diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
index 85cef3b7f..09973cbec 100644
--- a/lib/Insteon_PLM.pm
+++ b/lib/Insteon_PLM.pm
@@ -79,8 +79,7 @@ sub serial_startup {
 
     my $port = $::config_parms{ $instance . "_serial_port" };
     if ( !defined($port) ) {
-        main::print_log(
-            "WARN: " . $instance . "_serial_port missing from INI params!" );
+        main::print_log( "WARN: " . $instance . "_serial_port missing from INI params!" );
     }
     my $speed = 19200;
 
@@ -103,8 +102,7 @@ sub serial_restart {
     # TCP Port gets reconnected elsewhere
     return if $PLM_use_tcp;
 
-    ::print_log(
-            "[Insteon_PLM] WARN: The PLM did not respond to the last command."
+    ::print_log( "[Insteon_PLM] WARN: The PLM did not respond to the last command."
           . " The port may have closed, attempting to reopen the port." );
 
     #prep vars
@@ -137,15 +135,11 @@ sub new {
         @Insteon_PLM::ISA = ( 'Socket_Item', 'Insteon::BaseInterface' );
         $PLM_tcp_host     = $::config_parms{ $port_name . "_TCP_host" };
         $PLM_tcp_port     = $::config_parms{ $port_name . "_TCP_port" };
-        &::print_log(
-            "[Insteon_PLM] 2412N using TCP,  tcp_host=$PLM_tcp_host,  tcp_port=$PLM_tcp_port"
-        );
+        &::print_log( "[Insteon_PLM] 2412N using TCP,  tcp_host=$PLM_tcp_host,  tcp_port=$PLM_tcp_port" );
     }
     else {
         if ( !defined($port) ) {
-            main::print_log( "WARN: "
-                  . $port_name
-                  . "_serial_port missing from INI params!" );
+            main::print_log( "WARN: " . $port_name . "_serial_port missing from INI params!" );
         }
         @Insteon_PLM::ISA = ( 'Serial_Item', 'Insteon::BaseInterface' );
         $PLM_use_tcp = 0;
@@ -171,9 +165,7 @@ sub new {
     if ( $PLM_use_tcp == 1 ) {
         my $tcp_hostport = "$PLM_tcp_host:$PLM_tcp_port";
 
-        $PLM_socket =
-          new Socket_Item( undef, undef, $tcp_hostport, 'Insteon PLM 2412N',
-            'tcp', 'raw' );
+        $PLM_socket = new Socket_Item( undef, undef, $tcp_hostport, 'Insteon PLM 2412N', 'tcp', 'raw' );
         start $PLM_socket;
         $$self{socket} = $PLM_socket;
     }
@@ -185,13 +177,11 @@ sub new {
     $$self{xmit_delay} = $::config_parms{Insteon_PLM_xmit_delay};
     $$self{xmit_delay} = 0.25
       unless defined $$self{xmit_delay};    # and $$self{xmit_delay} > 0.125;
-    &::print_log(
-        "[Insteon_PLM] setting default xmit delay to: $$self{xmit_delay}");
+    &::print_log("[Insteon_PLM] setting default xmit delay to: $$self{xmit_delay}");
     $$self{xmit_x10_delay} = $::config_parms{Insteon_PLM_xmit_x10_delay};
     $$self{xmit_x10_delay} = 0.5
       unless defined $$self{xmit_x10_delay} and $$self{xmit_x10_delay} > 0.5;
-    &::print_log(
-        "[Insteon_PLM] setting x10 xmit delay to: $$self{xmit_x10_delay}");
+    &::print_log("[Insteon_PLM] setting x10 xmit delay to: $$self{xmit_x10_delay}");
     $self->_clear_timeout('xmit');
     $self->_clear_timeout('command');
 
@@ -314,9 +304,8 @@ sub check_for_data {
                 $self->process_queue();
             }
             else {
-                &::print_log(
-                    "[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on..."
-                ) if $self->debuglevel( 2, 'insteon' );
+                &::print_log( "[Insteon_PLM] DEBUG2: PLM command timer expired but no transmission in place.  Moving on..." )
+                  if $self->debuglevel( 2, 'insteon' );
                 $self->clear_active_message();
                 $self->process_queue();
             }
@@ -339,8 +328,7 @@ Used to send X10 messages, generates an X10 command and queues it.
 sub set {
     my ( $self, $p_state, $p_setby, $p_response ) = @_;
 
-    my @x10_commands =
-      &Insteon::X10Message::generate_commands( $p_state, $p_setby );
+    my @x10_commands = &Insteon::X10Message::generate_commands( $p_state, $p_setby );
     foreach my $command (@x10_commands) {
         $self->queue_message( new Insteon::X10Message($command) );
     }
@@ -388,14 +376,11 @@ sub scan_link_table {
 
     #$$self{links} = undef; # clear out the old
     if ( $skip_unchanged && $self->_aldb->health =~ /(empty)|(unchanged)/ ) {
-        ::print_log(
-            '[Scan Link Tables] - PLM Link Table is unchanged, skipping.');
+        ::print_log('[Scan Link Tables] - PLM Link Table is unchanged, skipping.');
 
         package main;
         eval($callback);
-        &::print_log(
-            "[Insteon_PLM] WARN1: Error encountered during scan callback: "
-              . $@ )
+        &::print_log( "[Insteon_PLM] WARN1: Error encountered during scan callback: " . $@ )
           if $@ and $self->debuglevel( 1, 'insteon' );
 
         package Insteon_PLM;
@@ -460,8 +445,7 @@ Cancels any pending linking session that has not completed.
 
 sub cancel_linking {
     my ($self) = @_;
-    $self->queue_message(
-        new Insteon::InsteonMessage( 'all_link_cancel', $self ) );
+    $self->queue_message( new Insteon::InsteonMessage( 'all_link_cancel', $self ) );
 }
 
 =item C<_aldb()>
@@ -518,24 +502,18 @@ sub _send_cmd {
           if $self->debuglevel( 2, 'insteon' );
         $command = $prefix{x10_send} . $command;
         $delay   = $$self{xmit_x10_delay};
-        $self->_set_timeout( 'command', '1000' )
-          ; # a commmand needs to be PLM ack'd w/i 1 seconds or a retry is attempted
-         # clear command timeout so that we don't wait for an insteon ack before sending the next command
+        $self->_set_timeout( 'command', '1000' );    # a commmand needs to be PLM ack'd w/i 1 seconds or a retry is attempted
+             # clear command timeout so that we don't wait for an insteon ack before sending the next command
     }
     else {
         my $command_type = $message->command_type;
-        &main::print_log(
-                "[Insteon_PLM] DEBUG2: Sending "
+        &main::print_log( "[Insteon_PLM] DEBUG2: Sending "
               . $message->to_string
               . " incurred delay of "
               . sprintf( '%.2f', $incurred_delay_time )
               . " seconds; starting hop-count: "
               . (
-                (
-                    ref $message->setby
-                      && $message->setby->isa('Insteon::BaseObject')
-                ) ? $message->setby->default_hop_count : "?"
-              )
+                ( ref $message->setby && $message->setby->isa('Insteon::BaseObject') ) ? $message->setby->default_hop_count : "?" )
         ) if $message->setby->debuglevel( 2, 'insteon' );
         $command = $prefix{$command_type} . $command;
         if (   $command_type eq 'all_link_send'
@@ -544,32 +522,23 @@ sub _send_cmd {
             or $command_type eq 'all_link_direct_cleanup' )
         {
             $self->_set_timeout( 'command', $cmd_timeout )
-              ; # a commmand needs to be ack'd by device w/i $cmd_timeout or a retry is attempted
+              ;    # a commmand needs to be ack'd by device w/i $cmd_timeout or a retry is attempted
         }
     }
-    my $is_extended = ( $message->can('command_type')
-          && $message->command_type eq "insteon_ext_send" ) ? 1 : 0;
-    if (
-        length($command) != (
-            Insteon::MessageDecoder::insteon_cmd_len( substr( $command, 0, 4 ),
-                0, $is_extended ) * 2
-        )
-      )
-    {
-        &::print_log( "[Insteon_PLM]: ERROR!! Command sent to PLM "
-              . lc($command)
-              . " is of an incorrect length.  Message not sent." );
+    my $is_extended =
+      ( $message->can('command_type') && $message->command_type eq "insteon_ext_send" ) ? 1 : 0;
+    if ( length($command) != ( Insteon::MessageDecoder::insteon_cmd_len( substr( $command, 0, 4 ), 0, $is_extended ) * 2 ) ) {
+        &::print_log(
+            "[Insteon_PLM]: ERROR!! Command sent to PLM " . lc($command) . " is of an incorrect length.  Message not sent." );
         $self->clear_active_message();
     }
     else {
         my $debug_obj = $self;
         $debug_obj = $message->setby
           if ( $message->can('setby') && ref $message->setby );
-        &::print_log(
-            "[Insteon_PLM] DEBUG3: Sending  PLM raw data: " . lc($command) )
+        &::print_log( "[Insteon_PLM] DEBUG3: Sending  PLM raw data: " . lc($command) )
           if $debug_obj->debuglevel( 3, 'insteon' );
-        &::print_log( "[Insteon_PLM] DEBUG4:\n"
-              . Insteon::MessageDecoder::plm_decode($command) )
+        &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($command) )
           if $debug_obj->debuglevel( 4, 'insteon' );
         my $data = pack( "H*", $command );
         if ( $PLM_use_tcp == 1 ) {
@@ -631,8 +600,7 @@ sub _parse_data {
 
     # STEP 1 Prepend any prior unprocessed data fragment
     if ( $$self{_data_fragment} ) {
-        ::print_log( "[Insteon_PLM] DEBUG3: Prepending prior data fragment"
-              . ": $$self{_data_fragment}" )
+        ::print_log( "[Insteon_PLM] DEBUG3: Prepending prior data fragment" . ": $$self{_data_fragment}" )
           if $self->debuglevel( 3, 'insteon' );
         $data = $$self{_data_fragment} . $data;
     }
@@ -653,16 +621,14 @@ sub _parse_data {
                   ? 0.3
                   : 1.0;
                 ::print_log(
-                    "[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command"
-                      . " after delaying for $nack_delay second" )
+                    "[Insteon_PLM] DEBUG3: Interface extremely busy. Resending command" . " after delaying for $nack_delay second" )
                   if $self->debuglevel( 3, 'insteon' );
                 $self->_set_timeout( 'xmit', $nack_delay * 1000 );
                 $self->active_message->no_hop_increase(1);
                 $process_next_command = 0;
             }
             else {
-                ::print_log( "[Insteon_PLM] DEBUG3: Interface extremely busy."
-                      . " No message to resend." )
+                ::print_log( "[Insteon_PLM] DEBUG3: Interface extremely busy." . " No message to resend." )
                   if $self->debuglevel( 3, 'insteon' );
             }
 
@@ -674,8 +640,7 @@ sub _parse_data {
         my $record_type = substr( $data, 0, 4 );
         unless ( grep( /$record_type/, values(%prefix) ) ) {
             $data = $self->_next_valid_prefix($data);
-            ::print_log( "[Insteon_PLM] ERROR: Received data did not start "
-                  . "with a valid prefix.  Trimming to: $data" );
+            ::print_log( "[Insteon_PLM] ERROR: Received data did not start " . "with a valid prefix.  Trimming to: $data" );
             $record_type = substr( $data, 0, 4 );
         }
 
@@ -687,8 +652,8 @@ sub _parse_data {
         if ($pending_message) {
 
             # Prep Variables
-            my $prev_cmd = lc $pending_message->interface_data;
-            my $prev_cmd_length = length($prev_cmd);    # Used to get msg data
+            my $prev_cmd        = lc $pending_message->interface_data;
+            my $prev_cmd_length = length($prev_cmd);                     # Used to get msg data
 
             # Add PLM Prefix to Prior Command
             if ( $pending_message->isa('Insteon::X10Message') ) {
@@ -716,8 +681,7 @@ sub _parse_data {
             #Note Receipt of PLM Response
             $pending_message->plm_receipt(1);
 
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
 
             $self->device_id( substr( $data, 4, 6 ) );
@@ -732,8 +696,7 @@ sub _parse_data {
             #Note Receipt of PLM Response
             $pending_message->plm_receipt(1);
 
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
             my $message_data = substr( $data, 4, 8 );
             $self->on_interface_config_received($message_data);
@@ -746,12 +709,10 @@ sub _parse_data {
             #Note Receipt of PLM ACK
             $pending_message->plm_receipt(1);
 
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $debug_obj->debuglevel( 4, 'insteon' );
 
-            ::print_log( "[Insteon_PLM] DEBUG3: Received PLM acknowledge: "
-                  . $pending_message->to_string )
+            ::print_log( "[Insteon_PLM] DEBUG3: Received PLM acknowledge: " . $pending_message->to_string )
               if $debug_obj->debuglevel( 3, 'insteon' );
 
             # Handle PLM ALDB Messages (Should these be here???)
@@ -765,17 +726,11 @@ sub _parse_data {
 
                     package main;
                     eval( $self->active_message->success_callback );
-                    &::print_log(
-                        "[Insteon_PLM] WARN1: Error encountered during ack callback: "
-                          . $@ )
-                      if (
-                           $@
+                    &::print_log( "[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@ )
+                      if ( $@
                         && $self->active_message->can('setby')
                         && ref $self->active_message->setby
-                        && $self->active_message->setby->debuglevel(
-                            1, 'insteon'
-                        )
-                      );
+                        && $self->active_message->setby->debuglevel( 1, 'insteon' ) );
 
                     package Insteon_PLM;
                 }
@@ -794,25 +749,18 @@ sub _parse_data {
                     $self->_aldb->{_success_callback} = undef;
                 }
                 elsif ( $$self{_mem_callback} ) {
-                    $callback =
-                      $pending_message->callback();    #$$self{_mem_callback};
+                    $callback = $pending_message->callback();    #$$self{_mem_callback};
                     $$self{_mem_callback} = undef;
                 }
                 if ($callback) {
 
                     package main;
                     eval($callback);
-                    &::print_log(
-                        "[Insteon_PLM] WARN1: Error encountered during ack callback: "
-                          . $@ )
-                      if (
-                           $@
+                    &::print_log( "[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@ )
+                      if ( $@
                         && $self->active_message->can('setby')
                         && ref $self->active_message->setby
-                        && $self->active_message->setby->debuglevel(
-                            1, 'insteon'
-                        )
-                      );
+                        && $self->active_message->setby->debuglevel( 1, 'insteon' ) );
 
                     package Insteon_PLM;
                 }
@@ -837,8 +785,7 @@ sub _parse_data {
             #Note Receipt of PLM NAK
             $pending_message->plm_receipt(1);
 
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $debug_obj->debuglevel( 4, 'insteon' );
 
             # regardless, we're not retrying as we'll just get the same
@@ -859,10 +806,8 @@ sub _parse_data {
                     $self->_aldb->health("unchanged");
                 }
                 $self->_aldb->scandatetime(&main::get_tickcount);
-                &::print_log( "[Insteon_PLM] "
-                      . $self->get_object_name
-                      . " completed link memory scan. Status: "
-                      . $self->_aldb->health() )
+                &::print_log(
+                    "[Insteon_PLM] " . $self->get_object_name . " completed link memory scan. Status: " . $self->_aldb->health() )
                   if $self->debuglevel( 1, 'insteon' );
                 if ( $$self{_mem_callback} ) {
                     my $callback = $$self{_mem_callback};
@@ -870,31 +815,24 @@ sub _parse_data {
 
                     package main;
                     eval($callback);
-                    &::print_log(
-                        "[Insteon_PLM] WARN1: Error encountered during nack callback: "
-                          . $@ )
+                    &::print_log( "[Insteon_PLM] WARN1: Error encountered during nack callback: " . $@ )
                       if $@ and $self->debuglevel( 1, 'insteon' );
 
                     package Insteon_PLM;
                 }
             }
             elsif ( $record_type eq $prefix{all_link_send} ) {
-                &::print_log(
-                    "[Insteon_PLM] WARN: PLM ALDB does not have a link for this scene defined: "
+                &::print_log( "[Insteon_PLM] WARN: PLM ALDB does not have a link for this scene defined: "
                       . $pending_message->to_string
                       . $@ );
             }
             elsif ( $record_type eq $prefix{all_link_start} ) {
-                &::print_log(
-                        "[Insteon_PLM] WARN: PLM unable to enter linking mode: "
-                      . $pending_message->to_string
-                      . $@ );
+                &::print_log( "[Insteon_PLM] WARN: PLM unable to enter linking mode: " . $pending_message->to_string . $@ );
             }
             elsif ( $record_type eq $prefix{all_link_manage_rec} ) {
 
                 # parse out the data
-                my $failed_cmd_code =
-                  substr( $pending_message->interface_data(), 0, 2 );
+                my $failed_cmd_code = substr( $pending_message->interface_data(), 0, 2 );
                 my $failed_cmd = 'unknown';
                 if ( $failed_cmd_code eq '40' ) {
                     $failed_cmd = 'update/add controller record';
@@ -905,12 +843,9 @@ sub _parse_data {
                 elsif ( $failed_cmd_code eq '80' ) {
                     $failed_cmd = 'delete record';
                 }
-                my $failed_group =
-                  substr( $pending_message->interface_data(), 4, 2 );
-                my $failed_deviceid =
-                  substr( $pending_message->interface_data(), 6, 6 );
-                &::print_log(
-                        "[Insteon_PLM] WARN: PLM unable to complete requested "
+                my $failed_group    = substr( $pending_message->interface_data(), 4, 2 );
+                my $failed_deviceid = substr( $pending_message->interface_data(), 6, 6 );
+                &::print_log( "[Insteon_PLM] WARN: PLM unable to complete requested "
                       . "PLM link table update ($failed_cmd) for "
                       . "group: $failed_group and deviceid: $failed_deviceid" );
                 my $callback;
@@ -919,25 +854,21 @@ sub _parse_data {
                     $self->_aldb->{_success_callback} = undef;
                 }
                 elsif ( $$self{_mem_callback} ) {
-                    $callback =
-                      $pending_message->callback();    #$$self{_mem_callback};
+                    $callback = $pending_message->callback();    #$$self{_mem_callback};
                     $$self{_mem_callback} = undef;
                 }
                 if ($callback) {
 
                     package main;
                     eval($callback);
-                    &::print_log(
-                        "[Insteon_PLM] WARN1: Error encountered during ack callback: "
-                          . $@ )
+                    &::print_log( "[Insteon_PLM] WARN1: Error encountered during ack callback: " . $@ )
                       if $@ and $self->debuglevel( 1, 'insteon' );
 
                     package Insteon_PLM;
                 }
             }
             else {
-                &::print_log( "[Insteon_PLM] WARN: received NACK from PLM for "
-                      . $pending_message->to_string() );
+                &::print_log( "[Insteon_PLM] WARN: received NACK from PLM for " . $pending_message->to_string() );
             }
             $data =~ s/^$nackcmd//;
         }
@@ -946,20 +877,15 @@ sub _parse_data {
             #Note Receipt of PLM Bad Cmd
             $pending_message->plm_receipt(1);
 
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $debug_obj->debuglevel( 4, 'insteon' );
 
-            ::print_log( "[Insteon_PLM] WARN: received Bad Command Error"
-                  . " from PLM for "
-                  . $pending_message->to_string() );
+            ::print_log( "[Insteon_PLM] WARN: received Bad Command Error" . " from PLM for " . $pending_message->to_string() );
 
             $data =~ s/^$badcmd//;
         }
         elsif ($pending_message
-            && $data =~
-            /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)|($prefix{insteon_send}\w{12}0f)/
-          )
+            && $data =~ /^($prefix{insteon_send}\w{12}06)|($prefix{insteon_send}\w{12}15)|($prefix{insteon_send}\w{12}0f)/ )
         {
             # This looks like a garbled PLM Response
             my $unknown_deviceid  = substr( $data, 4,  6 );
@@ -968,20 +894,16 @@ sub _parse_data {
             my $unknown_data      = substr( $data, 14, 2 );
             my $unknown_obj = &Insteon::get_object( $unknown_deviceid, '01' );
             if ($unknown_obj) {
-                &::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $unknown_obj->debuglevel( 4, 'insteon' );
-                &::print_log(
-                    "[Insteon_PLM] WARN: encountered garbled PLM data '$data'"
+                &::print_log( "[Insteon_PLM] WARN: encountered garbled PLM data '$data'"
                       . " but expected '$ackcmd'. Attempting to find next valid"
                       . " message." );
             }
             else {
-                &::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $self->debuglevel( 4, 'insteon' );
-                &::print_log(
-                    "[Insteon_PLM] ERROR: encountered garbled PLM data '$data' "
+                &::print_log( "[Insteon_PLM] ERROR: encountered garbled PLM data '$data' "
                       . "that does not match any known device ID (expected '$ackcmd')."
                       . " Attempting to find next valid message." );
             }
@@ -1001,13 +923,11 @@ sub _parse_data {
             my $message_data = substr( $data, 4, 18 );
             my $find_obj = Insteon::get_object( substr( $data, 4, 6 ), '01' );
             if ( ref $find_obj ) {
-                ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $find_obj->debuglevel( 4, 'insteon' );
             }
             else {
-                ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $self->debuglevel( 4, 'insteon' );
             }
             $self->on_standard_insteon_received($message_data);
@@ -1021,13 +941,11 @@ sub _parse_data {
             my $message_data = substr( $data, 4, 46 );
             my $find_obj = Insteon::get_object( substr( $data, 4, 6 ), '01' );
             if ( ref $find_obj ) {
-                ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $find_obj->debuglevel( 4, 'insteon' );
             }
             else {
-                ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $self->debuglevel( 4, 'insteon' );
             }
             $self->on_extended_insteon_received($message_data);
@@ -1039,8 +957,7 @@ sub _parse_data {
         {
             #X10 Received
             my $message_data = substr( $data, 4, 4 );
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
             my $message_data = substr( $data, 0, 8 );
             my $x10_message  = new Insteon::X10Message($message_data);
@@ -1056,13 +973,11 @@ sub _parse_data {
         {
             #ALL-Linking Completed
             my $message_data = substr( $data, 4, 16 );
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
             my $link_address = substr( $message_data, 4, 6 );
-            ::print_log(
-                "[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)"
-            ) if $self->debuglevel( 2, 'insteon' );
+            ::print_log( "[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)" )
+              if $self->debuglevel( 2, 'insteon' );
             my $device_object = Insteon::get_object($link_address);
             $device_object->devcat( substr( $message_data, 10, 4 ) );
             $device_object->firmware( substr( $message_data, 14, 2 ) );
@@ -1076,12 +991,10 @@ sub _parse_data {
 
             #Select type of link (00 - responder, 01 - master, ff - delete)
             if ( $type eq '00' ) {
-                $self->_aldb->add_link_to_hash( 'A2', $group, '0',
-                    $link_address, $data1, $data2, $data3 );
+                $self->_aldb->add_link_to_hash( 'A2', $group, '0', $link_address, $data1, $data2, $data3 );
             }
             elsif ( $type eq '01' ) {
-                $self->_aldb->add_link_to_hash( 'E2', $group, '1',
-                    $link_address, $data1, $data2, $data3 );
+                $self->_aldb->add_link_to_hash( 'E2', $group, '1', $link_address, $data1, $data2, $data3 );
             }
             elsif ( lc($type) eq 'ff' ) {
 
@@ -1108,16 +1021,13 @@ sub _parse_data {
             #Run success callback if it exists
             if ( ref $self->active_message ) {
                 if ( $self->active_message->success_callback ) {
-                    main::print_log(
-                        "[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
+                    main::print_log( "[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
                           . $self->active_message->success_callback )
                       if $self->debuglevel( 4, 'insteon' );
 
                     package main;
                     eval $self->active_message->success_callback;
-                    ::print_log(
-                        "[Insteon::Insteon_PLM] problem w/ success callback: $@"
-                    ) if $@;
+                    ::print_log( "[Insteon::Insteon_PLM] problem w/ success callback: $@" ) if $@;
 
                     package Insteon::BaseObject;
                 }
@@ -1139,42 +1049,32 @@ sub _parse_data {
                 # bytes 0-1 - group; 2-7 device address
                 my $failure_group  = substr( $message_data, 0, 2 );
                 my $failure_device = substr( $message_data, 2, 6 );
-                my $failed_object =
-                  &Insteon::get_object( $failure_device, '01' );
+                my $failed_object = &Insteon::get_object( $failure_device, '01' );
                 if ( ref $failed_object ) {
-                    ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                          . Insteon::MessageDecoder::plm_decode($data) )
+                    ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                       if $failed_object->debuglevel( 4, 'insteon' );
-                    ::print_log(
-                        "[Insteon_PLM] DEBUG2: Received all-link cleanup failure from "
+                    ::print_log( "[Insteon_PLM] DEBUG2: Received all-link cleanup failure from "
                           . $failed_object->get_object_name
-                          . " for all link group: $failure_group. Trying a direct cleanup."
-                    ) if $failed_object->debuglevel( 2, 'insteon' );
-                    my $message = new Insteon::InsteonMessage(
-                        'all_link_direct_cleanup',      $failed_object,
-                        $self->active_message->command, $failure_group
-                    );
+                          . " for all link group: $failure_group. Trying a direct cleanup." )
+                      if $failed_object->debuglevel( 2, 'insteon' );
+                    my $message =
+                      new Insteon::InsteonMessage( 'all_link_direct_cleanup', $failed_object, $self->active_message->command,
+                        $failure_group );
                     push( @{ $$failed_object{command_stack} }, $message );
                     $failed_object->_process_command_stack();
                 }
                 else {
-                    ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                          . Insteon::MessageDecoder::plm_decode($data) )
+                    ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                       if $self->debuglevel( 4, 'insteon' );
-                    ::print_log(
-                        "[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
+                    ::print_log( "[Insteon_PLM] Received all-link cleanup failure from an unkown device id: "
                           . "$failure_device and for all link group: $failure_group. You may "
-                          . "want to run delete orphans to remove this link from your PLM"
-                    );
+                          . "want to run delete orphans to remove this link from your PLM" );
                 }
             }
             else {
-                ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                      . Insteon::MessageDecoder::plm_decode($data) )
+                ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
                   if $self->debuglevel( 4, 'insteon' );
-                ::print_log(
-                    "[Insteon_PLM] DEBUG2: Received all-link cleanup failure."
-                      . " But there is no pending message." )
+                ::print_log( "[Insteon_PLM] DEBUG2: Received all-link cleanup failure." . " But there is no pending message." )
                   if $self->debuglevel( 2, 'insteon' );
             }
 
@@ -1188,11 +1088,9 @@ sub _parse_data {
 
             #ALL-Link Record Response
             my $message_data = substr( $data, 4, 16 );
-            &::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
-            &::print_log(
-                "[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data")
+            &::print_log("[Insteon_PLM] DEBUG2: ALL-Link Record Response:$message_data")
               if $self->debuglevel( 2, 'insteon' );
             $self->_aldb->parse_alllink($message_data);
 
@@ -1206,28 +1104,21 @@ sub _parse_data {
         elsif ( $record_type eq $prefix{plm_user_reset}
             and ( length($data) >= 4 ) )
         {
-            &::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
-            main::print_log(
-                "[Insteon_PLM] Detected PLM user reset to factory defaults");
+            main::print_log("[Insteon_PLM] Detected PLM user reset to factory defaults");
             $self->_aldb->health('changed');
             $data = substr( $data, 4 );
         }
-        elsif ( $record_type eq $prefix{plm_reset} and ( length($data) >= 6 ) )
-        {
-            &::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+        elsif ( $record_type eq $prefix{plm_reset} and ( length($data) >= 6 ) ) {
+            &::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
             if ( substr( $data, 4, 2 ) eq '06' ) {
-                ::print_log(
-                    "[Insteon_PLM] Received ACK to software reset request");
+                ::print_log("[Insteon_PLM] Received ACK to software reset request");
                 $self->_aldb->health('changed');
             }
             else {
-                ::print_log(
-                    "[Insteon_PLM] ERROR Received NACK to software reset request"
-                );
+                ::print_log( "[Insteon_PLM] ERROR Received NACK to software reset request" );
             }
 
             $data = substr( $data, 6 );
@@ -1237,18 +1128,15 @@ sub _parse_data {
         {
             #ALL-Link Cleanup Status Report
             my $message_data = substr( $data, 4, 2 );
-            ::print_log( "[Insteon_PLM] DEBUG4:\n"
-                  . Insteon::MessageDecoder::plm_decode($data) )
+            ::print_log( "[Insteon_PLM] DEBUG4:\n" . Insteon::MessageDecoder::plm_decode($data) )
               if $self->debuglevel( 4, 'insteon' );
             my $cleanup_ack = substr( $message_data, 0, 2 );
             if ( ref $self->active_message ) {
                 if ( $cleanup_ack eq '15' ) {
-                    &::print_log(
-                        "[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
+                    &::print_log( "[Insteon_PLM] WARN1: All-link cleanup failure for scene: "
                           . $self->active_message->setby->get_object_name
                           . ". Retrying in 1 second." )
-                      if $self->active_message->setby->debuglevel( 1,
-                        'insteon' );
+                      if $self->active_message->setby->debuglevel( 1, 'insteon' );
 
                     # except that we should cause a bit of a delay to let things settle out
                     $self->_set_timeout( 'xmit', 1000 );
@@ -1259,11 +1147,8 @@ sub _parse_data {
                       ( $self->active_message )
                       ? $self->active_message->to_string()
                       : "";
-                    &::print_log(
-                        "[Insteon_PLM] Received all-link cleanup success: $message_to_string"
-                      )
-                      if $self->active_message->setby->debuglevel( 1,
-                        'insteon' );
+                    &::print_log( "[Insteon_PLM] Received all-link cleanup success: $message_to_string" )
+                      if $self->active_message->setby->debuglevel( 1, 'insteon' );
                     if (   ref $self->active_message
                         && ref $self->active_message->setby )
                     {
@@ -1292,9 +1177,7 @@ sub _parse_data {
 
         # If the timer has expired, Find next message
         if ( $$self{_data_time} < ( time - 1 ) && length($data) ) {
-            ::print_log(
-                    "[Insteon_PLM] DEBUG3: ERROR: Could not process message."
-                  . " Removing stale data from queue." )
+            ::print_log( "[Insteon_PLM] DEBUG3: ERROR: Could not process message." . " Removing stale data from queue." )
               if ( $self->debuglevel( 3, 'insteon' ) );
 
             # Dump 1 character from data
diff --git a/lib/Irrigation_Item.pm b/lib/Irrigation_Item.pm
index 3d2d267dd..b3507b7d6 100644
--- a/lib/Irrigation_Item.pm
+++ b/lib/Irrigation_Item.pm
@@ -96,10 +96,9 @@ sub initialize {
     $$self{m_zoneHammer}      = 0;
     $$self{m_zoneHammerTime}  = 0;
     $$self{m_zoneHammerTimer} = new Timer();
-    $$self{m_zoneMaximum} =
-      1 * 60 * 60;    #if no time is specified this is the failsafe time
+    $$self{m_zoneMaximum}     = 1 * 60 * 60;    #if no time is specified this is the failsafe time
     $$self{m_ETData}[12];
-    $self->zone_count(8);    #default 8 zones
+    $self->zone_count(8);                       #default 8 zones
 }
 
 sub set {
@@ -282,11 +281,11 @@ sub zone {
     else {
         &::print_log("Irrigiation Zone:$p_zone:Off:");
         $self->SUPER::set( 'off:' . $p_zone );
-        if ( $self->single() eq 1 ) { #if single shot mode, shut everything down
+        if ( $self->single() eq 1 ) {    #if single shot mode, shut everything down
             $self->zone_current(0);
             $$self{m_timerCycle}->set('off');
         }
-        else {                        # if normal cycle mode, skip this zone
+        else {                           # if normal cycle mode, skip this zone
             if (    $self->zone_current() eq $p_zone
                 and $$self{m_timerCycle}->active() eq 1 )
             {
@@ -301,7 +300,7 @@ sub zone {
         $$self{m_timerCycle}->set( $p_time, $self );
     }
     elsif ( lc($p_state) eq 'on' ) {
-        $$self{m_timerCycle}->set( 1 * 60 * 60, $self );  #Failsafe 1 hour limit
+        $$self{m_timerCycle}->set( 1 * 60 * 60, $self );    #Failsafe 1 hour limit
     }
 
 }
diff --git a/lib/K8055.pm b/lib/K8055.pm
index 0a5371f15..d1da87442 100644
--- a/lib/K8055.pm
+++ b/lib/K8055.pm
@@ -110,13 +110,9 @@ sub initialize {
     $hostname = $::config_parms{k8055_host} unless $hostname;
     $port     = $::config_parms{k8055_port} unless $port;
 
-    $self->{socket} =
-      new Socket_Item( undef, undef, "$hostname:$port",
-        'k8055-' . $self->{idNumber},
-        'tcp', 'record', "\n" );
+    $self->{socket} = new Socket_Item( undef, undef, "$hostname:$port", 'k8055-' . $self->{idNumber}, 'tcp', 'record', "\n" );
     $self->{socket}->start();
-    &main::MainLoop_pre_add_hook( \&checkForData, undef, $self )
-      ;    # not persistent
+    &main::MainLoop_pre_add_hook( \&checkForData, undef, $self );    # not persistent
 }
 
 sub checkForData {
@@ -153,8 +149,7 @@ sub parseResponse {
         return;
     }
     if ( $success ne 'ok' ) {
-        $self->printMessage(
-            "received unknown message success=$success ($data)");
+        $self->printMessage("received unknown message success=$success ($data)");
         return;
     }
     if ( $command eq 'value' ) {
diff --git a/lib/LCD.pm b/lib/LCD.pm
index d457ee8b1..9b0a45121 100644
--- a/lib/LCD.pm
+++ b/lib/LCD.pm
@@ -53,8 +53,7 @@ sub new {
     $$self{timer} = new main::Timer;
 
     if ( $type eq 'lcdproc' ) {
-        $$self{object} =
-          new main::Socket_Item( undef, undef, $port, 'lcdproc' );
+        $$self{object} = new main::Socket_Item( undef, undef, $port, 'lcdproc' );
     }
 
     # lcdserial is Ian Davidson's code for talking to his custom
diff --git a/lib/Light_Item.pm b/lib/Light_Item.pm
index e2894c58f..e1a516d65 100644
--- a/lib/Light_Item.pm
+++ b/lib/Light_Item.pm
@@ -142,33 +142,29 @@ sub initialize {
     $$self{m_write}         = 1;
     $$self{m_timerSync}     = new Timer();
     $$self{m_timerSyncTime} = 1800;
-    $$self{m_timerSync}
-      ->set( $$self{m_timerSyncTime} + ( rand() * $$self{m_timerSyncTime} ),
-        $self );    #random off command
-    $$self{m_timerOff}    = new Timer();
-    $$self{m_timerUnlock} = new Timer();
-    $$self{m_timerOn}     = new Timer();
-    $$self{m_predict_off_time} = 60;    # Default predict off time of 60 seconds
-    $$self{m_on_state}         = 'on';  # Turn on to "on" by default
-    $$self{m_predict}          = 0;     # Turn off prediction by default
-    $$self{m_sync}             = 1;     # Turn on X10 sync
+    $$self{m_timerSync}->set( $$self{m_timerSyncTime} + ( rand() * $$self{m_timerSyncTime} ), $self );    #random off command
+    $$self{m_timerOff}         = new Timer();
+    $$self{m_timerUnlock}      = new Timer();
+    $$self{m_timerOn}          = new Timer();
+    $$self{m_predict_off_time} = 60;                         # Default predict off time of 60 seconds
+    $$self{m_on_state}         = 'on';                       # Turn on to "on" by default
+    $$self{m_predict}          = 0;                          # Turn off prediction by default
+    $$self{m_sync}             = 1;                          # Turn on X10 sync
     $$self{m_door_auto_off}    = 0;
     $$self{m_door_always_on}   = 0;
     $$self{m_pending_lock}     = 0;
     $$self{m_delay_on}         = 0;
     $$self{m_manual}           = undef;
-    $$self{m_manualTimer}     = new Timer();
-    $$self{m_idleTimer}       = new Timer();
-    $$self{m_idleAmount}      = 0;
-    $$self{m_idleState}       = undef;
-    $$self{m_idleActiveState} = undef;
-    $$self{state}             = 'off';
-    $$self{m_always_set_state} =
-      1;    # the default is to set state regardless of change
-    $$self{m_restrict_off} =
-      0;    # disable light restrictions items from preventing off states
-    $$self{m_save_state} = 0;    # allow states to be restored across restarts
-    $$self{debug} = $main::Debug{light_item};
+    $$self{m_manualTimer}      = new Timer();
+    $$self{m_idleTimer}        = new Timer();
+    $$self{m_idleAmount}       = 0;
+    $$self{m_idleState}        = undef;
+    $$self{m_idleActiveState}  = undef;
+    $$self{state}              = 'off';
+    $$self{m_always_set_state} = 1;                          # the default is to set state regardless of change
+    $$self{m_restrict_off}     = 0;                          # disable light restrictions items from preventing off states
+    $$self{m_save_state}       = 0;                          # allow states to be restored across restarts
+    $$self{debug}              = $main::Debug{light_item};
 
     # defined possible states
     @{ $$self{states} } = ( 'on', 'off' );
@@ -205,25 +201,18 @@ sub set {
         if (   ( ( $self->state eq 'off' ) and $$self{m_manual_auto_off} )
             or ( ( $self->state ne 'off' ) and $$self{m_manual_auto_on} ) )
         {
-            if ( $self->allow_set_state( $$self{_automation_state}, $p_setby ) )
-            {
+            if ( $self->allow_set_state( $$self{_automation_state}, $p_setby ) ) {
                 &::print_log(
-                    "Light_Item($$self{object_name}):: manual state reverting to tracked state: "
-                      . "$$self{_automation_state}" )
+                    "Light_Item($$self{object_name}):: manual state reverting to tracked state: " . "$$self{_automation_state}" )
                   if $self->{debug};
-                $self->SUPER::set( $$self{_automation_state},
-                    $p_setby, $p_respond );
+                $self->SUPER::set( $$self{_automation_state}, $p_setby, $p_respond );
             }
             else {
-                &::print_log(
-                    "Light_Item($$self{object_name}):: resuming from manual to automatic mode"
-                ) if $self->{debug};
+                &::print_log( "Light_Item($$self{object_name}):: resuming from manual to automatic mode" ) if $self->{debug};
             }
         }
         else {
-            &::print_log(
-                "Light_Item($$self{object_name}):: resuming from manual to automatic mode"
-            ) if $self->{debug};
+            &::print_log( "Light_Item($$self{object_name}):: resuming from manual to automatic mode" ) if $self->{debug};
         }
 
         $self->manual(0);
@@ -271,44 +260,31 @@ sub set {
 
         #IDLE handler
         $l_temp_state = $self->do_idle( $p_state, $p_setby, $l_event_state );
-        $l_handler_state =
-          $self->get_handler_state( $l_temp_state, $l_event_state,
-            $l_handler_state );
+        $l_handler_state = $self->get_handler_state( $l_temp_state, $l_event_state, $l_handler_state );
 
         #Delay ON handler
-        $l_temp_state =
-          $self->do_on_delay( $p_state, $p_setby, $l_event_state );
-        $l_handler_state =
-          $self->get_handler_state( $l_temp_state, $l_event_state,
-            $l_handler_state );
+        $l_temp_state = $self->do_on_delay( $p_state, $p_setby, $l_event_state );
+        $l_handler_state = $self->get_handler_state( $l_temp_state, $l_event_state, $l_handler_state );
 
         #Delay OFF handler
-        $l_temp_state =
-          $self->do_off_delay( $p_state, $p_setby, $l_event_state );
-        $l_handler_state =
-          $self->get_handler_state( $l_temp_state, $l_event_state,
-            $l_handler_state );
+        $l_temp_state = $self->do_off_delay( $p_state, $p_setby, $l_event_state );
+        $l_handler_state = $self->get_handler_state( $l_temp_state, $l_event_state, $l_handler_state );
 
         #X10 Sync handler
-        $l_temp_state =
-          $self->do_X10_sync( $p_state, $p_setby, $l_event_state );
-        $l_handler_state =
-          $self->get_handler_state( $l_temp_state, $l_event_state,
-            $l_handler_state );
+        $l_temp_state = $self->do_X10_sync( $p_state, $p_setby, $l_event_state );
+        $l_handler_state = $self->get_handler_state( $l_temp_state, $l_event_state, $l_handler_state );
 
         ######### RESTRICTIONS
         # Apply restrictions
         #  ON
-        if ( defined($l_handler_state) and $l_handler_state ne 'off' )
-        {    #If we are on
+        if ( defined($l_handler_state) and $l_handler_state ne 'off' ) {    #If we are on
             if ( $self->is_on_restriction( $p_state, $p_setby )
                 and !( $self->manual ) )
-            {    #if there is a restriction in place, dont do it
+            {                                                               #if there is a restriction in place, dont do it
                 $l_final_state = undef;
             }
             else {
-                if ( $l_event_state ne $l_handler_state )
-                {    #If a handler modified the state, then use it instead
+                if ( $l_event_state ne $l_handler_state ) {                 #If a handler modified the state, then use it instead
                     $l_final_state = $l_handler_state;
                 }
                 elsif ($p_state =~ /^[+-]?\d?\d\%?/
@@ -324,10 +300,8 @@ sub set {
         }
 
         #  OFF
-        if ( defined($l_handler_state) and $l_handler_state eq 'off' )
-        {    #If we are off
-            if ( $self->is_off_restriction( $p_state, $p_setby ) )
-            {    #if there is a restriction in place, dont do it
+        if ( defined($l_handler_state) and $l_handler_state eq 'off' ) {    #If we are off
+            if ( $self->is_off_restriction( $p_state, $p_setby ) ) {        #if there is a restriction in place, dont do it
                 $l_final_state = undef;
             }
             else {
@@ -339,7 +313,7 @@ sub set {
         if ( defined($l_final_state) ) {
             $$self{_automation_state} = $l_final_state;
             if ( $self->manual ) {
-                $l_final_state = undef;    # don't set state if manual
+                $l_final_state = undef;                                     # don't set state if manual
             }
         }
     }
@@ -428,8 +402,7 @@ sub get_off_delay_effective {
     {
         $l_delay = $self->delay_off();
     }
-    if ( $self->predict_off_time() != 0 and $p_state eq 'predict' )
-    {    #Predict delay instead of default
+    if ( $self->predict_off_time() != 0 and $p_state eq 'predict' ) {    #Predict delay instead of default
         $l_delay = $self->predict_off_time();
     }
     if ( defined( $$self{m_pending_lock} )
@@ -443,18 +416,13 @@ sub get_off_delay_effective {
 sub do_X10_sync {
     my ( $self, $p_state, $p_setby, $p_event_state ) = @_;
 
-    if ( $self->x10_sync() and $p_event_state eq 'off' )
-    {    #if we have a qualified attempt to turn off
-        if ( !$$self{m_timerOff}->active() )
-        {    #if the off timer isnt already running
-            $$self{m_timerSync}->set(
-                $$self{m_timerSyncTime} + ( rand() * $$self{m_timerSyncTime} ),
-                $self
-            );    #sync non-status reporting light status
+    if ( $self->x10_sync() and $p_event_state eq 'off' ) {    #if we have a qualified attempt to turn off
+        if ( !$$self{m_timerOff}->active() ) {                #if the off timer isnt already running
+            $$self{m_timerSync}->set( $$self{m_timerSyncTime} + ( rand() * $$self{m_timerSyncTime} ), $self )
+              ;                                               #sync non-status reporting light status
             &::print_log("$$self{object_name}:X10Sync Start") if $self->{debug};
         }
-        elsif ( $p_setby eq $$self{m_timerSync} )
-        {         #If delay_off timer is running and this is a Sync Event
+        elsif ( $p_setby eq $$self{m_timerSync} ) {           #If delay_off timer is running and this is a Sync Event
             $p_event_state = undef;
         }
     }
@@ -466,17 +434,15 @@ sub do_on_delay {
     my ( $self, $p_state, $p_setby, $p_event_state ) = @_;
     my $l_delay;
 
-    if ( $p_event_state eq 'on' ) {   #if we have a qualified attempt to turn on
+    if ( $p_event_state eq 'on' ) {                           #if we have a qualified attempt to turn on
         $l_delay = $self->delay_on();
-        if ( $l_delay > 0 ) {         #If a delay is set, then set timer
-            if ( !$$self{m_timerOn}->active() )
-            {                         #only reset if we arent previously running
+        if ( $l_delay > 0 ) {                                 #If a delay is set, then set timer
+            if ( !$$self{m_timerOn}->active() ) {             #only reset if we arent previously running
                 $$self{m_timerOn}->set( $l_delay, $self );
             }
 
             #stop ON command for now.
-            if ( $p_setby ne $$self{m_timerOn} )
-            {                         #stop everything but out timer
+            if ( $p_setby ne $$self{m_timerOn} ) {            #stop everything but out timer
                 $p_event_state = undef;
             }
         }
@@ -504,14 +470,13 @@ sub do_off_delay {
                         and $p_state eq 'predict' )
                 )
               )
-            { #These are subject to a delay off timer upon turning on (temporary state)
-                if ( !$self->is_somebody_present( $p_setby, $p_state ) )
-                {    #only start the timer if no one is here
+            {                #These are subject to a delay off timer upon turning on (temporary state)
+                if ( !$self->is_somebody_present( $p_setby, $p_state ) ) {    #only start the timer if no one is here
                     &::print_log("$$self{object_name}:Delay Start:$l_delay")
                       if $self->{debug};
                     $$self{m_timerOff}->set( $l_delay, $self );
                 }
-                else {    #stop the timer if this is true
+                else {                                                        #stop the timer if this is true
                     $$self{m_timerOff}->unset();
                     &::print_log("$$self{object_name}:Delay Stop:$l_delay")
                       if $self->{debug};
@@ -538,16 +503,15 @@ sub do_off_delay {
                     or $p_setby->isa('Photocell_Item')
                     or $p_setby->isa('Door_Item') )
               )
-            { # Do not immediately turn off for these devices. Qualify for delay override
+            {    # Do not immediately turn off for these devices. Qualify for delay override
                 if ( !$self->is_somebody_present( $p_setby, $p_state ) ) {
-                    if ( !$$self{m_timerOn}->active() )
-                    {    #only reset if we arent previously running
+                    if ( !$$self{m_timerOn}->active() ) {    #only reset if we arent previously running
                         &::print_log("$$self{object_name}:Delay Start:$l_delay")
                           if $self->{debug};
                         $$self{m_timerOff}->set( $l_delay, $self );
                     }
                 }
-                else {    #stop the timer if someone is here
+                else {                                       #stop the timer if someone is here
                     &::print_log("$$self{object_name}:Delay Stop:$l_delay")
                       if $self->{debug};
                     $$self{m_timerOff}->unset();
@@ -569,8 +533,7 @@ sub do_idle {
     if ( defined( $$self{m_idleAmount} ) && $$self{m_idleAmount} > 0 ) {
 
         #Activation qualifying event?
-        if ( $p_event_state eq 'on' and $p_setby ne $$self{m_idleTimer} )
-        {    #Dont trigger on ourselves!
+        if ( $p_event_state eq 'on' and $p_setby ne $$self{m_idleTimer} ) {    #Dont trigger on ourselves!
             $$self{m_idleTimer}->set( $$self{m_idleAmount}, $self );
         }
     }
@@ -612,8 +575,7 @@ sub is_on_event {
                 $l_qualified = 1;
             }
         }
-        elsif ( $p_setby->isa('Photocell_Item') )
-        { #Photocell only triggers an ON event if there are no other devices attached
+        elsif ( $p_setby->isa('Photocell_Item') ) {    #Photocell only triggers an ON event if there are no other devices attached
             if ( $p_state eq 'dark' ) {
                 if (
                     !(
@@ -628,17 +590,15 @@ sub is_on_event {
             }
         }
         elsif ( $p_setby eq $$self{m_idleTimer} )
-        { #We consider an idle time an 'on' event.  It will try and set the light at a visible level at least
-            if ( $self->idle_state() ne 'off' )
-            {    #Only if the idle state is considered on
+        {    #We consider an idle time an 'on' event.  It will try and set the light at a visible level at least
+            if ( $self->idle_state() ne 'off' ) {    #Only if the idle state is considered on
                 $l_qualified = 1;
             }
         }
-        elsif ( $p_setby eq $$self{m_timerSync} )
-        {        #Todo: Eventually this should probably sync ON states as well..
+        elsif ( $p_setby eq $$self{m_timerSync} ) {    #Todo: Eventually this should probably sync ON states as well..
             $l_qualified = 0;
         }
-        elsif ( $p_setby eq $$self{m_timerOn} ) {    #Timeout occurs then go
+        elsif ( $p_setby eq $$self{m_timerOn} ) {      #Timeout occurs then go
             if ( $p_state eq 'off' and $self->delay_on() > 0 ) {
                 $l_qualified = 1;
             }
@@ -649,13 +609,11 @@ sub is_on_event {
         elsif ( $p_setby eq $$self{m_timerUnlock} ) {
             $l_qualified = 0;
         }
-        elsif ( $p_state ne 'off' and $p_state ne 'manual' )
-        {                                            #defined but unknown object
+        elsif ( $p_state ne 'off' and $p_state ne 'manual' ) {    #defined but unknown object
             $l_qualified = 1;
         }
     }
-    elsif ( $p_state ne 'off' and $p_state ne 'manual' )
-    {                                                #undefined unknown object
+    elsif ( $p_state ne 'off' and $p_state ne 'manual' ) {        #undefined unknown object
         $l_qualified = 1;
     }
     return $l_qualified;
@@ -667,9 +625,7 @@ sub is_on_restriction {
     if (   ( $setby_conduit =~ /^serial|xpl|xap|web|telnet/i )
         or ( $main::Reload and ( $p_setby eq 'init' ) ) )
     {
-        &::print_log(
-            "$$self{object_name}:No on restrictions permitted when set by non-automation device\n"
-        ) if $self->{debug};
+        &::print_log( "$$self{object_name}:No on restrictions permitted when set by non-automation device\n" ) if $self->{debug};
         return 0;
     }
     my $l_qualified = 0;
@@ -684,8 +640,7 @@ sub is_on_restriction {
 
         #Automatic on events are no allowed to shutoff lights if someone is here
         if ( $p_setby->isa('Light_Restriction_Item') ) {
-            if ( ( $self->is_somebody_present( $p_setby, $p_state ) ) )
-            {    #If someone is in the room, allow the light on!
+            if ( ( $self->is_somebody_present( $p_setby, $p_state ) ) ) {    #If someone is in the room, allow the light on!
                 $l_qualified = 1;
             }
         }
@@ -708,8 +663,7 @@ sub is_on_restriction {
     }
 
     #	if ($self->is_on_event($p_state,$p_setby) and $self->state() eq 'on') {
-    if ( $p_state eq $self->state() )
-    {    #Dont bother setting the state if it already is
+    if ( $p_state eq $self->state() ) {    #Dont bother setting the state if it already is
         $l_qualified = 1;
     }
     if (
@@ -717,7 +671,7 @@ sub is_on_restriction {
         and (  $p_state eq 'motion'
             or $p_state eq 'open' )
       )
-    {    #Dont want to spam these on states if not necessary
+    {                                      #Dont want to spam these on states if not necessary
         $l_qualified = 1;
     }
     return $l_qualified;
@@ -731,12 +685,11 @@ sub is_off_event {
 
         #Criteria Qualifying to turn the light off
 
-        if ( $p_setby->isa('Motion_Item') )
-        {   #Motion Item off event (usually not used by itself, but with a delay
+        if ( $p_setby->isa('Motion_Item') ) {    #Motion Item off event (usually not used by itself, but with a delay
             my @l_objects = $self->find_members('Presence_Monitor');
             if ( @l_objects == 0 ) {
                 $l_qualified = 1;
-            }    # Generate this event _only_ if occupancy system is not used
+            }                                    # Generate this event _only_ if occupancy system is not used
         }
         elsif ( $p_setby->isa('Door_Item') ) {    #Closed door will turn us off
             if ( $p_state eq 'closed' ) { $l_qualified = 1; }
@@ -744,21 +697,19 @@ sub is_off_event {
         elsif ( $p_setby->isa('Presence_Monitor') ) {    #Vacancy will turn off
             if ( $p_state eq 'vacant' ) { $l_qualified = 1; }
         }
-        elsif ( $p_setby->isa('Light_Restriction_Item') )
-        {    #We cant be on anymore, so turn off
+        elsif ( $p_setby->isa('Light_Restriction_Item') ) {    #We cant be on anymore, so turn off
             if ( $p_state eq 'no_light' ) { $l_qualified = 1; }
         }
         elsif ( $p_setby->isa('Photocell_Item') )
-        { #If a photocell is attached and shows us that it is light, then turn off the lights
+        {    #If a photocell is attached and shows us that it is light, then turn off the lights
             if ( $p_state eq 'light' ) { $l_qualified = 1; }
         }
         elsif ( $p_setby eq $$self{m_idleTimer} ) {    #Neither on or off
-            if ( $self->idle_state() eq 'off' ) { #only if the idle state is off
+            if ( $self->idle_state() eq 'off' ) {      #only if the idle state is off
                 $l_qualified = 1;
             }
         }
-        elsif ( $p_setby eq $$self{m_timerSync} )
-        {    #Make sure devices that are thought of in MH as off stay off.
+        elsif ( $p_setby eq $$self{m_timerSync} ) {    #Make sure devices that are thought of in MH as off stay off.
             if (    $self->x10_sync()
                 and $self->state() eq $p_state
                 and $p_state eq 'off'
@@ -769,22 +720,20 @@ sub is_off_event {
                   if $self->{debug};
             }
         }
-        elsif ( $p_setby eq $$self{m_timerOn} ) {    #Does not apply
+        elsif ( $p_setby eq $$self{m_timerOn} ) {      #Does not apply
             $l_qualified = 0;
         }
-        elsif ( $p_setby eq $$self{m_timerOff} )
-        {    #Delay off timer is tripped, turn off now
+        elsif ( $p_setby eq $$self{m_timerOff} ) {     #Delay off timer is tripped, turn off now
             $l_qualified = 1;
         }
-        elsif ( $p_setby eq $$self{m_timerUnlock} )
-        {    #TODO: Not really sure of the behaviour for this guy.  Kirk?
+        elsif ( $p_setby eq $$self{m_timerUnlock} ) {    #TODO: Not really sure of the behaviour for this guy.  Kirk?
             $l_qualified = 0;
         }
-        elsif ( $p_state eq 'off' ) {    #defined but unknown object
+        elsif ( $p_state eq 'off' ) {                    #defined but unknown object
             $l_qualified = 1;
         }
     }
-    elsif ( $p_state eq 'off' ) {        #undefined unknown object
+    elsif ( $p_state eq 'off' ) {                        #undefined unknown object
         $l_qualified = 1;
     }
     return $l_qualified;
@@ -797,14 +746,12 @@ sub is_off_restriction {
     if (   ( $setby_conduit =~ /^serial|xpl|xap|web|telnet/i )
         or ( $main::Reload and ( $p_setby eq 'init' ) ) )
     {
-        &::print_log(
-            "$$self{object_name}:No off restrictions permitted when set by non-automation device ($setby_conduit)"
-        ) if $self->{debug};
+        &::print_log( "$$self{object_name}:No off restrictions permitted when set by non-automation device ($setby_conduit)" )
+          if $self->{debug};
         return 0;
     }
     my $l_qualified = 0;
-    if ( $$self{m_restrict_off} and ( !$self->is_change_allowed() ) )
-    {    # We cant change the status of the light
+    if ( $$self{m_restrict_off} and ( !$self->is_change_allowed() ) ) {    # We cant change the status of the light
         $l_qualified = 1;
     }
     if ( defined($p_setby) ) {
@@ -817,18 +764,15 @@ sub is_off_restriction {
             or $p_setby eq $$self{m_idleTimer}
             or $p_setby eq $$self{m_timerSync} )
         {
-            if ( $self->is_somebody_present( $p_setby, $p_state ) )
-            {    #If someone is in the room, dont turn the light off!
+            if ( $self->is_somebody_present( $p_setby, $p_state ) ) {    #If someone is in the room, dont turn the light off!
                 $l_qualified = 1;
             }
         }
     }
-    if ( $self->door_always_on() and !$self->are_all_doors_closed() )
-    {            #If door always on is enabled
+    if ( $self->door_always_on() and !$self->are_all_doors_closed() ) {    #If door always on is enabled
         $l_qualified = 1;
     }
-    if ( $self->state() eq $p_state and $p_setby ne $$self{m_timerSync} )
-    {            #If we are already off, dont bother sending another.
+    if ( $self->state() eq $p_state and $p_setby ne $$self{m_timerSync} ) {    #If we are already off, dont bother sending another.
         $l_qualified = 1;
     }
     return $l_qualified;
@@ -840,9 +784,7 @@ sub is_change_allowed {
     my @l_objects;
     @l_objects = $self->find_members('Light_Restriction_Item');
     for my $obj (@l_objects) {
-        &::print_log(
-            "Light_Item($$self{object_name}): Light_Restriction_Item $$obj{object_name}: "
-              . $obj->state() )
+        &::print_log( "Light_Item($$self{object_name}): Light_Restriction_Item $$obj{object_name}: " . $obj->state() )
           if $self->{debug};
         if ( $obj->state() eq 'no_light' ) {
             return 0;
@@ -851,9 +793,7 @@ sub is_change_allowed {
 
     # Only return 1 if no restrictions are active *and* no lock is pending
     if ( $$self{m_pending_lock} ) {
-        &::print_log(
-            "Light_Item($$self{object_name}): not allowing on because of pending lock"
-        ) if $self->{debug};
+        &::print_log( "Light_Item($$self{object_name}): not allowing on because of pending lock" ) if $self->{debug};
         return 0;
     }
     else {
@@ -913,10 +853,7 @@ sub get_photo {
 sub predict {
     my ( $self, $p_blnPredict ) = @_;
     $$self{m_predict} = $p_blnPredict if defined $p_blnPredict;
-    &::print_log( "InPredict:"
-          . $$self{object_name} . ":"
-          . $p_blnPredict . ":"
-          . $$self{m_predict} )
+    &::print_log( "InPredict:" . $$self{object_name} . ":" . $p_blnPredict . ":" . $$self{m_predict} )
       if $self->{debug};
     return $$self{m_predict};
 }
@@ -979,16 +916,14 @@ sub manual {
                 or ( $self->state eq '' )
                 or ( $self->state eq '0%' ) )
             {
-                &::print_log(
-                    "Light_Item($$self{object_name}):: setting mode to manual (off)"
+                &::print_log( "Light_Item($$self{object_name}):: setting mode to manual (off)"
                       . ( ( $$self{m_manual_auto_off} ) ? "[auto]" : "" )
                       . "; reverting in $offTime seconds" )
                   if $self->{debug};
                 $$self{m_manualTimer}->set( $offTime, $self );
             }
             else {
-                &::print_log(
-                    "Light_Item($$self{object_name}):: setting mode to manual (on)"
+                &::print_log( "Light_Item($$self{object_name}):: setting mode to manual (on)"
                       . ( ( $$self{m_manual_auto_on} ) ? "[auto]" : "" )
                       . "; reverting in $onTime seconds" )
                   if $self->{debug};
diff --git a/lib/Light_Restriction_Item.pm b/lib/Light_Restriction_Item.pm
index 02dc366a6..ef981fd69 100644
--- a/lib/Light_Restriction_Item.pm
+++ b/lib/Light_Restriction_Item.pm
@@ -97,8 +97,7 @@ sub _check_values {
     if ( $main::Startup or $main::Reload ) {
         foreach (@CheckStartup) {
             if ( $$_{'attached_object'} ) {
-                &::print_log(
-                    "$$_{object_name}: Checking attached object after startup")
+                &::print_log("$$_{object_name}: Checking attached object after startup")
                   if $main::Debug{occupancy};
                 $_->_check_watched_value( $$_{'attached_object'}->state() );
             }
@@ -117,26 +116,21 @@ sub _check_scalar {
         $self->_check_watched_value( ${ $$self{'scalar_ref'} } );
     }
     elsif ( ref $$self{'hash_ref'} and $$self{'hash_key'} ) {
-        $self->_check_watched_value(
-            $$self{'hash_ref'}->{ $$self{'hash_key'} } );
+        $self->_check_watched_value( $$self{'hash_ref'}->{ $$self{'hash_key'} } );
     }
 }
 
 sub _check_watched_value ($$) {
     my ( $self, $value ) = @_;
     if ( $value ne $$self{'last_watched_val'} ) {
-        &::print_log(
-            "$$self{object_name}: New value $value different than $$self{last_watched_val}"
-        ) if $main::Debug{occupancy};
+        &::print_log( "$$self{object_name}: New value $value different than $$self{last_watched_val}" ) if $main::Debug{occupancy};
         $$self{'last_watched_val'} = $value;
         if ( $$self{'ok_values'} ) {
             foreach ( @{ $$self{'ok_values'} } ) {
                 if ( $$self{'last_watched_val'} eq $_ ) {
 
                     # New scalar value is one of the OK ones
-                    &::print_log(
-                        "$$self{object_name}: New value $value matches ok values: light_ok"
-                    ) if $main::Debug{occupancy};
+                    &::print_log( "$$self{object_name}: New value $value matches ok values: light_ok" ) if $main::Debug{occupancy};
                     unless ( $self->state() eq 'light_ok' ) {
                         $self->SUPER::set('light_ok');
                     }
@@ -147,9 +141,7 @@ sub _check_watched_value ($$) {
         else {
             if ( $$self{'last_watched_val'} ) {
                 unless ( $self->state() eq 'light_ok' ) {
-                    &::print_log(
-                        "$$self{object_name}: New value $value is true: light_ok"
-                    ) if $main::Debug{occupancy};
+                    &::print_log( "$$self{object_name}: New value $value is true: light_ok" ) if $main::Debug{occupancy};
                     $self->SUPER::set('light_ok');
                 }
                 return;
@@ -201,8 +193,7 @@ sub attach_hash_key {
         push @CheckScalars, $self;
     }
     else {
-        print
-          "ERROR: Light_Restriction_Item::attach_hash_key() called with a non-reference first parameter!\n";
+        print "ERROR: Light_Restriction_Item::attach_hash_key() called with a non-reference first parameter!\n";
     }
 }
 
@@ -217,8 +208,7 @@ sub attach_scalar {
         push @CheckScalars, $self;
     }
     else {
-        print
-          "ERROR: Light_Restriction_Item::attach_scalar() called with a non-reference first parameter!\n";
+        print "ERROR: Light_Restriction_Item::attach_scalar() called with a non-reference first parameter!\n";
     }
 }
 
diff --git a/lib/Light_Switch_Item.pm b/lib/Light_Switch_Item.pm
index 65a6d9f29..a00d83a6e 100644
--- a/lib/Light_Switch_Item.pm
+++ b/lib/Light_Switch_Item.pm
@@ -132,15 +132,13 @@ sub set {
     my ( $self, $p_state, $p_setby ) = @_;
     if ( ref $p_setby ) {
         if ( $p_setby->can('get_set_by') ) {
-            &::print_log(
-                "Light_Switch_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
+            &::print_log( "Light_Switch_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
                   . $p_setby->get_set_by )
               if $main::Debug{occupancy};
         }
         else {
-            &::print_log(
-                "Light_Switch_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name}"
-            ) if $main::Debug{occupancy};
+            &::print_log( "Light_Switch_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name}" )
+              if $main::Debug{occupancy};
         }
     }
     return if ( $p_state eq 'manual' );
@@ -153,9 +151,7 @@ sub set {
                     and $p_setby eq $p_setby->get_set_by() )
               )
             {
-                &::print_log(
-                    "Light_Switch_Item($$self{object_name}): setting state to 'pressed'"
-                ) if $main::Debug{occupancy};
+                &::print_log( "Light_Switch_Item($$self{object_name}): setting state to 'pressed'" ) if $main::Debug{occupancy};
                 $self->SUPER::set( 'pressed', $p_setby );
                 last;
             }
diff --git a/lib/Lynx10PLC.pm b/lib/Lynx10PLC.pm
index 870c5ed99..59d877b9a 100644
--- a/lib/Lynx10PLC.pm
+++ b/lib/Lynx10PLC.pm
@@ -216,13 +216,7 @@ sub serial_startup {
 
     if ( $::config_parms{Lynx10PLC_port} ) {
         my ($speed) = $::config_parms{Lynx10PLC_baudrate} || 9600;
-        if (
-            &::serial_port_create(
-                'Lynx10PLC', $::config_parms{Lynx10PLC_port},
-                $speed,      'none'
-            )
-          )
-        {
+        if ( &::serial_port_create( 'Lynx10PLC', $::config_parms{Lynx10PLC_port}, $speed, 'none' ) ) {
             $serial_port = $::Serial_Ports{Lynx10PLC}{object};
             $serial_port->error_msg(0);
 
@@ -238,9 +232,7 @@ sub serial_startup {
             select( undef, undef, undef, .100 );    # Sleep a bit
 
             # Force LynxNet protocol and Legacy Dim Mode 1
-            if ( &send( NETID_LYNXNET, pack( 'C3', LNCMD_WRITENVRAM, 1, 3 ) ) ==
-                0 )
-            {
+            if ( &send( NETID_LYNXNET, pack( 'C3', LNCMD_WRITENVRAM, 1, 3 ) ) == 0 ) {
                 print "Lynx10-PLC is not responding, trying to reconfigure\n";
                 configure_plc($speed);
                 $serial_port->baudrate($speed);
@@ -369,8 +361,7 @@ sub send_plc {
 
     if ( $::config_parms{Lynx10PLC_port} =~ 'proxy' ) {
         print "using proxy, calling proxy_send\n" if $main::Debug{proxy};
-        &main::proxy_send( 'Lynx10PLC', 'lynx10plc', 'send_plc', $cmd,
-            $module_type );
+        &main::proxy_send( 'Lynx10PLC', 'lynx10plc', 'send_plc', $cmd, $module_type );
         return;
     }
 
@@ -422,49 +413,39 @@ sub cmd2payld {
 
     # Command "L" is X10_BRIGHT
     elsif ( $code =~ /^l/i ) {
-        $payld =
-          pack( 'C1', X10_BRIGHT ) . $_queuedAddr . pack( 'C2', X10_EOL, 6 );
+        $payld = pack( 'C1', X10_BRIGHT ) . $_queuedAddr . pack( 'C2', X10_EOL, 6 );
     }
 
     # Command "M" is X10_DIM
     elsif ( $code =~ /^m/i ) {
-        $payld =
-          pack( 'C1', X10_DIM ) . $_queuedAddr . pack( 'C2', X10_EOL, 6 );
+        $payld = pack( 'C1', X10_DIM ) . $_queuedAddr . pack( 'C2', X10_EOL, 6 );
     }
 
     # Command "&P#" is X10_EXTENDED_CODE_1
     elsif ( my ($extended_data) = $code =~ /&P(\d+)/ ) {
         if ( ( $extended_data > 0 ) && ( $extended_data <= 64 ) ) {
             --$extended_data;
-            $payld =
-                pack( 'C1', X10_EXTENDED_CODE_1 )
-              . $_queuedAddr
-              . pack( 'C3', X10_EOL, $extended_data, X10_EXTENDED_CODE_1 );
+            $payld = pack( 'C1', X10_EXTENDED_CODE_1 ) . $_queuedAddr . pack( 'C3', X10_EOL, $extended_data, X10_EXTENDED_CODE_1 );
         }
     }
 
     # Command "-#" is X10_DIM
     elsif ( $code =~ /^-(\d+)$/ ) {
         my $dim = int( ( $1 / 100 ) * $dim_intervals );
-        $payld =
-          pack( 'C1', X10_DIM ) . $_queuedAddr . pack( 'C2', X10_EOL, $dim )
+        $payld = pack( 'C1', X10_DIM ) . $_queuedAddr . pack( 'C2', X10_EOL, $dim )
           if $dim;
     }
 
     # Command "+#" is X10_BRIGHT
     elsif ( $code =~ /^\+(\d+)$/ ) {
         my $dim = int( ( $1 / 100 ) * $dim_intervals );
-        $payld =
-          pack( 'C1', X10_BRIGHT ) . $_queuedAddr . pack( 'C2', X10_EOL, $dim )
+        $payld = pack( 'C1', X10_BRIGHT ) . $_queuedAddr . pack( 'C2', X10_EOL, $dim )
           if $dim;
     }
 
     # Command STATUS
     elsif ( $code =~ /^STATUS$/ ) {
-        $payld =
-            pack( 'C1', X10_STATUS_REQUEST )
-          . $_queuedAddr
-          . pack( 'C1', X10_EOL );
+        $payld = pack( 'C1', X10_STATUS_REQUEST ) . $_queuedAddr . pack( 'C1', X10_EOL );
 
         #+++ $Lynx10PLC{STATUS_REQUEST} = "$house";
         $Lynx10PLC{STATUS_REQUEST} = $Lynx10PLC{UNIT_ADDRESS};
@@ -473,26 +454,20 @@ sub cmd2payld {
     # Preset Dim
     elsif ( my ($dim) = $code =~ /PRESET_DIM(\d)$/ ) {
         my $dim_level = $preset_dim_levels2{$house} + ( $dim - 1 ) * 16;
-        $payld =
-            pack( 'C1', X10_DIM_PRESET )
-          . $_queuedAddr
-          . pack( 'C2', X10_EOL, $dim_level );
+        $payld = pack( 'C1', X10_DIM_PRESET ) . $_queuedAddr . pack( 'C2', X10_EOL, $dim_level );
     }
 
     # Command X10_ALL_LIGHTS_ON
     elsif ( $code =~ /^o/i ) {
-        $payld =
-          pack( 'C1', X10_ALLLIGHTSON ) . $_queuedAddr . pack( 'C1', X10_EOL );
+        $payld = pack( 'C1', X10_ALLLIGHTSON ) . $_queuedAddr . pack( 'C1', X10_EOL );
     }
 
     # Command X10_ALL_OFF
     elsif ( $code =~ /^p/i ) {
-        $payld =
-          pack( 'C1', X10_ALLUNITSOFF ) . $_queuedAddr . pack( 'C1', X10_EOL );
+        $payld = pack( 'C1', X10_ALLUNITSOFF ) . $_queuedAddr . pack( 'C1', X10_EOL );
     }
     elsif ( $code =~ /^FORCEADDR/i ) {
-        $payld =
-          pack( 'C1', X10_UNITADDRESS ) . $_queuedAddr . pack( 'C1', X10_EOL );
+        $payld = pack( 'C1', X10_UNITADDRESS ) . $_queuedAddr . pack( 'C1', X10_EOL );
     }
 
     # just have house code and unit, no code.
@@ -504,11 +479,7 @@ sub cmd2payld {
 
     debugPrint( "cmd2payld: cmd=$cmd, payld=" . unpack( 'H*', $payld ) )
       if $main::Debug{lynx10plc} && $payld;
-    &::logit(
-        "$::config_parms{data_dir}/logs/x10.log",
-        "out: $cmd, payld=" . unpack( 'H*', $payld ),
-        "12"
-    ) if $payld;
+    &::logit( "$::config_parms{data_dir}/logs/x10.log", "out: $cmd, payld=" . unpack( 'H*', $payld ), "12" ) if $payld;
     $_queuedAddr = undef if $payld;
     return $payld;
 }
@@ -533,10 +504,7 @@ sub processPkt {
 
     &splitPkt($pkt);
 
-    debugPrint( "<-- processPkt: netid="
-          . sprintf( "%02X", $_netid )
-          . ", payld: len=$_paysz, data="
-          . unpack( 'H*', $_payld ) )
+    debugPrint( "<-- processPkt: netid=" . sprintf( "%02X", $_netid ) . ", payld: len=$_paysz, data=" . unpack( 'H*', $_payld ) )
       if $main::Debug{lynx10plc};
 
     &processPkt_X10     if ( $_netid == NETID_X10 );
@@ -550,10 +518,7 @@ sub processPkt_LYNXNET {
     my $msg = "";
 
     if ( $_paycmd == LNCMD_MFGANDMODEL ) {
-        $msg = "Mfg="
-          . unpack( 'H*', substr( $_payld, 1, 2 ) )
-          . ", Model="
-          . unpack( 'H*', substr( $_payld, 3, 2 ) )
+        $msg = "Mfg=" . unpack( 'H*', substr( $_payld, 1, 2 ) ) . ", Model=" . unpack( 'H*', substr( $_payld, 3, 2 ) )
           if $_paysz == 5;
     }
     elsif ( $_paycmd == LNCMD_SERIALNUM ) {
@@ -579,7 +544,7 @@ sub processPkt_X10 {
 
     if ( $_paycmd == X10_UNITADDRESS ) {
         if ( $_paysz >= 3 ) {
-            $_cmds = $table_hcodes{ $data[1] } . $table_ucodes{ $data[2] };
+            $_cmds                     = $table_hcodes{ $data[1] } . $table_ucodes{ $data[2] };
             $Lynx10PLC{UNITADDRESS}    = $_cmds;
             $Lynx10PLC{STATUS_REQUEST} = "";
         }
@@ -613,9 +578,7 @@ sub processPkt_X10 {
     elsif ( $_paycmd == X10_RD_STATCOUNTER ) {
         if ( $_paysz == 5 ) {
             my $cntr = unpack( 'C', substr( $_payld, 2, 1 ) );
-            my $stat =
-              unpack( 'C', substr( $_payld, 3, 1 ) ) * 256 +
-              unpack( 'C', substr( $_payld, 4, 1 ) );
+            my $stat = unpack( 'C', substr( $_payld, 3, 1 ) ) * 256 + unpack( 'C', substr( $_payld, 4, 1 ) );
             my $cntrname = &StatCntrName($cntr);
             $msg = sprintf( "LynxNet X10 %-15s: $stat", $cntrname );
             $Lynx10PLC{$cntrname} = $stat;
@@ -623,9 +586,7 @@ sub processPkt_X10 {
     }
     elsif ( $_paycmd == X10_CARRIERPRESENT ) {
         if ( $_paysz == 7 ) {
-            my $days =
-              unpack( 'C', substr( $_payld, 2, 1 ) ) * 256 +
-              unpack( 'C', substr( $_payld, 3, 1 ) );
+            my $days  = unpack( 'C', substr( $_payld, 2, 1 ) ) * 256 + unpack( 'C', substr( $_payld, 3, 1 ) );
             my $hours = unpack( 'C', substr( $_payld, 4, 1 ) );
             my $mins  = unpack( 'C', substr( $_payld, 5, 1 ) );
             my $secs  = unpack( 'C', substr( $_payld, 6, 1 ) );
@@ -633,8 +594,7 @@ sub processPkt_X10 {
             my $totsecs = ( $days * 24 + $hours ) * 3600 + $mins * 60 + $secs;
             $Lynx10PLC{CARRIERPRESENT} = $totsecs;
 
-            $msg = "LynxNet X10 Uptime         : $days days, $hours:"
-              . sprintf( "%02d:%02d", $mins, $secs );
+            $msg = "LynxNet X10 Uptime         : $days days, $hours:" . sprintf( "%02d:%02d", $mins, $secs );
         }
     }
     elsif ( $_paycmd == X10_RECEIVERSENSITIVITY ) {
@@ -695,13 +655,11 @@ sub processPkt_X10 {
 
     elsif ( $_paycmd == X10_EXTENDED_CODE_1 ) {
         if ( $_paysz == 6 ) {
-            my ( $foo, $hc, $uc, $eol, $data, $command ) =
-              unpack( 'C6', $_payld );
+            my ( $foo, $hc, $uc, $eol, $data, $command ) = unpack( 'C6', $_payld );
             $hc = $table_hcodes{$hc};
             $uc = $table_ucodes{$uc};
 
-            debugPrint(
-                "paysz=$_paysz, hc=$hc, uc=$uc, data=$data, command=$command")
+            debugPrint("paysz=$_paysz, hc=$hc, uc=$uc, data=$data, command=$command")
               if $main::Debug{lynx10plc};
 
             #extended output status
@@ -711,17 +669,11 @@ sub processPkt_X10 {
                 # B6  0=Lamp, 1=appliance
                 # B5-B0 dim level
                 my $dim_level = $data & 0x3f;    #bits 0-5
-                debugPrint(
-                    sprintf "dim_level:$dim_level (%d%%)",
-                    int( 100 * $dim_level / 63 ) + 1
-                ) if $main::Debug{lynx10plc};
+                debugPrint( sprintf "dim_level:$dim_level (%d%%)", int( 100 * $dim_level / 63 ) + 1 ) if $main::Debug{lynx10plc};
                 $_cmds = $hc . $uc . "&P" . $dim_level;
             }
             else {
-                $_cmds .= $hc
-                  . sprintf( "Z%02x%02x%02x",
-                    $table_dcodes2[ $table_ucodes2{$uc} ],
-                    $data, $command );
+                $_cmds .= $hc . sprintf( "Z%02x%02x%02x", $table_dcodes2[ $table_ucodes2{$uc} ], $data, $command );
             }
         }
     }
@@ -745,11 +697,7 @@ sub processPkt_X10 {
     debugPrint( "Lynx10PLC::processPkt_X10: _cmds= " . $_cmds )
       if $main::Debug{lynx10plc} && $_cmds;
 
-    &::logit(
-        "$::config_parms{data_dir}/logs/x10.log",
-        "in:  $_cmds, payld=" . unpack( 'H*', $_payld ),
-        "12"
-    ) if $_cmds;
+    &::logit( "$::config_parms{data_dir}/logs/x10.log", "in:  $_cmds, payld=" . unpack( 'H*', $_payld ), "12" ) if $_cmds;
 }
 
 =item C<splitPkt>
@@ -860,10 +808,7 @@ sub read {
             # Data was read, so append it to the readBuf
             $readBuf .= $data;
 
-            print "Data rcvd: len="
-              . length($data)
-              . ", data="
-              . unpack( 'H*', $data ) . "\n"
+            print "Data rcvd: len=" . length($data) . ", data=" . unpack( 'H*', $data ) . "\n"
               if $main::Debug{serial};
         }
         else {
@@ -970,12 +915,7 @@ sub send {
     my ( $exp_seqnum, $exp_netid ) = ( $_seqnum, $_netid );
 
     my $msg =
-        "WR pkt: len="
-      . sprintf( "%2d", length($pkt) )
-      . ", data="
-      . unpack( 'H*', $pkt )
-      . ", payld="
-      . unpack( 'H*', $payld );
+      "WR pkt: len=" . sprintf( "%2d", length($pkt) ) . ", data=" . unpack( 'H*', $pkt ) . ", payld=" . unpack( 'H*', $payld );
     $msg .= "(" . PayCmdName($_paycmd) . ")" if $_paycmd;
     print "$msg\n" if $main::Debug{serial};
     system("$logger \"$msg\"") if $logger;
@@ -1023,8 +963,7 @@ sub send {
 
 sub debugPrint {
     my ($msg) = @_;
-    printf "%02d:%02d:%02d %s\n", $main::Hour, $main::Minute, $main::Second,
-      $msg;
+    printf "%02d:%02d:%02d %s\n", $main::Hour, $main::Minute, $main::Second, $msg;
 }
 
 sub StatCntrName {
@@ -1097,9 +1036,8 @@ sub ClrStatCntr {
 }
 
 my @stat_cntrs = (
-    STATCNTR_TRANSMIT_PKTS,  STATCNTR_RECEIVED_PKTS,
-    STATCNTR_RECEPTION_ERRS, STATCNTR_TRANSMIT_ERRS,
-    STATCNTR_COLLISIONS,     STATCNTR_POWERFAILURES
+    STATCNTR_TRANSMIT_PKTS, STATCNTR_RECEIVED_PKTS, STATCNTR_RECEPTION_ERRS, STATCNTR_TRANSMIT_ERRS,
+    STATCNTR_COLLISIONS,    STATCNTR_POWERFAILURES
 );
 
 sub clearAllStats {
@@ -1139,8 +1077,7 @@ sub sendExtendedCode {
     return unless ( 4 == @_ );
     my ( $hc, $uc, $cmd, $data ) = @_;
 
-    &send( NETID_X10,
-        pack( 'C6', X10_EXTENDED_CODE_1, $hc, $uc, X10_EOL, $data, $cmd ) );
+    &send( NETID_X10, pack( 'C6', X10_EXTENDED_CODE_1, $hc, $uc, X10_EOL, $data, $cmd ) );
 }
 
 sub sendX10On {
diff --git a/lib/MBM_mh.pm b/lib/MBM_mh.pm
index 76758502e..cbe37d779 100644
--- a/lib/MBM_mh.pm
+++ b/lib/MBM_mh.pm
@@ -25,7 +25,7 @@ B<Generic_Item>
 
 use strict;
 use Win32::API;
-use MBM_sensors;   # Required.  Distributed with MisterHouse or obtain from CPAN
+use MBM_sensors;    # Required.  Distributed with MisterHouse or obtain from CPAN
 
 package MBM_mh;
 @MBM_mh::ISA = ('Generic_Item');
@@ -51,11 +51,7 @@ sub new {
     bless $self, $class;
 
     push @MBM_Sensor_Objects, $self;
-    restore_data $self (
-        'name',  'current', 'high',   'low',
-        'count', 'total',   'alarm1', 'alarm2',
-        'timestamp'
-    );
+    restore_data $self ( 'name', 'current', 'high', 'low', 'count', 'total', 'alarm1', 'alarm2', 'timestamp' );
 
     return $self;
 }
@@ -134,8 +130,7 @@ sub check_for_data {
                 $self->{alarm2}    = $MBM_sensors{$type}{alarm2}[$num];
                 $self->{timestamp} = $MBM_sensors{timecurrent};
                 set $self $MBM_sensors{$type}{current}[$num];
-                ::print_log
-                  "MBM updating $type $num $self->{name} with $self->{current}"
+                ::print_log "MBM updating $type $num $self->{name} with $self->{current}"
                   if $::config_parms{debug} eq 'MBM';
             }
         }
diff --git a/lib/MBM_sensors.pm b/lib/MBM_sensors.pm
index bc7b3641a..a4f19b468 100644
--- a/lib/MBM_sensors.pm
+++ b/lib/MBM_sensors.pm
@@ -129,23 +129,20 @@ sub get {
 
     my $MBMSharedInfoPattern = 'S' .    # siSMB_Base SMBus base address
       'C' .                             # siSMB_Type SMBus how accessed
-      'C' .      # siSMB_Code SMBus sub type Intel, AMD, ALi, etc.
-      'C' .      # siSMB_Addr Address of sensor chip on bus
-      'A41' .    # siSMB_Name Nice name for SMBus
-      'S' .      # siISA_Base ISA base address of sensor chip
-      'N' .      # siChipType
-      'C';       # siVoltageSubType
+      'C' .                             # siSMB_Code SMBus sub type Intel, AMD, ALi, etc.
+      'C' .                             # siSMB_Addr Address of sensor chip on bus
+      'A41' .                           # siSMB_Name Nice name for SMBus
+      'S' .                             # siISA_Base ISA base address of sensor chip
+      'N' .                             # siChipType
+      'C';                              # siVoltageSubType
     my $MBMSharedInfoLen = length pack $MBMSharedInfoPattern;
     $MBMSharedInfoLen += 4 - ( $MBMSharedInfoLen % 4 )
       if ( $MBMSharedInfoLen % 4 );
 
-    my $MBMSharedMemPattern = 'd' .    # sdVersion
-      $MBMSharedIndexPattern x 10
-      . $MBMSharedSensorPattern x 100
-      . $MBMSharedInfoPattern . 'A41'
-      .                                # sdStart    Start Time
-      'A41' .                          # sdCurrent  Current Time
-      'A256C';                         # sdPath
+    my $MBMSharedMemPattern = 'd' .                                                                    # sdVersion
+      $MBMSharedIndexPattern x 10 . $MBMSharedSensorPattern x 100 . $MBMSharedInfoPattern . 'A41' .    # sdStart    Start Time
+      'A41' .                                                                                          # sdCurrent  Current Time
+      'A256C';                                                                                         # sdPath
 
     # Due to Delphi field alignment, overall length not equal length pack $MBMSharedMemPattern
     # Instead, it is:
@@ -166,8 +163,7 @@ sub get {
     # Create objects for all the API calls we need
 ##
 
-    my $OpenFileMapping =
-      new Win32::API( 'kernel32', 'OpenFileMapping', 'NNP', 'N' );
+    my $OpenFileMapping = new Win32::API( 'kernel32', 'OpenFileMapping', 'NNP', 'N' );
     if ( not defined $OpenFileMapping ) {
         die "MBM_sensors.pm: Can't import 'OpenFileMapping' API";
     }
@@ -177,20 +173,17 @@ sub get {
         die "MBM_sensors.pm: Can't import 'CloseHandle' API";
     }
 
-    my $MapViewOfFile =
-      new Win32::API( 'kernel32', 'MapViewOfFile', 'NNNNN', 'N' );
+    my $MapViewOfFile = new Win32::API( 'kernel32', 'MapViewOfFile', 'NNNNN', 'N' );
     if ( not defined $MapViewOfFile ) {
         die "MBM_sensors.pm: Can't import 'MapViewOfFile' API";
     }
 
-    my $UnmapViewOfFile =
-      new Win32::API( 'kernel32', 'UnmapViewOfFile', 'N', 'N' );
+    my $UnmapViewOfFile = new Win32::API( 'kernel32', 'UnmapViewOfFile', 'N', 'N' );
     if ( not defined $UnmapViewOfFile ) {
         die "MBM_sensors.pm: Can't import 'UnmapViewOfFile' API";
     }
 
-    my $RtlMoveMemory =
-      new Win32::API( 'kernel32', 'RtlMoveMemory', 'PNN', 'V' );
+    my $RtlMoveMemory = new Win32::API( 'kernel32', 'RtlMoveMemory', 'PNN', 'V' );
     if ( not defined $RtlMoveMemory ) {
         die "MBM_sensors.pm: Can't import 'RtlMoveMemory' API";
     }
@@ -203,8 +196,7 @@ sub get {
 
     #print "MBM_sensors.pm: MBM Handle " . $MBMhandle . "\n";
     if ( !$MBMhandle ) {
-        $MBM_sensors{error} =
-          "MBM_sensors.pm: Could not obtain MBM shared memory handle. Is MBM running?";
+        $MBM_sensors{error} = "MBM_sensors.pm: Could not obtain MBM shared memory handle. Is MBM running?";
         warn $MBM_sensors{error};
         return %MBM_sensors;
     }
@@ -250,8 +242,7 @@ sub get {
 
     my $SensorTotalCount = 0;
     for ( $i = 0; $i < 10; $i++ ) {
-        my ( $iType, $iCount ) = unpack "x$offset$MBMSharedIndexPattern",
-          $MBMSharedMem;
+        my ( $iType, $iCount ) = unpack "x$offset$MBMSharedIndexPattern", $MBMSharedMem;
 
         #printf "MBM_sensors.pm: At offset of %2.1d: iType=%2.2X, iCount=%2.1d\n", $offset, $iType, $iCount;
         $offset           += $MBMSharedIndexLen;
@@ -259,10 +250,8 @@ sub get {
     }
 
     for ( $i = 0; $i < $SensorTotalCount; $i++ ) {
-        my (
-            $ssType,  $ssName,  $ssCurrent, $ssLow, $ssHigh,
-            $ssCount, $ssTotal, $ssAlarm1,  $ssAlarm2
-        ) = unpack "x$offset$MBMSharedSensorPattern", $MBMSharedMem;
+        my ( $ssType, $ssName, $ssCurrent, $ssLow, $ssHigh, $ssCount, $ssTotal, $ssAlarm1, $ssAlarm2 ) =
+          unpack "x$offset$MBMSharedSensorPattern", $MBMSharedMem;
 
         #print "MBM_sensors.pm: $ssType, $ssName, $ssCurrent, $ssLow, $ssHigh, $ssCount, $ssTotal, $ssAlarm1, $ssAlarm2\n";
         $offset += $MBMSharedSensorLen;
@@ -282,16 +271,13 @@ sub get {
     # Restart the offset, as we did not necessarily loop through all possible sensor slots.
     $offset = 8 + $MBMSharedIndexLen * 10 + $MBMSharedSensorLen * 100;
 
-    my (
-        $siSMB_Base, $siSMB_Type, $siSMBCode,  $siSMB_Addr,
-        $siSMB_Name, $siISA_Base, $siChipType, $siVoltageSubType
-    ) = unpack "x$offset$MBMSharedInfoPattern", $MBMSharedMem;
+    my ( $siSMB_Base, $siSMB_Type, $siSMBCode, $siSMB_Addr, $siSMB_Name, $siISA_Base, $siChipType, $siVoltageSubType ) =
+      unpack "x$offset$MBMSharedInfoPattern", $MBMSharedMem;
 
     #print "MBM_sensors.pm: Shared Info $siSMB_Base, $siSMB_Type, $siSMBCode, $siSMB_Addr, $siSMB_Name, $siISA_Base, $siChipType, $siVoltageSubType\n";
     $offset += $MBMSharedInfoLen;
 
-    my ( $sdStart, $sdCurrent, $sdPath ) = unpack "x$offset" . "A41A41A256",
-      $MBMSharedMem;
+    my ( $sdStart, $sdCurrent, $sdPath ) = unpack "x$offset" . "A41A41A256", $MBMSharedMem;
 
     #print "MBM_sensors.pm: Shared last part $sdStart, $sdCurrent, $sdPath\n";
     $MBM_sensors{timestart}   = $sdStart;
diff --git a/lib/MSN.pm b/lib/MSN.pm
index 7fa30a778..6a236a7fd 100644
--- a/lib/MSN.pm
+++ b/lib/MSN.pm
@@ -51,11 +51,7 @@ use IO::Select;
 #use DBI;
 use Digest::MD5 qw(md5 md5_hex md5_base64);
 
-my (
-    @Calls,    $Handle,     $Host,   $TrID,   $Port,
-    $Password, $CustomName, %Ignore, $Status, $Debug,
-    %Socks,    $Master,     $Funcs
-);
+my ( @Calls, $Handle, $Host, $TrID, $Port, $Password, $CustomName, %Ignore, $Status, $Debug, %Socks, $Master, $Funcs );
 
 $TrID = 0;
 $Port = 1863;
@@ -174,8 +170,7 @@ sub buddystatus {
         open OUT, ">/tmp/msn.status";
         print OUT time, "\n";
         foreach ( keys %{ $self->{Buddies} } ) {
-            print OUT "$_ ", $self->{Buddies}->{$_}->{Status}, " ",
-              $self->{Buddies}->{$username}->{LastChange}, "\n";
+            print OUT "$_ ", $self->{Buddies}->{$_}->{Status}, " ", $self->{Buddies}->{$username}->{LastChange}, "\n";
         }
         close OUT;
     }
@@ -257,8 +252,7 @@ sub process {
                     }
                 }
                 else {
-                    die "Unsupported authentication method: \"",
-                      &join( " ", @data ), "\"\n";
+                    die "Unsupported authentication method: \"", &join( " ", @data ), "\"\n";
                 }
             }
             elsif ( $cmd eq 'XFR' ) {
@@ -281,28 +275,23 @@ sub process {
                     if ( $Calls[0] ) {
                         my ( $h, undef ) = split( /:/, $data[2] );
                         $$self->{Sessions}->{ $Calls[0] } = MSN->new('SB');
-                        $$self->{Sessions}->{ $Calls[0] }->{Socket} =
-                          IO::Socket::INET->new(
+                        $$self->{Sessions}->{ $Calls[0] }->{Socket} = IO::Socket::INET->new(
                             PeerAddr => $h,
                             PeerPort => $Port,
                             Proto    => 'tcp'
-                          ) or die "$!";
+                        ) or die "$!";
 
                         # Add the new connection to the Select structure.
-                        $Select->add(
-                            $$self->{Sessions}->{ $Calls[0] }->{Socket} );
-                        $Socks{ $$self->{Sessions}->{ $Calls[0] }->{Socket}
-                              ->fileno } = \$$self->{Sessions}->{ $Calls[0] };
+                        $Select->add( $$self->{Sessions}->{ $Calls[0] }->{Socket} );
+                        $Socks{ $$self->{Sessions}->{ $Calls[0] }->{Socket}->fileno } = \$$self->{Sessions}->{ $Calls[0] };
                         $$self->{Sessions}->{ $Calls[0] }->{Key} = $data[4];
-                        $$self->{Sessions}->{ $Calls[0] }
-                          ->send( 'USR', $Handle . ' ' . $data[4] );
+                        $$self->{Sessions}->{ $Calls[0] }->send( 'USR', $Handle . ' ' . $data[4] );
                         $$self->{Sessions}->{ $Calls[0] }->{Type}   = 'SB';
                         $$self->{Sessions}->{ $Calls[0] }->{Handle} = $Calls[0];
 
                     }
                     else {
-                        die
-                          "Huh? Recieved XFR SB request, but there are no pending calls!\n";
+                        die "Huh? Recieved XFR SB request, but there are no pending calls!\n";
                     }
                 }
             }
@@ -326,26 +315,23 @@ sub process {
                 my ( $sid, $addr, undef, $key, $chandle, $cname ) = @data;
                 my ( $h, undef ) = split( /:/, $addr );
                 $$self->{Sessions}->{$chandle} = MSN->new('SB');
-                $$self->{Sessions}->{$chandle}->{Socket} =
-                  IO::Socket::INET->new(
+                $$self->{Sessions}->{$chandle}->{Socket} = IO::Socket::INET->new(
                     PeerAddr => $h,
                     PeerPort => $Port,
                     Proto    => 'tcp'
-                  ) or die "$!";
+                ) or die "$!";
                 $Select->add( $$self->{Sessions}->{$chandle}->{Socket} );
                 $Socks{ $$self->{Sessions}->{$chandle}->{Socket}->fileno } =
                   \$$self->{Sessions}->{$chandle};
                 $$self->{Sessions}->{$chandle}->{Key}    = $key;
                 $$self->{Sessions}->{$chandle}->{Handle} = $chandle;
-                $$self->{Sessions}->{$chandle}
-                  ->send( 'ANS', "$Handle $key $sid" );
+                $$self->{Sessions}->{$chandle}->send( 'ANS', "$Handle $key $sid" );
             }
             elsif ( $cmd eq 'ANS' ) {
                 my ($response) = @data;
 
                 if ( defined $$Funcs{Answer} ) {
-                    &{ $$Funcs{Answer} }( $self, $response )
-                      ;    # bbw Added $response
+                    &{ $$Funcs{Answer} }( $self, $response );    # bbw Added $response
                 }
 
             }
@@ -358,8 +344,7 @@ sub process {
                     $msg = stripheader($msg);
                     if ( $$self->{Type} eq 'SB' ) {
                         if ( defined $$Funcs{Message} ) {
-                            &{ $$Funcs{Message} }
-                              ( $self, $user, $friendly, $msg );
+                            &{ $$Funcs{Message} }( $self, $user, $friendly, $msg );
                         }
 
                         #                  if ($msg =~ /seen/is) {
diff --git a/lib/Marrick.pm b/lib/Marrick.pm
index a5c6cbc40..efb3ecd7e 100644
--- a/lib/Marrick.pm
+++ b/lib/Marrick.pm
@@ -97,12 +97,11 @@ sub init {
     $Mserial_port->parity("none");
     $Mserial_port->buffers( 4096, 4096 );
     @ReplyBuf = ();
-    $Mserial_port->write("M00=00\r")
-      ;    # Setting to 0 for old dim modes (needed for TXB16)
+    $Mserial_port->write("M00=00\r");    # Setting to 0 for old dim modes (needed for TXB16)
     sleep(1);
     &read();
     @ReplyBuf = ();
-    $Mserial_port->write("V0\r");    # Get the version of Marrick firmware
+    $Mserial_port->write("V0\r");        # Get the version of Marrick firmware
     sleep(1);
     &read();
 
@@ -145,8 +144,7 @@ sub startup {
     $Marrick{SENABLE}        = 0;
     $Marrick{STATUS_REQUEST} = "";
     @ReplyBuf                = ();
-    &main::print_log(
-        "Marrick unit has been started - Main events processor initialized.")
+    &main::print_log("Marrick unit has been started - Main events processor initialized.")
       if $main::Debug{marrick};
 
 }
@@ -205,8 +203,7 @@ sub Process_Event {
                 my $rslt = "";
                 $Marrick{HOUSEID} = $table_rhcodes{$2};
                 foreach my $unit ( "1" .. "G" ) {
-                    $rslt .=
-                      "X" . $Marrick{HOUSEID} . $unit . $Marrick{HOUSEID} . "K";
+                    $rslt .= "X" . $Marrick{HOUSEID} . $unit . $Marrick{HOUSEID} . "K";
                 }
                 return $rslt;
             }
@@ -214,43 +211,28 @@ sub Process_Event {
                 my $rslt = "";
                 $Marrick{HOUSEID} = $table_rhcodes{$2};
                 foreach my $unit ( "1" .. "G" ) {
-                    $rslt .=
-                      "X" . $Marrick{HOUSEID} . $unit . $Marrick{HOUSEID} . "J";
+                    $rslt .= "X" . $Marrick{HOUSEID} . $unit . $Marrick{HOUSEID} . "J";
                 }
                 return $rslt;
             }
             elsif ( $3 eq "2" ) {
                 my $rslt = "";
                 $Marrick{HOUSEID} = $table_rhcodes{$2};
-                $rslt .= "X"
-                  . $Marrick{HOUSEID}
-                  . $Marrick{UNITID}
-                  . $Marrick{HOUSEID} . "J";
+                $rslt .= "X" . $Marrick{HOUSEID} . $Marrick{UNITID} . $Marrick{HOUSEID} . "J";
                 return $rslt;
             }
             elsif ( $3 eq "3" ) {
                 my $rslt = "";
                 $Marrick{HOUSEID} = $table_rhcodes{$2};
-                $rslt .= "X"
-                  . $Marrick{HOUSEID}
-                  . $Marrick{UNITID}
-                  . $Marrick{HOUSEID} . "K";
+                $rslt .= "X" . $Marrick{HOUSEID} . $Marrick{UNITID} . $Marrick{HOUSEID} . "K";
                 return $rslt;
             }
             elsif ( $3 eq "A" ) {
-                my $rslt = "X"
-                  . $Marrick{HOUSEID}
-                  . $Marrick{UNITID}
-                  . $table_rhcodes{$2}
-                  . "PRESET_DIM1";
+                my $rslt = "X" . $Marrick{HOUSEID} . $Marrick{UNITID} . $table_rhcodes{$2} . "PRESET_DIM1";
                 return $rslt;
             }
             elsif ( $3 eq "B" ) {
-                my $rslt = "X"
-                  . $Marrick{HOUSEID}
-                  . $Marrick{UNITID}
-                  . $table_rhcodes{$2}
-                  . "PRESET_DIM2";
+                my $rslt = "X" . $Marrick{HOUSEID} . $Marrick{UNITID} . $table_rhcodes{$2} . "PRESET_DIM2";
                 return $rslt;
             }
         }
@@ -292,9 +274,7 @@ sub send_X10 {
     if ( $code =~ /PRESET_DIM/ ) {
         $header = "X0" . $house_bits . $device_bits;
         $header .= "X1" . $table_hcodes{$level} . $code_bits;
-        &main::print_log(
-            "DIM PRESET Encoded House: $house, Unit: $device Code: $code Level: $level"
-        ) if $main::Debug{marrick};
+        &main::print_log( "DIM PRESET Encoded House: $house, Unit: $device Code: $code Level: $level" ) if $main::Debug{marrick};
         &main::print_log("DIM PRESET SENT Code: $header")
           if $main::Debug{marrick};
     }
@@ -304,8 +284,7 @@ sub send_X10 {
             and defined $code_bits )
         {
             &main::print_log(
-                "Error, invalid Marrick X10 data.  data=$house_code house=$house_bits device=$device_bits code=$code_bits"
-            );
+                "Error, invalid Marrick X10 data.  data=$house_code house=$house_bits device=$device_bits code=$code_bits" );
             return;
         }
         $header = $code_bits . $house_bits . $device_bits;
@@ -321,8 +300,7 @@ sub send_X10 {
         $rslt = &GetReply();
     }
     if ( $rslt =~ /E.*/ ) {
-        &main::print_log(
-            "Marrick - Error received when sending command $header to X10.");
+        &main::print_log("Marrick - Error received when sending command $header to X10.");
         goto retrns;
     }
     elsif ( $rslt =~ /\*/ ) {
diff --git a/lib/Motion_Item.pm b/lib/Motion_Item.pm
index e2680bc35..2a7e0f0a7 100644
--- a/lib/Motion_Item.pm
+++ b/lib/Motion_Item.pm
@@ -101,13 +101,11 @@ sub set {
 
     if ( ref $p_setby and $p_setby->can('get_set_by') ) {
         &::print_log(
-            "Motion_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
-              . $p_setby->get_set_by )
+            "Motion_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by " . $p_setby->get_set_by )
           if $main::Debug{occupancy};
     }
     else {
-        &::print_log(
-            "Motion_Item($$self{object_name})::set($p_state, $p_setby)")
+        &::print_log("Motion_Item($$self{object_name})::set($p_state, $p_setby)")
           if $main::Debug{occupancy};
     }
 
@@ -134,8 +132,7 @@ sub set {
             package Motion_Item;
         }
         else {
-            &::print_log(
-                "$$self{object_name}->Has not received motion in 24hrs");
+            &::print_log("$$self{object_name}->Has not received motion in 24hrs");
         }
         $p_state = 'check';
     }
diff --git a/lib/Motion_Tracker.pm b/lib/Motion_Tracker.pm
index 92a99a664..87a0c8a3b 100644
--- a/lib/Motion_Tracker.pm
+++ b/lib/Motion_Tracker.pm
@@ -174,8 +174,7 @@ sub last_motion {
     else {
         # Haven't expired yet, so setup timer to set state later on
         # Note that I subtract the age() as time served :)
-        $$self{expire_timer}
-          ->set( $self->expire_timeout() - $self->age(), $self );
+        $$self{expire_timer}->set( $self->expire_timeout() - $self->age(), $self );
     }
     return $last_motion;
 }
diff --git a/lib/Musica.pm b/lib/Musica.pm
index 46a7efaaa..92f33ae58 100644
--- a/lib/Musica.pm
+++ b/lib/Musica.pm
@@ -607,22 +607,18 @@ use vars qw( %source_name_to_number @source_number_to_name
 );
 
 @source_number_to_name = (
-    '',        'CD',       'AUX',   'TAPE',     'TUNER',    'TUNER2',
-    'AM',      'FM',       'MP3',   'BLUES',    'CHILDREN', 'CLASSIC',
-    'COUNTRY', 'DAD',      'DANCE', 'DVD',      'LIGHTS',   'INTERNET',
-    'JAZZ',    'REQUEST',  'MOM',   'XM RADIO', 'POP',      'R&B',
-    'RAP',     'HD RADIO', 'ROCK',  'SAT',      'SAT2',     'SOUL',
-    'WESTERN'
+    '',       'CD',       'AUX',      'TAPE',    'TUNER',   'TUNER2',   'AM',    'FM',
+    'MP3',    'BLUES',    'CHILDREN', 'CLASSIC', 'COUNTRY', 'DAD',      'DANCE', 'DVD',
+    'LIGHTS', 'INTERNET', 'JAZZ',     'REQUEST', 'MOM',     'XM RADIO', 'POP',   'R&B',
+    'RAP',    'HD RADIO', 'ROCK',     'SAT',     'SAT2',    'SOUL',     'WESTERN'
 );
 
 @source_number_to_name_30419 = (
-    '',        'CD',      'AUX',   'TAPE',     'TUNER',    'TUNER2',
-    'AM',      'FM',      'MP3',   'BLUES',    'CHILDREN', 'CLASSIC',
-    'COUNTRY', 'DAD',     'DANCE', 'DVD',      'LIGHTS',   'INTERNET',
-    'JAZZ',    'REQUEST', 'MOM',   'XMRADIO',  'POP',      'R&B',
-    'RAP',     'RADIO',   'ROCK',  'SAT',      'SAT2',     'SOUL',
-    'CD2',     'TALK',    'NEWS',  'SIRIUS',   'TRAFFIC',  'WEATHER',
-    'SPORTS',  'NPR',     'DSS',   'M SERVER', 'DISH',     ''
+    '',         'CD',      'AUX',     'TAPE',   'TUNER',   'TUNER2',  'AM',     'FM',       'MP3',  'BLUES',
+    'CHILDREN', 'CLASSIC', 'COUNTRY', 'DAD',    'DANCE',   'DVD',     'LIGHTS', 'INTERNET', 'JAZZ', 'REQUEST',
+    'MOM',      'XMRADIO', 'POP',     'R&B',    'RAP',     'RADIO',   'ROCK',   'SAT',      'SAT2', 'SOUL',
+    'CD2',      'TALK',    'NEWS',    'SIRIUS', 'TRAFFIC', 'WEATHER', 'SPORTS', 'NPR',      'DSS',  'M SERVER',
+    'DISH',     ''
 );
 
 %button_name_to_number = (
@@ -653,17 +649,11 @@ use vars qw( %source_name_to_number @source_number_to_name
     'next'     => 12,    # 6
 );
 
-@button_number_to_name = (
-    '',        'pause', 'stop', 'play',  'rewind',   'up',
-    'forward', 'left',  'down', 'right', 'previous', 'power',
-    'next'
-);
+@button_number_to_name =
+  ( '', 'pause', 'stop', 'play', 'rewind', 'up', 'forward', 'left', 'down', 'right', 'previous', 'power', 'next' );
 
-@button_number_to_name_40822 = (
-    '',       'pause', 'stop', 'play',  'shuffle',  '',
-    'repeat', 'left',  '',     'right', 'previous', 'mode',
-    'next'
-);
+@button_number_to_name_40822 =
+  ( '', 'pause', 'stop', 'play', 'shuffle', '', 'repeat', 'left', '', 'right', 'previous', 'mode', 'next' );
 
 my %commands_to_keys = (
 
@@ -716,67 +706,39 @@ sub serial_startup {
 
 sub _check_for_data {
     for my $port_name ( keys %Musica_Systems ) {
-        if (
-            (
-                $Musica_Systems{$port_name}{'last_data_received'} +
-                MAX_RESPONSE_WAIT
-            ) < $::Time
-          )
-        {
+        if ( ( $Musica_Systems{$port_name}{'last_data_received'} + MAX_RESPONSE_WAIT ) < $::Time ) {
+
             # It has been a while since we received data for this object... so, call
             # the _send_next_cmd() function which will re-send the first item in the
             # queue (if there is one present) just to try the command again
             if ( $Musica_Systems{$port_name}{'object'}->{'queue'}->[0] ) {
                 $Musica_Systems{$port_name}{'object'}->{'waiting_for_zone'} = 0;
-                if (
-                    (
-                        $Musica_Systems{$port_name}{'object'}->{'resend_count'}
-                        < 3
-                    )
-                    or ( $Musica_Systems{$port_name}{'object'}->{'queue'}->[0]
-                        =~ /^StatVer/ )
-                  )
+                if (   ( $Musica_Systems{$port_name}{'object'}->{'resend_count'} < 3 )
+                    or ( $Musica_Systems{$port_name}{'object'}->{'queue'}->[0] =~ /^StatVer/ ) )
                 {
                     $Musica_Systems{$port_name}{'object'}->{'resend_count'}++;
-                    $Musica_Systems{$port_name}{'object'}
-                      ->_report_error( "Going to re-send command ["
-                          . $Musica_Systems{$port_name}{'object'}->{'queue'}
-                          ->[0]
-                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)"
-                      );
+                    $Musica_Systems{$port_name}{'object'}->_report_error( "Going to re-send command ["
+                          . $Musica_Systems{$port_name}{'object'}->{'queue'}->[0]
+                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)" );
                     $Musica_Systems{$port_name}{'object'}->_send_next_cmd();
                 }
-                elsif (
-                    $Musica_Systems{$port_name}{'object'}->{'resend_count'} ==
-                    3 )
-                {
+                elsif ( $Musica_Systems{$port_name}{'object'}->{'resend_count'} == 3 ) {
                     $Musica_Systems{$port_name}{'object'}->{'resend_count'}++;
-                    $Musica_Systems{$port_name}{'object'}->_report_error(
-                        "Resetting serial connection to re-send command ["
-                          . $Musica_Systems{$port_name}{'object'}->{'queue'}
-                          ->[0]
-                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)"
-                    );
+                    $Musica_Systems{$port_name}{'object'}->_report_error( "Resetting serial connection to re-send command ["
+                          . $Musica_Systems{$port_name}{'object'}->{'queue'}->[0]
+                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)" );
                     &::serial_port_reopen($port_name);
                 }
-                elsif (
-                    $Musica_Systems{$port_name}{'object'}->{'resend_count'} <
-                    6 )
-                {
+                elsif ( $Musica_Systems{$port_name}{'object'}->{'resend_count'} < 6 ) {
                     $Musica_Systems{$port_name}{'object'}->{'resend_count'}++;
-                    $Musica_Systems{$port_name}{'object'}
-                      ->_report_error( "Going to re-send command ["
-                          . $Musica_Systems{$port_name}{'object'}->{'queue'}
-                          ->[0]
-                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)"
-                      );
+                    $Musica_Systems{$port_name}{'object'}->_report_error( "Going to re-send command ["
+                          . $Musica_Systems{$port_name}{'object'}->{'queue'}->[0]
+                          . "] ($Musica_Systems{$port_name}{'object'}->{'resend_count'} times)" );
                     $Musica_Systems{$port_name}{'object'}->_send_next_cmd();
                 }
                 else {
-                    $Musica_Systems{$port_name}{'object'}
-                      ->_critical_error( "Re-sent command ["
-                          . $Musica_Systems{$port_name}{'object'}->{'queue'}
-                          ->[0]
+                    $Musica_Systems{$port_name}{'object'}->_critical_error( "Re-sent command ["
+                          . $Musica_Systems{$port_name}{'object'}->{'queue'}->[0]
                           . '] too many times, dropping' );
                     $Musica_Systems{$port_name}{'object'}->_found_response();
                 }
@@ -785,62 +747,33 @@ sub _check_for_data {
         }
         for ( my $i = 1; $i <= MAX_ZONES; $i++ ) {
             if ( $Musica_Systems{$port_name}{'object'}->{'zones'}[$i] ) {
-                if ( $Musica_Systems{$port_name}{'object'}->{'zones'}[$i]
-                    ->{'just_turned_on'} )
-                {
-                    if (
-                        (
+                if ( $Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'just_turned_on'} ) {
+                    if ( ( $Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'on_time'} + MAX_ZONE_ON_DELAY ) <= $::Time ) {
+                        if ( $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'} < 3 ) {
+                            $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'}++;
                             $Musica_Systems{$port_name}{'object'}
-                            ->{'zones'}[$i]->{'on_time'} + MAX_ZONE_ON_DELAY
-                        ) <= $::Time
-                      )
-                    {
-                        if ( $Musica_Systems{$port_name}{'object'}
-                            ->{'on_repeat_count'} < 3 )
-                        {
-                            $Musica_Systems{$port_name}{'object'}
-                              ->{'on_repeat_count'}++;
-                            $Musica_Systems{$port_name}{'object'}
-                              ->_report_error(
-                                "Turning zone $i on again since it did not turn on before"
-                              );
-                            $Musica_Systems{$port_name}{'object'}
-                              ->{'zones'}[$i]->{'on_time'} = $::Time;
+                              ->_report_error( "Turning zone $i on again since it did not turn on before" );
+                            $Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'on_time'} = $::Time;
                             $Musica_Systems{$port_name}{'object'}->_queue_cmd(
-                                "ChangeSrc/$i/$Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'just_turned_on'}"
-                            );
+                                "ChangeSrc/$i/$Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'just_turned_on'}" );
                         }
-                        elsif ( $Musica_Systems{$port_name}{'object'}
-                            ->{'on_repeat_count'} == 3 )
-                        {
-                            $Musica_Systems{$port_name}{'object'}
-                              ->{'on_repeat_count'}++;
-                            $Musica_Systems{$port_name}{'object'}
-                              ->_report_error(
-                                "Resetting serial connection to turn zone $i on again since it did not turn on before"
-                              );
+                        elsif ( $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'} == 3 ) {
+                            $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'}++;
+                            $Musica_Systems{$port_name}{'object'}->_report_error(
+                                "Resetting serial connection to turn zone $i on again since it did not turn on before" );
                             &::serial_port_reopen($port_name);
                         }
-                        elsif ( $Musica_Systems{$port_name}{'object'}
-                            ->{'on_repeat_count'} < 6 )
-                        {
-                            $Musica_Systems{$port_name}{'object'}
-                              ->{'on_repeat_count'}++;
-                            $Musica_Systems{$port_name}{'object'}
-                              ->_report_error(
-                                "Turning zone $i on again since it did not turn on before"
-                              );
+                        elsif ( $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'} < 6 ) {
+                            $Musica_Systems{$port_name}{'object'}->{'on_repeat_count'}++;
                             $Musica_Systems{$port_name}{'object'}
-                              ->{'zones'}[$i]->{'on_time'} = $::Time;
+                              ->_report_error( "Turning zone $i on again since it did not turn on before" );
+                            $Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'on_time'} = $::Time;
                             $Musica_Systems{$port_name}{'object'}->_queue_cmd(
-                                "ChangeSrc/$i/$Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'just_turned_on'}"
-                            );
+                                "ChangeSrc/$i/$Musica_Systems{$port_name}{'object'}->{'zones'}[$i]->{'just_turned_on'}" );
                         }
                         else {
                             $Musica_Systems{$port_name}{'object'}
-                              ->_critical_error(
-                                "Turning zone $i on again since it did not turn on before"
-                              );
+                              ->_critical_error( "Turning zone $i on again since it did not turn on before" );
                         }
                     }
                 }
@@ -873,9 +806,7 @@ sub new {
     my $self = {};
     $$self{'port_name'} = $port_name;
     $$self{'zone'}      = 0;
-    &::print_log(
-        "$self->{'port_name'}: Netstreams Musica Misterhouse Module Version "
-          . OBJECT_VERSION );
+    &::print_log( "$self->{'port_name'}: Netstreams Musica Misterhouse Module Version " . OBJECT_VERSION );
     for ( my $i = 1; $i <= MAX_ZONES; $i++ ) {
         $$self{'zones'}[$i] = undef;
     }
@@ -883,11 +814,10 @@ sub new {
     bless $self, $class;
     $$self{'musica_obj'} = $self;
     $Musica_Systems{$port_name}{'object'} = $self;
-    if ( 1 == scalar( keys %Musica_Systems ) ) {  # Add hooks on first call only
+    if ( 1 == scalar( keys %Musica_Systems ) ) {    # Add hooks on first call only
         &::MainLoop_pre_add_hook( \&Musica::_check_for_data, 1 );
     }
-    &::serial_port_create( $port_name,
-        $::config_parms{ $port_name . "_serial_port" }, 9600 );
+    &::serial_port_create( $port_name, $::config_parms{ $port_name . "_serial_port" }, 9600 );
     $self->_queue_cmd('EventData/0/1');
     $self->_queue_cmd('EventSrc/1');
     $self->_queue_cmd('EventStore/0/1');
@@ -901,8 +831,7 @@ sub _store_zone_source {
       if $main::Debug{musica};
     if ( $$self{'zones'}[$zone] and ( $source ne 'X' ) ) {
         my $currsrc = $$self{'zones'}[$zone]->{'source'};
-        &::print_log(
-            "$self->{'port_name'}: _store_zone_source($zone,$source): $currsrc")
+        &::print_log("$self->{'port_name'}: _store_zone_source($zone,$source): $currsrc")
           if $main::Debug{musica};
         unless ( $currsrc eq $source ) {
             $$self{'timerOff'}->stop() if $$self{'timerOff'};
@@ -910,9 +839,8 @@ sub _store_zone_source {
 
                 # Currently off
                 $$self{'zones'}[$zone]->set_receive( 'zone_on', $set_by );
-                &::print_log(
-                    "$self->{'port_name'}: _store_zone_source($zone,$source): Zone just turned on"
-                ) if $main::Debug{musica};
+                &::print_log( "$self->{'port_name'}: _store_zone_source($zone,$source): Zone just turned on" )
+                  if $main::Debug{musica};
                 if (   ( $source eq '1' )
                     or ( $source eq '2' )
                     or ( $source eq '3' )
@@ -921,30 +849,25 @@ sub _store_zone_source {
                     # 5602 keypads don't seem to get the source labels unless they are on, so
                     # make sure to set the labels whenever a source is selected
                     if (SOURCE_SEND_LABELS) {
-                        $$self{'sources'}[$source]->set_label(
-                            $$self{'sources'}[$source]->get_label() );
+                        $$self{'sources'}[$source]->set_label( $$self{'sources'}[$source]->get_label() );
                     }
                 }
             }
             else {
                 if ( $source eq '0' ) {
                     if ( defined $currsrc ) {
-                        &::print_log(
-                            "$self->{'port_name'}: _store_zone_source($zone,$source): Zone just turned off"
-                        ) if $main::Debug{musica};
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'zone_off', $set_by );
+                        &::print_log( "$self->{'port_name'}: _store_zone_source($zone,$source): Zone just turned off" )
+                          if $main::Debug{musica};
+                        $$self{'zones'}[$zone]->set_receive( 'zone_off', $set_by );
                         if ( $$self{'timerOff'} ) {
                             $$self{'timerOff'}->set(0);
                         }
                     }
                 }
                 else {
-                    &::print_log(
-                        "$self->{'port_name'}: _store_zone_source($zone,$source): Zone source changed"
-                    ) if $main::Debug{musica};
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'source_changed', $set_by );
+                    &::print_log( "$self->{'port_name'}: _store_zone_source($zone,$source): Zone source changed" )
+                      if $main::Debug{musica};
+                    $$self{'zones'}[$zone]->set_receive( 'source_changed', $set_by );
                     if (   ( $source eq '1' )
                         or ( $source eq '2' )
                         or ( $source eq '3' )
@@ -953,8 +876,7 @@ sub _store_zone_source {
                         # 5602 keypads don't seem to get the source labels unless they are on, so
                         # make sure to set the labels whenever a source is selected
                         if (SOURCE_SEND_LABELS) {
-                            $$self{'sources'}[$source]->set_label(
-                                $$self{'sources'}[$source]->get_label() );
+                            $$self{'sources'}[$source]->set_label( $$self{'sources'}[$source]->get_label() );
                         }
                     }
                 }
@@ -972,8 +894,7 @@ sub _store_zone_source {
 
 sub _found_response {
     my ($self) = @_;
-    &::print_log(
-        "$self->{'port_name'}: found response for: [$self->{'queue'}->[0]]")
+    &::print_log("$self->{'port_name'}: found response for: [$self->{'queue'}->[0]]")
       if $main::Debug{musica};
     $self->{'last_received'}      = $self->{'next_last_received'};
     $self->{'next_last_received'} = $$self{'queue'}->[0];
@@ -1013,15 +934,11 @@ sub _see_if_zone_just_turned_on {
         # Currently off
         unless ( $$self{'zones'}[$zone]->{'just_turned_on'} ) {
             $$self{'zones'}[$zone]->{'on_time'} = $::Time;
-            &::print_log(
-                "$self->{'port_name'}: setting just_turned_on=$new_source (zone $zone)"
-            ) if $main::Debug{musica};
+            &::print_log( "$self->{'port_name'}: setting just_turned_on=$new_source (zone $zone)" ) if $main::Debug{musica};
             $$self{'zones'}[$zone]->{'just_turned_on'}    = $new_source;
             $$self{'zones'}[$zone]->{'just_turned_on_by'} = $set_by;
             $$self{'on_repeat_count'}                     = 0;
-            &::print_log(
-                "$self->{'port_name'}: Recording that zone $zone was just turned on"
-            ) if $main::Debug{musica};
+            &::print_log( "$self->{'port_name'}: Recording that zone $zone was just turned on" ) if $main::Debug{musica};
         }
         return 1;
     }
@@ -1064,23 +981,18 @@ sub _parse_data {
         $version =~ s/^\D//;
         if ( $zone == 0 ) {
             $$self{'adc_version'} = $version;
-            &::print_log(
-                "$self->{'port_name'}: Netstreams Musica ADC Version: $version"
-            );
+            &::print_log( "$self->{'port_name'}: Netstreams Musica ADC Version: $version" );
         }
         elsif ( $$self{'zones'}[$zone] ) {
             if ( $version eq 'X' ) {
                 $version = 'Not Present';
-                $self->_report_error( 'Zone keypad not detected by ADC',
-                    $zone );
+                $self->_report_error( 'Zone keypad not detected by ADC', $zone );
                 $$self{'zones'}[$zone]->{'present'} = 0;
             }
             else {
                 $$self{'zones'}[$zone]->{'keypad_version'} = $version;
                 $main::Save{"Musica-Keypad$zone-Version"} = $version;
-                &::print_log(
-                    "$self->{'port_name'}: Netstreams Musica Zone $zone Keypad Version: $version"
-                );
+                &::print_log( "$self->{'port_name'}: Netstreams Musica Zone $zone Keypad Version: $version" );
                 $self->_process_keypad_version($zone);
             }
         }
@@ -1102,13 +1014,10 @@ sub _parse_data {
                 $$self{'last_held_button'} = $button;
             }
             elsif ( $$self{'last_held_time'} and $$self{'last_held_button'} ) {
-                if ( ( $main::Time - $$self{'last_held_time'} ) <=
-                    IGNORE_BUTTON_PRESSED_AFTER_HELD )
-                {
+                if ( ( $main::Time - $$self{'last_held_time'} ) <= IGNORE_BUTTON_PRESSED_AFTER_HELD ) {
                     if ( $$self{'last_held_button'} == $button ) {
-                        &::print_log(
-                            "$self->{'port_name'}: ignoring button press because of recent button hold"
-                        ) if $main::Debug{musica};
+                        &::print_log( "$self->{'port_name'}: ignoring button press because of recent button hold" )
+                          if $main::Debug{musica};
                         $ignore = 1;
                     }
                 }
@@ -1116,30 +1025,20 @@ sub _parse_data {
             unless ($ignore) {
                 if ( $$self{'zones'}[$zone] ) {
                     if ( $$self{'zones'}[$zone]->{'keypad_version'} >= 40822 ) {
-                        $$self{'zones'}[$zone]->set_receive(
-                            $action . $button_number_to_name_40822[$button],
-                            'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( $action . $button_number_to_name_40822[$button], 'keypad' );
                     }
                     else {
-                        $$self{'zones'}[$zone]->set_receive(
-                            $action . $button_number_to_name[$button],
-                            'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( $action . $button_number_to_name[$button], 'keypad' );
                     }
                 }
                 if ( $$self{'sources'}[$source] ) {
                     if (    ( $$self{'zones'}[$zone] )
-                        and
-                        ( $$self{'zones'}[$zone]->{'keypad_version'} >= 40822 )
-                      )
+                        and ( $$self{'zones'}[$zone]->{'keypad_version'} >= 40822 ) )
                     {
-                        $$self{'sources'}[$source]->set_receive(
-                            $action . $button_number_to_name_40822[$button],
-                            'keypad' );
+                        $$self{'sources'}[$source]->set_receive( $action . $button_number_to_name_40822[$button], 'keypad' );
                     }
                     else {
-                        $$self{'sources'}[$source]->set_receive(
-                            $action . $button_number_to_name[$button],
-                            'keypad' );
+                        $$self{'sources'}[$source]->set_receive( $action . $button_number_to_name[$button], 'keypad' );
                     }
                 }
             }
@@ -1147,8 +1046,7 @@ sub _parse_data {
     }
     elsif ( $cmd eq 'ExeLock' ) {
         my ( $zone, $lock ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'locked', $lock,
-            ( $lock ? 'locked' : 'unlocked' ) );
+        $self->_store_zone_data( $zone, 'locked', $lock, ( $lock ? 'locked' : 'unlocked' ) );
     }
     elsif ( $cmd eq 'ChangeVol' ) {
         my ( $zone, $volume ) = split /\//, $value;
@@ -1156,13 +1054,11 @@ sub _parse_data {
     }
     elsif ( $cmd eq 'NudgeVol' ) {
         my ( $zone, $volume ) = split /\//, $value;
-        $self->_store_zone_nudge( $zone, 'volume', $volume, 0, 35,
-            'volume_changed' );
+        $self->_store_zone_nudge( $zone, 'volume', $volume, 0, 35, 'volume_changed' );
     }
     elsif ( $cmd eq 'ChangeMute' ) {
         my ( $zone, $mute ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'mute', $mute,
-            ( $mute ? 'mute_on' : 'mute_off' ) );
+        $self->_store_zone_data( $zone, 'mute', $mute, ( $mute ? 'mute_on' : 'mute_off' ) );
     }
     elsif ( $cmd eq 'ChangeTreb' ) {
         my ( $zone, $treble ) = split /\//, $value;
@@ -1170,8 +1066,7 @@ sub _parse_data {
     }
     elsif ( $cmd eq 'NudgeTreb' ) {
         my ( $zone, $treble ) = split /\//, $value;
-        $self->_store_zone_nudge( $zone, 'treble', $treble, 1, 15,
-            'treble_changed' );
+        $self->_store_zone_nudge( $zone, 'treble', $treble, 1, 15, 'treble_changed' );
     }
     elsif ( $cmd eq 'ChangeBass' ) {
         my ( $zone, $bass ) = split /\//, $value;
@@ -1183,18 +1078,15 @@ sub _parse_data {
     }
     elsif ( $cmd eq 'ChangeBal' ) {
         my ( $zone, $balance ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'balance', $balance,
-            'balance_changed' );
+        $self->_store_zone_data( $zone, 'balance', $balance, 'balance_changed' );
     }
     elsif ( $cmd eq 'NudgeBal' ) {
         my ( $zone, $balance ) = split /\//, $value;
-        $self->_store_zone_nudge( $zone, 'balance', $balance, 1, 15,
-            'balance_changed' );
+        $self->_store_zone_nudge( $zone, 'balance', $balance, 1, 15, 'balance_changed' );
     }
     elsif ( $cmd eq 'ChangeLoud' ) {
         my ( $zone, $loudness ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'loudness', $loudness,
-            ( $loudness ? 'loudness_on' : 'loudness_off' ) );
+        $self->_store_zone_data( $zone, 'loudness', $loudness, ( $loudness ? 'loudness_on' : 'loudness_off' ) );
     }
     elsif ( $cmd eq 'ChangeAmp' ) {
         my ( $zone, $amp ) = split /\//, $value;
@@ -1209,13 +1101,11 @@ sub _parse_data {
     }
     elsif ( $cmd eq 'ChangeBaCo' ) {
         my ( $zone, $color ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'blcolor', $color,
-            ( $color ? 'color_amber' : 'color_green' ) );
+        $self->_store_zone_data( $zone, 'blcolor', $color, ( $color ? 'color_amber' : 'color_green' ) );
     }
     elsif ( $cmd eq 'ChangeBaLi' ) {
         my ( $zone, $level ) = split /\//, $value;
-        $self->_store_zone_data( $zone, 'brightness', $level,
-            'brightness_changed' );
+        $self->_store_zone_data( $zone, 'brightness', $level, 'brightness_changed' );
     }
     elsif ( $cmd eq 'NudgeSrc' ) {
         my ( $zone, $source ) = split /\//, $value;
@@ -1229,12 +1119,7 @@ sub _parse_data {
             }
         }
         else {
-            unless (
-                $self->_see_if_zone_just_turned_on(
-                    $zone, $source, 'misterhouse'
-                )
-              )
-            {
+            unless ( $self->_see_if_zone_just_turned_on( $zone, $source, 'misterhouse' ) ) {
                 $self->_store_zone_source( $zone, $source, 'misterhouse' );
             }
         }
@@ -1254,29 +1139,23 @@ sub _parse_data {
             my $changed = 0;
             for ( my $i = 1; $i <= MAX_SOURCES; $i++ ) {
                 if ( $$self{'sources'}[$i] ) {
-                    unless (
-                        $$self{'sources'}[$i]->{'label'} eq $sources[ $i - 1 ] )
-                    {
+                    unless ( $$self{'sources'}[$i]->{'label'} eq $sources[ $i - 1 ] ) {
                         if ( $$self{'sources'}[$i]->{'label'} ) {
                             $changed = $i;
                             $$self{'sources'}[$i]->{'label'} =
                               $sources[ $i - 1 ];
                             if ( $$self{'zones'}[$zone] ) {
-                                $$self{'sources'}[$i]
-                                  ->set_receive( 'label_changed',
-                                    $$self{'zones'}[$zone] );
+                                $$self{'sources'}[$i]->set_receive( 'label_changed', $$self{'zones'}[$zone] );
                             }
                             else {
-                                $$self{'sources'}[$i]
-                                  ->set_receive( 'label_changed', undef );
+                                $$self{'sources'}[$i]->set_receive( 'label_changed', undef );
                             }
                         }
                     }
                 }
             }
             if ( $$self{'zones'}[$zone] ) {
-                $$self{'zones'}[$zone]
-                  ->set_receive( 'changed_label_source_' . $changed, 'keypad' )
+                $$self{'zones'}[$zone]->set_receive( 'changed_label_source_' . $changed, 'keypad' )
                   if $changed;
             }
         }
@@ -1288,40 +1167,25 @@ sub _parse_data {
             $who = 'misterhouse';
         }
         for ( my $i = 1; $i <= MAX_ZONES; $i++ ) {
-            unless (
-                $self->_see_if_zone_just_turned_on(
-                    $i, $sources[ $i - 1 ], $who
-                )
-              )
-            {
+            unless ( $self->_see_if_zone_just_turned_on( $i, $sources[ $i - 1 ], $who ) ) {
                 $self->_store_zone_source( $i, $sources[ $i - 1 ], $who );
             }
         }
     }
     elsif ( $cmd eq 'EventData' ) {
         my (
-            $zone,     $volume, $bass,    $treble,     $balance,
-            $loudness, $mute,   $blcolor, $brightness, $audioport,
-            $amp,      $locked, $overheat
+            $zone,    $volume,     $bass,      $treble, $balance, $loudness, $mute,
+            $blcolor, $brightness, $audioport, $amp,    $locked,  $overheat
         ) = split /\//, $value;
         if ( $$self{'zones'}[$zone] ) {
             if ( $self->_check_first_cmd( $zone, "ChangeVol/$zone/$volume" ) ) {
-                $self->_store_zone_data( $zone, 'volume', $volume,
-                    'volume_changed' );
+                $self->_store_zone_data( $zone, 'volume', $volume, 'volume_changed' );
             }
             elsif ( $$self{'zones'}[$zone]->{'volume'} != $volume ) {
-                if (
-                    defined( $$self{'zones'}[$zone]->{'volume'} )
-                    and (
-                        (
-                            $$self{'zones'}[$zone]->{'on_time'} +
-                            IGNORE_AFTER_ON
-                        ) < $::Time
-                    )
-                  )
+                if ( defined( $$self{'zones'}[$zone]->{'volume'} )
+                    and ( ( $$self{'zones'}[$zone]->{'on_time'} + IGNORE_AFTER_ON ) < $::Time ) )
                 {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'volume_changed', 'keypad' );
+                    $$self{'zones'}[$zone]->set_receive( 'volume_changed', 'keypad' );
                 }
                 $$self{'zones'}[$zone]->{'volume'} = $volume;
             }
@@ -1333,126 +1197,90 @@ sub _parse_data {
                   if defined $$self{'zones'}[$zone]->{'bass'};
                 $$self{'zones'}[$zone]->{'bass'} = $bass;
             }
-            if ( $self->_check_first_cmd( $zone, "ChangeTreb/$zone/$treble" ) )
-            {
-                $self->_store_zone_data( $zone, 'treble', $treble,
-                    'treble_changed' );
+            if ( $self->_check_first_cmd( $zone, "ChangeTreb/$zone/$treble" ) ) {
+                $self->_store_zone_data( $zone, 'treble', $treble, 'treble_changed' );
             }
             elsif ( $$self{'zones'}[$zone]->{'treble'} != $treble ) {
-                $$self{'zones'}[$zone]
-                  ->set_receive( 'treble_changed', 'keypad' )
+                $$self{'zones'}[$zone]->set_receive( 'treble_changed', 'keypad' )
                   if defined $$self{'zones'}[$zone]->{'treble'};
                 $$self{'zones'}[$zone]->{'treble'} = $treble;
             }
-            if ( $self->_check_first_cmd( $zone, "ChangeBal/$zone/$balance" ) )
-            {
-                $self->_store_zone_data( $zone, 'balance', $balance,
-                    'balance_changed' );
+            if ( $self->_check_first_cmd( $zone, "ChangeBal/$zone/$balance" ) ) {
+                $self->_store_zone_data( $zone, 'balance', $balance, 'balance_changed' );
             }
             elsif ( $$self{'zones'}[$zone]->{'balance'} != $balance ) {
-                $$self{'zones'}[$zone]
-                  ->set_receive( 'balance_changed', 'keypad' )
+                $$self{'zones'}[$zone]->set_receive( 'balance_changed', 'keypad' )
                   if defined $$self{'zones'}[$zone]->{'balance'};
                 $$self{'zones'}[$zone]->{'balance'} = $balance;
             }
-            if (
-                $self->_check_first_cmd( $zone, "ChangeLoud/$zone/$loudness" ) )
-            {
-                $self->_store_zone_data( $zone, 'loudness', $loudness,
-                    ( $loudness ? 'loudness_on' : 'loudness_off' ) );
+            if ( $self->_check_first_cmd( $zone, "ChangeLoud/$zone/$loudness" ) ) {
+                $self->_store_zone_data( $zone, 'loudness', $loudness, ( $loudness ? 'loudness_on' : 'loudness_off' ) );
             }
             elsif ( $$self{'zones'}[$zone]->{'loudness'} != $loudness ) {
                 if ($loudness) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'loudness_on', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'loudness_on', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'loudness'};
                 }
                 else {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'loudness_off', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'loudness_off', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'loudness'};
                 }
                 $$self{'zones'}[$zone]->{'loudness'} = $loudness;
             }
             if ( $self->_check_first_cmd( $zone, "ChangeMute/$zone/$mute" ) ) {
-                $self->_store_zone_data( $zone, 'mute', $mute,
-                    ( $mute ? 'mute_on' : 'mute_off' ) );
+                $self->_store_zone_data( $zone, 'mute', $mute, ( $mute ? 'mute_on' : 'mute_off' ) );
             }
             elsif ( $$self{'zones'}[$zone]->{'mute'} != $mute ) {
-                if (
-                    defined( $$self{'zones'}[$zone]->{'mute'} )
-                    and (
-                        (
-                            $$self{'zones'}[$zone]->{'on_time'} +
-                            IGNORE_AFTER_ON
-                        ) < $::Time
-                    )
-                  )
+                if ( defined( $$self{'zones'}[$zone]->{'mute'} )
+                    and ( ( $$self{'zones'}[$zone]->{'on_time'} + IGNORE_AFTER_ON ) < $::Time ) )
                 {
                     if ($mute) {
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'mute_on', 'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( 'mute_on', 'keypad' );
                     }
                     else {
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'mute_off', 'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( 'mute_off', 'keypad' );
                     }
                 }
                 $$self{'zones'}[$zone]->{'mute'} = $mute;
             }
-            if ( $self->_check_first_cmd( $zone, "ChangeBaCo/$zone/$blcolor" ) )
-            {
-                $self->_store_zone_data( $zone, 'blcolor', $blcolor,
-                    ( $blcolor ? 'color_amber' : 'color_green' ) );
+            if ( $self->_check_first_cmd( $zone, "ChangeBaCo/$zone/$blcolor" ) ) {
+                $self->_store_zone_data( $zone, 'blcolor', $blcolor, ( $blcolor ? 'color_amber' : 'color_green' ) );
             }
             elsif ( $$self{'zones'}[$zone]->{'blcolor'} != $blcolor ) {
                 if ($blcolor) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'color_amber', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'color_amber', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'blcolor'};
                 }
                 else {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'color_green', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'color_green', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'blcolor'};
                 }
                 $$self{'zones'}[$zone]->{'blcolor'} = $blcolor;
             }
-            if (
-                $self->_check_first_cmd(
-                    $zone, "ChangeBaLi/$zone/$brightness"
-                )
-              )
-            {
-                $self->_store_zone_data( $zone, 'brightness', $brightness,
-                    'brightness_changed' );
+            if ( $self->_check_first_cmd( $zone, "ChangeBaLi/$zone/$brightness" ) ) {
+                $self->_store_zone_data( $zone, 'brightness', $brightness, 'brightness_changed' );
             }
             elsif ( $$self{'zones'}[$zone]->{'brightness'} != $brightness ) {
                 if ( defined $$self{'zones'}[$zone]->{'brightness'} ) {
                     if ( $$self{'zones'}[$zone]->{'brightness'} == 0 ) {
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'backlight_on', 'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( 'backlight_on', 'keypad' );
                     }
                     elsif ( $brightness == 0 ) {
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'backlight_off', 'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( 'backlight_off', 'keypad' );
                     }
                     else {
-                        $$self{'zones'}[$zone]
-                          ->set_receive( 'brightness_changed', 'keypad' );
+                        $$self{'zones'}[$zone]->set_receive( 'brightness_changed', 'keypad' );
                     }
                 }
                 $$self{'zones'}[$zone]->{'brightness'} = $brightness;
             }
             unless ( $$self{'zones'}[$zone]->{'audioport'} == $audioport ) {
                 if ($audioport) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'audio_port_connected', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'audio_port_connected', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'audioport'};
                 }
                 else {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'audio_port_disconnected', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'audio_port_disconnected', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'audioport'};
                 }
                 $$self{'zones'}[$zone]->{'audioport'} = $audioport;
@@ -1469,18 +1297,15 @@ sub _parse_data {
             }
             elsif ( $$self{'zones'}[$zone]->{'amp'} != $amp ) {
                 if ( $amp == 0 ) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'internal_amp', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'internal_amp', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'amp'};
                 }
                 elsif ( $amp == 1 ) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'internal_external_amp', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'internal_external_amp', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'amp'};
                 }
                 else {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'external_amp', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'external_amp', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'amp'};
                 }
                 $$self{'zones'}[$zone]->{'amp'} = $amp;
@@ -1498,21 +1323,18 @@ sub _parse_data {
             }
             unless ( $$self{'zones'}[$zone]->{'overheat'} == $overheat ) {
                 if ($overheat) {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'overheated', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'overheated', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'overheat'};
                 }
                 else {
-                    $$self{'zones'}[$zone]
-                      ->set_receive( 'heat_normal', 'keypad' )
+                    $$self{'zones'}[$zone]->set_receive( 'heat_normal', 'keypad' )
                       if defined $$self{'zones'}[$zone]->{'overheat'};
                 }
                 $$self{'zones'}[$zone]->{'overheat'} = $overheat;
             }
             if ( $$self{'zones'}[$zone]->{'just_turned_on'} ) {
-                &::print_log(
-                    "$self->{'port_name'}: Got first EventData after zone $zone was turned on, setting zone_on state"
-                ) if $main::Debug{musica};
+                &::print_log( "$self->{'port_name'}: Got first EventData after zone $zone was turned on, setting zone_on state" )
+                  if $main::Debug{musica};
                 $self->_store_zone_source(
                     $zone,
                     $$self{'zones'}[$zone]->{'just_turned_on'},
@@ -1520,9 +1342,8 @@ sub _parse_data {
                 );
                 $$self{'zones'}[$zone]->{'just_turned_on'} = 0;
                 if ( $$self{'waiting_for_zone'} == $zone ) {
-                    &::print_log(
-                        "$self->{'port_name'}: Queue was waiting on this zone, sending next message"
-                    ) if $main::Debug{musica};
+                    &::print_log( "$self->{'port_name'}: Queue was waiting on this zone, sending next message" )
+                      if $main::Debug{musica};
                     $$self{'waiting_for_zone'} = 0;
                     $self->_send_next_cmd();
                 }
@@ -1547,8 +1368,7 @@ sub _register_zone {
 
     # Determine version of the keypad
     if ( $$self{'zones'}[$zone_num]->{'keypad_version'} ) {
-        &::print_log(
-            "$self->{'port_name'}: Netstreams Musica Zone $zone_num Keypad Version: "
+        &::print_log( "$self->{'port_name'}: Netstreams Musica Zone $zone_num Keypad Version: "
               . $$self{'zones'}[$zone_num]->{'keypad_version'}
               . " (as specified in your .mht file)" );
         $self->_process_keypad_version($zone_num);
@@ -1557,8 +1377,7 @@ sub _register_zone {
         if ( $main::Save{"Musica-Keypad$zone_num-Version"} ) {
             $$self{'zones'}[$zone_num]->{'keypad_version'} =
               $main::Save{"Musica-Keypad$zone_num-Version"};
-            &::print_log(
-                "$self->{'port_name'}: Netstreams Musica Zone $zone_num Keypad Version: "
+            &::print_log( "$self->{'port_name'}: Netstreams Musica Zone $zone_num Keypad Version: "
                   . $main::Save{"Musica-Keypad$zone_num-Version"}
                   . " (restored from \%Save)" );
             $self->_process_keypad_version($zone_num);
@@ -1578,29 +1397,21 @@ sub _send_next_cmd {
     my ($self) = @_;
     if ( $$self{'queue'}->[0] ) {
         my ( $cmd, $zone, $value );
-        if ( ( $cmd, $zone, $value ) =
-            ( $$self{'queue'}->[0] =~ /^([^\/]+)\/(\d+)\/(\d+)/ ) )
-        {
-            &::print_log(
-                "$self->{'port_name'}: checking command '$cmd' '$zone' '$value'"
-            ) if $main::Debug{musica};
+        if ( ( $cmd, $zone, $value ) = ( $$self{'queue'}->[0] =~ /^([^\/]+)\/(\d+)\/(\d+)/ ) ) {
+            &::print_log( "$self->{'port_name'}: checking command '$cmd' '$zone' '$value'" ) if $main::Debug{musica};
             if ( $$self{'zones'}[$zone] ) {
 
                 # Check to make sure the zone still isn't turning on
                 if ( $$self{'zones'}[$zone]->{'just_turned_on'} ) {
-                    &::print_log(
-                        "$self->{'port_name'}: just_turned_on=$$self{'zones'}[$zone]->{'just_turned_on'} (zone $zone)"
-                    ) if $main::Debug{musica};
+                    &::print_log( "$self->{'port_name'}: just_turned_on=$$self{'zones'}[$zone]->{'just_turned_on'} (zone $zone)" )
+                      if $main::Debug{musica};
                     my $moved = '';
 
                     # See if we can find a command for another zone meanwhile
-                    for ( my $i = 0;
-                        $i <= scalar( @{ $$self{'queue'} } ); $i++ )
-                    {
+                    for ( my $i = 0; $i <= scalar( @{ $$self{'queue'} } ); $i++ ) {
                         if ( $$self{'queue'}->[$i] =~ /^[^\/]+\/(\d+)/ ) {
                             if ( $$self{'zones'}[$1]
-                                and
-                                not $$self{'zones'}[$zone]->{'just_turned_on'} )
+                                and not $$self{'zones'}[$zone]->{'just_turned_on'} )
                             {
                                 $moved = $$self{'queue'}->[$i];
                                 splice @{ $$self{'queue'} }, $i, 1;
@@ -1617,9 +1428,7 @@ sub _send_next_cmd {
                     else {
                         # Nothing to send, so we have to wait...
                         $$self{'waiting_for_zone'} = $zone;
-                        &::print_log(
-                            "$self->{'port_name'}: Queue stalled while waiting for zone $zone to turn on"
-                        );
+                        &::print_log( "$self->{'port_name'}: Queue stalled while waiting for zone $zone to turn on" );
                         return;
                     }
                 }
@@ -1627,16 +1436,10 @@ sub _send_next_cmd {
                 # Check to see if this command is necessary since the new keypads will not
                 # respond with an EventData if these messages don't change anythig
                 if ( $commands_to_keys{$cmd} ) {
-                    &::print_log(
-                        "$self->{'port_name'}: $cmd -> $commands_to_keys{$cmd}")
+                    &::print_log("$self->{'port_name'}: $cmd -> $commands_to_keys{$cmd}")
                       if $main::Debug{musica};
-                    if (
-                        defined $$self{'zones'}[$zone]
-                        ->{ $commands_to_keys{$cmd} } )
-                    {
-                        if ( $$self{'zones'}[$zone]->{ $commands_to_keys{$cmd} }
-                            == $value )
-                        {
+                    if ( defined $$self{'zones'}[$zone]->{ $commands_to_keys{$cmd} } ) {
+                        if ( $$self{'zones'}[$zone]->{ $commands_to_keys{$cmd} } == $value ) {
                             &::print_log(
                                 "$self->{'port_name'} zone $zone: dropping unnecessary command (already set to value): [$$self{'queue'}->[0]]"
                             ) if $main::Debug{musica};
@@ -1648,11 +1451,8 @@ sub _send_next_cmd {
                 }
             }
         }
-        &::print_log(
-            "$self->{'port_name'}: sending first command in queue: [$$self{'queue'}->[0]]"
-        ) if $main::Debug{musica};
-        $main::Serial_Ports{ $$self{'port_name'} }{'object'}
-          ->write("$$self{'queue'}->[0]\r");
+        &::print_log( "$self->{'port_name'}: sending first command in queue: [$$self{'queue'}->[0]]" ) if $main::Debug{musica};
+        $main::Serial_Ports{ $$self{'port_name'} }{'object'}->write("$$self{'queue'}->[0]\r");
         $Musica_Systems{ $$self{'port_name'} }{'last_data_received'} = $::Time;
         if ( $cmd and ( $cmd eq 'ChangeAmp' ) ) {
             if (    $$self{'zones'}[$zone]
@@ -1696,9 +1496,8 @@ sub _queue_cmd {
         $$self{'musica_obj'}->_queue_cmd($cmd);
     }
     else {
-        &::print_log(
-            "ERROR: Musica($self->{'object_name'}): Could not find queue in which to place command [$cmd]"
-        ) if $main::Debug{musica};
+        &::print_log( "ERROR: Musica($self->{'object_name'}): Could not find queue in which to place command [$cmd]" )
+          if $main::Debug{musica};
     }
 }
 
@@ -1749,8 +1548,7 @@ sub _report_error {
         &::print_log("ERROR: Musica($self->{'port_name'}) zone $zone: $error");
     }
     else {
-        $$self{'last_error'} =
-          "Received error regarding non-existant zone: $error";
+        $$self{'last_error'} = "Received error regarding non-existant zone: $error";
         $self->set_receive('error');
     }
 }
@@ -1777,14 +1575,8 @@ sub _store_zone_nudge {
     if ( $zone == 0 ) {
         for ( my $i = 1; $i <= MAX_ZONES; $i++ ) {
             if ( $$self{'zones'}[$i] and $$self{'zones'}[$i]->{'present'} ) {
-                $self->_store_zone_data(
-                    $zone, $member,
-                    &Musica::_calc_zone_nudge(
-                        $$self{'zones'}[$i]->{$member},
-                        $value, $min, $max
-                    ),
-                    $newstate
-                );
+                $self->_store_zone_data( $zone, $member,
+                    &Musica::_calc_zone_nudge( $$self{'zones'}[$i]->{$member}, $value, $min, $max ), $newstate );
             }
         }
     }
@@ -1800,8 +1592,7 @@ sub _store_zone_data {
             if ( $$self{'zones'}[$i] and $$self{'zones'}[$i]->{'present'} ) {
                 if ( $$self{'zones'}[$i]->{$member} != $value ) {
                     $$self{'zones'}[$i]->{$member} = $value;
-                    $$self{'zones'}[$i]
-                      ->set_receive( $newstate, 'misterhouse' );
+                    $$self{'zones'}[$i]->set_receive( $newstate, 'misterhouse' );
                 }
             }
         }
@@ -1809,14 +1600,12 @@ sub _store_zone_data {
     else {
         if ( $$self{'zones'}[$zone] ) {
             if ( $value eq 'X' ) {
-                $$self{'zones'}[$zone]->_report_error(
-                    "Zone keypad not detected by ADC (tried to set $member)");
+                $$self{'zones'}[$zone]->_report_error("Zone keypad not detected by ADC (tried to set $member)");
             }
             else {
                 if ( $$self{'zones'}[$zone]->{$member} != $value ) {
                     $$self{'zones'}[$zone]->{$member} = $value;
-                    $$self{'zones'}[$zone]
-                      ->set_receive( $newstate, 'misterhouse' );
+                    $$self{'zones'}[$zone]->set_receive( $newstate, 'misterhouse' );
                 }
             }
         }
@@ -1829,8 +1618,7 @@ sub _is_base_obj {
         return 1;
     }
     else {
-        $self->_report_error(
-            "$function() can only be called on main Musica object");
+        $self->_report_error("$function() can only be called on main Musica object");
         return 0;
     }
 }
@@ -1944,8 +1732,7 @@ sub set_source {
             $source = $source->{'source'};
         }
         else {
-            $self->_report_error(
-                "set_source(): Invalid reference as source parameter: $source");
+            $self->_report_error("set_source(): Invalid reference as source parameter: $source");
         }
     }
     elsif ( $Musica::source_name_to_number{ uc($source) } ) {
@@ -1953,8 +1740,7 @@ sub set_source {
         # Specified the source label, look up proper source number
         my $labelid = $Musica::source_name_to_number{ uc($source) };
         for ( my $i = 1; $i <= MAX_SOURCES; $i++ ) {
-            if ( $$self{'musica_obj'}->{'sources'}[$i]->{'label'} == $labelid )
-            {
+            if ( $$self{'musica_obj'}->{'sources'}[$i]->{'label'} == $labelid ) {
                 $source = $i;
                 last;
             }
@@ -1962,8 +1748,7 @@ sub set_source {
     }
     unless ( ( $source eq 'E' ) or ( $source eq 'F' ) ) {
         unless ( ( $source > 0 ) and ( $source <= Musica::MAX_SOURCES ) ) {
-            $self->_report_error(
-                "set_source(): Invalid source identifier: $source");
+            $self->_report_error("set_source(): Invalid source identifier: $source");
             return;
         }
     }
@@ -1976,8 +1761,7 @@ sub set_volume {
         $volume = ( 35 * ( $volume / 100 ) );
     }
     unless ( ( $volume >= 0 ) or ( $volume <= 35 ) ) {
-        $self->_report_error(
-            "set_volume(): volume specified is out of range: $volume");
+        $self->_report_error("set_volume(): volume specified is out of range: $volume");
     }
     $volume =~ s/^\s+//;
     $volume =~ s/\s+$//;
@@ -2050,9 +1834,7 @@ sub set_backlight_brightness {
         $level = ( 8 * ( $level / 100 ) );
     }
     unless ( ( $level >= 0 ) or ( $level <= 8 ) ) {
-        $self->_report_error(
-            "set_backlight_brightness(): level specified is out of range: $level"
-        );
+        $self->_report_error( "set_backlight_brightness(): level specified is out of range: $level" );
     }
     $self->_queue_cmd("ChangeBaLi/$$self{'zone'}/$level");
 }
@@ -2174,9 +1956,7 @@ sub _report_error {
     my ( $self, $error ) = @_;
     $$self{'last_error'} = $error;
     $self->set_receive('error');
-    &::print_log(
-        "ERROR: Musica($self->{'musica_obj'}->{'port_name'}) zone $$self{'object_name'}: $error"
-    );
+    &::print_log( "ERROR: Musica($self->{'musica_obj'}->{'port_name'}) zone $$self{'object_name'}: $error" );
 }
 
 sub set {
@@ -2219,9 +1999,7 @@ sub _resolve_to_button_id {
             return $button;
         }
         else {
-            $self->_report_error(
-                "press_button()/hold_button(): Invalid button ID: $button (must be 1 to 12)"
-            );
+            $self->_report_error( "press_button()/hold_button(): Invalid button ID: $button (must be 1 to 12)" );
             return 0;
         }
     }
@@ -2235,8 +2013,7 @@ sub _resolve_to_button_id {
             return $Musica::button_name_to_number{$button};
         }
     }
-    $self->_report_error(
-        "press_button()/hold_button(): Invalid button label: $button");
+    $self->_report_error("press_button()/hold_button(): Invalid button label: $button");
 }
 
 ################################################################################
@@ -2438,9 +2215,7 @@ sub _report_error {
     my ( $self, $error ) = @_;
     $$self{'last_error'} = $error;
     $self->set_receive('error');
-    &::print_log(
-        "ERROR: Musica($self->{'musica_obj'}->{'port_name'}) source $$self{'object_name'}: $error"
-    );
+    &::print_log( "ERROR: Musica($self->{'musica_obj'}->{'port_name'}) source $$self{'object_name'}: $error" );
 }
 
 sub _zone_not_using {
@@ -2541,9 +2316,7 @@ sub set_label {
     unless (( $labelnum >= 1 )
         and ( $labelnum <= $#Musica::source_number_to_name ) )
     {
-        $self->_report_error(
-            "set_label(): Invalid source label: $label (resolved number was $labelnum)"
-        );
+        $self->_report_error( "set_label(): Invalid source label: $label (resolved number was $labelnum)" );
         return;
     }
     $self->_queue_cmd("ChangeStore/$$self{'source'}/$labelnum");
diff --git a/lib/Nest.pm b/lib/Nest.pm
index 1c811059c..740f463af 100644
--- a/lib/Nest.pm
+++ b/lib/Nest.pm
@@ -260,7 +260,7 @@ sub connect_stream {
             $self->debug( "IO::Socket::SSL connected", $info );
             last;
         }
-        else {    # handshake still incomplete
+        else {                                         # handshake still incomplete
             if ( $SSL_ERROR == SSL_WANT_READ ) {
                 $select->can_read;
             }
@@ -268,8 +268,7 @@ sub connect_stream {
                 $select->can_write;
             }
             else {
-                $self->debug(
-                    "ERROR connecting to Nest server: " . $SSL_ERROR );
+                $self->debug( "ERROR connecting to Nest server: " . $SSL_ERROR );
                 $self->reconnect_delay();
                 return;
             }
@@ -277,8 +276,7 @@ sub connect_stream {
     }
 
     # Request specific location
-    my $request = HTTP::Request->new( 'GET', $url->full_path,
-        [ "Accept", "text/event-stream", "Host", $url->host ] );
+    my $request = HTTP::Request->new( 'GET', $url->full_path, [ "Accept", "text/event-stream", "Host", $url->host ] );
     $request->protocol('HTTP/1.1');
     unless ( $$self{socket}->syswrite( $request->as_string ) ) {
         $self->debug( "ERROR connecting to Nest server: " . $! );
@@ -318,14 +316,12 @@ sub check_for_data {
                 if ( $r->code == 307 ) {
 
                     # This is a location redirect
-                    $self->debug( "redirecting to " . $r->header('location'),
-                        $trace );
+                    $self->debug( "redirecting to " . $r->header('location'), $trace );
                     $$self{socket} =
                       $self->connect_stream( $r->header('location') );
                 }
                 elsif ( $r->code == 401 ) {
-                    $self->debug( "ERROR, your authorization was rejected. "
-                          . "Please check your settings." );
+                    $self->debug( "ERROR, your authorization was rejected. " . "Please check your settings." );
                     $$self{enabled} = 0;
                 }
                 elsif ( $r->code == 200 ) {
@@ -334,9 +330,7 @@ sub check_for_data {
                     $self->debug( "Successfully connected to stream", $warn );
                 }
                 else {
-                    $self->debug( "ERROR, unable to connect stream. "
-                          . "Response was: "
-                          . $r->as_string );
+                    $self->debug( "ERROR, unable to connect stream. " . "Response was: " . $r->as_string );
                     $self->reconnect_delay();
                 }
                 $$self{data} = "";
@@ -456,8 +450,7 @@ sub write_data {
 
     # Use a process item to prevent blocking
     if ( !$$self{write_process_active} ) {
-        $$self{write_process}
-          ->set("&Nest_Interface::_write_data_process('$url','$json')");
+        $$self{write_process}->set("&Nest_Interface::_write_data_process('$url','$json')");
         $$self{write_process}->start();
         $$self{write_process_active} = 1;
 
@@ -465,10 +458,7 @@ sub write_data {
         ::MainLoop_pre_add_hook( $$self{write_process_code}, 'persistent' );
     }
     else {
-        push(
-            @{ $$self{write_process_queue} },
-            "&Nest_Interface::_write_data_process('$url','$json')"
-        );
+        push( @{ $$self{write_process_queue} }, "&Nest_Interface::_write_data_process('$url','$json')" );
     }
 }
 
@@ -486,8 +476,7 @@ sub _write_data_process {
     if ( $r->code == 307 ) {
 
         # This is a location redirect
-        ::print_log(
-            "[Nest_Interface] redirecting to " . $r->header('location') )
+        ::print_log( "[Nest_Interface] redirecting to " . $r->header('location') )
           if $::Debug{'nest'} >= 3;
         return _write_data_process( $r->header('location'), $json );
     }
@@ -504,8 +493,7 @@ sub write_process_handler {
         unlink("$::config_parms{data_dir}/nest.resp");
         my $r = HTTP::Response->parse($resp_string);
         if ( $r->code == 401 ) {
-            $self->debug( "ERROR, your authorization was rejected. "
-                  . "Please check your settings." );
+            $self->debug( "ERROR, your authorization was rejected. " . "Please check your settings." );
         }
         elsif ( $r->code == 200 ) {
 
@@ -514,9 +502,7 @@ sub write_process_handler {
         }
         else {
             my $content = decode_json $r->content;
-            $self->debug( "ERROR, unable to write data to Nest server. "
-                  . $r->status_line . " - "
-                  . $$content{error} );
+            $self->debug( "ERROR, unable to write data to Nest server. " . $r->status_line . " - " . $$content{error} );
         }
 
         # Look see if there is a queue of write commands
@@ -622,21 +608,10 @@ sub convert_to_ids {
         $self->debug( "Nest Initial data load convert_to_ids " . $value );
         my $device_id = $parent->device_id();
         if ( $$parent{type} ne '' ) {
-            push(
-                @{
-                    $$self{monitor}{data}{ $$parent{class} }{ $$parent{type} }
-                      {$device_id}{$value}
-                },
-                $action
-            );
+            push( @{ $$self{monitor}{data}{ $$parent{class} }{ $$parent{type} }{$device_id}{$value} }, $action );
         }
         else {
-            push(
-                @{
-                    $$self{monitor}{data}{ $$parent{class} }{$device_id}{$value}
-                },
-                $action
-            );
+            push( @{ $$self{monitor}{data}{ $$parent{class} }{$device_id}{$value} }, $action );
         }
     }
     delete $$self{register};
@@ -740,8 +715,7 @@ sub device_id {
             return $device_id;
         }
     }
-    $self->debug(
-        "ERROR, no device by the name " . $$parent{name} . " was found." );
+    $self->debug( "ERROR, no device by the name " . $$parent{name} . " was found." );
     return 0;
 }
 
@@ -788,12 +762,10 @@ sub get_value {
     my ( $self, $value ) = @_;
     my $device_id = $self->device_id;
     if ( $$self{type} ne '' ) {
-        return $$self{interface}{JSON}{data}{ $$self{class} }{ $$self{type} }
-          {$device_id}{$value};
+        return $$self{interface}{JSON}{data}{ $$self{class} }{ $$self{type} }{$device_id}{$value};
     }
     else {
-        return $$self{interface}{JSON}{data}{ $$self{class} }{$device_id}
-          {$value};
+        return $$self{interface}{JSON}{data}{ $$self{class} }{$device_id}{$value};
     }
 }
 
@@ -866,10 +838,7 @@ sub new {
     my $monitor_value = "ambient_temperature_" . $scale;
     my $self = new Nest_Generic( $interface, '', { $monitor_value => '' } );
     bless $self, $class;
-    $$self{class}   = 'devices',
-      $$self{type}  = 'thermostats',
-      $$self{name}  = $name,
-      $$self{scale} = $scale;
+    $$self{class} = 'devices', $$self{type} = 'thermostats', $$self{name} = $name, $$self{scale} = $scale;
     return $self;
 }
 
@@ -1044,9 +1013,7 @@ sub set_hvac_mode {
         && $state ne 'heat-cool'
         && $state ne 'off' )
     {
-        $self->debug(
-            "set_hvac_mode must be one of: heat, cool, heat-cool, or off. Not $state."
-        );
+        $self->debug( "set_hvac_mode must be one of: heat, cool, heat-cool, or off. Not $state." );
         return;
     }
     $$self{state_pending}{hvac_mode} = [ $p_setby, $p_response ];
@@ -1087,8 +1054,7 @@ use strict;
 
 sub new {
     my ( $class, $parent ) = @_;
-    my $self = new Nest_Generic( $$parent{interface}, $parent,
-        { 'fan_timer_active' => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'fan_timer_active' => '' } );
     $$self{states} = [ 'on', 'off' ];
     bless $self, $class;
     return $self;
@@ -1303,8 +1269,7 @@ use strict;
 sub new {
     my ( $class, $parent ) = @_;
     my $scale = $$parent{scale};
-    my $self  = new Nest_Generic( $$parent{interface}, $parent,
-        { 'target_temperature_' . $scale => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'target_temperature_' . $scale => '' } );
     $$self{states} = [ 'cooler', 'warmer' ];
     bless $self, $class;
     return $self;
@@ -1353,8 +1318,7 @@ use strict;
 sub new {
     my ( $class, $parent ) = @_;
     my $scale = $$parent{scale};
-    my $self  = new Nest_Generic( $$parent{interface}, $parent,
-        { 'target_temperature_high_' . $scale => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'target_temperature_high_' . $scale => '' } );
     $$self{states} = [ 'cooler', 'warmer' ];
     bless $self, $class;
     return $self;
@@ -1403,8 +1367,7 @@ use strict;
 sub new {
     my ( $class, $parent ) = @_;
     my $scale = $$parent{scale};
-    my $self  = new Nest_Generic( $$parent{interface}, $parent,
-        { 'target_temperature_low_' . $scale => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'target_temperature_low_' . $scale => '' } );
     $$self{states} = [ 'cooler', 'warmer' ];
     bless $self, $class;
     return $self;
@@ -1453,8 +1416,7 @@ use strict;
 sub new {
     my ( $class, $parent ) = @_;
     my $scale = $$parent{scale};
-    my $self  = new Nest_Generic( $$parent{interface}, $parent,
-        { 'away_temperature_high_' . $scale => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'away_temperature_high_' . $scale => '' } );
     bless $self, $class;
     return $self;
 }
@@ -1491,8 +1453,7 @@ use strict;
 sub new {
     my ( $class, $parent ) = @_;
     my $scale = $$parent{scale};
-    my $self  = new Nest_Generic( $$parent{interface}, $parent,
-        { 'away_temperature_low_' . $scale => '' } );
+    my $self = new Nest_Generic( $$parent{interface}, $parent, { 'away_temperature_low_' . $scale => '' } );
     bless $self, $class;
     return $self;
 }
@@ -1568,10 +1529,7 @@ sub new {
         }
     );
     bless $self, $class;
-    $$self{class}  = 'devices',
-      $$self{type} = 'smoke_co_alarms',
-      $$self{name} = $name,
-      return $self;
+    $$self{class} = 'devices', $$self{type} = 'smoke_co_alarms', $$self{name} = $name, return $self;
 }
 
 sub data_changed {
@@ -1698,10 +1656,7 @@ sub new {
     my ( $class, $name, $interface ) = @_;
     my $self = new Nest_Generic( $interface, '', { 'away' => '' } );
     bless $self, $class;
-    $$self{class}    = 'structures',
-      $$self{type}   = '',
-      $$self{name}   = $name,
-      $$self{states} = [ 'home', 'away' ];
+    $$self{class} = 'structures', $$self{type} = '', $$self{name} = $name, $$self{states} = [ 'home', 'away' ];
     return $self;
 }
 
diff --git a/lib/Network_Item.pm b/lib/Network_Item.pm
index 51e3e5032..4c13ea203 100644
--- a/lib/Network_Item.pm
+++ b/lib/Network_Item.pm
@@ -60,8 +60,7 @@ sub new {
     $self->add_states('start');
 
     $self->{timer} = new Timer;
-    $self->{timer}
-      ->set( $self->{interval}, sub { &Network_Item::ping_check($self) }, -1 );
+    $self->{timer}->set( $self->{interval}, sub { &Network_Item::ping_check($self) }, -1 );
 
     $self->{process} = new Process_Item( $ping_test_cmd . $address );
     $self->{process}->set_output($ping_test_file);
@@ -125,10 +124,7 @@ sub setstate_start {
     $hwaddr_re = join( ':', ('[0-9A-Fa-f]{1,2}') x 6 );
     if ( $hwaddr !~ m/^$hwaddr_re$/ ) {
         warn "Invalid hardware address: $hwaddr\n";
-        &::print_log( "Missing or invalid MAC address for "
-              . $self->{address} . " ( "
-              . $hwaddr
-              . " )" )
+        &::print_log( "Missing or invalid MAC address for " . $self->{address} . " ( " . $hwaddr . " )" )
           if $::Debug{network};
         $state = 'down';
         $self->set_states_for_next_pass($state);
diff --git a/lib/Numbered_Menu.pm b/lib/Numbered_Menu.pm
index c35873e64..1239e7340 100644
--- a/lib/Numbered_Menu.pm
+++ b/lib/Numbered_Menu.pm
@@ -112,7 +112,7 @@ sub set {
     return
       unless ( $$self{m_active} or $p_state eq 'start' or $p_state eq 'on' );
 
-    if ( $p_setby ne $$self{m_outputTimer} )  #keep timer states out of the loop
+    if ( $p_setby ne $$self{m_outputTimer} )    #keep timer states out of the loop
     {
         $self->SUPER::set($p_state);
     }
@@ -122,7 +122,7 @@ sub set {
             $self->sequence_item();
         }
     }
-    else                                      #process any request
+    else                                        #process any request
     {
         if ( $p_state =~ /^[0-9]+/ and $$self{m_active} ) {
             $self->select_item($p_state);
@@ -168,12 +168,11 @@ sub select_menu {
     if ( $$self{m_menuCurrent} =~ /^states/ ) {
         my $l_menuPrevious = ${ $$self{m_menuList} }[ $$self{m_menuDepth} - 1 ];
         my $l_itemPrevious = ${ $$self{m_itemList} }[ $$self{m_menuDepth} - 1 ];
-        my $item = ${ $$menus{$l_menuPrevious}{items} }[ $l_itemPrevious - 1 ];
+        my $item           = ${ $$menus{$l_menuPrevious}{items} }[ $l_itemPrevious - 1 ];
 
         #		&::print_log("POP:$$self{m_menuDepth},$l_menuPrevious: $l_itemPrevious : $$item{A}: $$item{Dstates}");
         if ( $$item{A} and $$item{Dstates} ) {
-            $self->set_states_for_next_pass(
-                "MENU:$$item{Dprefix}command$$item{Dsuffix}");
+            $self->set_states_for_next_pass("MENU:$$item{Dprefix}command$$item{Dsuffix}");
         }
     }
     else {
@@ -215,9 +214,7 @@ sub select_item {
               ${ $$self{m_menuList} }[ $$self{m_menuDepth} - 1 ];
 
             #			&::print_log("MenuPreve: $l_menuPrevious");
-            my $response =
-              &::menu_run( $$self{m_menugroup}, $l_menuPrevious,
-                $l_itemPrevious, $l_item, "l" );
+            my $response = &::menu_run( $$self{m_menugroup}, $l_menuPrevious, $l_itemPrevious, $l_item, "l" );
             if ($response) {
                 $self->set_states_for_next_pass("RESPONSE:$response");
             }
@@ -228,9 +225,7 @@ sub select_item {
             my $l_item = $$self{m_itemCurrent} - 1;
 
             #			&::menu_run("$$self{m_menugroup},$$self{m_menuCurrent},$l_item,$$item{D},l");
-            my $response =
-              &::menu_run( $$self{m_menugroup}, $$self{m_menuCurrent}, $l_item,
-                undef, "l" );
+            my $response = &::menu_run( $$self{m_menugroup}, $$self{m_menuCurrent}, $l_item, undef, "l" );
             if ($response) {
                 $self->set_states_for_next_pass("RESPONSE:$response");
             }
@@ -240,9 +235,7 @@ sub select_item {
     {
         #		&::print_log("RRun Item:$$self{m_menucurrent} : $p_item");
         my $l_item = $$self{m_itemCurrent} - 1;
-        my $response =
-          &::menu_run( $$self{m_menugroup}, $$self{m_menuCurrent}, $l_item,
-            undef, "l" );
+        my $response = &::menu_run( $$self{m_menugroup}, $$self{m_menuCurrent}, $l_item, undef, "l" );
         if ($response) {
             $self->set_states_for_next_pass("RESPONSE:$response");
         }
@@ -340,8 +333,7 @@ sub item_delay {
     if ( $$self{m_outputDelay} == 0 ) {
 
         # if delay is set to 0 there should be something in here to immediately call back.
-        $self->set( 'off', $$self{m_outputTimer} )
-          ;    # might be recursive somehow though?
+        $self->set( 'off', $$self{m_outputTimer} );    # might be recursive somehow though?
     }
     elsif ( $$self{m_outputDelay} == -1 ) {
 
diff --git a/lib/Occupancy_Monitor.pm b/lib/Occupancy_Monitor.pm
index 82d7fcb8a..fd40d9166 100644
--- a/lib/Occupancy_Monitor.pm
+++ b/lib/Occupancy_Monitor.pm
@@ -823,13 +823,9 @@ sub check_log {
 
     if ( $main::Debug{occupancy} ) {
         foreach ( @{ $$self{m_object_log} } ) {
-            &::print_log(
-                "Log: $$self{m_objects}{$_}{object}->{object_name} [@{$$self{m_objects}{$_}{edges}}]"
-            );
+            &::print_log( "Log: $$self{m_objects}{$_}{object}->{object_name} [@{$$self{m_objects}{$_}{edges}}]" );
         }
-        &::print_log(
-            "Log check: $$p_obj{object_name} [@{$$self{m_objects}{$p_obj}{edges}}]"
-        );
+        &::print_log( "Log check: $$p_obj{object_name} [@{$$self{m_objects}{$p_obj}{edges}}]" );
     }
 
     # check for duplicate edges
@@ -895,9 +891,8 @@ sub generate_state {
     if (    ( $$self{m_max_occupancy} >= 0 )
         and ( $$self{m_people} > $$self{m_max_occupancy} ) )
     {
-        &::print_log(
-            "Occupancy of $$self{m_people} exceeds set maximum ($$self{m_max_occupancy}): removing oldest presence"
-        ) if $main::Debug{occupancy};
+        &::print_log( "Occupancy of $$self{m_people} exceeds set maximum ($$self{m_max_occupancy}): removing oldest presence" )
+          if $main::Debug{occupancy};
         $$self{m_people} =
           $self->reduce_occupancy_count( $$self{m_max_occupancy} );
     }
@@ -906,22 +901,14 @@ sub generate_state {
     if (    ( $$self{m_expected_occupancy} >= 0 )
         and ( $$self{m_people} > $$self{m_expected_occupancy} ) )
     {
-        &::print_log(
-            "Occupancy of $$self{m_people} exceeds the expected occupancy ($$self{m_expected_occupancy})"
-        ) if $main::Debug{occupancy};
-        if (
-            $$self{m_expected_occupancy_last_time}
-            and (
-                (
-                    $$self{m_expected_occupancy_last_time} +
-                    $$self{m_expected_occupancy_time}
-                ) > $::Time
-            )
-          )
+        &::print_log( "Occupancy of $$self{m_people} exceeds the expected occupancy ($$self{m_expected_occupancy})" )
+          if $main::Debug{occupancy};
+        if ( $$self{m_expected_occupancy_last_time}
+            and ( ( $$self{m_expected_occupancy_last_time} + $$self{m_expected_occupancy_time} ) > $::Time ) )
         {
             &::print_log(
-                "Expected occupancy was exceeded twice within $$self{m_expected_occupancy_time} seconds, allowing increase"
-            ) if $main::Debug{occupancy};
+                "Expected occupancy was exceeded twice within $$self{m_expected_occupancy_time} seconds, allowing increase" )
+              if $main::Debug{occupancy};
             $$self{m_expected_occupancy}++;
             $$self{m_expected_occupancy_last_time} = 0;
         }
@@ -1000,9 +987,7 @@ sub count_people {
     my %rooms_seen;
     foreach my $obj ( keys %{ $$self{m_objects} } ) {
         unless ( ref $$self{m_objects}{$obj}{edges} ) {
-            &::print_log(
-                "Occupancy Monitor ERROR: Object has no edges set: $$obj{object_name}"
-            );
+            &::print_log( "Occupancy Monitor ERROR: Object has no edges set: $$obj{object_name}" );
             return 0;
         }
         my @array = @{ $$self{m_objects}{$obj}{edges} };
@@ -1037,16 +1022,9 @@ sub remove_oldest_person {
     }
     if ($oldest_obj) {
         foreach my $obj ( keys %{ $$self{m_objects} } ) {
-            if (
-                $self->compare_array(
-                    \@{ $$self{m_objects}{$oldest_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
-              )
-            {
-                &::print_log(
-                    "Removing most stale person from room: $$self{m_objects}{$obj}{object}->{object_name}"
-                ) if $main::Debug{occupancy};
+            if ( $self->compare_array( \@{ $$self{m_objects}{$oldest_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
+                &::print_log( "Removing most stale person from room: $$self{m_objects}{$obj}{object}->{object_name}" )
+                  if $main::Debug{occupancy};
                 if ( $self->{room_counts} and $$self{m_objects}{$obj}{count} ) {
                     $$self{m_objects}{$obj}{count}--;
                 }
@@ -1076,28 +1054,15 @@ sub check_maintain {
       if $main::Debug{occupancy};
     my $maintain = 0;
     foreach my $obj ( keys %{ $$self{m_objects} } ) {
-        if (
-            $self->compare_array(
-                \@{ $$self{m_objects}{$p_obj}{edges} },
-                \@{ $$self{m_objects}{$obj}{edges} }
-            )
-          )
-        {
-            if (
-                (
-                    (
-                        $$self{m_objects}{$obj}{last_decrease} +
-                        $$self{m_objects}{$p_obj}{m_maintain}
-                    ) >= $::Time
-                )
-                and ( $$self{m_objects}{$obj}{count} < 1 )
-              )
+        if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
+            if (    ( ( $$self{m_objects}{$obj}{last_decrease} + $$self{m_objects}{$p_obj}{m_maintain} ) >= $::Time )
+                and ( $$self{m_objects}{$obj}{count} < 1 ) )
             {
                 # Okay, the object was decreased recently... and is down to zero
                 # so we want to re-establish presence
                 &::print_log(
-                    "Sensor $$p_obj{object_name} re-establishing presence in $$self{m_objects}{$obj}{object}->{object_name}"
-                ) if $main::Debug{occupancy};
+                    "Sensor $$p_obj{object_name} re-establishing presence in $$self{m_objects}{$obj}{object}->{object_name}" )
+                  if $main::Debug{occupancy};
                 $maintain++;
                 $$self{m_objects}{$obj}{count} = 1;
                 $$self{m_objects}{$obj}{time}  = $::Time;
@@ -1124,28 +1089,15 @@ sub need_to_steal_old_presence {
     my ( $self, $p_obj ) = @_;
     my $edge;
     foreach my $obj ( keys %{ $$self{m_objects} } ) {
-        if (
-            $edge = $self->compare_array_elements(
-                \@{ $$self{m_objects}{$p_obj}{edges} },
-                \@{ $$self{m_objects}{$obj}{edges} }
-            )
-          )
+        if ( $edge = $self->compare_array_elements( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) )
         {
             if ( $$self{m_objects}{$obj}{count} >= 1 ) {
-                unless (
-                        $$self{door_edges}
+                unless ($$self{door_edges}
                     and $$self{door_edges}{$edge}
-                    and $self->was_door_closed(
-                        $edge, @{ $$self{m_objects}{$obj}{edges} }
-                    )
-                  )
+                    and $self->was_door_closed( $edge, @{ $$self{m_objects}{$obj}{edges} } ) )
                 {
-                    if (
-                        $self->{room_counts}
-                        and $self->is_presence_too_old(
-                            @{ $$self{m_objects}{$obj}{edges} }
-                        )
-                      )
+                    if (    $self->{room_counts}
+                        and $self->is_presence_too_old( @{ $$self{m_objects}{$obj}{edges} } ) )
                     {
                         return 1;
                     }
@@ -1170,28 +1122,16 @@ sub check_ignore {
       if $main::Debug{occupancy};
 
     if ( $$self{m_objects}{$p_obj}{used} ) {
-        &::print_log(
-            "Ignored duplicate activity from: " . $$p_obj{object_name} )
+        &::print_log( "Ignored duplicate activity from: " . $$p_obj{object_name} )
           if $main::Debug{occupancy};
         return 1;
     }
 
     # Make sure we don't want to ignore this
     foreach my $obj ( keys %{ $$self{m_objects} } ) {
-        if (
-            $self->compare_array(
-                \@{ $$self{m_objects}{$p_obj}{edges} },
-                \@{ $$self{m_objects}{$obj}{edges} }
-            )
-          )
-        {
-            if (
-                (
-                    $$self{m_objects}{$obj}{last_decrease} +
-                    $$self{m_objects}{$p_obj}{m_ignore_time}
-                ) >= $::Time
-              )
-            {
+        if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
+            if ( ( $$self{m_objects}{$obj}{last_decrease} + $$self{m_objects}{$p_obj}{m_ignore_time} ) >= $::Time ) {
+
                 # The object was decreased within the specified ignore time,
                 # so ignore this acitvity
                 &::print_log( "Ignored activity from: " . $$p_obj{object_name} )
@@ -1222,14 +1162,12 @@ sub was_door_just_closed {
             if (
                 (
                     $$self{m_timing}{"@room_edges"}{time} -
-                    $$self{m_objects}
-                    { $$self{m_timing}{"@room_edges"}{object} }{m_ignore_time}
+                    $$self{m_objects}{ $$self{m_timing}{"@room_edges"}{object} }{m_ignore_time}
                 ) > $last_time
               )
             {
                 # Motion detector inside room since the door change,
-                &::print_log(
-                    "Door $$object{object_name} was recently closed, but there was recent motion from "
+                &::print_log( "Door $$object{object_name} was recently closed, but there was recent motion from "
                       . $$self{m_timing}{"@room_edges"}{object}->{object_name} )
                   if $main::Debug{occupancy};
                 return 0;
@@ -1263,9 +1201,7 @@ sub was_door_closed {
     {
         # Return that door was opened within the specified time frame,
         # thus allowing presence to be transferred across the edge
-        &::print_log(
-            "Door $$object{object_name} was opened so occupancy transfer is allowed"
-        ) if $main::Debug{occupancy};
+        &::print_log( "Door $$object{object_name} was opened so occupancy transfer is allowed" ) if $main::Debug{occupancy};
         if (    ( state $object ne 'open' )
             and $$self{m_timing}
             and $$self{m_timing}{"@room_edges"} )
@@ -1273,8 +1209,7 @@ sub was_door_closed {
             if (
                 (
                     $$self{m_timing}{"@room_edges"}{time} -
-                    $$self{m_objects}
-                    { $$self{m_timing}{"@room_edges"}{object} }{m_ignore_time}
+                    $$self{m_objects}{ $$self{m_timing}{"@room_edges"}{object} }{m_ignore_time}
                 ) > $object->get_last_close_time
               )
             {
@@ -1289,9 +1224,7 @@ sub was_door_closed {
 
     # If we are here then the door was NOT opened within the specified
     # time.  Return 1 to indicate that the door is closed
-    &::print_log(
-        "Door $$object{object_name} was not opened so occupancy transfer is not allowed"
-    ) if $main::Debug{occupancy};
+    &::print_log( "Door $$object{object_name} was not opened so occupancy transfer is not allowed" ) if $main::Debug{occupancy};
     return 1;
 }
 
@@ -1322,128 +1255,77 @@ sub determine_new_count {
 # Return 0 if the decrease has occurred too many times in past X seconds
 sub check_decrease_count {
     my ( $self, $p_obj, $source_edges ) = @_;
-    unless (
-            $$self{m_bounce_prevent}
-        and $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
+    unless ($$self{m_bounce_prevent}
         and $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-        {"@{$source_edges}"}
-        and
-        ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-            {"@{$source_edges}"}{'time'} > 0 )
-        and
-        ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-            {"@{$source_edges}"}{'count'} > 0 )
-      )
+        and $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}
+        and ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'time'} > 0 )
+        and ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'count'} > 0 ) )
     {
         return 1;
     }
-    if ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-        {"@{$source_edges}"}{'array'}[0] == $::Time )
-    {
+    if ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}[0] == $::Time ) {
+
         # Same exact time, assume it is another object in the same room
         return 1;
     }
     for (
-        my $i = (
-            $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-              {"@{$source_edges}"}{'count'} - 1
-        );
+        my $i = ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'count'} - 1 );
         $i > 0;
         $i--
       )
     {
-        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-          {"@{$source_edges}"}{'array'}[$i] =
-          $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-          {"@{$source_edges}"}{'array'}[ $i - 1 ];
+        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}[$i] =
+          $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}[ $i - 1 ];
     }
-    &::print_log(
-        "Checking for bouncing in $$self{m_objects}{$p_obj}{object}{object_name} [source @{$source_edges}]: "
-          . $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-          {"@{$source_edges}"}{'array'}[
-          $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-          {"@{$source_edges}"}{'count'} - 1
-          ]
-          . ', '
-          . (
-            $::Time -
-              $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-              {"@{$source_edges}"}{'time'}
-          )
-    ) if $main::Debug{occupancy};
-    if (
-        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-        {"@{$source_edges}"}{'array'}[
-        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-          {"@{$source_edges}"}{'count'} - 1
-        ] > (
-            $::Time -
-              $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-              {"@{$source_edges}"}{'time'}
-        )
-      )
+    &::print_log( "Checking for bouncing in $$self{m_objects}{$p_obj}{object}{object_name} [source @{$source_edges}]: "
+          . $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}
+          [ $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'count'} - 1 ] . ', '
+          . ( $::Time - $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'time'} ) )
+      if $main::Debug{occupancy};
+    if ( $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}
+        [ $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'count'} - 1 ] >
+        ( $::Time - $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'time'} ) )
     {
-        &::print_log(
-            "Checking for bouncing: expected_occupancy=$$self{m_expected_occupancy}, people=$$self{m_people}"
-        ) if $main::Debug{occupancy};
+        &::print_log( "Checking for bouncing: expected_occupancy=$$self{m_expected_occupancy}, people=$$self{m_people}" )
+          if $main::Debug{occupancy};
         if (   ( $$self{m_expected_occupancy} < 0 )
             or ( $$self{m_people} < $$self{m_expected_occupancy} ) )
         {
             # Bounced too many times in the specified amount of time... and we have room to expand without exceeding the expected occupancy
             foreach ( keys %{ $$self{m_bounce_prevent} } ) {
-                if ( $$self{m_bounce_prevent}{$_}
-                    {"@{$$self{m_objects}{$p_obj}{edges}}"} )
-                {
-                    for (
-                        my $i = 0;
-                        $i < $$self{m_bounce_prevent}{$_}
-                        {"@{$$self{m_objects}{$p_obj}{edges}}"}{'count'};
-                        $i++
-                      )
-                    {
-                        $$self{m_bounce_prevent}{$_}
-                          {"@{$$self{m_objects}{$p_obj}{edges}}"}{'array'}[$i]
-                          = 0;
+                if ( $$self{m_bounce_prevent}{$_}{"@{$$self{m_objects}{$p_obj}{edges}}"} ) {
+                    for ( my $i = 0; $i < $$self{m_bounce_prevent}{$_}{"@{$$self{m_objects}{$p_obj}{edges}}"}{'count'}; $i++ ) {
+                        $$self{m_bounce_prevent}{$_}{"@{$$self{m_objects}{$p_obj}{edges}}"}{'array'}[$i] = 0;
                     }
                 }
             }
             for (
                 my $i = 0;
-                $i <
-                $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-                {"@{$source_edges}"}{'count'};
+                $i < $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'count'};
                 $i++
               )
             {
-                $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-                  {"@{$source_edges}"}{'array'}[$i] = 0;
+                $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}[$i] = 0;
             }
             &::print_log(
-                "Preventing bouncing by leaving presence in $$self{m_objects}{$p_obj}{object}{object_name}: @{$source_edges}"
-            ) if $main::Debug{occupancy};
+                "Preventing bouncing by leaving presence in $$self{m_objects}{$p_obj}{object}{object_name}: @{$source_edges}" )
+              if $main::Debug{occupancy};
             return 0;
         }
     }
-    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}
-      {"@{$source_edges}"}{'array'}[0] = $::Time;
+    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj}{edges}}"}{"@{$source_edges}"}{'array'}[0] = $::Time;
     return 1;
 }
 
 sub prevent_bounces {
     my ( $self, $p_obj1, $p_obj2, $p_time, $p_count ) = @_;
-    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}
-      {"@{$$self{m_objects}{$p_obj2}{edges}}"}{'time'} = $p_time;
-    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}
-      {"@{$$self{m_objects}{$p_obj1}{edges}}"}{'time'} = $p_time;
-    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}
-      {"@{$$self{m_objects}{$p_obj2}{edges}}"}{'count'} = $p_count;
-    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}
-      {"@{$$self{m_objects}{$p_obj1}{edges}}"}{'count'} = $p_count;
+    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{'time'}  = $p_time;
+    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{'time'}  = $p_time;
+    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{'count'} = $p_count;
+    $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{'count'} = $p_count;
     for ( my $i = 0; $i < $p_count; $i++ ) {
-        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}
-          {"@{$$self{m_objects}{$p_obj2}{edges}}"}{'array'}[$i] = 0;
-        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}
-          {"@{$$self{m_objects}{$p_obj1}{edges}}"}{'array'}[$i] = 0;
+        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{'array'}[$i] = 0;
+        $$self{m_bounce_prevent}{"@{$$self{m_objects}{$p_obj2}{edges}}"}{"@{$$self{m_objects}{$p_obj1}{edges}}"}{'array'}[$i] = 0;
     }
 }
 
@@ -1459,22 +1341,14 @@ sub calc_presence {
       unless defined $presence_value;
 
     # Run checks if partial presence is being used for this room
-    if ( ( $$self{m_objects}{$p_obj}{count} < 1 ) and ( $presence_value < 1 ) )
-    {
+    if ( ( $$self{m_objects}{$p_obj}{count} < 1 ) and ( $presence_value < 1 ) ) {
+
         # The current count is between 0 and 1 which indicates a partial presence
         # So, we need to see how this new activity affects the total...
-        &::print_log(
-            "Object $$p_obj{object_name} contributing $presence_value to presence"
-        ) if $main::Debug{occupancy};
+        &::print_log( "Object $$p_obj{object_name} contributing $presence_value to presence" ) if $main::Debug{occupancy};
         $$self{m_objects}{$p_obj}{used} = 1;
         foreach my $obj ( keys %{ $$self{m_objects} } ) {
-            if (
-                $self->compare_array(
-                    \@{ $$self{m_objects}{$p_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
-              )
-            {
+            if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
                 $$self{m_objects}{$obj}{count} =
                   $self->determine_new_count( $obj, $presence_value );
             }
@@ -1482,21 +1356,14 @@ sub calc_presence {
         if ( $$self{m_objects}{$p_obj}{count} < 1 ) {
 
             # Nope, still not high enough... exit.
-            &::print_log(
-                "Object $$p_obj{object_name} presence still not high enough: $$self{m_objects}{$p_obj}{count}"
-            ) if $main::Debug{occupancy};
+            &::print_log( "Object $$p_obj{object_name} presence still not high enough: $$self{m_objects}{$p_obj}{count}" )
+              if $main::Debug{occupancy};
             return 0;
         }
         else {
             # Okay, we are above one... so now, return to 0 so that things can proceed like normal
             foreach my $obj ( keys %{ $$self{m_objects} } ) {
-                if (
-                    $self->compare_array(
-                        \@{ $$self{m_objects}{$p_obj}{edges} },
-                        \@{ $$self{m_objects}{$obj}{edges} }
-                    )
-                  )
-                {
+                if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
                     $$self{m_objects}{$obj}{count} = 0;
                 }
             }
@@ -1512,17 +1379,10 @@ sub calc_presence {
         #		&::print_log("checking: " . $$self{m_objects}{$obj}{object}->{object_name});
         if (
             (
-                $edge = $self->compare_array_elements(
-                    \@{ $$self{m_objects}{$p_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
-            )
-            and (
-                not $self->compare_array(
-                    \@{ $$self{m_objects}{$p_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
+                $edge =
+                $self->compare_array_elements( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } )
             )
+            and ( not $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) )
           )
         {
             #			&::print_log("Destroy:" . $$self{m_objects}{$obj}{object}->{object_name});
@@ -1530,55 +1390,34 @@ sub calc_presence {
             # prediction for nodes that havent been visited yet
             $$self{m_objects}{$obj}{used} = 0;
             if ( $$self{m_objects}{$obj}{count} >= 1 ) {
-                &::print_log( "Object "
-                      . $$self{m_objects}{$obj}{object}->{object_name}
-                      . " has common edge: $edge" )
+                &::print_log( "Object " . $$self{m_objects}{$obj}{object}->{object_name} . " has common edge: $edge" )
                   if $main::Debug{occupancy};
                 if ( $$self{door_edges} and $$self{door_edges}{$edge} ) {
                     &::print_log( "Object "
                           . $$self{m_objects}{$obj}{object}->{object_name}
-                          . " was marked as a door with timeout: $$self{door_edges}{$edge}{seconds}"
-                    ) if $main::Debug{occupancy};
+                          . " was marked as a door with timeout: $$self{door_edges}{$edge}{seconds}" )
+                      if $main::Debug{occupancy};
                 }
-                unless (
-                        $$self{door_edges}
+                unless ($$self{door_edges}
                     and $$self{door_edges}{$edge}
-                    and $self->was_door_closed(
-                        $edge, @{ $$self{m_objects}{$obj}{edges} }
-                    )
-                  )
+                    and $self->was_door_closed( $edge, @{ $$self{m_objects}{$obj}{edges} } ) )
                 {
-                    &::print_log( "Object "
-                          . $$self{m_objects}{$obj}{object}->{object_name}
-                          . " no door edge restriction active" )
+                    &::print_log( "Object " . $$self{m_objects}{$obj}{object}->{object_name} . " no door edge restriction active" )
                       if $main::Debug{occupancy};
                     if (
                            ( $$self{m_objects}{$p_obj}{count} < 1 )
                         or ( $$self{m_objects}{$p_obj}{count} eq '' )
-                        or $self->is_presence_too_old(
-                            @{ $$self{m_objects}{$obj}{edges} }
-                        )
-                        or (
-                                $$self{door_edges}
+                        or $self->is_presence_too_old( @{ $$self{m_objects}{$obj}{edges} } )
+                        or (    $$self{door_edges}
                             and $$self{door_edges}{$edge}
-                            and $self->was_door_just_closed(
-                                $edge, @{ $$self{m_objects}{$obj}{edges} }
-                            )
-                        )
+                            and $self->was_door_just_closed( $edge, @{ $$self{m_objects}{$obj}{edges} } ) )
                       )
                     {
                         # only decrement if first entering the node, or if this is a door
                         # edge and the door was just and there has not been recent activity
                         # inside the other room (was_door_just_closed() tells us that)
-                        if (
-                            (
-                                not $decrease_prevented{
-                                    "@{$$self{m_objects}{$obj}{edges}}"}
-                            )
-                            and $self->check_decrease_count(
-                                $obj, \@{ $$self{m_objects}{$p_obj}{edges} }
-                            )
-                          )
+                        if ( ( not $decrease_prevented{"@{$$self{m_objects}{$obj}{edges}}"} )
+                            and $self->check_decrease_count( $obj, \@{ $$self{m_objects}{$p_obj}{edges} } ) )
                         {
                             if ( $self->{room_counts} ) {
                                 $$self{m_objects}{$obj}{count}--;
@@ -1588,12 +1427,9 @@ sub calc_presence {
                             }
                         }
                         else {
-                            $decrease_prevented{
-                                "@{$$self{m_objects}{$obj}{edges}}"}++;
+                            $decrease_prevented{"@{$$self{m_objects}{$obj}{edges}}"}++;
                         }
-                        unless (
-                            $rooms_seen{"@{$$self{m_objects}{$obj}{edges}}"} )
-                        {
+                        unless ( $rooms_seen{"@{$$self{m_objects}{$obj}{edges}}"} ) {
                             $dec_count++;
                             $rooms_seen{"@{$$self{m_objects}{$obj}{edges}}"}++;
                         }
@@ -1633,20 +1469,8 @@ sub calc_presence {
     {
         my $proceed = 0;
         foreach my $obj ( keys %{ $$self{m_objects} } ) {
-            unless (
-                $self->compare_array(
-                    \@{ $$self{m_objects}{$p_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
-              )
-            {
-                unless (
-                    $self->compare_array(
-                        \@{ $$self{m_objects}{$partial}{edges} },
-                        \@{ $$self{m_objects}{$obj}{edges} }
-                    )
-                  )
-                {
+            unless ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
+                unless ( $self->compare_array( \@{ $$self{m_objects}{$partial}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
                     if (
                         $edge = $self->compare_array_elements(
                             \@{ $$self{m_objects}{$partial}{edges} },
@@ -1654,27 +1478,15 @@ sub calc_presence {
                         )
                       )
                     {
-                        unless (
-                                $$self{door_edges}
+                        unless ($$self{door_edges}
                             and $$self{door_edges}{$edge}
-                            and $self->was_door_closed(
-                                $edge, @{ $$self{m_objects}{$obj}{edges} }
-                            )
-                          )
+                            and $self->was_door_closed( $edge, @{ $$self{m_objects}{$obj}{edges} } ) )
                         {
-                            &::print_log(
-                                "Moving to intermediate room that already had partial presence: "
-                                  . $$self{m_objects}{$partial}{object}
-                                  ->{object_name} )
+                            &::print_log( "Moving to intermediate room that already had partial presence: "
+                                  . $$self{m_objects}{$partial}{object}->{object_name} )
                               if $main::Debug{occupancy};
-                            if (
-                                $self->calc_presence(
-                                    $$self{m_objects}{$partial}{object}, 1
-                                )
-                              )
-                            {
-                                $self->add_log(
-                                    $$self{m_objects}{$partial}{object} );
+                            if ( $self->calc_presence( $$self{m_objects}{$partial}{object}, 1 ) ) {
+                                $self->add_log( $$self{m_objects}{$partial}{object} );
                                 $proceed = 1;
                                 last;
                             }
@@ -1706,25 +1518,15 @@ sub calc_presence {
         # extra list of possible rooms to steal presence from, so check them.
         foreach my $obj ( @{ $$self{m_objects}{$p_obj}{extra_rooms} } ) {
             if ( $$self{m_objects}{$obj}{count} >= 1 ) {
-                &::print_log(
-                    "Stealing presence from extra room $obj->{object_name}")
+                &::print_log("Stealing presence from extra room $obj->{object_name}")
                   if $main::Debug{occupancy};
 
                 # First, move a person to an intermediate room...
                 foreach my $obj2 ( keys %{ $$self{m_objects} } ) {
-                    unless (
-                        $self->compare_array(
-                            \@{ $$self{m_objects}{$p_obj}{edges} },
-                            \@{ $$self{m_objects}{$obj2}{edges} }
-                        )
-                      )
+                    unless ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj2}{edges} } ) )
                     {
                         unless (
-                            $self->compare_array(
-                                \@{ $$self{m_objects}{$obj}{edges} },
-                                \@{ $$self{m_objects}{$obj2}{edges} }
-                            )
-                          )
+                            $self->compare_array( \@{ $$self{m_objects}{$obj}{edges} }, \@{ $$self{m_objects}{$obj2}{edges} } ) )
                         {
                             if (
                                 $edge = $self->compare_array_elements(
@@ -1733,54 +1535,26 @@ sub calc_presence {
                                 )
                               )
                             {
-                                unless (
-                                        $$self{door_edges}
+                                unless ($$self{door_edges}
                                     and $$self{door_edges}{$edge}
-                                    and $self->was_door_closed(
-                                        $edge,
-                                        @{ $$self{m_objects}{$obj2}{edges} }
-                                    )
-                                  )
+                                    and $self->was_door_closed( $edge, @{ $$self{m_objects}{$obj2}{edges} } ) )
                                 {
                                     if (
                                         $edge = $self->compare_array_elements(
-                                            \@{
-                                                $$self{m_objects}{$obj}{edges}
-                                            },
-                                            \@{
-                                                $$self{m_objects}{$obj2}{edges}
-                                            }
+                                            \@{ $$self{m_objects}{$obj}{edges} },
+                                            \@{ $$self{m_objects}{$obj2}{edges} }
                                         )
                                       )
                                     {
-                                        unless (
-                                                $$self{door_edges}
+                                        unless ($$self{door_edges}
                                             and $$self{door_edges}{$edge}
-                                            and $self->was_door_closed(
-                                                $edge,
-                                                @{
-                                                    $$self{m_objects}{$obj}
-                                                      {edges}
-                                                }
-                                            )
-                                          )
+                                            and $self->was_door_closed( $edge, @{ $$self{m_objects}{$obj}{edges} } ) )
                                         {
                                             &::print_log(
-                                                "Moving to intermediate room "
-                                                  . $$self{m_objects}{$obj2}
-                                                  {object}->{object_name} )
+                                                "Moving to intermediate room " . $$self{m_objects}{$obj2}{object}->{object_name} )
                                               if $main::Debug{occupancy};
-                                            if (
-                                                $self->calc_presence(
-                                                    $$self{m_objects}{$obj2}
-                                                      {object},
-                                                    1
-                                                )
-                                              )
-                                            {
-                                                $self->add_log(
-                                                    $$self{m_objects}{$obj2}
-                                                      {object} );
+                                            if ( $self->calc_presence( $$self{m_objects}{$obj2}{object}, 1 ) ) {
+                                                $self->add_log( $$self{m_objects}{$obj2}{object} );
                                                 $proceed = 1;
                                                 last;
                                             }
@@ -1808,19 +1582,11 @@ sub calc_presence {
 
     #increment current motion
     foreach my $obj ( keys %{ $$self{m_objects} } ) {
-        if (
-            $self->compare_array(
-                \@{ $$self{m_objects}{$p_obj}{edges} },
-                \@{ $$self{m_objects}{$obj}{edges} }
-            )
-          )
-        {
-            &::print_log(
-                "Clearing used flag for $$p_obj{object_name} (presence)")
+        if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
+            &::print_log("Clearing used flag for $$p_obj{object_name} (presence)")
               if $main::Debug{occupancy};
             $$self{m_objects}{$obj}{used} = 0;
-            &::print_log( "Adding $dec_count to room "
-                  . $$self{m_objects}{$obj}{object}->{object_name} )
+            &::print_log( "Adding $dec_count to room " . $$self{m_objects}{$obj}{object}->{object_name} )
               if $main::Debug{occupancy};
             if ( $self->{room_counts}
                 and ( $$self{m_objects}{$obj}{count} >= 1 ) )
@@ -1852,8 +1618,7 @@ sub calc_total {
 
     #Seed the node pool before the search
     if ( $l_Ubound > 0 ) {
-        push @l_NodePool,
-          @{ $$self{m_objects}{ $$self{m_object_log}->[0] }{edges} };
+        push @l_NodePool, @{ $$self{m_objects}{ $$self{m_object_log}->[0] }{edges} };
     }
     else {    # bail out if object is not found
         return 0;
@@ -1861,22 +1626,14 @@ sub calc_total {
 
     for ( $l_Index = 0; $l_Index < $l_Ubound - 1; $l_Index++ ) {
         if (
-            $self->compare_array_elements(
-                \@l_NodePool,
-                \@{
-                    $$self{m_objects}{ $$self{m_object_log}->[ $l_Index + 1 ] }
-                      {edges}
-                }
-            ) > 0
-          )
+            $self->compare_array_elements( \@l_NodePool, \@{ $$self{m_objects}{ $$self{m_object_log}->[ $l_Index + 1 ] }{edges} } )
+            > 0 )
         {
             return $l_Index + 1;
         }
 
         #add previous edges together to search all
-        push @l_NodePool,
-          @{ $$self{m_objects}{ $$self{m_object_log}->[ $l_Index + 1 ] }{edges}
-          };
+        push @l_NodePool, @{ $$self{m_objects}{ $$self{m_object_log}->[ $l_Index + 1 ] }{edges} };
 
     }
     return $l_Index + 1;
@@ -1915,10 +1672,7 @@ sub sensor_count {
             if ( $$self{m_object_log}->[0] and $$self{m_objects}{$p_obj} ) {
                 if (
                     $self->compare_array(
-                        \@{
-                            $$self{m_objects}{ $$self{m_object_log}->[0] }
-                              {edges}
-                        },
+                        \@{ $$self{m_objects}{ $$self{m_object_log}->[0] }{edges} },
                         \@{ $$self{m_objects}{$p_obj}{edges} }
                     )
                   )
@@ -1955,7 +1709,7 @@ sub list_presence_string {
     return "@sensor_names";
 }
 
-sub compare_array # compare arrays to see if all elements are present in the other
+sub compare_array    # compare arrays to see if all elements are present in the other
 {
     my ( $self, $p_ary1, $p_ary2 ) = @_[ 0, 1, 2 ];
 
@@ -1971,8 +1725,7 @@ sub compare_array # compare arrays to see if all elements are present in the oth
     @l_ary1 = @{$p_ary1};
     @l_ary2 = @{$p_ary2};
 
-    if ( @l_ary1 != @l_ary2 )
-    { #if the number of elements doesnt match then they are obviously not the same
+    if ( @l_ary1 != @l_ary2 ) {    #if the number of elements doesnt match then they are obviously not the same
         return 0;
     }
 
@@ -1984,15 +1737,14 @@ sub compare_array # compare arrays to see if all elements are present in the oth
                 $l_match = 1;
             }
         }
-        if ( $l_match ne 1 )
-        {    #didnt find an element in the other then bail out, dont match
+        if ( $l_match ne 1 ) {     #didnt find an element in the other then bail out, dont match
             return 0;
         }
     }
     return 1;
 }
 
-sub compare_array_elements #find any array elements in any elements of other array
+sub compare_array_elements         #find any array elements in any elements of other array
 {
     my ( $self, $p_ary1, $p_ary2 ) = @_[ 0, 1, 2 ];
 
@@ -2007,9 +1759,7 @@ sub compare_array_elements #find any array elements in any elements of other arr
         foreach my $item2 ( @{$p_ary1} ) {
             if ( $item1 == $item2 ) {
                 if ( $item1 == 0 ) {
-                    &::print_log(
-                        "Occupancy Monitor: WARNING: Use of 0 for an edge number will cause problems"
-                    );
+                    &::print_log( "Occupancy Monitor: WARNING: Use of 0 for an edge number will cause problems" );
                     return 1;
                 }
                 else {
@@ -2027,13 +1777,7 @@ sub set_extra_rooms() {
         my %rooms_seen;
         @{ $$self{m_objects}{$p_obj}{extra_rooms} } = ();
         foreach my $obj (@extras) {
-            if (
-                $self->compare_array(
-                    \@{ $$self{m_objects}{$p_obj}{edges} },
-                    \@{ $$self{m_objects}{$obj}{edges} }
-                )
-              )
-            {
+            if ( $self->compare_array( \@{ $$self{m_objects}{$p_obj}{edges} }, \@{ $$self{m_objects}{$obj}{edges} } ) ) {
                 &::print_log(
                     "Occupancy_Monitor::set_extra_rooms($p_obj->{object_name}): WARNING: ignoring $obj->{object_name} because it has the same edges (@{$$self{m_objects}{$obj}{edges}}) as $p_obj->{object_name}"
                 );
@@ -2045,8 +1789,7 @@ sub set_extra_rooms() {
                     );
                 }
                 else {
-                    $rooms_seen{"@{$$self{m_objects}{$obj}{edges}}"} =
-                      $obj->{object_name};
+                    $rooms_seen{"@{$$self{m_objects}{$obj}{edges}}"} = $obj->{object_name};
                     push @{ $$self{m_objects}{$p_obj}{extra_rooms} }, $obj;
                 }
             }
@@ -2092,9 +1835,7 @@ sub ignore_time {
 sub presence_move_time {
     my ( $self, $p_obj, $p_time ) = @_;
     unless ( ref $$self{m_objects}{$p_obj}{edges} ) {
-        &::print_log(
-            "Occupancy_Monitor::presence_move_time ERROR: object $$p_obj{object_name} has no edges defined"
-        );
+        &::print_log( "Occupancy_Monitor::presence_move_time ERROR: object $$p_obj{object_name} has no edges defined" );
         return undef;
     }
     my @array = @{ $$self{m_objects}{$p_obj}{edges} };
diff --git a/lib/Omnistat.pm b/lib/Omnistat.pm
index 2de1eb3fc..ae4ed2245 100644
--- a/lib/Omnistat.pm
+++ b/lib/Omnistat.pm
@@ -589,17 +589,13 @@ sub send_cmd {
 
     #omnistat_debug("Omnistat[$$self{address}]->send_cmd: Left over serial data before send_cmd (if any): $_");
     if ($_) {
-        &::print_log(
-            "Omnistat[$$self{address}]->send_cmd: Left over serial data before send_cmd (likely bug/dropped data): $_"
-        );
+        &::print_log( "Omnistat[$$self{address}]->send_cmd: Left over serial data before send_cmd (likely bug/dropped data): $_" );
 
         # I occasionally see this on restart, that's totally fine, it just cleans up leftover data on the port:
         # Omnistat[2]->send_cmd: Left over serial data before send_cmd (likely bug/dropped data): 0xfe
     }
 
-    omnistat_debug(
-        "Omnistat[$$self{address}]->send_cmd string=@string ($reply_count char(s) to read back)"
-    );
+    omnistat_debug( "Omnistat[$$self{address}]->send_cmd string=@string ($reply_count char(s) to read back)" );
     foreach my $byte (@string) {
         $byte =~ s/0x//;    # strip off the 0x
         $cmd = $cmd . pack "H2", $byte;    # pack it into 8 bits
@@ -646,8 +642,7 @@ sub send_cmd {
     $self->die_reset(
         "$::Time_Date: Omnistat[$$self{address}]->send_cmd did not get ack reply to command @string (received: $rcvd). We were expecting $reply_count bytes back."
     ) unless ( length($rcvd) > 3 );
-    $self->die_reset(
-        "$::Time_Date: Omnistat[$$self{address}]->send_cmd did not get expected first byte ("
+    $self->die_reset( "$::Time_Date: Omnistat[$$self{address}]->send_cmd did not get expected first byte ("
           . sprintf( "0x%02x", $ack_byte )
           . ") in ack reply to command @string (got "
           . sprintf( "0x%02x", $rcvd_ack )
@@ -734,9 +729,7 @@ sub display {
 # * Create the Omnistat device on serial port.
 # *********************************************
 sub serial_startup {
-    &main::serial_port_create( 'Omnistat',
-        $main::config_parms{Omnistat_serial_port},
-        300, 'none', 'raw' );
+    &main::serial_port_create( 'Omnistat', $main::config_parms{Omnistat_serial_port}, 300, 'none', 'raw' );
     &::MainLoop_pre_add_hook( \&Omnistat::check_for_data, 1 );
 }
 
@@ -790,22 +783,21 @@ sub translate_temp {
       if ( not $settemp or $settemp eq "0x00" );
 
     # Calculate conversion mathematically rather than using a table so all temps will work (needed for outside temperature)
-    if ( substr( $settemp, 0, 2 ) eq '0x' )
-    {    # if it starts with 0x, reverse xlate
+    if ( substr( $settemp, 0, 2 ) eq '0x' ) {    # if it starts with 0x, reverse xlate
         $omnitemp = hex($settemp);
-        $omnitemp = -40 + .5 * $omnitemp;    #degrees Celcius
+        $omnitemp = -40 + .5 * $omnitemp;        #degrees Celcius
         if ( !( $main::config_parms{Omnistat_celcius} ) ) {
-            $omnitemp = 32 + 1.8 * $omnitemp;    # degrees Fahrenheit
+            $omnitemp = 32 + 1.8 * $omnitemp;                           # degrees Fahrenheit
             $omnitemp = int( $omnitemp + .5 * ( $omnitemp <=> 0 ) );    #round
         }
     }
-    else {    # xlate from Fahrenheit/Celcius
+    else {                                                              # xlate from Fahrenheit/Celcius
         $omnitemp = $settemp;
         if ( !( $main::config_parms{Omnistat_celcius} ) ) {
-            $omnitemp = ( $omnitemp - 32 ) / 1.8;    #Fahrenheit to Celcius
+            $omnitemp = ( $omnitemp - 32 ) / 1.8;                       #Fahrenheit to Celcius
         }
-        $omnitemp = ( $omnitemp + 40 ) / .5;         #omnistat degrees
-        $omnitemp = int( $omnitemp + .5 * ( $omnitemp <=> 0 ) );    #round
+        $omnitemp = ( $omnitemp + 40 ) / .5;                            #omnistat degrees
+        $omnitemp = int( $omnitemp + .5 * ( $omnitemp <=> 0 ) );        #round
         $omnitemp = sprintf( "0x%02x", $omnitemp );
     }
 
@@ -821,18 +813,14 @@ sub translate_time {
     my ( $hours, $minutes, $ampm );
     my ($omnitime);
 
-    if ( substr( $settime, 0, 2 ) eq '0x' )
-    {    #Translate omnitime to readable time
-        if ( $settime eq '0x60' )
-        {    #if it's set to 24hrs past midnight, time is blank
+    if ( substr( $settime, 0, 2 ) eq '0x' ) {    #Translate omnitime to readable time
+        if ( $settime eq '0x60' ) {              #if it's set to 24hrs past midnight, time is blank
             $omnitime = '';
         }
         else {
-            $minutes =
-              hex($settime) *
-              15;    #Omnistat is stored as 15 minute time periods pas midnight
+            $minutes = hex($settime) * 15;       #Omnistat is stored as 15 minute time periods pas midnight
             $hours   = int( $minutes / 60 );
-            $minutes = $minutes % 60;          #minutes past hour
+            $minutes = $minutes % 60;            #minutes past hour
             if ( $main::config_parms{Omnistat_24hr} ) {
 
                 #Translate to 24hr time
@@ -857,8 +845,7 @@ sub translate_time {
         }
     }
     else {    #Translate readable to omnistat time
-        if ( $settime eq '0' )
-        {     #set to 0 to clear time, or 24:00 if using 24h time
+        if ( $settime eq '0' ) {    #set to 0 to clear time, or 24:00 if using 24h time
             $omnitime = '0x60';
         }
         elsif ( $main::config_parms{Omnistat_24hr} ) {
@@ -918,8 +905,7 @@ sub translate_time {
 sub translate_stat_output {
     my ( $self, $reg48 ) = @_;
 
-    $self->die_reset(
-        "Omnistat::translate_stat_output got non hex value in '$reg48'")
+    $self->die_reset("Omnistat::translate_stat_output got non hex value in '$reg48'")
       unless ( is_hex($reg48) );
 
     # see reg 0x48 / output register in the comments at the top of this file
@@ -1009,29 +995,22 @@ sub restore_setpoints {
 
     #Determine the time
     $time =
-      ( $::Hour * 4 ) + ( $::Minute / 15 ) + ( $::Second / 60 );  #Omnistat time
+      ( $::Hour * 4 ) + ( $::Minute / 15 ) + ( $::Second / 60 );    #Omnistat time
 
     #Determine the day
-    if ( $day == 6 ) {                                            # Sunday
-        $register = 0x36;    # Sunday night time
+    if ( $day == 6 ) {                                              # Sunday
+        $register = 0x36;                                           # Sunday night time
     }
-    elsif ( $day == 5 ) {    # Saturday
-        $register = 0x2a;    # Saturday night time
+    elsif ( $day == 5 ) {                                           # Saturday
+        $register = 0x2a;                                           # Saturday night time
     }
-    else {                   # Weekday
-        $register = 0x1e;    # Weekday night time
+    else {                                                          # Weekday
+        $register = 0x1e;                                           # Weekday night time
     }
 
     # Check for setpoints for that day, need to consider what time it is
     for ( $setpointnum = 0; $setpointnum < 4; $setpointnum++ ) {
-        if (
-            hex(
-                $self->read_cached_reg(
-                    sprintf( "0x%02x", $register - 3 * $setpointnum )
-                )
-            ) < $time
-          )
-        {
+        if ( hex( $self->read_cached_reg( sprintf( "0x%02x", $register - 3 * $setpointnum ) ) ) < $time ) {
             $point = $register - 3 * $setpointnum;
             last;
         }
@@ -1057,14 +1036,8 @@ sub restore_setpoints {
 
             #Loop setpoints
             for ( $setpointnum = 0; $setpointnum < 4; $setpointnum++ ) {
-                if (
-                    hex(
-                        $self->read_cached_reg(
-                            sprintf( "0x%02x", $register - 3 * $setpointnum )
-                        )
-                    ) != 96
-                  )
-                {
+                if ( hex( $self->read_cached_reg( sprintf( "0x%02x", $register - 3 * $setpointnum ) ) ) != 96 ) {
+
                     #If the setpoint has a time set, use the setpoint
                     $point = $register - 3 * $setpointnum;
                     last;
@@ -1078,12 +1051,8 @@ sub restore_setpoints {
         my $cool_sp = $self->read_cached_reg( sprintf( "0x%02x", $point + 1 ) );
 
         # Set the setpoints (setting the registers avoids converting the temp only to convert it back)
-        &::print_log( "Omnistat: Heat Set to "
-              . &Omnistat::translate_temp($heat_sp)
-              . "\n" );
-        &::print_log( "Omnistat: Cool Set to "
-              . &Omnistat::translate_temp($cool_sp)
-              . "\n" );
+        &::print_log( "Omnistat: Heat Set to " . &Omnistat::translate_temp($heat_sp) . "\n" );
+        &::print_log( "Omnistat: Cool Set to " . &Omnistat::translate_temp($cool_sp) . "\n" );
         $self->set_reg( "0x3c", $heat_sp );
         $self->set_reg( "0x3b", $cool_sp );
     }
@@ -1515,8 +1484,7 @@ sub get_mode {
         $mode = [ 'off', 'heat', 'cool', 'auto' ]->[ hex($mode) ];
     }
     else {
-        $mode = [ 'off', 'program_heat', 'program_cool', 'program_auto' ]
-          ->[ hex($mode) ];
+        $mode = [ 'off', 'program_heat', 'program_cool', 'program_auto' ]->[ hex($mode) ];
     }
 
     return $mode;
@@ -1635,13 +1603,11 @@ sub set_state_change_if_any {
     }
     elsif ( $register eq "0x3b" ) {
         $self->set_receive('cool_sp_change');
-        omnistat_log(
-            "Omnistat[$$self{address}]->state_now set to cool_sp_change");
+        omnistat_log("Omnistat[$$self{address}]->state_now set to cool_sp_change");
     }
     elsif ( $register eq "0x3c" ) {
         $self->set_receive('heat_sp_change');
-        omnistat_log(
-            "Omnistat[$$self{address}]->state_now set to heat_sp_change");
+        omnistat_log("Omnistat[$$self{address}]->state_now set to heat_sp_change");
     }
     elsif ( $register eq "0x3d" ) {
         $self->set_receive('mode_change');
@@ -1653,21 +1619,16 @@ sub set_state_change_if_any {
     }
     elsif ( $register eq "0x3e" ) {
         $self->set_receive('fan_mode_change');
-        omnistat_log(
-            "Omnistat[$$self{address}]->state_now set to fan_mode_change");
+        omnistat_log("Omnistat[$$self{address}]->state_now set to fan_mode_change");
     }
     elsif ( $register eq "0x0f" ) {
         if ( $self->get_filter_reminder eq 0 ) {
             $self->set_receive('filter_reminder_now');
-            omnistat_log(
-                "Omnistat[$$self{address}]->state_now set to filter_reminder_now"
-            );
+            omnistat_log( "Omnistat[$$self{address}]->state_now set to filter_reminder_now" );
         }
         else {
             $self->set_receive('filter_reminder_change');
-            omnistat_log(
-                "Omnistat[$$self{address}]->state_now set to filter_reminder_change"
-            );
+            omnistat_log( "Omnistat[$$self{address}]->state_now set to filter_reminder_change" );
 
         }
 
@@ -1676,9 +1637,7 @@ sub set_state_change_if_any {
     }
     elsif ( $register eq "0x48" ) {    # this one is read only
         $self->set_receive('current_output_change');
-        omnistat_log(
-            "Omnistat[$$self{address}]->state_now set to current_output_change"
-        );
+        omnistat_log( "Omnistat[$$self{address}]->state_now set to current_output_change" );
     }
 }
 
@@ -1703,8 +1662,7 @@ sub read_reg {
     warn
       "You should call read_cached_reg instead of read_reg to avoid hang delays. Adjust CACHE_TIMEOUT_ values in new(), and/or set debug=omnistat in mh.private.ini to adjust caching"
       if ( not $whitelisted );
-    $self->die_reset(
-        "You can only read 14 registers at a time, you asked for $count")
+    $self->die_reset("You can only read 14 registers at a time, you asked for $count")
       if ( $count > 14 );
 
     $count = 1 if ( not $count );
@@ -1736,9 +1694,7 @@ sub read_reg {
 
             # see if it changed
             if ( $$self{cache}{ hex($regoffset) } ne $value[$i] ) {
-                omnistat_debug(
-                    "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] updated in cache"
-                );
+                omnistat_debug( "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] updated in cache" );
 
                 # Update the cache
                 $$self{cache}{ hex($regoffset) } = $value[$i];
@@ -1747,16 +1703,12 @@ sub read_reg {
                 $self->set_state_change_if_any($regoffset);
             }
             else {
-                omnistat_debug(
-                    "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] current in cache"
-                );
+                omnistat_debug( "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] current in cache" );
             }
         }
         else {
             # Set the cache
-            omnistat_debug(
-                "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] added to cache"
-            );
+            omnistat_debug( "Omnistat[$$self{address}]->read_reg: reg[$regoffset]=$value[$i] added to cache" );
             $$self{cache}{ hex($regoffset) } = $value[$i];
         }
 
@@ -1778,8 +1730,7 @@ sub set_reg {
     my $addr = $$self{address};
     my (@cmd);
 
-    $self->die_reset(
-        "Omnistat::set_reg got non hex value in $register <- $value")
+    $self->die_reset("Omnistat::set_reg got non hex value in $register <- $value")
       unless ( is_hex($register) and is_hex($value) );
     $cmd[0] = sprintf( "0x%02x", $addr );
     $cmd[1] = "0x21";
@@ -1845,8 +1796,7 @@ sub read_cached_reg {
             if ( $cache_age <= $age_limit ) {
                 $regval = $$self{cache}{ hex($regoffset) };
                 omnistat_debug(
-                    "Omnistat[$$self{address}]->read_cached_reg: fetched reg=$regoffset from cache ($cache_age <= $age_limit)"
-                );
+                    "Omnistat[$$self{address}]->read_cached_reg: fetched reg=$regoffset from cache ($cache_age <= $age_limit)" );
             }
             else {
                 omnistat_debug(
@@ -1855,9 +1805,7 @@ sub read_cached_reg {
             }
         }
         else {
-            omnistat_debug(
-                "Omnistat[$$self{address}]->read_cached_reg: reg=$regoffset not cached, fetching"
-            );
+            omnistat_debug( "Omnistat[$$self{address}]->read_cached_reg: reg=$regoffset not cached, fetching" );
         }
 
         # exit loop that builds from cache if any value is stale
@@ -1877,9 +1825,7 @@ sub read_cached_reg {
       if ( not defined $regval );
     $value =~ s/\s+$//;
 
-    omnistat_debug(
-        "Omnistat[$$self{address}]->read_cached_reg: reg=$register count=$count value=$value"
-    );
+    omnistat_debug( "Omnistat[$$self{address}]->read_cached_reg: reg=$register count=$count value=$value" );
 
     return $value;
 }
@@ -1898,10 +1844,7 @@ sub read_cached_reg {
 sub read_group1 {
     my ( $self, $plus_output, $maxcachetime ) = @_;
     my $addr = $$self{address};
-    my (
-        @cmd,  $group1, $output, $cool_set, $heat_set,
-        $mode, $fan,    $hold,   $cur,
-    );
+    my ( @cmd, $group1, $output, $cool_set, $heat_set, $mode, $fan, $hold, $cur, );
 
     # This is the official way to read group1, but it misses the processing we do
     # in read_reg while only saving 2 bytes to send, which is neglible, even at 300bps
@@ -1916,10 +1859,7 @@ sub read_group1 {
     # querying group1 and then ouput separately. Too bad output isn't part of group1.
     if ($plus_output) {
         $group1 = $self->read_cached_reg( "0x3b", 14, $maxcachetime );
-        (
-            $cool_set, $heat_set, $mode, $fan, $hold, $cur, $_, $_, $_, $_, $_,
-            $_, $_, $output
-        ) = split( ' ', $group1 );
+        ( $cool_set, $heat_set, $mode, $fan, $hold, $cur, $_, $_, $_, $_, $_, $_, $_, $output ) = split( ' ', $group1 );
         $output = $self->translate_stat_output($output);
     }
     else {
@@ -1943,9 +1883,7 @@ sub read_group1 {
 
     $cur = &Omnistat::translate_temp($cur);
 
-    omnistat_debug(
-        "Omnistat[$$self{address}]->read_group1:$cool_set,$heat_set,$mode,$fan,$hold,$cur,$output"
-    );
+    omnistat_debug( "Omnistat[$$self{address}]->read_group1:$cool_set,$heat_set,$mode,$fan,$hold,$cur,$output" );
     return ( $cool_set, $heat_set, $mode, $fan, $hold, $cur, $output );
 }
 
diff --git a/lib/OneWire_xAP.pm b/lib/OneWire_xAP.pm
index f6db25d77..6a9841c5b 100644
--- a/lib/OneWire_xAP.pm
+++ b/lib/OneWire_xAP.pm
@@ -99,21 +99,17 @@ sub add {
                 $xap_address = "liming.oxc.house";
             }
             if ( $is_oxc and $device->id !~ /^\S*\.\S*/ ) {
-                $xap_address =
-                  $xap_address . ':' . lc $device->type . "." . $device->id;
+                $xap_address = $xap_address . ':' . lc $device->type . "." . $device->id;
             }
             else {
                 $xap_address = $xap_address . ':' . $device->id;
             }
-            print
-              "Adding BSC_Item to a OneWire_xAP instance with address: $xap_address\n"
+            print "Adding BSC_Item to a OneWire_xAP instance with address: $xap_address\n"
               if $::Debug{onewire};
             my $xap_item = new BSC_Item($xap_address);
-            $xap_item->always_set_state(1)
-              ;    # needed so that we always update from info or event messages
+            $xap_item->always_set_state(1);    # needed so that we always update from info or event messages
             $$self{source_map}{$xap_item} = $device;
-            $self->SUPER::add_item_if_not_present($xap_item)
-              ;    # add it so that it can set this obejct
+            $self->SUPER::add_item_if_not_present($xap_item);    # add it so that it can set this obejct
             $xap_item->query();
         }
     }
@@ -146,20 +142,17 @@ sub set {
                 # parse the data from the level member stripping % char
                 if ( $source->level ) {
                     if ( $source->level =~ /\d+\/\d+/ ) {
-                        my ( $humid1, $range ) =
-                          $source->level =~ /^(\d+\.?\d*)\/(\d+)/;
+                        my ( $humid1, $range ) = $source->level =~ /^(\d+\.?\d*)\/(\d+)/;
                         $device->measurement( 100 * ( $humid1 / $range ) )
                           if ( defined($humid1) and ($range) );
                     }
                     else {
-                        my ( $humid, $humid_scale ) =
-                          $source->level =~ /^(-?\d*\.?\d*)\s*(\S*)/;
+                        my ( $humid, $humid_scale ) = $source->level =~ /^(-?\d*\.?\d*)\s*(\S*)/;
                         $device->measurement($humid) if defined($humid);
                     }
                 }
                 elsif ( $source->text ) {
-                    my ( $humid, $humid_scale ) =
-                      $source->text =~ /^(-?\d*\.?\d*)\s*(\S*)/;
+                    my ( $humid, $humid_scale ) = $source->text =~ /^(-?\d*\.?\d*)\s*(\S*)/;
                     $device->measurement($humid) if defined($humid);
                 }
             }
@@ -167,8 +160,7 @@ sub set {
 
                 # parse the data from the text member using the last char for scale
                 # TO-DO: perform conversion if temp_scale is not what device wants
-                my ( $temp, $temp_scale ) =
-                  $source->text =~ /^(-?\d*\.?\d*)\s*(\S*)/;
+                my ( $temp, $temp_scale ) = $source->text =~ /^(-?\d*\.?\d*)\s*(\S*)/;
                 $device->measurement($temp) if defined($temp);
             }
             elsif ( $device->type eq 'solar' ) {
diff --git a/lib/OpenSprinkler.pm b/lib/OpenSprinkler.pm
index 603cd6f47..f1fc02245 100644
--- a/lib/OpenSprinkler.pm
+++ b/lib/OpenSprinkler.pm
@@ -100,8 +100,7 @@ sub new {
     $self->{data}                 = undef;
     $self->{child_object}         = undef;
     $self->{config}->{cache_time} = 5;
-    $self->{config}->{cache_time} =
-      $::config_params{OpenSprinkler_config_cache_time}
+    $self->{config}->{cache_time} = $::config_params{OpenSprinkler_config_cache_time}
       if defined $::config_params{OpenSprinkler_config_cache_time};
     $self->{config}->{tz}           = $::config_params{time_zone};
     $self->{config}->{poll_seconds} = 10;
@@ -142,11 +141,8 @@ sub _init {
 
     if ($isSuccessResponse1) {
         if ($osp) {
-            main::print_log(
-                "[OpenSprinkler] OpenSprinkler found (v$osp->{hwv} / $osp->{fwv})"
-            );
-            my ( $isSuccessResponse2, $stations ) =
-              $self->_get_JSON_data('station_info');
+            main::print_log( "[OpenSprinkler] OpenSprinkler found (v$osp->{hwv} / $osp->{fwv})" );
+            my ( $isSuccessResponse2, $stations ) = $self->_get_JSON_data('station_info');
             for my $index ( 0 .. $#{ $stations->{snames} } ) {
 
                 #print "$index: $stations->{snames}[$index]\n";
@@ -180,22 +176,19 @@ sub _init {
                 $self->set( $self->{data}->{info}->{state}, 'poll' );
             }
             else {
-                main::print_log(
-                    "[OpenSprinkler] Problem retrieving initial data");
+                main::print_log("[OpenSprinkler] Problem retrieving initial data");
                 $self->{active} = 0;
                 return ('1');
             }
         }
         else {
-            main::print_log(
-                "[OpenSprinkler] Unknown device " . $self->{host} );
+            main::print_log( "[OpenSprinkler] Unknown device " . $self->{host} );
             $self->{active} = 0;
             return ('1');
         }
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Error. Unable to connect to " . $self->{host} );
+        main::print_log( "[OpenSprinkler] Error. Unable to connect to " . $self->{host} );
         $self->{active} = 0;
         return ('1');
     }
@@ -204,12 +197,10 @@ sub _init {
 sub poll {
     my ($self) = @_;
     main::print_log("[OpenSprinkler] Polling initiated") if ( $self->{debug} );
-    my ( $isSuccessResponse1, $vars )    = $self->_get_JSON_data('get_vars');
-    my ( $isSuccessResponse2, $options ) = $self->_get_JSON_data('get_options');
-    my ( $isSuccessResponse3, $stations ) =
-      $self->_get_JSON_data('get_stations');
-    my ( $isSuccessResponse4, $programs ) =
-      $self->_get_JSON_data('get_programs');
+    my ( $isSuccessResponse1, $vars )     = $self->_get_JSON_data('get_vars');
+    my ( $isSuccessResponse2, $options )  = $self->_get_JSON_data('get_options');
+    my ( $isSuccessResponse3, $stations ) = $self->_get_JSON_data('get_stations');
+    my ( $isSuccessResponse4, $programs ) = $self->_get_JSON_data('get_programs');
     if (    $isSuccessResponse1
         and $isSuccessResponse2
         and $isSuccessResponse3
@@ -236,8 +227,7 @@ sub poll {
         }
         for my $index ( 0 .. $#{ $programs->{pd} } ) {
             my $name = $programs->{pd}[$index][5];
-            print
-              "$index [flag=$programs->{pd}[$index][0]] [osname=$programs->{pd}[$index][5]] [name=$name]\n"
+            print "$index [flag=$programs->{pd}[$index][0]] [osname=$programs->{pd}[$index][5]] [name=$name]\n"
               if ( $self->{debug} );
             $self->{data}->{programs}->{$name}->{status} =
               ( $programs->{pd}[$index][0] % 2 == 1 )
@@ -259,8 +249,7 @@ sub poll {
         #print Dumper $self;
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "online" ) {
-                main::print_log
-                  "[OpenSprinkler] Communication Tracking object found. Updating to online..."
+                main::print_log "[OpenSprinkler] Communication Tracking object found. Updating to online..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "online", 'poll' );
             }
@@ -268,13 +257,11 @@ sub poll {
         return ('1');
     }
     else {
-        main::print_log( "[OpenSprinkler] Problem retrieving poll data from "
-              . $self->{host} );
+        main::print_log( "[OpenSprinkler] Problem retrieving poll data from " . $self->{host} );
         $self->{data}->{retry}++;
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "offline" ) {
-                main::print_log
-                  "[OpenSprinkler] Communication Tracking object found. Updating to offline..."
+                main::print_log "[OpenSprinkler] Communication Tracking object found. Updating to offline..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "offline", 'poll' );
             }
@@ -295,8 +282,7 @@ sub _get_JSON_data {
     $cmd = "" unless ($cmd);
     print "Opening http://$host/$rest{$mode}?pw=$password$cmd...\n"
       if ( $self->{debug} );
-    my $request =
-      HTTP::Request->new( GET => "http://$host/$rest{$mode}?pw=$password$cmd" );
+    my $request = HTTP::Request->new( GET => "http://$host/$rest{$mode}?pw=$password$cmd" );
 
     # Violate RFC 2396 by forcing broken query string. Opensprinkler expectes [ and ] in URL
     #${$request->uri} =~ s/%5B/[/;
@@ -311,13 +297,10 @@ sub _get_JSON_data {
     print 'Response code: ' . $responseCode . "\n" if $self->{debug};
     my $isSuccessResponse = $responseCode < 400;
     if ( !$isSuccessResponse ) {
-        main::print_log(
-            "[OpenSprinkler] Warning, failed to get data. Response code $responseCode"
-        );
+        main::print_log( "[OpenSprinkler] Warning, failed to get data. Response code $responseCode" );
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "offline" ) {
-                main::print_log
-                  "[OpenSprinkler] Communication Tracking object found. Updating to offline..."
+                main::print_log "[OpenSprinkler] Communication Tracking object found. Updating to offline..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "offline", 'poll' );
             }
@@ -327,8 +310,7 @@ sub _get_JSON_data {
     else {
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "online" ) {
-                main::print_log
-                  "[OpenSprinkler] Communication Tracking object found. Updating to online..."
+                main::print_log "[OpenSprinkler] Communication Tracking object found. Updating to online..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "online", 'poll' );
             }
@@ -336,8 +318,7 @@ sub _get_JSON_data {
     }
 
     return ( $isSuccessResponse, '1' )
-      if ( $cmd eq "&rbt=1" )
-      ; #kludge, reboot kills the OSP, so we don't get a return code, just always return success
+      if ( $cmd eq "&rbt=1" );    #kludge, reboot kills the OSP, so we don't get a return code, just always return success
 
     my $response;
     eval { $response = JSON::XS->new->decode( $responseObj->content ); };
@@ -357,28 +338,23 @@ sub _push_JSON_data {
 
     unless ( $self->{updating} ) {
         $self->{updating} = 1;
-        my ( $isSuccessResponse, $response ) =
-          $self->_get_JSON_data( $mode, $cmd );
+        my ( $isSuccessResponse, $response ) = $self->_get_JSON_data( $mode, $cmd );
         $self->{updating} = 0;
         if ( defined $response->{"result"} ) {
             my $result_code = 9;
             $result_code = $response->{"result"}
               if ( defined $response->{"result"} );
-            main::print_log "[OpenSprinkler] JSON fetch operation result is "
-              . $result{$result_code} . "\n"
+            main::print_log "[OpenSprinkler] JSON fetch operation result is " . $result{$result_code} . "\n"
               if ( ( $self->{loglevel} ) or ( $result_code != 1 ) );
             return ( $isSuccessResponse, $result{$result_code} );
         }
         else {
-            main::print_log(
-                "[OpenSprinkler] Warning, unknown response from data push");
+            main::print_log("[OpenSprinkler] Warning, unknown response from data push");
             return ('0');
         }
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Warning, not pushing data due to operation in progress"
-        );
+        main::print_log( "[OpenSprinkler] Warning, not pushing data due to operation in progress" );
         return ('0');
     }
 }
@@ -411,22 +387,18 @@ sub _setflag {
 sub register {
     my ( $self, $object, $type, $id ) = @_;
     if ( lc $type eq "station" ) {
-        &main::print_log(
-            "[OpenSprinkler] Registering station $id child object");
+        &main::print_log("[OpenSprinkler] Registering station $id child object");
         $self->{child_object}->{station}->{$id} = $object;
         $object->set_label( $self->{data}->{stations}->[$id]->{name} );
     }
     elsif ( lc $type eq "program" ) {
         if ( defined $self->{data}->{programs}->{$id} ) {
-            &main::print_log(
-                "[OpenSprinkler] Registering program $id child object");
+            &main::print_log("[OpenSprinkler] Registering program $id child object");
             $self->{child_object}->{program}->{$id} = $object;
             $object->set_label($id);
         }
         else {
-            &main::print_log(
-                "[OpenSprinkler] WARNING: Program $id doesn't have a corresponding program on the Opensprinkler!"
-            );
+            &main::print_log( "[OpenSprinkler] WARNING: Program $id doesn't have a corresponding program on the Opensprinkler!" );
         }
     }
     else {
@@ -443,8 +415,7 @@ sub stop_timer {
         $self->{timer}->stop() if ( $self->{timer}->active() );
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Warning, stop_timer called but timer undefined");
+        main::print_log("[OpenSprinkler] Warning, stop_timer called but timer undefined");
     }
 }
 
@@ -452,12 +423,10 @@ sub start_timer {
     my ($self) = @_;
 
     if ( defined $self->{timer} ) {
-        $self->{timer}->set( $self->{config}->{poll_seconds},
-            sub { &OpenSprinkler::_poll_check($self) }, -1 );
+        $self->{timer}->set( $self->{config}->{poll_seconds}, sub { &OpenSprinkler::_poll_check($self) }, -1 );
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Warning, start_timer called but timer undefined");
+        main::print_log("[OpenSprinkler] Warning, start_timer called but timer undefined");
     }
 }
 
@@ -480,71 +449,43 @@ sub print_info {
           . $self->{data}->{options}->{hwv}
           . " with firmware "
           . $self->{data}->{options}->{fwv} );
-    main::print_log(
-        "[OpenSprinkler] *Mode is " . $self->{data}->{info}->{state} );
+    main::print_log( "[OpenSprinkler] *Mode is " . $self->{data}->{info}->{state} );
     main::print_log( "[OpenSprinkler] Time Zone is " . $self->get_tz() );
-    main::print_log( "[OpenSprinkler] NTP Sync "
-          . $state[ $self->{data}->{options}->{ntp} ] );
-    main::print_log( "[OpenSprinkler] Use DHCP "
-          . $state[ $self->{data}->{options}->{dhcp} ] );
-    main::print_log( "[OpenSprinkler] Number of expansion boards "
-          . $self->{data}->{options}->{ext} );
-    main::print_log( "[OpenSprinkler] Station delay time "
-          . $self->{data}->{options}->{sdt} );
-    main::print_log(
-        "[OpenSprinkler] Master station " . $self->{data}->{options}->{mas} );
-    main::print_log(
-        "[OpenSprinkler] master on time " . $self->{data}->{options}->{mton} );
-    main::print_log(
-        "[OpenSprinkler] master off time " . $self->{data}->{options}->{mtof} );
-    main::print_log( "[OpenSprinkler] Rain Sensor "
-          . $state[ $self->{data}->{options}->{urs} ] );
-    main::print_log(
-        "[OpenSprinkler] *Water Level " . $self->{data}->{info}->{waterlevel} );
-    main::print_log( "[OpenSprinkler] Password is "
-          . $pwenabled[ $self->{data}->{options}->{ipas} ] );
-    main::print_log(
-        "[OpenSprinkler] Device ID " . $self->{data}->{options}->{devid} )
+    main::print_log( "[OpenSprinkler] NTP Sync " . $state[ $self->{data}->{options}->{ntp} ] );
+    main::print_log( "[OpenSprinkler] Use DHCP " . $state[ $self->{data}->{options}->{dhcp} ] );
+    main::print_log( "[OpenSprinkler] Number of expansion boards " . $self->{data}->{options}->{ext} );
+    main::print_log( "[OpenSprinkler] Station delay time " . $self->{data}->{options}->{sdt} );
+    main::print_log( "[OpenSprinkler] Master station " . $self->{data}->{options}->{mas} );
+    main::print_log( "[OpenSprinkler] master on time " . $self->{data}->{options}->{mton} );
+    main::print_log( "[OpenSprinkler] master off time " . $self->{data}->{options}->{mtof} );
+    main::print_log( "[OpenSprinkler] Rain Sensor " . $state[ $self->{data}->{options}->{urs} ] );
+    main::print_log( "[OpenSprinkler] *Water Level " . $self->{data}->{info}->{waterlevel} );
+    main::print_log( "[OpenSprinkler] Password is " . $pwenabled[ $self->{data}->{options}->{ipas} ] );
+    main::print_log( "[OpenSprinkler] Device ID " . $self->{data}->{options}->{devid} )
       if defined( $self->{data}->{options}->{devid} );
-    main::print_log(
-        "[OpenSprinkler] LCD Contrast " . $self->{data}->{options}->{con} );
-    main::print_log(
-        "[OpenSprinkler] LCD Backlight " . $self->{data}->{options}->{lit} );
-    main::print_log(
-        "[OpenSprinkler] LCD Dimming " . $self->{data}->{options}->{dim} );
-    main::print_log(
-        "[OpenSprinkler] Relay Pulse Time " . $self->{data}->{options}->{rlp} )
+    main::print_log( "[OpenSprinkler] LCD Contrast " . $self->{data}->{options}->{con} );
+    main::print_log( "[OpenSprinkler] LCD Backlight " . $self->{data}->{options}->{lit} );
+    main::print_log( "[OpenSprinkler] LCD Dimming " . $self->{data}->{options}->{dim} );
+    main::print_log( "[OpenSprinkler] Relay Pulse Time " . $self->{data}->{options}->{rlp} )
       if defined( $self->{data}->{options}->{rlp} );
-    main::print_log( "[OpenSprinkler] *Weather adjustment Method "
-          . $self->{data}->{info}->{adjustment_method} );
-    main::print_log( "[OpenSprinkler] Logging "
-          . $enabled[ $self->{data}->{options}->{lg} ] );
-    main::print_log( "[OpenSprinkler] Zone expansion boards "
-          . $self->{data}->{options}->{dexp} );
-    main::print_log( "[OpenSprinkler] Max zone expansion boards "
-          . $self->{data}->{options}->{mexp} );
-
-    main::print_log( "[OpenSprinkler] Device Time "
-          . localtime( $self->{data}->{vars}->{devt} ) );
-    main::print_log( "[OpenSprinkler] Number of 8 station boards "
-          . $self->{data}->{vars}->{nbrd} );
-    main::print_log(
-        "[OpenSprinkler] Rain delay " . $self->{data}->{vars}->{rd} );
-    main::print_log( "[OpenSprinkler] *Rain sensor status "
-          . $self->{data}->{info}->{rain_sensor_status} );
-    main::print_log(
-        "[OpenSprinkler] Location " . $self->{data}->{vars}->{loc} );
-    main::print_log(
-        "[OpenSprinkler] Wunderground key " . $self->{data}->{vars}->{wtkey} );
+    main::print_log( "[OpenSprinkler] *Weather adjustment Method " . $self->{data}->{info}->{adjustment_method} );
+    main::print_log( "[OpenSprinkler] Logging " . $enabled[ $self->{data}->{options}->{lg} ] );
+    main::print_log( "[OpenSprinkler] Zone expansion boards " . $self->{data}->{options}->{dexp} );
+    main::print_log( "[OpenSprinkler] Max zone expansion boards " . $self->{data}->{options}->{mexp} );
+
+    main::print_log( "[OpenSprinkler] Device Time " . localtime( $self->{data}->{vars}->{devt} ) );
+    main::print_log( "[OpenSprinkler] Number of 8 station boards " . $self->{data}->{vars}->{nbrd} );
+    main::print_log( "[OpenSprinkler] Rain delay " . $self->{data}->{vars}->{rd} );
+    main::print_log( "[OpenSprinkler] *Rain sensor status " . $self->{data}->{info}->{rain_sensor_status} );
+    main::print_log( "[OpenSprinkler] Location " . $self->{data}->{vars}->{loc} );
+    main::print_log( "[OpenSprinkler] Wunderground key " . $self->{data}->{vars}->{wtkey} );
     main::print_log( "[OpenSprinkler] *Sun Rises at " . $self->get_sunrise() );
     main::print_log( "[OpenSprinkler] *Sun Sets at " . $self->get_sunset() );
 
     if ( defined $self->{data}->{programs} ) {
         main::print_log("[OpenSprinkler] Programs found:");
         for my $key ( keys %{ $self->{data}->{programs} } ) {
-            main::print_log( "[OpenSprinkler]\t"
-                  . $key . " is "
-                  . $self->{data}->{programs}->{$key}->{status} );
+            main::print_log( "[OpenSprinkler]\t" . $key . " is " . $self->{data}->{programs}->{$key}->{status} );
         }
     }
 }
@@ -560,8 +501,7 @@ sub process_data {
         next if ( $self->{data}->{stations}->[$index]->{status} eq "disabled" );
         my $previous = "init";
         $previous = $self->{previous}->{data}->{stations}->[$index]->{state}
-          if (
-            defined $self->{previous}->{data}->{stations}->[$index]->{state} );
+          if ( defined $self->{previous}->{data}->{stations}->[$index]->{state} );
         if ( $previous ne $self->{data}->{stations}->[$index]->{state} ) {
             main::print_log(
                 "[OpenSprinkler] Station $index $self->{data}->{stations}->[$index]->{name} changed from $previous to $self->{data}->{stations}->[$index]->{state}"
@@ -571,8 +511,7 @@ sub process_data {
             if ( defined $self->{child_object}->{station}->{$index} ) {
                 main::print_log "Child object found. Updating..."
                   if ( $self->{loglevel} );
-                $self->{child_object}->{station}->{$index}
-                  ->set( $self->{data}->{stations}->[$index]->{state}, 'poll' );
+                $self->{child_object}->{station}->{$index}->set( $self->{data}->{stations}->[$index]->{state}, 'poll' );
             }
         }
     }
@@ -580,35 +519,28 @@ sub process_data {
     for my $key ( keys %{ $self->{data}->{programs} } ) {
         my $previous = "init";
         $previous = $self->{previous}->{data}->{programs}->{$key}->{status}
-          if (
-            defined $self->{previous}->{data}->{programs}->{$key}->{status} );
+          if ( defined $self->{previous}->{data}->{programs}->{$key}->{status} );
         if ( $previous ne $self->{data}->{programs}->{$key}->{status} ) {
-            main::print_log(
-                "[OpenSprinkler] Program $key changed from $previous to $self->{data}->{programs}->{$key}->{status}"
-            ) if ( $self->{loglevel} );
+            main::print_log( "[OpenSprinkler] Program $key changed from $previous to $self->{data}->{programs}->{$key}->{status}" )
+              if ( $self->{loglevel} );
             $self->{previous}->{data}->{programs}->{$key}->{status} =
               $self->{data}->{programs}->{$key}->{status};
             if ( defined $self->{child_object}->{program}->{$key} ) {
                 main::print_log "Child object found. Updating..."
                   if ( $self->{loglevel} );
-                $self->{child_object}->{program}->{$key}
-                  ->set( $self->{data}->{programs}->{$key}->{status}, 'poll' );
+                $self->{child_object}->{program}->{$key}->set( $self->{data}->{programs}->{$key}->{status}, 'poll' );
             }
         }
     }
 
-    if ( $self->{previous}->{info}->{state} ne $self->{data}->{info}->{state} )
-    {
-        main::print_log(
-            "[OpenSprinkler] State changed from $self->{previous}->{info}->{state} to $self->{data}->{info}->{state}"
-        ) if ( $self->{loglevel} );
+    if ( $self->{previous}->{info}->{state} ne $self->{data}->{info}->{state} ) {
+        main::print_log( "[OpenSprinkler] State changed from $self->{previous}->{info}->{state} to $self->{data}->{info}->{state}" )
+          if ( $self->{loglevel} );
         $self->{previous}->{info}->{state} = $self->{data}->{info}->{state};
         $self->set( $self->{data}->{info}->{state}, 'poll' );
     }
 
-    if ( $self->{previous}->{info}->{waterlevel} !=
-        $self->{data}->{info}->{waterlevel} )
-    {
+    if ( $self->{previous}->{info}->{waterlevel} != $self->{data}->{info}->{waterlevel} ) {
         main::print_log(
             "[OpenSprinkler] Waterlevel changed from $self->{previous}->{info}->{waterlevel} to $self->{data}->{info}->{waterlevel}"
         ) if ( $self->{loglevel} );
@@ -617,14 +549,11 @@ sub process_data {
         if ( defined $self->{child_object}->{waterlevel} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{waterlevel}
-              ->set( $self->{data}->{info}->{waterlevel}, 'poll' );
+            $self->{child_object}->{waterlevel}->set( $self->{data}->{info}->{waterlevel}, 'poll' );
         }
     }
 
-    if ( $self->{previous}->{info}->{rain_sensor_status} ne
-        $self->{data}->{info}->{rain_sensor_status} )
-    {
+    if ( $self->{previous}->{info}->{rain_sensor_status} ne $self->{data}->{info}->{rain_sensor_status} ) {
         main::print_log(
             "[OpenSprinkler] Rain Sensor changed from $self->{previous}->{info}->{rain_sensor_status} to $self->{data}->{info}->{rain_sensor_status}"
         ) if ( $self->{loglevel} );
@@ -633,32 +562,23 @@ sub process_data {
         if ( defined $self->{child_object}->{rain_sensor_status} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{rain_sensor_status}
-              ->set( $self->{data}->{info}->{rain_sensor_status}, 'poll' );
+            $self->{child_object}->{rain_sensor_status}->set( $self->{data}->{info}->{rain_sensor_status}, 'poll' );
         }
     }
 
-    if (
-        $self->{previous}->{info}->{sunset} != $self->{data}->{info}->{sunset} )
-    {
-        main::print_log(
-            "[OpenSprinkler] Sunset changed to " . $self->get_sunset() )
+    if ( $self->{previous}->{info}->{sunset} != $self->{data}->{info}->{sunset} ) {
+        main::print_log( "[OpenSprinkler] Sunset changed to " . $self->get_sunset() )
           if ( $self->{loglevel} );
         $self->{previous}->{info}->{sunset} = $self->{data}->{info}->{sunset};
     }
 
-    if ( $self->{previous}->{info}->{sunrise} !=
-        $self->{data}->{info}->{sunrise} )
-    {
-        main::print_log(
-            "[OpenSprinkler] Sunrise changed to " . $self->get_sunrise() )
+    if ( $self->{previous}->{info}->{sunrise} != $self->{data}->{info}->{sunrise} ) {
+        main::print_log( "[OpenSprinkler] Sunrise changed to " . $self->get_sunrise() )
           if ( $self->{loglevel} );
         $self->{previous}->{info}->{sunrise} = $self->{data}->{info}->{sunrise};
     }
 
-    if ( $self->{previous}->{info}->{adjustment_method} ne
-        $self->{data}->{info}->{adjustment_method} )
-    {
+    if ( $self->{previous}->{info}->{adjustment_method} ne $self->{data}->{info}->{adjustment_method} ) {
         main::print_log(
             "[OpenSprinkler] Adjustment Method changed from $self->{previous}->{info}->{adjustment_method} to $self->{data}->{info}->{adjustment_method}"
         ) if ( $self->{loglevel} );
@@ -694,8 +614,7 @@ sub set_station {
     else {
         $cmd .= "&en=0";
     }
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'test_station', $cmd );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'test_station', $cmd );
     if ($isSuccessResponse) {
 
         #print "DB status=$status\n";
@@ -704,14 +623,12 @@ sub set_station {
             return (1);
         }
         else {
-            main::print_log(
-                "[OpenSprinkler] Error. Could not set station to $state");
+            main::print_log("[OpenSprinkler] Error. Could not set station to $state");
             return (0);
         }
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Error. Could not send data to OpenSprinkler");
+        main::print_log("[OpenSprinkler] Error. Could not send data to OpenSprinkler");
         return (0);
     }
 }
@@ -729,15 +646,13 @@ sub set_program {
     return unless ( defined $self->{data}->{programs}->{$name} );
     return if ( lc $state eq $self->{data}->{programs}->{$name}->{status} );
     my $cmd = "&pid=" . $self->{data}->{programs}->{$name}->{pid};
-    $cmd .= "&v=["
-      . _setflag( $self->{data}->{programs}->{$name}->{flag}, $state ) . ",";
+    $cmd .= "&v=[" . _setflag( $self->{data}->{programs}->{$name}->{flag}, $state ) . ",";
     $cmd .= $self->{data}->{programs}->{$name}->{data} . "]";
     $cmd .= "&name=" . _url_encode($name);
 
     #print "XXXX cmd=$cmd\n";
 
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'set_program', $cmd );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'set_program', $cmd );
     if ($isSuccessResponse) {
 
         #print "DB status=$status\n";
@@ -746,14 +661,12 @@ sub set_program {
             return (1);
         }
         else {
-            main::print_log(
-                "[OpenSprinkler] Error. Could not set program to $state");
+            main::print_log("[OpenSprinkler] Error. Could not set program to $state");
             return (0);
         }
     }
     else {
-        main::print_log(
-            "[OpenSprinkler] Error. Could not send data to OpenSprinkler");
+        main::print_log("[OpenSprinkler] Error. Could not send data to OpenSprinkler");
         return (0);
     }
 }
@@ -800,8 +713,7 @@ sub reboot {
     my ($self) = @_;
 
     my $cmd = "&rbt=1";
-    my ( $isSuccessResponse, $status ) =
-      $self->_get_JSON_data( 'set_vars', $cmd );
+    my ( $isSuccessResponse, $status ) = $self->_get_JSON_data( 'set_vars', $cmd );
 
     return ($status);
 }
@@ -810,8 +722,7 @@ sub reset {
     my ($self) = @_;
 
     my $cmd = "&rsn=1";
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'set_vars', $cmd );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'set_vars', $cmd );
 
     return ($status);
 }
@@ -832,8 +743,7 @@ sub set_rain_delay {
     my ( $self, $hours ) = @_;
 
     my $cmd = "&rd=$hours";
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'set_vars', $cmd );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'set_vars', $cmd );
 
     return ($status);
 }
@@ -861,23 +771,19 @@ sub set {
 
         my $cmd = "&en=" . $en;
 
-        my ( $isSuccessResponse, $status ) =
-          $self->_get_JSON_data( 'set_vars', $cmd );
+        my ( $isSuccessResponse, $status ) = $self->_get_JSON_data( 'set_vars', $cmd );
         if ($isSuccessResponse) {
             if ( $status eq "success" ) {
                 $self->poll;
                 return (1);
             }
             else {
-                main::print_log(
-                    "[OpenSprinkler] Error. Could not set state to $p_state. Status is $status"
-                );
+                main::print_log( "[OpenSprinkler] Error. Could not set state to $p_state. Status is $status" );
                 return (0);
             }
         }
         else {
-            main::print_log(
-                "[OpenSprinkler] Error. Could not send data to OpenSprinkler");
+            main::print_log("[OpenSprinkler] Error. Could not send data to OpenSprinkler");
             return (0);
         }
     }
@@ -896,7 +802,7 @@ sub new {
     $$self{master_object} = $object;
     $$self{station}       = $number;
     push( @{ $$self{states} }, 'on', 'off' );
-    $$self{on_timeout} = 3600;    #default to an hour for 'on'
+    $$self{on_timeout} = 3600;                              #default to an hour for 'on'
     $$self{on_timeout} = $on_timeout * 60 if $on_timeout;
     $object->register( $self, 'station', $number );
     $self->set( $object->get_station($number), 'poll' );
diff --git a/lib/Owfs_Item.pm b/lib/Owfs_Item.pm
index 0371034e6..e1c08e91f 100644
--- a/lib/Owfs_Item.pm
+++ b/lib/Owfs_Item.pm
@@ -93,7 +93,7 @@ use strict;
 
 our (%objects_by_id);    # database of all discovered objects by id
 our $socket;             # single Socket_Item which serves all Owfs_Item objects
-our @queue;    # Queue of commands for owserver, commands handled one at a time
+our @queue;              # Queue of commands for owserver, commands handled one at a time
 our $socket_state    = 0;    # State variable for handling socket interface
 our $socket_inactive = 0;    # State variable for handling socket interface
 
@@ -161,9 +161,7 @@ sub new {
           if exists $main::config_parms{owfs_port};
         &main::print_log("Owfs_Item::new Initializing host:port: $host:$port")
           if $main::Debug{owfs};
-        $socket =
-          new Socket_Item( undef, undef, "$host:$port", undef, 'tcp', 'raw',
-            undef );
+        $socket = new Socket_Item( undef, undef, "$host:$port", undef, 'tcp', 'raw', undef );
         @queue = ();
     }
 
@@ -189,7 +187,7 @@ sub new {
     $self->{debug} = 0;
 
     # Initialize object state
-    $self->{state} = '';   # Will only be listed on web page if state is defined
+    $self->{state} = '';    # Will only be listed on web page if state is defined
 
     # Schedule item discovery
     $self->{discover_timer} = new Timer;
@@ -277,9 +275,8 @@ sub process_read_response {
     my $location = $self->{location};
     if ( defined $response ) {
         my $debug = $self->{debug} || $main::Debug{owfs};
-        &main::print_log(
-            "Owfs_Item::process_read_response device: $device location: $location token: $token response: $response"
-        ) if $debug;
+        &main::print_log( "Owfs_Item::process_read_response device: $device location: $location token: $token response: $response" )
+          if $debug;
         my $state = $self->convert_state($response);
         if ( $state ne $self->state() ) {
             $self->SUPER::set($state);
@@ -317,20 +314,18 @@ sub process_dir_response {
     my $path     = $self->{dir_path};
     my @tokens   = split( ',', $response );
     push @{ $self->{dir_tokens} }, @tokens;
-    &main::print_log(
-        "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path tokens: @tokens"
-    ) if $main::Debug{owfs};
+    &main::print_log( "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path tokens: @tokens" )
+      if $main::Debug{owfs};
 
     while ( scalar( @{ $self->{dir_tokens} } ) ) {
         my $token = shift @{ $self->{dir_tokens} };
-        &main::print_log(
-            "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path token: $token"
-        ) if $main::Debug{owfs};
+        &main::print_log( "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path token: $token" )
+          if $main::Debug{owfs};
         if ( $token =~ /\/([0123456789abcdefABCDEF\.]+|aux|main)$/ ) {
             my $leaf = $1;
             &main::print_log(
-                "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path token: $token leaf: $leaf"
-            ) if $main::Debug{owfs};
+                "Owfs_Item::process_dir_response family: $family id: $id level: $level path: $path token: $token leaf: $leaf" )
+              if $main::Debug{owfs};
             $leaf =~ /(.+)\.(.+)$/;
             if ( ( uc $family eq uc $1 ) && ( uc $id eq uc $2 ) ) {
                 $self->{root} = $path;
@@ -368,13 +363,8 @@ sub set {
 
     #$value .= ' ';
     my $value_length = length($value);
-    my $payload =
-      pack( 'Z' . $path_length . 'A' . $value_length, $path, $value );
-    $self->_ToServer(
-        $path,                $token,     $value,        $set_by,
-        length($payload) + 1, $msg_write, $value_length, 0,
-        $payload
-    );
+    my $payload = pack( 'Z' . $path_length . 'A' . $value_length, $path, $value );
+    $self->_ToServer( $path, $token, $value, $set_by, length($payload) + 1, $msg_write, $value_length, 0, $payload );
 }
 
 # This method is called to schedule a read command be sent to the owserver for the object.
@@ -383,8 +373,7 @@ sub get {
     return if ( !defined $self->{path} );
     my $path = $self->{path} . $token;
     &main::print_log("Owfs_Item::get path: $path") if $main::Debug{owfs};
-    $self->_ToServer( $path, $token, 0, 0, length($path) + 1,
-        $msg_read, $default_block, 0, $path );
+    $self->_ToServer( $path, $token, 0, 0, length($path) + 1, $msg_read, $default_block, 0, $path );
 }
 
 # This method is called to schedule a directory command be sent to the owserver for the object.
@@ -395,8 +384,7 @@ sub _dir {
     # new msg_dirall method -- single packet
     &main::print_log("Owfs_Item::dir path: $path") if $main::Debug{owfs};
     $self->{dir_path} = $path;
-    $self->_ToServer( $path, 0, 0, 0, length($path) + 1,
-        $msg_dirall, $default_block, 0, $path );
+    $self->_ToServer( $path, 0, 0, 0, length($path) + 1, $msg_dirall, $default_block, 0, $path );
 }
 
 # This method is called to schedule a write command be sent to the owserver for the object.
@@ -410,20 +398,13 @@ sub _set_root {
     if ( $token =~ /^\// ) {
         $path = $token;
     }
-    &main::print_log(
-        "Owfs_Item::_set_root token: $token root: $root path: $path value: $value"
-    ) if $main::Debug{owfs};
+    &main::print_log( "Owfs_Item::_set_root token: $token root: $root path: $path value: $value" ) if $main::Debug{owfs};
     my $path_length = length($path) + 1;
 
     #$value .= ' ';
     my $value_length = length($value);
-    my $payload =
-      pack( 'Z' . $path_length . 'A' . $value_length, $path, $value );
-    $self->_ToServer(
-        $path,                $token,     $value,        $set_by,
-        length($payload) + 1, $msg_write, $value_length, 0,
-        $payload
-    );
+    my $payload = pack( 'Z' . $path_length . 'A' . $value_length, $path, $value );
+    $self->_ToServer( $path, $token, $value, $set_by, length($payload) + 1, $msg_write, $value_length, 0, $payload );
 }
 
 # This method is called to schedule a read command be sent to the owserver for the object.
@@ -435,8 +416,7 @@ sub _get_root {
     return if ( !defined $root );
     my $path = $self->{root} . $token;
     &main::print_log("Owfs_Item::_get_root path: $path") if $main::Debug{owfs};
-    $self->_ToServer( $path, $token, 0, 0, length($path) + 1,
-        $msg_read, $default_block, 0, $path );
+    $self->_ToServer( $path, $token, 0, 0, length($path) + 1, $msg_read, $default_block, 0, $path );
 }
 
 # This method is used to search the one-wire tree for the specific object as defined
@@ -484,9 +464,8 @@ sub _lost {
     my $family   = $self->{family};
     my $id       = $self->{id};
     my $path     = $self->{path};
-    &main::print_log(
-        "Owfs_Item::DEVICE_LOST: device: $device location: $location family: $family id: $id path: $path"
-    );    # if $main::Debug{owfs};
+    &main::print_log( "Owfs_Item::DEVICE_LOST: device: $device location: $location family: $family id: $id path: $path" )
+      ;    # if $main::Debug{owfs};
     $self->{root}    = undef;
     $self->{path}    = undef;
     $self->{present} = 0;
@@ -525,21 +504,15 @@ sub _chomp_plus {
 # This method is a direct port from the OWNet.pm module from owfs.  This is the lower layer interface
 # to the owserver socket port.
 sub _ToServer {
-    my (
-        $self,   $path,           $token,    $value,
-        $set_by, $payload_length, $msg_type, $size,
-        $offset, $payload_data
-    ) = @_;
+    my ( $self, $path, $token, $value, $set_by, $payload_length, $msg_type, $size, $offset, $payload_data ) = @_;
     my $f = "N6Z$payload_length";
 
     #$f .= 'Z'.$payload_length if ( $payload_length > 0 ) ;
-    my $message = pack( $f,
-        $self->{VER}, $payload_length, $msg_type,
-        $self->{SG} | $self->{PERSIST},
-        $size, $offset, $payload_data );
+    my $message =
+      pack( $f, $self->{VER}, $payload_length, $msg_type, $self->{SG} | $self->{PERSIST}, $size, $offset, $payload_data );
     &main::print_log(
-        "Owfs_Item::_ToServer path: $path payload_length: $payload_length payload_data: $payload_data message: $message"
-    ) if $main::Debug{owfs};
+        "Owfs_Item::_ToServer path: $path payload_length: $payload_length payload_data: $payload_data message: $message" )
+      if $main::Debug{owfs};
     my $hashref = {
         msg_type => $msg_type,
         self     => $self,
@@ -555,21 +528,17 @@ sub _ToServer {
     &main::print_log("Owfs_Item::_ToServer num: $num") if $main::Debug{owfs};
 
     if ( $num > 100 ) {
-        &main::print_log(
-            "Owfs_Item::_ToServer high outstanding requests! num: $num");
+        &main::print_log("Owfs_Item::_ToServer high outstanding requests! num: $num");
     }
     if ( $main::Debug{owfs} && ( scalar(@queue) > 1 ) ) {
         foreach my $ref (@queue) {
             my $msg_type = $ref->{msg_type};
             my $path     = $ref->{path};
-            &main::print_log(
-                "Owfs_Item::_ToServer msg_type: $msg_type path: $path");
+            &main::print_log("Owfs_Item::_ToServer msg_type: $msg_type path: $path");
         }
     }
     if ( scalar(@queue) eq 1 ) {
-        &main::print_log(
-            "Owfs_Item::_ToServer path: $path message: $message sending socket...."
-        ) if $main::Debug{owfs};
+        &main::print_log( "Owfs_Item::_ToServer path: $path message: $message sending socket...." ) if $main::Debug{owfs};
         start $socket unless active $socket;
         $socket->set($message);
     }
@@ -580,9 +549,7 @@ sub _ToServer {
 sub _FromServerLow {
     my ( $self, $length_wanted ) = @_;
     my $length = length( $self->{record} );
-    &main::print_log(
-        "Owfs_Item::_FromServerLow length_wanted: $length_wanted length: $length"
-    ) if $main::Debug{owfs};
+    &main::print_log( "Owfs_Item::_FromServerLow length_wanted: $length_wanted length: $length" ) if $main::Debug{owfs};
     return '' if $length_wanted == 0;
     my $remaininglength = $length_wanted;
     my $fullread        = '';
@@ -596,8 +563,7 @@ sub _FromServerLow {
 # to the owserver socket port.
 sub _FromServer {
     my ($self) = @_;
-    my ( $version, $payload_length, $return_status, $sg, $size, $offset,
-        $payload_data );
+    my ( $version, $payload_length, $return_status, $sg, $size, $offset, $payload_data );
     while ( active $socket) {
         &main::print_log("Owfs_Item::_FromServer socket_state: $socket_state")
           if $main::Debug{owfs};
@@ -605,30 +571,21 @@ sub _FromServer {
             do {
                 my $r = _FromServerLow( $self, 24 );
                 if ( !defined $r ) {
-                    &main::print_log(
-                        "Owfs_Item::_FromServer Trouble getting header")
+                    &main::print_log("Owfs_Item::_FromServer Trouble getting header")
                       if $main::Debug{owfs};
                     return;
                 }
-                (
-                    $version, $payload_length, $return_status, $sg, $size,
-                    $offset
-                ) = unpack( 'N6', $r );
-                my @things = (
-                    $version, $payload_length, $return_status, $sg, $size,
-                    $offset
-                );
+                ( $version, $payload_length, $return_status, $sg, $size, $offset ) = unpack( 'N6', $r );
+                my @things = ( $version, $payload_length, $return_status, $sg, $size, $offset );
                 &main::print_log("Owfs_Item::_FromServer things: @things")
                   if $main::Debug{owfs};
 
                 # returns unsigned (though originals signed
                 # assume anything above 66000 is an error
                 if ( $return_status > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_FromServer Trouble getting payload")
+                    &main::print_log("Owfs_Item::_FromServer Trouble getting payload")
                       if $main::Debug{owfs};
-                    return ( $version, $payload_length, $return_status, $sg,
-                        $size, $offset, $payload_data );
+                    return ( $version, $payload_length, $return_status, $sg, $size, $offset, $payload_data );
                 }
             } while ( $payload_length > 66000 );
             $socket_state = 1;
@@ -636,15 +593,13 @@ sub _FromServer {
         else {
             $payload_data = $self->_FromServerLow($payload_length);
             if ( !defined $payload_data ) {
-                &main::print_log(
-                    "Owfs_Item::_FromServer Trouble getting payload")
+                &main::print_log("Owfs_Item::_FromServer Trouble getting payload")
                   if $main::Debug{owfs};
                 return;
             }
             $payload_data = substr( $payload_data, 0, $size );
             $socket_state = 0;
-            return ( $version, $payload_length, $return_status, $sg, $size,
-                $offset, $payload_data );
+            return ( $version, $payload_length, $return_status, $sg, $size, $offset, $payload_data );
         }
     }
 }
@@ -701,15 +656,12 @@ sub _run_loop {
               if $main::Debug{owfs};
             my @response = _FromServer($self);
             if ( !@response ) {
-                &main::print_log(
-                    "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY" ) if $main::Debug{owfs};
             }
             else {
                 if ( $response[2] > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop read msg_type: $msg_type path: $path ERROR response: $response[2]"
-                    );    # if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop read msg_type: $msg_type path: $path ERROR response: $response[2]" )
+                      ;    # if $main::Debug{owfs};
                     $self->{failcnt}++;
                     if ( $self->{failcnt} >= 5 ) {
                         $self->_lost();
@@ -718,9 +670,8 @@ sub _run_loop {
                 }
                 else {
                     # process response
-                    &main::print_log(
-                        "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]"
-                    ) if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]" )
+                      if $main::Debug{owfs};
                     $self->{failcnt} = 0;
                     $self->process_read_response( $token, $response[6] );
                 }
@@ -740,15 +691,12 @@ sub _run_loop {
               if $main::Debug{owfs};
             my @response = _FromServer($self);
             if ( !@response ) {
-                &main::print_log(
-                    "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY" ) if $main::Debug{owfs};
             }
             else {
                 if ( $response[2] > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop write msg_type: $msg_type path: $path ERROR response: $response[2]"
-                    );    # if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop write msg_type: $msg_type path: $path ERROR response: $response[2]" )
+                      ;    # if $main::Debug{owfs};
                     $self->{failcnt}++;
                     if ( $self->{failcnt} >= 5 ) {
                         $self->_lost();
@@ -757,12 +705,10 @@ sub _run_loop {
                 }
                 else {
                     # process response
-                    &main::print_log(
-                        "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[2]"
-                    ) if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[2]" )
+                      if $main::Debug{owfs};
                     $self->{failcnt} = 0;
-                    $self->process_write_response( ( $response[2] >= 0 ),
-                        $token, $value, $set_by );
+                    $self->process_write_response( ( $response[2] >= 0 ), $token, $value, $set_by );
                 }
                 shift @queue;
                 $popped = 1;
@@ -776,15 +722,12 @@ sub _run_loop {
             $self->{record} .= $record;
             my @response = _FromServer($self);
             if ( !@response ) {
-                &main::print_log(
-                    "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY" ) if $main::Debug{owfs};
             }
             else {
                 if ( $response[2] > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop dirall msg_type: $msg_type path: $path ERROR response: $response[2]"
-                    );    # if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop dirall msg_type: $msg_type path: $path ERROR response: $response[2]" )
+                      ;    # if $main::Debug{owfs};
                     $self->{failcnt}++;
                     if ( $self->{failcnt} >= 5 ) {
                         $self->_lost();
@@ -793,9 +736,8 @@ sub _run_loop {
                 }
                 else {
                     # process response
-                    &main::print_log(
-                        "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]"
-                    ) if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]" )
+                      if $main::Debug{owfs};
                     $self->{failcnt} = 0;
                     $self->process_dir_response( $response[6] );
                 }
@@ -811,15 +753,12 @@ sub _run_loop {
             $self->{record} .= $record;
             my @response = _FromServer($self);
             if ( !@response ) {
-                &main::print_log(
-                    "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY" ) if $main::Debug{owfs};
             }
             else {
                 if ( $response[2] > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop msg_dir msg_type: $msg_type path: $path ERROR response: $response[2]"
-                    );    # if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop msg_dir msg_type: $msg_type path: $path ERROR response: $response[2]" )
+                      ;    # if $main::Debug{owfs};
                     $self->{failcnt}++;
                     if ( $self->{failcnt} >= 5 ) {
                         $self->_lost();
@@ -829,18 +768,15 @@ sub _run_loop {
                 else {
                     $self->{failcnt} = 0;
                     if ( $response[1] == 0 ) {    # last null packet
-                        &main::print_log(
-                            "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]"
-                        ) if $main::Debug{owfs};
-                        $self->process_dir_response(
-                            substr( $self->{dirlist}, 1 ) );
+                        &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]" )
+                          if $main::Debug{owfs};
+                        $self->process_dir_response( substr( $self->{dirlist}, 1 ) );
                         shift @queue;
                         $popped = 1;
                     }
                     else {
-                        &main::print_log(
-                            "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]"
-                        ) if $main::Debug{owfs};
+                        &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path response: $response[6]" )
+                          if $main::Debug{owfs};
                         $self->{dirlist} .= ',' . $response[6];
                     }
                 }
@@ -856,20 +792,15 @@ sub _run_loop {
             $self->{record} .= $record;
             my @response = _FromServer($self);
             if ( !@response ) {
-                &main::print_log(
-                    "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type path: $path EMPTY" ) if $main::Debug{owfs};
             }
             else {
                 if ( $response[2] > 66000 ) {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop unknown msg_type: $msg_type path: $path ERROR response: $response[2]"
-                    );    # if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop unknown msg_type: $msg_type path: $path ERROR response: $response[2]" )
+                      ;    # if $main::Debug{owfs};
                 }
                 else {
-                    &main::print_log(
-                        "Owfs_Item::_run_loop msg_type: $msg_type (UNKNOWN) path: $path"
-                    ) if $main::Debug{owfs};
+                    &main::print_log( "Owfs_Item::_run_loop msg_type: $msg_type (UNKNOWN) path: $path" ) if $main::Debug{owfs};
                 }
                 shift @queue;
                 $popped = 1;
@@ -888,9 +819,7 @@ sub _run_loop {
         my $msg_type = $hashref->{msg_type};
         my $path     = $hashref->{path};
         my $message  = $hashref->{message};
-        &main::print_log(
-            "Owfs_Item::run_loop path: $path message: $message sending socket...."
-        ) if $main::Debug{owfs};
+        &main::print_log( "Owfs_Item::run_loop path: $path message: $message sending socket...." ) if $main::Debug{owfs};
         start $socket unless active $socket;
         $socket->set($message);
     }
@@ -997,8 +926,7 @@ sub new {
     }
 
     $self->{loop_timer} = new Timer;
-    $self->{loop_timer}
-      ->set( $self->{interval}, sub { Owfs_Switch::run_loop($self); } );
+    $self->{loop_timer}->set( $self->{interval}, sub { Owfs_Switch::run_loop($self); } );
 
     &::Reload_pre_add_hook( \&Owfs_Switch::reload_hook, 1 );
 
@@ -1027,9 +955,8 @@ sub set {
         my $value = $self->convert_value($state);
         $state = $self->convert_state($value);
         if ( ( $state eq $ON ) || ( $state eq $OFF ) ) {
-            &main::print_log(
-                "Owfs_Switch::set mode: $mode device: $device location: $location channel: $channel state: $state"
-            ) if $debug;
+            &main::print_log( "Owfs_Switch::set mode: $mode device: $device location: $location channel: $channel state: $state" )
+              if $debug;
             $self->{pio_state}   = $state;
             $self->{pend_set_by} = $set_by;
 
@@ -1039,9 +966,7 @@ sub set {
             }
         }
         else {
-            &main::print_log(
-                "Owfs_Switch::set ERROR mode: $mode Unknown state: $state")
-              ;    # if $debug;
+            &main::print_log("Owfs_Switch::set ERROR mode: $mode Unknown state: $state");    # if $debug;
         }
     }
 }
@@ -1092,8 +1017,7 @@ sub discovered {
         if ( defined $channel ) {
             $pio .= ".$channel";
         }
-        &main::print_log(
-            "Owfs_Item::discovered mode: $mode pio: $pio setting $PIO to 0")
+        &main::print_log("Owfs_Item::discovered mode: $mode pio: $pio setting $PIO to 0")
           if $main::Debug{owfs};
         $self->SUPER::set( $pio, $OFF );
     }
@@ -1169,18 +1093,14 @@ sub process_read_response {
                 $self->SUPER::process_read_response( $token, $response );
             }
             $self->{pio} = $response;
-            &main::print_log(
-                "Owfs_Switch::process_read_response $device $location $channel pio: $response"
-            ) if $debug;
+            &main::print_log( "Owfs_Switch::process_read_response $device $location $channel pio: $response" ) if $debug;
         }
         elsif ( $token =~ /sensed/ ) {
             if ( $mode == $SENSE ) {
                 $self->SUPER::process_read_response( $token, $response );
             }
             $self->{sensed} = $response;
-            &main::print_log(
-                "Owfs_Switch::process_read_response $device $location $channel sensed: $response"
-            ) if $debug;
+            &main::print_log( "Owfs_Switch::process_read_response $device $location $channel sensed: $response" ) if $debug;
         }
         elsif ( $token =~ /latch/ ) {
             $latch_store{$device} |= ( $latch_mask{$device} & $response );
@@ -1204,16 +1124,14 @@ sub process_read_response {
                 my $device  = $self->{device};
                 my $channel = $self->{channel};
                 &main::print_log(
-                    "Owfs_Switch::process_read_response device: $device channel: $channel chanidx: $chanidx latchstr: $latchstr"
-                ) if $debug;
+                    "Owfs_Switch::process_read_response device: $device channel: $channel chanidx: $chanidx latchstr: $latchstr" )
+                  if $debug;
                 $self->SUPER::set( $latchstr, 1 );    #$response);
             }
         }
     }
     else {
-        &main::print_log(
-            "Owfs_Switch::process_read_response $device $location $channel ERROR response: NULL"
-        );                                            # if $debug;
+        &main::print_log( "Owfs_Switch::process_read_response $device $location $channel ERROR response: NULL" );    # if $debug;
     }
 }
 
@@ -1230,8 +1148,7 @@ sub process_write_response {
     if ( defined $response ) {
 
         if ( ( $mode == $PIO ) && ( $token =~ /PIO/ ) ) {
-            $self->SUPER::process_write_response( $response, $token, $value,
-                $set_by );
+            $self->SUPER::process_write_response( $response, $token, $value, $set_by );
         }
     }
 }
@@ -1283,8 +1200,7 @@ sub run_loop {
     }
 
     # reschedule the timer for next pass
-    $self->{loop_timer}
-      ->set( $self->{interval}, sub { Owfs_Switch::run_loop($self); } );
+    $self->{loop_timer}->set( $self->{interval}, sub { Owfs_Switch::run_loop($self); } );
 }
 
 #=======================================================================================
@@ -1418,16 +1334,13 @@ sub process_read_response {
             }
             $self->{temperature} = $temperature;
             if ( $main::Debug{owfs} ) {
-                &main::print_log(
-                    "Owfs_DS18S20::process_read_response $device $location temperature: $temperature"
-                ) if $main::Debug{owfs};
+                &main::print_log( "Owfs_DS18S20::process_read_response $device $location temperature: $temperature" )
+                  if $main::Debug{owfs};
             }
         }
     }
     else {
-        &main::print_log(
-            "Owfs_DS18S20::process_read_response $device $location temperature: ERROR"
-        );    # if $main::Debug{owfs};
+        &main::print_log( "Owfs_DS18S20::process_read_response $device $location temperature: ERROR" );    # if $main::Debug{owfs};
     }
 }
 
@@ -1436,9 +1349,8 @@ sub process_write_response {
     my ( $self, $response, $token, $value, $set_by ) = @_;
     my $device   = $self->{device};
     my $location = $self->{location};
-    &main::print_log(
-        "Owfs_DS18S20::process_write_response $device $location response: $response token: $token value: $value"
-    ) if $main::Debug{owfs};
+    &main::print_log( "Owfs_DS18S20::process_write_response $device $location response: $response token: $token value: $value" )
+      if $main::Debug{owfs};
 }
 
 sub reload_hook {
@@ -1633,8 +1545,7 @@ our $LATCH = 2;
 sub new {
     my ( $class, $device, $location, $channel, $interval ) = @_;
     if ( ( $channel < 0 ) || ( $channel > 7 ) ) {
-        &main::print_log(
-            "Owfs_DS2408::new ERROR channel ($channel) out of range!");
+        &main::print_log("Owfs_DS2408::new ERROR channel ($channel) out of range!");
     }
     my $self = new Owfs_Switch( $device, $location, $channel, $interval, $PIO );
 
@@ -1656,11 +1567,9 @@ our $LATCH = 2;
 sub new {
     my ( $class, $device, $location, $channel, $interval ) = @_;
     if ( ( $channel < 0 ) || ( $channel > 7 ) ) {
-        &main::print_log(
-            "Owfs_DS2408::new ERROR channel ($channel) out of range!");
+        &main::print_log("Owfs_DS2408::new ERROR channel ($channel) out of range!");
     }
-    my $self =
-      new Owfs_Switch( $device, $location, $channel, $interval, $SENSE );
+    my $self = new Owfs_Switch( $device, $location, $channel, $interval, $SENSE );
 
     #bless $self,$class;
     return $self;
@@ -1680,11 +1589,9 @@ our $LATCH = 2;
 sub new {
     my ( $class, $device, $location, $channel, $interval ) = @_;
     if ( ( $channel < 0 ) || ( $channel > 7 ) ) {
-        &main::print_log(
-            "Owfs_DS2408::new ERROR channel ($channel) out of range!");
+        &main::print_log("Owfs_DS2408::new ERROR channel ($channel) out of range!");
     }
-    my $self =
-      new Owfs_Switch( $device, $location, $channel, $interval, $LATCH );
+    my $self = new Owfs_Switch( $device, $location, $channel, $interval, $LATCH );
 
     #bless $self,$class;
     return $self;
@@ -1776,8 +1683,7 @@ our $LATCH = 2;
 sub new {
     my ( $class, $device, $location, $channel, $interval ) = @_;
     if ( ( $channel < 0 ) || ( $channel > 1 ) ) {
-        &main::print_log(
-            "Owfs_DS2413::new ERROR channel ($channel) out of range!");
+        &main::print_log("Owfs_DS2413::new ERROR channel ($channel) out of range!");
     }
     my $self = new Owfs_Switch( $device, $location, $channel, $interval, $PIO );
     bless $self, $class;
@@ -1798,11 +1704,9 @@ our $LATCH = 2;
 sub new {
     my ( $class, $device, $location, $channel, $interval ) = @_;
     if ( ( $channel < 0 ) || ( $channel > 1 ) ) {
-        &main::print_log(
-            "Owfs_DS2413::new ERROR channel ($channel) out of range!");
+        &main::print_log("Owfs_DS2413::new ERROR channel ($channel) out of range!");
     }
-    my $self =
-      new Owfs_Switch( $device, $location, $channel, $interval, $SENSE );
+    my $self = new Owfs_Switch( $device, $location, $channel, $interval, $SENSE );
     bless $self, $class;
     return $self;
 }
@@ -1930,14 +1834,10 @@ sub process_read_response {
             $self->SUPER::process_read_response( $token, $voltage );
         }
         $self->{voltage} = $voltage;
-        &main::print_log(
-            "Owfs_DS2450::process_read_response $device $location $channel voltage: $voltage"
-        ) if $main::Debug{owfs};
+        &main::print_log( "Owfs_DS2450::process_read_response $device $location $channel voltage: $voltage" ) if $main::Debug{owfs};
     }
     else {
-        &main::print_log(
-            "Owfs_DS2450::process_read_response $device $location $channel ERROR"
-        );    # if $main::Debug{owfs};
+        &main::print_log( "Owfs_DS2450::process_read_response $device $location $channel ERROR" );    # if $main::Debug{owfs};
     }
 }
 
@@ -1946,9 +1846,8 @@ sub process_write_response {
     my ( $self, $response, $token, $value, $set_by ) = @_;
     my $device   = $self->{device};
     my $location = $self->{location};
-    &main::print_log(
-        "Owfs_DS2450::process_write_response $device $location response: $response token: $token value: $value"
-    ) if $main::Debug{owfs};
+    &main::print_log( "Owfs_DS2450::process_write_response $device $location response: $response token: $token value: $value" )
+      if $main::Debug{owfs};
 }
 
 # This method is called whenever the object has been discovered.  Useful for initialization.
@@ -1992,9 +1891,8 @@ sub run_loop {
         my $location = $self->{location};
         my $active   = $self->{active};
         my $present  = $self->{present};
-        &main::print_log(
-            "Owfs_DS2450::run_loop $index $device $location channel: $channel present: $present active: $active"
-        ) if $main::Debug{owfs};
+        &main::print_log( "Owfs_DS2450::run_loop $index $device $location channel: $channel present: $present active: $active" )
+          if $main::Debug{owfs};
         if ( ( $self->{active} == 0 ) && $self->{present} ) {
             $self->SUPER::get("volt.$channel");
         }
diff --git a/lib/Owfs_Thermostat.pm b/lib/Owfs_Thermostat.pm
index 79f9678af..5e00cae4c 100644
--- a/lib/Owfs_Thermostat.pm
+++ b/lib/Owfs_Thermostat.pm
@@ -78,8 +78,7 @@ sub new {
     $self->{interval} = $interval;
 
     $self->{t_run_timer} = new Timer;
-    $self->{t_run_timer}
-      ->set( $self->{interval}, sub { &Owfs_Thermostat::run_loop($self) } );
+    $self->{t_run_timer}->set( $self->{interval}, sub { &Owfs_Thermostat::run_loop($self) } );
     $self->{t_hold_timer} = new Timer;
 
     # create a timer to identify how long the compressor is on (maintain minimum on time)
@@ -107,64 +106,21 @@ sub new {
     $self->{zone}         = ();
     $self->restore_defaults();
 
-    $self->restore_data( "system_mode", "fan_mode", "hold", "hold_timer",
-        "temp_sp" );
-    $self->restore_data(
-        "sun_0_time", "sun_0_temp", "sun_0_zone", "sun_1_time",
-        "sun_1_temp", "sun_1_zone"
-    );
-    $self->restore_data(
-        "sun_2_time", "sun_2_temp", "sun_2_zone", "sun_3_time",
-        "sun_3_temp", "sun_3_zone"
-    );
-    $self->restore_data(
-        "mon_0_time", "mon_0_temp", "mon_0_zone", "mon_1_time",
-        "mon_1_temp", "mon_1_zone"
-    );
-    $self->restore_data(
-        "mon_2_time", "mon_2_temp", "mon_2_zone", "mon_3_time",
-        "mon_3_temp", "mon_3_zone"
-    );
-    $self->restore_data(
-        "tue_0_time", "tue_0_temp", "tue_0_zone", "tue_1_time",
-        "tue_1_temp", "tue_1_zone"
-    );
-    $self->restore_data(
-        "tue_2_time", "tue_2_temp", "tue_2_zone", "tue_3_time",
-        "tue_3_temp", "tue_3_zone"
-    );
-    $self->restore_data(
-        "wed_0_time", "wed_0_temp", "wed_0_zone", "wed_1_time",
-        "wed_1_temp", "wed_1_zone"
-    );
-    $self->restore_data(
-        "wed_2_time", "wed_2_temp", "wed_2_zone", "wed_3_time",
-        "wed_3_temp", "wed_3_zone"
-    );
-    $self->restore_data(
-        "thu_0_time", "thu_0_temp", "thu_0_zone", "thu_1_time",
-        "thu_1_temp", "thu_1_zone"
-    );
-    $self->restore_data(
-        "thu_2_time", "thu_2_temp", "thu_2_zone", "thu_3_time",
-        "thu_3_temp", "thu_3_zone"
-    );
-    $self->restore_data(
-        "fri_0_time", "fri_0_temp", "fri_0_zone", "fri_1_time",
-        "fri_1_temp", "fri_1_zone"
-    );
-    $self->restore_data(
-        "fri_2_time", "fri_2_temp", "fri_2_zone", "fri_3_time",
-        "fri_3_temp", "fri_3_zone"
-    );
-    $self->restore_data(
-        "sat_0_time", "sat_0_temp", "sat_0_zone", "sat_1_time",
-        "sat_1_temp", "sat_1_zone"
-    );
-    $self->restore_data(
-        "sat_2_time", "sat_2_temp", "sat_2_zone", "sat_3_time",
-        "sat_3_temp", "sat_3_zone"
-    );
+    $self->restore_data( "system_mode", "fan_mode",   "hold",       "hold_timer", "temp_sp" );
+    $self->restore_data( "sun_0_time",  "sun_0_temp", "sun_0_zone", "sun_1_time", "sun_1_temp", "sun_1_zone" );
+    $self->restore_data( "sun_2_time",  "sun_2_temp", "sun_2_zone", "sun_3_time", "sun_3_temp", "sun_3_zone" );
+    $self->restore_data( "mon_0_time",  "mon_0_temp", "mon_0_zone", "mon_1_time", "mon_1_temp", "mon_1_zone" );
+    $self->restore_data( "mon_2_time",  "mon_2_temp", "mon_2_zone", "mon_3_time", "mon_3_temp", "mon_3_zone" );
+    $self->restore_data( "tue_0_time",  "tue_0_temp", "tue_0_zone", "tue_1_time", "tue_1_temp", "tue_1_zone" );
+    $self->restore_data( "tue_2_time",  "tue_2_temp", "tue_2_zone", "tue_3_time", "tue_3_temp", "tue_3_zone" );
+    $self->restore_data( "wed_0_time",  "wed_0_temp", "wed_0_zone", "wed_1_time", "wed_1_temp", "wed_1_zone" );
+    $self->restore_data( "wed_2_time",  "wed_2_temp", "wed_2_zone", "wed_3_time", "wed_3_temp", "wed_3_zone" );
+    $self->restore_data( "thu_0_time",  "thu_0_temp", "thu_0_zone", "thu_1_time", "thu_1_temp", "thu_1_zone" );
+    $self->restore_data( "thu_2_time",  "thu_2_temp", "thu_2_zone", "thu_3_time", "thu_3_temp", "thu_3_zone" );
+    $self->restore_data( "fri_0_time",  "fri_0_temp", "fri_0_zone", "fri_1_time", "fri_1_temp", "fri_1_zone" );
+    $self->restore_data( "fri_2_time",  "fri_2_temp", "fri_2_zone", "fri_3_time", "fri_3_temp", "fri_3_zone" );
+    $self->restore_data( "sat_0_time",  "sat_0_temp", "sat_0_zone", "sat_1_time", "sat_1_temp", "sat_1_zone" );
+    $self->restore_data( "sat_2_time",  "sat_2_temp", "sat_2_zone", "sat_3_time", "sat_3_temp", "sat_3_zone" );
 
     return $self;
 }
@@ -179,8 +135,7 @@ sub add_thermometer {
     my ( $self, $thermometer, $location, $zone ) = @_;
     return if $self->{thermometers}{$thermometer};
     $zone = "1" unless defined $zone;
-    &main::print_log(
-        "Owfs_Thermostat::adding_thermometer: $thermometer zone: $zone")
+    &main::print_log("Owfs_Thermostat::adding_thermometer: $thermometer zone: $zone")
       if $::Debug{owfs};
     $self->{thermometers}{$thermometer} =
       new Owfs_Item( $thermometer, $location );
@@ -245,11 +200,7 @@ sub set_fan_sensor {
 sub set_system_mode {
     my ( $self, $value ) = @_;
     if ( $value =~ /off|heat|cool/ ) {
-        &main::logit(
-            "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-            "System Mode change to $value",
-            , 1
-        );
+        &main::logit( "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log", "System Mode change to $value",, 1 );
         $self->{system_mode} = $value;
     }
 }
@@ -262,11 +213,7 @@ sub get_system_mode {
 sub set_fan_mode {
     my ( $self, $value ) = @_;
     if ( $value =~ /on|auto/ ) {
-        &main::logit(
-            "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-            "Fan Mode change to $value",
-            , 1
-        );
+        &main::logit( "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log", "Fan Mode change to $value",, 1 );
         $self->{fan_mode} = $value;
     }
 }
@@ -349,11 +296,7 @@ sub get_state {
 sub set_temp_sp {
     my ( $self, $temp_sp ) = @_;
     if ( ( $temp_sp >= 60 ) && ( $temp_sp <= 80 ) ) {
-        &main::logit(
-            "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-            "Set Point change to $temp_sp",
-            , 1
-        );
+        &main::logit( "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log", "Set Point change to $temp_sp",, 1 );
         $self->{temp_sp} = $temp_sp;
     }
 }
@@ -372,10 +315,7 @@ sub set_hold {
             my $min     = $2;
             my $seconds = ( $hour * 3600 ) + ( $min * 60 );
             if ($seconds) {
-                &main::logit(
-                    "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-                    "Hold Timer change to $hold",, 1
-                );
+                &main::logit( "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log", "Hold Timer change to $hold",, 1 );
                 $self->{t_hold_timer}->set($seconds);
             }
         }
@@ -644,12 +584,7 @@ sub get_schedule_sp {
     $currZone = $schedule[$dayIndex][$index][2];
     $dayIndex = $main::Wday;
     for ( $index = 0; $index < 4; $index++ ) {
-        if (
-            &main::time_less_than(
-                $self->time_from_ampm( $schedule[$dayIndex][$index][0] )
-            )
-          )
-        {
+        if ( &main::time_less_than( $self->time_from_ampm( $schedule[$dayIndex][$index][0] ) ) ) {
             return ( $currTemp, $currZone );
         }
         $currTemp = $schedule[$dayIndex][$index][1];
@@ -724,7 +659,8 @@ sub cool_relay {
                 my $sp = $self->{temp_sp};
                 &main::logit(
                     "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-                    "Cool $display zone_temp: $zone_temp temp_sp: $sp",, 1
+                    "Cool $display zone_temp: $zone_temp temp_sp: $sp",
+                    , 1
                 );
             }
         }
@@ -740,11 +676,7 @@ sub fan_relay {
             my $display   = $value ? "On" : "Off";
             my $zone_temp = $self->{zone}->[ $self->{temp_zone} ]->{average};
             my $sp        = $self->{temp_sp};
-            &main::logit(
-                "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log",
-                "Fan $display $zone_temp temp_sp: $sp",
-                , 1
-            );
+            &main::logit( "$::config_parms{data_dir}/logs/hvac/$::Year_Month_Now.log", "Fan $display $zone_temp temp_sp: $sp",, 1 );
         }
     }
 }
@@ -830,8 +762,7 @@ sub run_loop {
     }
 
     # reschedule the timer for next pass
-    $self->{t_run_timer}
-      ->set( $self->{interval}, sub { &Owfs_Thermostat::run_loop($self) } );
+    $self->{t_run_timer}->set( $self->{interval}, sub { &Owfs_Thermostat::run_loop($self) } );
 
     # has the hold timer expired?
     if ( $self->{t_hold_timer}->inactive() ) {
@@ -859,9 +790,8 @@ sub run_loop {
         $self->fan_relay(0);
         if ( exists $self->{zone}->[ $self->{temp_zone} ]->{average} ) {
             if (
-                ( $self->{temp_sp} < 75 )
-                && ( $self->{temp_sp} >
-                    $self->{zone}->[ $self->{temp_zone} ]->{average} )
+                   ( $self->{temp_sp} < 75 )
+                && ( $self->{temp_sp} > $self->{zone}->[ $self->{temp_zone} ]->{average} )
                 && (   ( not exists $::Weather{TempOutdoor} )
                     || ( $::Weather{TempOutdoor} < $self->{temp_sp} )
                     || $self->{hold} )
@@ -882,9 +812,8 @@ sub run_loop {
         $self->heat_relay(0);
         if ( exists $self->{zone}->[ $self->{temp_zone} ]->{average} ) {
             if (
-                ( $self->{temp_sp} >= 70 )
-                && ( $self->{temp_sp} <
-                    $self->{zone}->[ $self->{temp_zone} ]->{average} )
+                   ( $self->{temp_sp} >= 70 )
+                && ( $self->{temp_sp} < $self->{zone}->[ $self->{temp_zone} ]->{average} )
                 && (   ( not exists $::Weather{TempOutdoor} )
                     || ( $::Weather{TempOutdoor} >= ( $self->{temp_sp} - 2 ) )
                     || 1
diff --git a/lib/PAobj.pm b/lib/PAobj.pm
index 9c471b7e5..32e3c8c48 100644
--- a/lib/PAobj.pm
+++ b/lib/PAobj.pm
@@ -58,9 +58,7 @@ sub init {
     %pa_zone_types = ();
     my $ref2 = &::get_object_by_name("pa_allspeakers");
     if ( !$ref2 ) {
-        print(
-            "\n\nWARNING! PA Zones were not found! Your *.mht file probably doesn't list the PA zones correctly.\n\n"
-        );
+        print( "\n\nWARNING! PA Zones were not found! Your *.mht file probably doesn't list the PA zones correctly.\n\n" );
         return 0;
     }
     $self->check_group('default');
@@ -106,18 +104,14 @@ sub init_weeder {
 
         $weeder_ref{$card} = '' unless $weeder_ref{$card};
         $weeder_ref{$card} .= $id;
-        &::print_log(
-            "PAobj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}"
-        ) if $main::Debug{pa};
+        &::print_log( "PAobj: init card: $card, id: $id, Room: $room, List: $weeder_ref{$card}" ) if $main::Debug{pa};
     }
 
     for my $card ( 'A' .. 'P', 'a' .. 'p' ) {
         if ( $weeder_ref{$card} ) {
             my $data = $weeder_ref{$card};
             $weeder_max{$card} = $self->last_char($data);
-            &::print_log(
-                "PAobj: init weeder board=$card, ports=$data, max port="
-                  . $weeder_max{$card} )
+            &::print_log( "PAobj: init weeder board=$card, ports=$data, max port=" . $weeder_max{$card} )
               if $main::Debug{pa};
         }
     }
@@ -143,8 +137,7 @@ sub active {
 sub prep_parms {
     my ( $self, $parms ) = @_;
     &::print_log("PAobj: delay: $$self{pa_delay}\n") if $main::Debug{pa} >= 3;
-    &::print_log(
-        "PAobj: set,mode: " . $parms->{mode} . ",rooms: " . $parms->{rooms} )
+    &::print_log( "PAobj: set,mode: " . $parms->{mode} . ",rooms: " . $parms->{rooms} )
       if $main::Debug{pa} >= 3;
 
     my @speakers = $self->get_speakers( $parms->{rooms} );
@@ -169,9 +162,7 @@ sub prep_parms {
 
     foreach my $type ( keys(%speakertype) ) {
         my @thespeakers = @{ $speakertype{$type} };
-        &::print_log( "PAobj: speakers_$type: "
-              . ( $#thespeakers + 1 ) . ": "
-              . join( ',', @thespeakers ) )
+        &::print_log( "PAobj: speakers_$type: " . ( $#thespeakers + 1 ) . ": " . join( ',', @thespeakers ) )
           if $main::Debug{pa};
         $pa_zones{active}{$type} = join( ',', @thespeakers );
         if ( $#thespeakers > -1 ) {
@@ -228,8 +219,7 @@ sub audio_hook {
     foreach my $serial ( keys(%speakers_aviosys) ) {
         &::print_log("PAobj: calling set for aviosys serial port: $serial")
           if $main::Debug{pa} >= 3;
-        $results = $self->set_aviosys( $state, $serial,
-            @{ $speakers_aviosys{$serial} } );
+        $results = $self->set_aviosys( $state, $serial, @{ $speakers_aviosys{$serial} } );
     }
     for my $room ( split( ',', $pa_zones{active}{wdio} ) ) {
         my $ref    = &::get_object_by_name( 'pa_' . $room );
@@ -357,9 +347,7 @@ sub set_xap {
                     voice  => $voiceparms{voice}
                 }
             );
-            &::print_log(
-                "PAobj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}"
-            ) if $main::Debug{pa};
+            &::print_log( "PAobj: xap cmd: $ref->{object_name} is sending voice text: $voiceparms{text}" ) if $main::Debug{pa};
         }
         else {
             &::print_log("PAobj: Unable to locate object for: pa_$room");
@@ -392,9 +380,7 @@ sub set_xpl {
                     mode   => $voiceparms{mode}
                 }
             );
-            &::print_log(
-                "PAobj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}"
-            ) if $main::Debug{pa};
+            &::print_log( "PAobj: set_xpl: $ref->{object_name} is sending voice text: $voiceparms{text}" ) if $main::Debug{pa};
         }
         else {
             &::print_log("PAobj: Unable to locate object for: pa_$room");
@@ -449,8 +435,7 @@ sub get_weeder_string {
     my ( $bit_flag, $state, $ref, $bit, $byte_code, $weeder_code, $id );
 
     # yea, there are cleaner ways to do this, but this should work
-    my %decimal_to_hex =
-      qw(0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 A 11 B 12 C 13 D 14 E 15 F);
+    my %decimal_to_hex = qw(0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 A 11 B 12 C 13 D 14 E 15 F);
     $byte_code = $bit_counter = 0;
     $weeder_code = '';
 
@@ -468,10 +453,9 @@ sub get_weeder_string {
         }
 
         $bit_flag = ( $state eq 'on' ) ? 1 : 0;    # get 0 or 1
-        &::print_log(
-            "PAobj: get_weeder_string card: $card, bit=$bit state=$bit_flag")
+        &::print_log("PAobj: get_weeder_string card: $card, bit=$bit state=$bit_flag")
           if $main::Debug{pa} >= 2;
-        $byte_code += ( $bit_flag << $bit_counter );  # get bit in byte position
+        $byte_code += ( $bit_flag << $bit_counter );    # get bit in byte position
 
         if ( $bit_counter++ >= 3 ) {
 
@@ -488,8 +472,7 @@ sub get_weeder_string {
         $weeder_code = $decimal_to_hex{$byte_code} . $weeder_code;
     }
 
-    if ( $self->{pa_type} eq 'wdio_old' )
-    {    #TODO: Find way to implement this with new code
+    if ( $self->{pa_type} eq 'wdio_old' ) {    #TODO: Find way to implement this with new code
         $card        = "D$card";
         $weeder_code = 'h' . $weeder_code;
     }
@@ -555,11 +538,7 @@ sub set_amixer {
     $mixpercent = '100%' if lc $state eq 'on';
     for my $room (@speakers) {
         my $ref = &::get_object_by_name( 'pa_' . $room );
-        &::print_log( "PAobj: set_amixer: "
-              . $room . " / "
-              . $state . " / "
-              . $ref->{mixer} . " / "
-              . $ref->{mixerchan} )
+        &::print_log( "PAobj: set_amixer: " . $room . " / " . $state . " / " . $ref->{mixer} . " / " . $ref->{mixerchan} )
           if $main::Debug{pa} >= 3;
 
         if ( defined( $ref->{mixerchan} ) ) {
@@ -576,10 +555,7 @@ sub set_amixer {
         }
     }
     foreach my $mixer ( keys(%amixerref) ) {
-        my $mixcmd =
-            "amixer -q set $mixer "
-          . $amixerref{$mixer}{'l'} . ','
-          . $amixerref{$mixer}{'r'};
+        my $mixcmd = "amixer -q set $mixer " . $amixerref{$mixer}{'l'} . ',' . $amixerref{$mixer}{'r'};
         &main::print_log("PAobj: set_amixer: CMD: $mixcmd")
           if $main::Debug{pa} >= 2;
         my $r = system $mixcmd;
@@ -666,9 +642,7 @@ sub get_speakers_speakable {
                 && ( $gss_mode eq 'normal' || $mode eq 'unmuted' ) )
             {
                 push( @pazones, $room );
-                &::print_log(
-                    "PAobj: speakable: Pushed $room into pazones array. New count:"
-                      . ( $#pazones + 1 ) )
+                &::print_log( "PAobj: speakable: Pushed $room into pazones array. New count:" . ( $#pazones + 1 ) )
                   if $main::Debug{pa} >= 2;
             }
         }
@@ -712,8 +686,7 @@ sub last_char {
 
 #Type Address	Name			Groups               		Serial   Type
 sub new {
-    my ( $class, $paz_address, $paz_name, $paz_groups, $paz_serial, $paz_type )
-      = @_;
+    my ( $class, $paz_address, $paz_name, $paz_groups, $paz_serial, $paz_type ) = @_;
     my $self = {};
 
     bless $self, $class;
diff --git a/lib/PLCBUS.pm b/lib/PLCBUS.pm
index ca1565317..7a6ebadfc 100644
--- a/lib/PLCBUS.pm
+++ b/lib/PLCBUS.pm
@@ -107,17 +107,17 @@ my %cmd_to_hex = (
         expected_response => undef,
     },
     fade_stop => {
-        cmd         => 0x0B,
-        flags       => 0x20,
-        data        => 0,
-        description => "In Same HOME & UNIT, “One light Stop Dimming”. +",
+        cmd               => 0x0B,
+        flags             => 0x20,
+        data              => 0,
+        description       => "In Same HOME & UNIT, “One light Stop Dimming”. +",
         expected_response => undef,
     },
     presetdim => {
-        cmd         => 0x0C,
-        flags       => 0x20,
-        data        => 1,
-        description => "In Same HOME & UNIT, “Preset Brightness Level”. *+",
+        cmd               => 0x0C,
+        flags             => 0x20,
+        data              => 1,
+        description       => "In Same HOME & UNIT, “Preset Brightness Level”. *+",
         expected_response => undef,
     },
     status_on => {
@@ -174,10 +174,10 @@ my %cmd_to_hex = (
         expected_response => undef,
     },
     all_scenes_addrs_erase => {
-        cmd         => 0x14,
-        flags       => 0x20,
-        data        => 1,
-        description => "Clean all the Scene a ddresses in each receiver. *+",
+        cmd               => 0x14,
+        flags             => 0x20,
+        data              => 1,
+        description       => "Clean all the Scene a ddresses in each receiver. *+",
         expected_response => undef,
     },
     future1 => {
@@ -230,11 +230,10 @@ my %cmd_to_hex = (
         expected_response => undef,
     },
     get_all_id_pulse => {
-        cmd   => 0x1C,
-        flags => 0x00,
-        data  => 0,
-        description =>
-          "(THE SAME USER AND THE SAME HOME) Check the ID PULSE in the same USER & HOME.",
+        cmd               => 0x1C,
+        flags             => 0x00,
+        data              => 0,
+        description       => "(THE SAME USER AND THE SAME HOME) Check the ID PULSE in the same USER & HOME.",
         expected_response => ['report_all_id_pulse'],
         home_cmd          => 1,
         noreplay          => 1,
@@ -245,8 +244,7 @@ my %cmd_to_hex = (
         data              => 0,
         expected_response => ['report_only_on_pulse'],
         home_cmd          => 1,
-        description =>
-          "(THE SAME USER AND THE SAME HOME) Check the Only ON ID PULSE in the same USER & HOME."
+        description       => "(THE SAME USER AND THE SAME HOME) Check the Only ON ID PULSE in the same USER & HOME."
     },
     report_all_id_pulse => {
         cmd               => 0x1E,
@@ -268,29 +266,27 @@ my %hex_to_cmd = (
     ##  * = contains data
     ##  + = needs feedback
 
-    0x00 => "all_unit_off",    #  In Same HOME, “All Units Off”.
-    0x01 => "all_lts_on",      #  In Same HOME, “All Lights On”.
-    0x02 => "on",              #  In Same HOME +UNIT, “One UNIT On”.  +
-    0x03 => "off",             #  In Same HOME + UNIT,”One UNIT Off”. +
-    0x04 => "dim",             #  In Same HOME + UNIT,”One UNIT Dim”. *+
-    0x05 => "bright",          #  In Same HOME + UNIT,”One UNIT Brighten” *+
-    0x06 => "all_light_off",   #  In Same HOME, “All Lights Off”.
-    0x07 => "all_user_lts_on", #  Under Same USER, “All USER Lights On”.
-    0x08 => "all_user_unit_off",   #  Under Same USER, “All USER Units Off”.
-    0x09 => "all_user_light_off",  #  Under Same USER, “All USER Lights Off”
-    0x0A => "blink",     #  In Same HOME+ UNIT, “One Light Blink”. *+
-    0x0B => "fade_stop", #  In Same HOME+ UNIT, “One light Stop Dimming”. +
-    0x0C => "presetdim", #  In Same HOME+UNIT, “Preset Brightness Level”. *+
-    0x0D => "status_on", #  Status feedback as “ON”.*
-    0x0E => "status_off",           #  Status feedback as “OFF”.
-    0x0F => "status_req",           #  Status Checking
-    0x10 => "r_master_addrs_setup", #  Setup the main address of Receiver. *+
-    0x11 => "t_master_addrs_setup", #  Setup the main address of Transmitter. *+
-    0x12 => "scenes_addrs_setup",   #  Setup Scene address *
-    0x13 => "scenes_addrs_erase"
-    ,    #  Clean    Scene    address    under the    same HOME+UNIT
-    0x14 => "all_scenes_addrs_erase"
-    ,    #  Clean all the Scene addresses in each receiver. *+
+    0x00 => "all_unit_off",              #  In Same HOME, “All Units Off”.
+    0x01 => "all_lts_on",                #  In Same HOME, “All Lights On”.
+    0x02 => "on",                        #  In Same HOME +UNIT, “One UNIT On”.  +
+    0x03 => "off",                       #  In Same HOME + UNIT,”One UNIT Off”. +
+    0x04 => "dim",                       #  In Same HOME + UNIT,”One UNIT Dim”. *+
+    0x05 => "bright",                    #  In Same HOME + UNIT,”One UNIT Brighten” *+
+    0x06 => "all_light_off",             #  In Same HOME, “All Lights Off”.
+    0x07 => "all_user_lts_on",           #  Under Same USER, “All USER Lights On”.
+    0x08 => "all_user_unit_off",         #  Under Same USER, “All USER Units Off”.
+    0x09 => "all_user_light_off",        #  Under Same USER, “All USER Lights Off”
+    0x0A => "blink",                     #  In Same HOME+ UNIT, “One Light Blink”. *+
+    0x0B => "fade_stop",                 #  In Same HOME+ UNIT, “One light Stop Dimming”. +
+    0x0C => "presetdim",                 #  In Same HOME+UNIT, “Preset Brightness Level”. *+
+    0x0D => "status_on",                 #  Status feedback as “ON”.*
+    0x0E => "status_off",                #  Status feedback as “OFF”.
+    0x0F => "status_req",                #  Status Checking
+    0x10 => "r_master_addrs_setup",      #  Setup the main address of Receiver. *+
+    0x11 => "t_master_addrs_setup",      #  Setup the main address of Transmitter. *+
+    0x12 => "scenes_addrs_setup",        #  Setup Scene address *
+    0x13 => "scenes_addrs_erase",        #  Clean    Scene    address    under the    same HOME+UNIT
+    0x14 => "all_scenes_addrs_erase",    #  Clean all the Scene addresses in each receiver. *+
     0x15 => "",                          #  * for future
     0x16 => "",                          #  * for future
     0x17 => "",                          #  * for future
@@ -298,12 +294,10 @@ my %hex_to_cmd = (
     0x19 => "get_noise_strength",        #  Check the Noise Strength.   +
     0x1A => "report_signal_strength",    #  Report the Signal Strength. *
     0x1B => "report_noise_strength",     #  Report the Noise Strength. *
-    0x1C => "get_all_id_pulse"
-    , #  (THE SAME USER AND THE SAME HOM E) Check the ID PULSE in the same USER + HOME.
-    0x1D => "get_only_on_id_pulse"
-    , #  (THE SAME USER AND THE SAME HOME) Check the Only ON ID PULSE in the same USER+ HOME.
-    0x1E => "report_all_id_pulse",     #  （ For 3-phase power line only ）
-    0x1F => "report_only_on_pulse",    #  （ For 3-phase power line only ）
+    0x1C => "get_all_id_pulse",          #  (THE SAME USER AND THE SAME HOM E) Check the ID PULSE in the same USER + HOME.
+    0x1D => "get_only_on_id_pulse",      #  (THE SAME USER AND THE SAME HOME) Check the Only ON ID PULSE in the same USER+ HOME.
+    0x1E => "report_all_id_pulse",       #  （ For 3-phase power line only ）
+    0x1F => "report_only_on_pulse",      #  （ For 3-phase power line only ）
 );
 
 ## NOTES
@@ -390,19 +384,15 @@ sub _new_instance {
 
     $self->{current_cmd}   = undef;    ## currrent active command
     $self->{command_queue} = [];       ## qued commands
-    $self->{plc_devices} =
-      ();    # stores a hash of homes. Each home hold a hash of plcbus modules
-    $self->{homes} = ()
-      ; # only used for code generation so we know which home commands have alreay been created
-    $self->{plcbussrv_proc} =
-      new Process_Item();    # to start/stop the plcbussrv server
+    $self->{plc_devices}   = ();       # stores a hash of homes. Each home hold a hash of plcbus modules
+    $self->{homes}         = ();       # only used for code generation so we know which home commands have alreay been created
+    $self->{plcbussrv_proc} = new Process_Item();                        # to start/stop the plcbussrv server
     $self->{plcbussrv_port} = $::config_parms{plcbussrv_port} || 4567;
 
     my $plcbusserv_log = "/dev/null";
     $plcbusserv_log = $::config_parms{plcbussrv_logfile}
       if $::config_parms{plcbussrv_logfile};
-    my $c =
-      "plcbussrv /dev/plcbus $self->{plcbussrv_port} &>1 > $plcbusserv_log";
+    my $c = "plcbussrv /dev/plcbus $self->{plcbussrv_port} &>1 > $plcbusserv_log";
     _log($c);
     $self->{plcbussrv_proc}->set($c);
     $self->{plcbussrv_proc}->start();
@@ -551,8 +541,7 @@ sub _handle_incoming_commands {
         if ( defined( $self->{current_cmd} ) ) {
             $current_cmd_home = $self->{current_cmd}->{home};
         }
-        $self->_handle_REPORT_ONLY_ON_PULSE( $current_cmd_home, $dec->{d1},
-            $dec->{d2} );
+        $self->_handle_REPORT_ONLY_ON_PULSE( $current_cmd_home, $dec->{d1}, $dec->{d2} );
         return 1;
     }
     elsif ( $cmd =~ /^report_all_id_pulse$/ ) {
@@ -562,8 +551,7 @@ sub _handle_incoming_commands {
         if ( defined( $self->{current_cmd} ) ) {
             $current_cmd_home = $self->{current_cmd}->{home};
         }
-        $self->_handle_REPORT_ALL_ID_PULSE( $current_cmd_home, $dec->{d1},
-            $dec->{d2} );
+        $self->_handle_REPORT_ALL_ID_PULSE( $current_cmd_home, $dec->{d1}, $dec->{d2} );
         return 1;
     }
     else {
@@ -596,10 +584,7 @@ sub _handle_REPORT_ONLY_ON_PULSE($$$) {
             }
         }
     }
-    _logdd( "$home report_only_on_pulse 'd1d2': '"
-          . bin_rep($d1)
-          . bin_rep($d2)
-          . "'" );
+    _logdd( "$home report_only_on_pulse 'd1d2': '" . bin_rep($d1) . bin_rep($d2) . "'" );
     _log("$home ON : '$on' OFF: '$off'");
 }
 
@@ -614,10 +599,7 @@ sub _handle_REPORT_ALL_ID_PULSE($$$) {
             $exist .= "$home$unit";
         }
     }
-    _logdd( "$home report_all_id_pulse 'd1d2': '"
-          . bin_rep($d1)
-          . bin_rep($d2)
-          . "'" );
+    _logdd( "$home report_all_id_pulse 'd1d2': '" . bin_rep($d1) . bin_rep($d2) . "'" );
     _log("$home present: $exist");
 }
 
@@ -679,10 +661,8 @@ sub _is_current_command_complete() {
         $what .= "'ack' ";
         $ok = 0;
     }
-    if ( $current->{expected_response} && !$current->{expected_response_seen} )
-    {
-        $what .= "'response ("
-          . join( "|", @{ $self->{current_cmd}->{expected_response} } ) . ")' ";
+    if ( $current->{expected_response} && !$current->{expected_response_seen} ) {
+        $what .= "'response (" . join( "|", @{ $self->{current_cmd}->{expected_response} } ) . ")' ";
         $ok = 0;
     }
     if (
@@ -708,14 +688,12 @@ sub _is_current_command_complete() {
         and $current->{three_phase} == 0
         and $current->{ack_seen} )
     {
-        _logdd(
-            "Considering 1-Phase command completed, because ACK was received");
+        _logdd("Considering 1-Phase command completed, because ACK was received");
         $ok = 1;
         $current->{completed} = 1;
         my $module =
           $self->{plc_devices}->{ $current->{home} }->{ $current->{unit} };
-        $module->_set( $current->{cmd}, $current->{setby},
-            $current->{respond} );
+        $module->_set( $current->{cmd}, $current->{setby}, $current->{respond} );
     }
     elsif ( $ok && !$self->{current_cmd}->{completed} ) {
         $current->{completed} = 1;
@@ -725,10 +703,7 @@ sub _is_current_command_complete() {
         $current->{duration} =
           Time::HiRes::tv_interval( $current->{last_write} );
         my $name = "$self->{current_cmd}->{home}$self->{current_cmd}->{unit}";
-        _logdd(
-            "$name completed within $self->{current_cmd}->{duration} (allowed: "
-              . $self->_get_timeout()
-              . ")" );
+        _logdd( "$name completed within $self->{current_cmd}->{duration} (allowed: " . $self->_get_timeout() . ")" );
     }
     return $ok;
 }
@@ -761,7 +736,7 @@ sub _has_current_command_timeout() {
         return 0;
     }
     my $maxwait = $self->_get_timeout();
-    my $diff = Time::HiRes::tv_interval( $self->{current_cmd}->{last_write} );
+    my $diff    = Time::HiRes::tv_interval( $self->{current_cmd}->{last_write} );
     if ( $diff < $maxwait ) {
         return 0;
     }
@@ -837,9 +812,7 @@ sub _can_transmit() {
     }
 
     if ( !$self->{plcbussrv_connection} || !$self->{select} ) {
-        _log(
-            "not connected to plcpus command server can't transmit, dropping all pending commands"
-        );
+        _log( "not connected to plcpus command server can't transmit, dropping all pending commands" );
         $self->{command_queue} = [];
         return 0;
     }
@@ -861,8 +834,7 @@ sub _read_from_server() {
                 $self->{select}->remove( $self->{plcbussrv_connection} );
                 $self->{select}               = undef;
                 $self->{plcbussrv_connection} = undef;
-                _log(
-                    "Connection to comman server broken, trying to reconnect.");
+                _log("Connection to comman server broken, trying to reconnect.");
                 $self->_connect_command_server();
             }
             return $data;
@@ -884,8 +856,7 @@ sub _read_packet() {
         for my $cur (@u) {
             if ( scalar @rx_tmp == 0 ) {
                 if ( $cur != $STX ) {
-                    _log( "< not a startbyte. Dropped "
-                          . sprintf( "0x%02x", $cur ) );
+                    _log( "< not a startbyte. Dropped " . sprintf( "0x%02x", $cur ) );
                 }
                 else {
                     push @rx_tmp, $cur;
@@ -905,10 +876,8 @@ sub _read_packet() {
         my @rx = splice( @rx_tmp, 0, 9 );
 
         if ( sum(@rx) % 0x100 != 0x0 )
-        { ## aus pcbbus.pl geklaut, kp warum das so ghet, nirgends steht wie die checksumme funktioniert..
-            _log(   "< READ INVALID PACKET: \n"
-                  . sprintf( " 0x%02x" x scalar @rx, @rx )
-                  . "\n" );
+        {    ## aus pcbbus.pl geklaut, kp warum das so ghet, nirgends steht wie die checksumme funktioniert..
+            _log( "< READ INVALID PACKET: \n" . sprintf( " 0x%02x" x scalar @rx, @rx ) . "\n" );
             my @tmp = @rx_tmp;
             @rx_tmp = ();
             for my $cur (@tmp) {
@@ -938,11 +907,7 @@ sub _decode_incoming($) {
 
     return 0 unless scalar(@rx) == 9;
 
-    my (
-        $rx_STX,       $rx_length,       $rx_USER_CODE,
-        $rx_home_unit, $rx_command,      $rx_data1,
-        $rx_data2,     $rx_RX_TX_SWITCH, $rx_ETX
-    ) = @rx;
+    my ( $rx_STX, $rx_length, $rx_USER_CODE, $rx_home_unit, $rx_command, $rx_data1, $rx_data2, $rx_RX_TX_SWITCH, $rx_ETX ) = @rx;
 
     my $rx_decoded = decode_command($rx_command);
     my $home       = get_home($rx_home_unit);
@@ -953,12 +918,7 @@ sub _decode_incoming($) {
     my $cmd     = $hex_to_cmd{$cmd_hex};
     my $datastr = "";
     if ( $cmd_to_hex{$cmd}{data} == 1 ) {
-        $datastr =
-            ", d1=0x"
-          . hex_rep($rx_data1)
-          . "($rx_data1) d2=0x"
-          . hex_rep($rx_data2)
-          . "($rx_data2)";
+        $datastr            = ", d1=0x" . hex_rep($rx_data1) . "($rx_data1) d2=0x" . hex_rep($rx_data2) . "($rx_data2)";
         $rx_decoded->{data} = 1;
         $rx_decoded->{d1}   = $rx_data1;
         $rx_decoded->{d2}   = $rx_data2;
@@ -968,8 +928,7 @@ sub _decode_incoming($) {
 
     $m .= _command_to_string($rx_command);
 
-    my $rxtx =
-      decode_rx_tx_switch( $rx_RX_TX_SWITCH, $rx_data1, $rx_data2, \$m );
+    my $rxtx = decode_rx_tx_switch( $rx_RX_TX_SWITCH, $rx_data1, $rx_data2, \$m );
     $rx_decoded->{rxtx} = $rxtx;
     $m .= ", R_ID_SW"  if ( $rxtx->{R_ID_SW} );
     $m .= ", R_ACK_SW" if ( $rxtx->{R_ACK_SW} );
@@ -1000,8 +959,7 @@ sub queue_command {
     }
 
     if ( !$cmd_to_hex{ $command->{cmd} } ) {
-        _logw( "command '$command->{cmd}' unknown => not queued.\n"
-              . Dumper($command) );
+        _logw( "command '$command->{cmd}' unknown => not queued.\n" . Dumper($command) );
         return;
     }
 
@@ -1019,9 +977,8 @@ sub queue_command {
 sub _write_current_command {
     my ($self) = @_;
     my ( $home, $unit, $cmd, $d1, $d2 ) = (
-        $self->{current_cmd}->{home}, $self->{current_cmd}->{unit},
-        $self->{current_cmd}->{cmd},  $self->{current_cmd}->{d1},
-        $self->{current_cmd}->{d2}
+        $self->{current_cmd}->{home}, $self->{current_cmd}->{unit}, $self->{current_cmd}->{cmd},
+        $self->{current_cmd}->{d1},   $self->{current_cmd}->{d2}
     );
     my $tx_home_unit = 0x00;
     $tx_home_unit = $unit - 1 if $unit;
@@ -1034,8 +991,8 @@ sub _write_current_command {
     my $tx_command = $cmd_to_hex{$cmd}{cmd};
 
     my $phase_flag = $self->_get_phase_flag( $home, $unit );
-    $tx_command = $tx_command | $phase_flag;                   #  3-/1-phase
-    $tx_command = $tx_command | $cmd_to_hex{$cmd}{'flags'};    # ack_pulse
+    $tx_command                           = $tx_command | $phase_flag;                   #  3-/1-phase
+    $tx_command                           = $tx_command | $cmd_to_hex{$cmd}{'flags'};    # ack_pulse
     $self->{current_cmd}->{waits_for_ack} = $cmd_to_hex{$cmd}{'flags'};
     $self->{current_cmd}->{expected_response} =
       $cmd_to_hex{$cmd}{expected_response};
@@ -1049,12 +1006,9 @@ sub _write_current_command {
     my $usercode = _get_user_code();
 
     my $m = sprintf( "$home$unit TX " . " %02x" x 8,
-        $tx_STX, $tx_length, $usercode, $tx_home_unit, $tx_command, $tx_data1,
-        $tx_data2, $tx_ETX );
+        $tx_STX, $tx_length, $usercode, $tx_home_unit, $tx_command, $tx_data1, $tx_data2, $tx_ETX );
     $m .= "    => " . _command_to_string($tx_command);
-    my $tx = pack( 'C*',
-        $tx_STX, $tx_length, $usercode, $tx_home_unit, $tx_command, $tx_data1,
-        $tx_data2, $tx_ETX );
+    my $tx = pack( 'C*', $tx_STX, $tx_length, $usercode, $tx_home_unit, $tx_command, $tx_data1, $tx_data2, $tx_ETX );
 
     my $result = $self->{plcbussrv_connection}->send($tx);
 
@@ -1064,10 +1018,7 @@ sub _write_current_command {
         _log( $m . ": WRITE TO COMAND SERVER FAILED" );
     }
     elsif ( $result != length $tx ) {
-        _log(   $m
-              . ": WRITE incomplete. have written '$result' of '"
-              . length $tx
-              . "'" );
+        _log( $m . ": WRITE incomplete. have written '$result' of '" . length $tx . "'" );
     }
     else {
         _logd($m);
@@ -1199,8 +1150,7 @@ sub generate_code(@) {
         $object = "PLCBUS_Scene('$name', '$home','$unit', '$grouplist')";
     }
     elsif ( $type =~ /^PLCBUS.*/i ) {
-        _log(
-            "Unknown PLCBUS device type '$type'. Creating generic PLCBUS item");
+        _log("Unknown PLCBUS device type '$type'. Creating generic PLCBUS item");
         $object = "PLCBUS_Item('$name', '$home','$unit', '$grouplist')";
     }
     else {
@@ -1216,11 +1166,7 @@ sub generate_code(@) {
         $homes->{$home}++;
         my $vc = "\$" . $home_name . "_voice_cmds";
         $more .= "\n";
-        $more .=
-            "   $vc = new Voice_Cmd(\"PLCBUS "
-          . $home . " ["
-          . get_cmd_list('home')
-          . "]\");\n";
+        $more .= "   $vc = new Voice_Cmd(\"PLCBUS " . $home . " [" . get_cmd_list('home') . "]\");\n";
         $more .= ::store_object_data( $vc, 'Voice_Cmd', 'PLCBUS', 'PLCBUS' );
 
         # $more .= "\$PLCBUS->add(".$vc.");\n";
@@ -1228,34 +1174,24 @@ sub generate_code(@) {
         $more .= " if (my \$status = said $vc){\n";
         $more .= "     \$status =~ s/ /_/g;\n";
         $more .= "     respond \"queued \$status for home '$home'\";\n";
-        $more .=
-          "     PLCBUS->instance()->queue_command( {home => '$home', unit => 0, cmd => \$status});\n";
+        $more .= "     PLCBUS->instance()->queue_command( {home => '$home', unit => 0, cmd => \$status});\n";
         $more .= " }\n";
     }
     my $usercode = _get_user_code();
     if ( !$homes->{$usercode} ) {
         $homes->{$usercode}++;
-        $more .=
-            "   \$PLCBUS_USER_Commands = new Voice_Cmd(\"PLCBUS ["
-          . get_cmd_list('user')
-          . "]\");\n";
-        $more .=
-          ::store_object_data( "\$PLCBUS_USER_Commands", 'Voice_Cmd', 'PLCBUS',
-            'PLCBUS' );
+        $more .= "   \$PLCBUS_USER_Commands = new Voice_Cmd(\"PLCBUS [" . get_cmd_list('user') . "]\");\n";
+        $more .= ::store_object_data( "\$PLCBUS_USER_Commands", 'Voice_Cmd', 'PLCBUS', 'PLCBUS' );
 
         #$more .= "\$PLCBUS->add(\$PLCBUS_USER_Commands);\n";
         $more .= " if (my \$status = said \$PLCBUS_USER_Commands){\n";
         $more .= "     \$status =~ s/ /_/g;\n";
         $more .= "     respond \"queued comand \$status for all\";\n";
-        $more .=
-          "     PLCBUS->instance()->queue_command( {home => 'A', unit => 0, cmd => \$status});\n";
+        $more .= "     PLCBUS->instance()->queue_command( {home => 'A', unit => 0, cmd => \$status});\n";
         $more .= " }\n";
 
-        $more .=
-          "   \$PLCBUS_scan_house = new Voice_Cmd(\"PLCBUS scan house\");\n";
-        $more .=
-          ::store_object_data( "\$PLCBUS_scan_house", 'Voice_Cmd', 'PLCBUS',
-            'PLCBUS' );
+        $more .= "   \$PLCBUS_scan_house = new Voice_Cmd(\"PLCBUS scan house\");\n";
+        $more .= ::store_object_data( "\$PLCBUS_scan_house", 'Voice_Cmd', 'PLCBUS', 'PLCBUS' );
         $more .= " if (my \$status = said \$PLCBUS_scan_house){\n";
         $more .= "     \$status =~ s/ /_/g;\n";
         $more .= "     respond \"scanning home codes A .. P\";\n";
@@ -1272,8 +1208,7 @@ sub generate_code(@) {
 sub scan_whole_hose {
     my ($self) = @_;
     foreach my $home ( "A" .. "P" ) {
-        $self->queue_command(
-            { home => $home, unit => 0, cmd => 'report_all_id_pulse' } );
+        $self->queue_command( { home => $home, unit => 0, cmd => 'report_all_id_pulse' } );
     }
 }
 
@@ -1464,8 +1399,7 @@ sub new {
     $self->{unit}   = $unit;
     $self->{name}   = $name;
     $self->{groups} = $grouplist;
-    my @default_states =
-      qw|on off bright dim status_req get_noise_strength get_signal_strength status_on status_off|;
+    my @default_states = qw|on off bright dim status_req get_noise_strength get_signal_strength status_on status_off|;
     $self->set_states(@default_states);
     $self->_logd("ctor $self->{name} home: $self->{home} unit: $self->{unit}");
     PLCBUS->instance()->add_device($self);
@@ -1488,14 +1422,10 @@ sub generate_voice_commands {
 
     foreach ( sort keys %$voice_cmds ) {
         my $vc_var_name = "\$${name}_$_";
-        $varlist .= " $vc_var_name";
-        $object_string .=
-          "$vc_var_name  = new Voice_Cmd '$vc_pref $voice_cmds->{$_}[0]';\n";
-        $object_string .=
-          "$vc_var_name -> tie_event('" . $voice_cmds->{$_}[1] . "');\n";
-        $object_string .=
-          ::store_object_data( "$vc_var_name", 'Voice_Cmd', 'PLCBUS',
-            'PLCBUS' );
+        $varlist       .= " $vc_var_name";
+        $object_string .= "$vc_var_name  = new Voice_Cmd '$vc_pref $voice_cmds->{$_}[0]';\n";
+        $object_string .= "$vc_var_name -> tie_event('" . $voice_cmds->{$_}[1] . "');\n";
+        $object_string .= ::store_object_data( "$vc_var_name", 'Voice_Cmd', 'PLCBUS', 'PLCBUS' );
     }
     $object_string = "use vars qw($varlist);\n" . $object_string;
 
@@ -1517,30 +1447,16 @@ sub get_voice_cmds {
             '[on,off,status req,get signal strength,get noise strength,1 phase,3 phase,use mh ini phase mode]',
             "\$$object_name->set(\$state)"
         ],
-        'bright_025' => [
-            'presetdim to 25% within [0,1,2,3,4,5,6,7,8,9,10]s',
-            "\$$object_name->preset_dim_from_voice_cmd( 25, \$state)"
-        ],
-        'bright_050' => [
-            'presetdim to 50% within [0,1,2,3,4,5,6,7,8,9,10]s',
-            "\$$object_name->preset_dim_from_voice_cmd( 50, \$state)"
-        ],
-        'bright_075' => [
-            'presetdim to 75% within [0,1,2,3,4,5,6,7,8,9,10]s',
-            "\$$object_name->preset_dim_from_voice_cmd( 75, \$state)"
-        ],
-        'bright_100' => [
-            'presetdim to 100% within [0,1,2,3,4,5,6,7,8,9,10]s',
-            "\$$object_name->preset_dim_from_voice_cmd(100, \$state)"
-        ],
-        'bright_cmd' => [
-            'bright [25,50,75,100]%',
-            "\$$object_name->command(\"bright\", \$state, 1)"
-        ],
-        'dim_cmd' => [
-            'dim [25,50,75,100]%',
-            "\$$object_name->command(\"dim\", \$state, 1)"
-        ],
+        'bright_025' =>
+          [ 'presetdim to 25% within [0,1,2,3,4,5,6,7,8,9,10]s', "\$$object_name->preset_dim_from_voice_cmd( 25, \$state)" ],
+        'bright_050' =>
+          [ 'presetdim to 50% within [0,1,2,3,4,5,6,7,8,9,10]s', "\$$object_name->preset_dim_from_voice_cmd( 50, \$state)" ],
+        'bright_075' =>
+          [ 'presetdim to 75% within [0,1,2,3,4,5,6,7,8,9,10]s', "\$$object_name->preset_dim_from_voice_cmd( 75, \$state)" ],
+        'bright_100' =>
+          [ 'presetdim to 100% within [0,1,2,3,4,5,6,7,8,9,10]s', "\$$object_name->preset_dim_from_voice_cmd(100, \$state)" ],
+        'bright_cmd' => [ 'bright [25,50,75,100]%', "\$$object_name->command(\"bright\", \$state, 1)" ],
+        'dim_cmd'    => [ 'dim [25,50,75,100]%',    "\$$object_name->command(\"dim\", \$state, 1)" ],
     );
 
     return \%voice_cmds;
@@ -1609,8 +1525,7 @@ sub _set {
 
 sub preset_dim_from_voice_cmd() {
     my ( $self, $brightness, $faderate ) = @_;
-    my $msg =
-      "change preset brightness to $brightness% at a faderate of $faderate seconds for $self->{name} was requested";
+    my $msg = "change preset brightness to $brightness% at a faderate of $faderate seconds for $self->{name} was requested";
     ::respond("$msg");
     $self->preset_dim( $brightness, $faderate );
 }
@@ -1624,14 +1539,7 @@ sub preset_dim {
 }
 
 my @light_cmds = [ "on", "off", "bright", "dim" ];
-my @plc_cmds = [
-    "status req",
-    "blink",
-    "status on",
-    "status off",
-    "get signal strength",
-    "get noise strength"
-];
+my @plc_cmds = [ "status req", "blink", "status on", "status off", "get signal strength", "get noise strength" ];
 
 sub set {
     my ( $self, $new_state, $setby, $respond ) = @_;
diff --git a/lib/Parport_Item.pm b/lib/Parport_Item.pm
index 9f275303a..080acca87 100755
--- a/lib/Parport_Item.pm
+++ b/lib/Parport_Item.pm
@@ -90,8 +90,7 @@ sub new {
         return $self;
     }
     else {
-        &main::print_log(
-            "Parport_Item: ERROR: Unsupported pin ($pin) for $description");
+        &main::print_log("Parport_Item: ERROR: Unsupported pin ($pin) for $description");
         die "Parport_Item: ERROR: Unsupported pin ($pin) for $description";
     }
 }
@@ -117,8 +116,7 @@ sub get_pin_state {
                     || ( $pin_state == '0' ) )
               )
             {
-                &Generic_Item::set_states_for_next_pass( $item, 'off',
-                    'Parallel Port' );
+                &Generic_Item::set_states_for_next_pass( $item, 'off', 'Parallel Port' );
             }
             elsif (
                 ( $item->{'state'} eq 'off' )
@@ -126,8 +124,7 @@ sub get_pin_state {
                     || ( $pin_state == '1' ) )
               )
             {
-                &Generic_Item::set_states_for_next_pass( $item, 'on',
-                    'Parallel Port' );
+                &Generic_Item::set_states_for_next_pass( $item, 'on', 'Parallel Port' );
             }
         }
     }
diff --git a/lib/Philips_Hue.pm b/lib/Philips_Hue.pm
index 45f9129ce..2db5e0ad3 100644
--- a/lib/Philips_Hue.pm
+++ b/lib/Philips_Hue.pm
@@ -145,18 +145,11 @@ sub default_setstate {
     $cmnd = $state if ( $state =~ /\%/ );
 
     return -1
-      if ( $self->state eq $state )
-      ;    # Don't propagate state unless it has changed.
+      if ( $self->state eq $state );    # Don't propagate state unless it has changed.
 
+    ::print_log( 'hue', "Request " . $self->get_object_name . " turn " . $cmnd );
     ::print_log( 'hue',
-        "Request " . $self->get_object_name . " turn " . $cmnd );
-    ::print_log( 'hue',
-            "Command settings: '"
-          . $$self{gateway} . "' - '"
-          . $$self{apikey} . "' - '"
-          . $$self{lamp_id} . "' : '"
-          . $cmnd
-          . "'" );
+        "Command settings: '" . $$self{gateway} . "' - '" . $$self{apikey} . "' - '" . $$self{lamp_id} . "' : '" . $cmnd . "'" );
 
     # Disable the effect commands when we turn off the light
     if ( $cmnd eq 'off' || $cmnd eq 'on' ) {
@@ -182,8 +175,7 @@ sub effect {
 
     my $light_state = $self->state();
 
-    ::print_log( 'hue',
-        "Effect '$effect' request, current lamp state is $light_state" );
+    ::print_log( 'hue', "Effect '$effect' request, current lamp state is $light_state" );
 
     # Do not continue if state is undefined to avoid loops.
     return if ( $light_state eq "" );
@@ -213,9 +205,7 @@ sub bri {
 
     # Sanity check
     if ( !( ( $value =~ /\d+/ ) && ( $value >= 0 ) && ( $value <= 100 ) ) ) {
-        ::print_log(
-            "Brightness value should be in %, but you passed $value. Brightness not set"
-        );
+        ::print_log( "Brightness value should be in %, but you passed $value. Brightness not set" );
         return;
     }
 
@@ -239,9 +229,7 @@ sub ct_k {
 
     # Sanity check
     if ( !( $value =~ /\d+/ ) ) {
-        ::print_log(
-            "Color temperature in Kelvin should be numeric, but you passed $value. Value not set"
-        );
+        ::print_log( "Color temperature in Kelvin should be numeric, but you passed $value. Value not set" );
         return;
     }
 
@@ -329,8 +317,7 @@ sub effect {
 sub ct_k {
     my ( $self, $value ) = @_;
 
-    ::print_log( 'hue',
-        "Setting color temperature not supported on Lux light" );
+    ::print_log( 'hue', "Setting color temperature not supported on Lux light" );
 
     return;
 
@@ -339,16 +326,14 @@ sub ct_k {
 sub hs {
     my ( $self, $hue, $sat ) = @_;
 
-    ::print_log( 'hue',
-        "Setting hue and saturation not supported on Lux light" );
+    ::print_log( 'hue', "Setting hue and saturation not supported on Lux light" );
 
 }
 
 sub hsb {
     my ( $self, $hue, $sat, $bri ) = @_;
 
-    ::print_log( 'hue',
-        "Setting hue, saturation and brightness not supported on Lux light" );
+    ::print_log( 'hue', "Setting hue, saturation and brightness not supported on Lux light" );
 
 }
 
diff --git a/lib/Photocell_Item.pm b/lib/Photocell_Item.pm
index 25114495f..9ceaf4cf5 100644
--- a/lib/Photocell_Item.pm
+++ b/lib/Photocell_Item.pm
@@ -86,14 +86,12 @@ sub set {
     }
 
     if ( ref $p_setby and $p_setby->can('get_set_by') ) {
-        &::print_log(
-            "Photocell_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
+        &::print_log( "Photocell_Item($$self{object_name})::set($p_state, $p_setby): $$p_setby{object_name} was set by "
               . $p_setby->get_set_by )
           if $main::Debug{occupancy};
     }
     else {
-        &::print_log(
-            "Photocell_Item($$self{object_name})::set($p_state, $p_setby)")
+        &::print_log("Photocell_Item($$self{object_name})::set($p_state, $p_setby)")
           if $main::Debug{occupancy};
     }
 
diff --git a/lib/PocketSphinx.pm b/lib/PocketSphinx.pm
index 3a5de9f4e..5c7fea2ce 100644
--- a/lib/PocketSphinx.pm
+++ b/lib/PocketSphinx.pm
@@ -54,8 +54,8 @@ my $s_pocketsphinx = undef;
 my $sentence_file = "$main::config_parms{data_dir}/pocketsphinx/current.sent";
 my $lm_file       = "$main::config_parms{data_dir}/pocketsphinx/current.lm.DMP";
 my $lm_log_file   = "$main::config_parms{data_dir}/pocketsphinx/build_lm.log";
-my $hmm_file   = "/usr/local/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k";
-my $awake_time = 300;
+my $hmm_file      = "/usr/local/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k";
+my $awake_time    = 300;
 
 sub startup {
     if ( not defined $s_pocketsphinx
@@ -68,8 +68,7 @@ sub startup {
         $main::config_parms{voice_cmd} = "pocketsphinx";
 
         # Create a socket for the external VR program to communicate to
-        $s_pocketsphinx =
-          new Socket_Item( undef, undef, 'server_pocketsphinx' );
+        $s_pocketsphinx = new Socket_Item( undef, undef, 'server_pocketsphinx' );
 
         # Setup our callback to get voice commands from the socket
         Voice_Cmd::init_pocketsphinx( \&said );
@@ -85,8 +84,7 @@ sub startup {
         # Create some classes we need
         $p_sphinx = new Process_Item;
         my $friendly_name = "PocketSphinx_Control_p_sphinx";
-        &main::store_object_data( $p_sphinx, 'Process_Item', $friendly_name,
-            $friendly_name );
+        &main::store_object_data( $p_sphinx, 'Process_Item', $friendly_name, $friendly_name );
         $PocketSphinx_state = "idle";
 
         # Now build the language models from the various voice commands.
@@ -98,14 +96,11 @@ sub startup {
         $hmm_file = "$main::config_parms{pocketsphinx_hmm}"
           if exists $main::config_parms{pocketsphinx_hmm};
         if ( !-e $hmm_file ) {
-            &main::print_log(
-                "PocketSphinx_Control:: ERROR: file: $hmm_file MISSING!!");
+            &main::print_log("PocketSphinx_Control:: ERROR: file: $hmm_file MISSING!!");
         }
         else {
-            &::MainLoop_pre_add_hook( \&PocketSphinx_Control::state_machine,
-                'persistent' );
-            &::Reload_pre_add_hook( \&PocketSphinx_Control::restart,
-                'persistent' );
+            &::MainLoop_pre_add_hook( \&PocketSphinx_Control::state_machine, 'persistent' );
+            &::Reload_pre_add_hook( \&PocketSphinx_Control::restart, 'persistent' );
         }
     }
 }
@@ -147,9 +142,7 @@ sub said {
 
         # search for awake phrase
         if ( $main::Save{vr_mode} eq "asleep" ) {
-            foreach (
-                split( /,/, $main::config_parms{pocketsphinx_awake_phrase} ) )
-            {
+            foreach ( split( /,/, $main::config_parms{pocketsphinx_awake_phrase} ) ) {
                 my $token = $_;
 
                 #strip leading/trailing white space
@@ -160,9 +153,7 @@ sub said {
                 if ( $tmp eq $token ) {
                     $text = $tmp;
                 }
-                &main::print_log(
-                    "PocketSphinx_Control:: tmp: $tmp text: $text token: $token"
-                ) if $main::Debug{pocketsphinx};
+                &main::print_log( "PocketSphinx_Control:: tmp: $tmp text: $text token: $token" ) if $main::Debug{pocketsphinx};
             }
         }
         else {
@@ -174,23 +165,19 @@ sub said {
 
 sub state_machine {
     my ($self) = @_;
-    if ( $main::Startup or $main::Reload or ( $PocketSphinx_state eq "reset" ) )
-    {
+    if ( $main::Startup or $main::Reload or ( $PocketSphinx_state eq "reset" ) ) {
         &build_sentence_file($sentence_file);
         $PocketSphinx_state = "build_lm";
         &main::print_log("PocketSphinx_Control:: build_lm")
           if $main::Debug{pocketsphinx};
-        set_errlog $p_sphinx
-          "$main::config_parms{data_dir}/pocketsphinx/build_lm.stderr";
-        set_output $p_sphinx
-          "$main::config_parms{data_dir}/pocketsphinx/build_lm.stdout";
+        set_errlog $p_sphinx "$main::config_parms{data_dir}/pocketsphinx/build_lm.stderr";
+        set_output $p_sphinx "$main::config_parms{data_dir}/pocketsphinx/build_lm.stdout";
         my $pgm_root = "/usr/local/bin";
         if ( $self->{continuous} =~ /(\S+)\/pocketsphinx/ ) {
             $pgm_root = $1;
         }
         my $data_root = "$main::config_parms{data_dir}/pocketsphinx/current";
-        set $p_sphinx
-          "&PocketSphinx_Control::build_lm ('$pgm_root','$data_root','$lm_log_file')";
+        set $p_sphinx "&PocketSphinx_Control::build_lm ('$pgm_root','$data_root','$lm_log_file')";
         start $p_sphinx;
     }
 
@@ -292,31 +279,25 @@ sub build_lm {
 
     my $binary = "$pgm_root/sphinx_lm_convert";
     if ( !-e $binary ) {
-        &main::print_log(
-            "PocketSphinx Control:: ERROR: file: $binary MISSING!!");
-        &main::print_log(
-            "PocketSphinx Control:: Did you forget to install the Cmuclmtk?");
+        &main::print_log("PocketSphinx Control:: ERROR: file: $binary MISSING!!");
+        &main::print_log("PocketSphinx Control:: Did you forget to install the Cmuclmtk?");
     }
 
     open( LOG, ">$logfile" );
 
-    my $cmd =
-      "$pgm_root/text2wfreq < $data_root.sent | $pgm_root/wfreq2vocab > $data_root.vocab";
+    my $cmd = "$pgm_root/text2wfreq < $data_root.sent | $pgm_root/wfreq2vocab > $data_root.vocab";
     print LOG "$cmd\n";
     system $cmd;
 
-    $cmd =
-      "$pgm_root/text2idngram -vocab $data_root.vocab -idngram $data_root.idngram < $data_root.sent";
+    $cmd = "$pgm_root/text2idngram -vocab $data_root.vocab -idngram $data_root.idngram < $data_root.sent";
     print LOG "$cmd\n";
     system $cmd;
 
-    $cmd =
-      "$pgm_root/idngram2lm -vocab_type 0 -idngram $data_root.idngram -vocab $data_root.vocab -arpa $data_root.arpa";
+    $cmd = "$pgm_root/idngram2lm -vocab_type 0 -idngram $data_root.idngram -vocab $data_root.vocab -arpa $data_root.arpa";
     print LOG "$cmd\n";
     system $cmd;
 
-    $cmd =
-      "$pgm_root/sphinx_lm_convert -i $data_root.arpa -o $data_root.lm.DMP";
+    $cmd = "$pgm_root/sphinx_lm_convert -i $data_root.arpa -o $data_root.lm.DMP";
     print LOG "$cmd\n";
     system $cmd;
 
@@ -455,22 +436,17 @@ sub new {
     # create some necessary classes
     $self->{p_sphinx} = new Process_Item;
     my $friendly_name = "PocketSphinx_Listener_p_sphinx_$device";
-    &main::store_object_data( $self->{p_sphinx}, 'Process_Item',
-        $friendly_name, $friendly_name );
+    &main::store_object_data( $self->{p_sphinx}, 'Process_Item', $friendly_name, $friendly_name );
     $self->{t_crash_timer} = new Timer;
     $self->{t_speak_timer} = new Timer;
 
     # file names from the Control portion
-    $self->{log_file} =
-      "$main::config_parms{data_dir}/pocketsphinx/pocketsphinx";
-    $self->{sentence_file} =
-      "$main::config_parms{data_dir}/pocketsphinx/current.sent";
-    $self->{lm_file} =
-      "$main::config_parms{data_dir}/pocketsphinx/current.lm.DMP";
+    $self->{log_file}      = "$main::config_parms{data_dir}/pocketsphinx/pocketsphinx";
+    $self->{sentence_file} = "$main::config_parms{data_dir}/pocketsphinx/current.sent";
+    $self->{lm_file}       = "$main::config_parms{data_dir}/pocketsphinx/current.lm.DMP";
 
     # run parameters
-    $self->{hmm_file} =
-      "/usr/local/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k";
+    $self->{hmm_file}   = "/usr/local/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k";
     $self->{continuous} = "/usr/local/bin/pocketsphinx_continuous";
     $self->{host}       = "localhost";
     $self->{port}       = 3235;
@@ -484,8 +460,7 @@ sub new {
     # runtime maintenance
     $self->{disabled}  = 0;
     $self->{crash_cnt} = 0;
-    &::MainLoop_pre_add_hook( \&PocketSphinx_Listener::state_machine,
-        undef, $self );
+    &::MainLoop_pre_add_hook( \&PocketSphinx_Listener::state_machine, undef, $self );
     &::Reload_pre_add_hook( \&PocketSphinx_Listener::restart, undef, $self );
     &::Speak_parms_add_hook( \&PocketSphinx_Listener::speak, 0 );
 
@@ -537,8 +512,7 @@ sub restore_string {
     my $restore_string = '';
     my $restore_data   = &_trim( $self->{p_sphinx}->restore_string() );
     $restore_data =~ s/\->/\$self\->{p_sphinx}\->/g;
-    $restore_string .=
-      $self->{object_name} . "->{restore_data} = q#$restore_data#;\n";
+    $restore_string .= $self->{object_name} . "->{restore_data} = q#$restore_data#;\n";
     $restore_string .= $self->{object_name} . "->restore();\n"
       if $self->{p_sphinx}->pid();
     return $restore_string;
@@ -558,9 +532,7 @@ sub restore {
     &main::print_log("PocketSphinx_Listener:: restore_string: $restore_data")
       if $main::Debug{pocketsphinx};
     eval $restore_data;
-    &main::print_log(
-        "PocketSphinx_Listener:: restore: Error in Persistent data restore: $@\n"
-    ) if $@;
+    &main::print_log( "PocketSphinx_Listener:: restore: Error in Persistent data restore: $@\n" ) if $@;
     $self->{p_sphinx}->stop();
 }
 
@@ -660,8 +632,7 @@ sub state_machine {
 
     # check to see of the pocketsphinx VR program has completed, check for short crashes (something is wrong)
     if ( $self->{p_sphinx}->done_now() ) {
-        &main::print_log(
-            "PocketSphinx_Listener:: process_done: $self->{device}")
+        &main::print_log("PocketSphinx_Listener:: process_done: $self->{device}")
           if $main::Debug{pocketsphinx};
         if ( &PocketSphinx_Control::get_state() eq 'run_sphinx' ) {
             my $runtime = $self->{p_sphinx}->runtime();
@@ -688,13 +659,10 @@ sub state_machine {
             && $self->{listening}
             && !$self->{t_crash_timer}->active() )
         {
-            &main::print_log(
-                "PocketSphinx_Listener:: run_sphinx $self->{device}")
+            &main::print_log("PocketSphinx_Listener:: run_sphinx $self->{device}")
               if $main::Debug{pocketsphinx};
-            $self->{p_sphinx}
-              ->set_errlog("$self->{log_file}_$self->{device}.stderr");
-            $self->{p_sphinx}
-              ->set_output("$self->{log_file}_$self->{device}.stdout");
+            $self->{p_sphinx}->set_errlog("$self->{log_file}_$self->{device}.stderr");
+            $self->{p_sphinx}->set_output("$self->{log_file}_$self->{device}.stdout");
             $self->{p_sphinx}->set_killsig("TERM");
             my $command = join " ",
               "pocketsphinx ",
@@ -713,8 +681,7 @@ sub state_machine {
             $self->{p_sphinx}->start();
 
             if ( $self->{speak} ) {
-                &main::speak(
-                    "voice recognition system is now available and ready");
+                &main::speak("voice recognition system is now available and ready");
             }
         }
     }
diff --git a/lib/Presence_Monitor.pm b/lib/Presence_Monitor.pm
index 65b1614db..f6b03dc9d 100644
--- a/lib/Presence_Monitor.pm
+++ b/lib/Presence_Monitor.pm
@@ -106,8 +106,7 @@ sub new {
     $$self{m_occupancy_expire}     = 0;
     $$self{wdog_interval}          = 60;
     $$self{m_timer_wdog}           = new Timer;
-    $$self{m_timer_wdog}->set( $self->{wdog_interval},
-        sub { &Presence_Monitor::watch_dog($self) } );
+    $$self{m_timer_wdog}->set( $self->{wdog_interval}, sub { &Presence_Monitor::watch_dog($self) } );
     $$self{debug} = $main::Debug{presence};
     return $self;
 }
@@ -128,23 +127,19 @@ sub watch_dog {
     my ($self) = @_;
     if ( $self->state eq 'occupied' ) {
         if ( !$self->{m_timerOccupancyExpire}->active() ) {
-            &::print_log(
-                "$$self{object_name}: watch_dog, occupied without timer!")
+            &::print_log("$$self{object_name}: watch_dog, occupied without timer!")
               if $self->{debug};
             if ( defined $self->{m_occupancy_expire} ) {
-                &::print_log(
-                    "$$self{object_name}: occupancy timer set $$self{m_occupancy_expire}, watchdog condition!"
-                ) if $self->{debug};
-                $self->{m_timerOccupancyExpire}
-                  ->set( $self->{m_occupancy_expire}, $self );
+                &::print_log( "$$self{object_name}: occupancy timer set $$self{m_occupancy_expire}, watchdog condition!" )
+                  if $self->{debug};
+                $self->{m_timerOccupancyExpire}->set( $self->{m_occupancy_expire}, $self );
                 $self->{wdog_interval} = $self->{m_occupancy_expire} + 2;
             }
         }
     }
 
     # reload the timer
-    $self->{m_timer_wdog}->set( $self->{wdog_interval},
-        sub { &Presence_Monitor::watch_dog($self) } );
+    $self->{m_timer_wdog}->set( $self->{wdog_interval}, sub { &Presence_Monitor::watch_dog($self) } );
 }
 
 sub handle_presence {
@@ -161,11 +156,9 @@ sub handle_presence {
     }
     foreach my $action ( keys %{ $$self{'presence_timers'} } ) {
         foreach my $time ( keys %{ $$self{'presence_timers'}{$action} } ) {
-            unless (
-                $$self{'presence_timers'}{$action}{$time}{'timer'}->active() )
-            {
-                $$self{'presence_timers'}{$action}{$time}{'timer'}->set( $time,
-                    $$self{'presence_timers'}{$action}{$time}{'action'} );
+            unless ( $$self{'presence_timers'}{$action}{$time}{'timer'}->active() ) {
+                $$self{'presence_timers'}{$action}{$time}{'timer'}
+                  ->set( $time, $$self{'presence_timers'}{$action}{$time}{'action'} );
             }
         }
     }
@@ -178,19 +171,15 @@ sub handle_vacancy {
     return unless ( $self->state eq 'occupied' );
     foreach my $action ( keys %{ $$self{'presence_timers'} } ) {
         foreach my $time ( keys %{ $$self{'presence_timers'}{$action} } ) {
-            if ( $$self{'presence_timers'}{$action}{$time}{'timer'}->active() )
-            {
+            if ( $$self{'presence_timers'}{$action}{$time}{'timer'}->active() ) {
                 $$self{'presence_timers'}{$action}{$time}{'timer'}->unset();
             }
         }
     }
     foreach my $action ( keys %{ $$self{'vacancy_timers'} } ) {
         foreach my $time ( keys %{ $$self{'vacancy_timers'}{$action} } ) {
-            unless (
-                $$self{'vacancy_timers'}{$action}{$time}{'timer'}->active() )
-            {
-                $$self{'vacancy_timers'}{$action}{$time}{'timer'}->set( $time,
-                    $$self{'vacancy_timers'}{$action}{$time}{'action'} );
+            unless ( $$self{'vacancy_timers'}{$action}{$time}{'timer'}->active() ) {
+                $$self{'vacancy_timers'}{$action}{$time}{'timer'}->set( $time, $$self{'vacancy_timers'}{$action}{$time}{'action'} );
             }
         }
     }
@@ -206,9 +195,7 @@ sub process_count {
         $$self{m_timerCancelPredict}->set( 60, $self );
 
         #    $$self{m_timerOccupancyExpire}->unset( );
-        &::print_log(
-            "$$self{object_name}: predict timer set 60, marking room as predict"
-        ) if $self->{debug};
+        &::print_log( "$$self{object_name}: predict timer set 60, marking room as predict" ) if $self->{debug};
         $p_state = 'predict';
     }
     elsif ( $l_count >= 1 ) {
@@ -222,11 +209,9 @@ sub process_count {
             and $$self{m_obj}->state =~ /(motion|open)/i )
         {
             #            and ref $p_setby and ref $p_setby->get_set_by and $p_setby->get_set_by eq $$self{m_obj}
-            $$self{m_timerOccupancyExpire}
-              ->set( $$self{m_occupancy_expire}, $self );
-            &::print_log(
-                "$$self{object_name}: occupancy timer set $$self{m_occupancy_expire}, marking room as occupied"
-            ) if $self->{debug};
+            $$self{m_timerOccupancyExpire}->set( $$self{m_occupancy_expire}, $self );
+            &::print_log( "$$self{object_name}: occupancy timer set $$self{m_occupancy_expire}, marking room as occupied" )
+              if $self->{debug};
         }
         elsif ( !( defined $$self{m_occupancy_expire} ) ) {
             $$self{m_timerOccupancyExpire}->unset();
@@ -243,9 +228,7 @@ sub process_count {
         and !$$self{m_timerOccupancyExpire}->active
       )
     {
-        &::print_log(
-            "$$self{object_name}: room count ($l_count) zero, marking room as vacant"
-        ) if $self->{debug};
+        &::print_log( "$$self{object_name}: room count ($l_count) zero, marking room as vacant" ) if $self->{debug};
         $p_state = 'vacant';
         $self->handle_vacancy();
     }
@@ -310,9 +293,7 @@ sub set {
         and $self->state() eq 'predict' )
     {    #timer up reset
         if ( $$self{m_OM}->sensor_count( $$self{m_obj} ) eq -1 ) {
-            &::print_log(
-                "$$self{object_name}: prediction timer expired, marking room as vacant"
-            ) if $self->{debug};
+            &::print_log( "$$self{object_name}: prediction timer expired, marking room as vacant" ) if $self->{debug};
             $$self{m_OM}->sensor_count( $$self{m_obj}, 0 );
             $p_state = 'vacant';
             $self->handle_vacancy();
@@ -326,9 +307,7 @@ sub set {
     {    #timer up
         $p_state = 'vacant';
         $$self{m_OM}->sensor_count( $$self{m_obj}, 0 );
-        &::print_log(
-            "$$self{object_name}: occupancy timer expired, marking room as vacant"
-        ) if $self->{debug};
+        &::print_log( "$$self{object_name}: occupancy timer expired, marking room as vacant" ) if $self->{debug};
         $self->handle_vacancy();
     }
     else {
diff --git a/lib/Process_Item.pm b/lib/Process_Item.pm
index 7a86e7e00..0b0a7aa27 100644
--- a/lib/Process_Item.pm
+++ b/lib/Process_Item.pm
@@ -60,7 +60,7 @@ my ( @active_processes, @done_processes );
 sub new {
     my ( $class, @cmds ) = @_;
     my $self = {};
-    &set( $self, @cmds ) if @cmds; # Optional.  Can be specified later with set.
+    &set( $self, @cmds ) if @cmds;    # Optional.  Can be specified later with set.
     bless $self, $class;
     return $self;
 }
@@ -140,29 +140,20 @@ sub restore_string {
     if ( $self->{cmds} and my $cmds = join( $;, @{ $self->{cmds} } ) ) {
         $cmds =~ s/\n/ /g;         # Avoid new-lines on restored vars
         $cmds =~ s/~/\\~/g;
-        $restore_string .= '@{'
-          . $self->{object_name}
-          . "->{cmds}} = split(\$;, q~$cmds~) if (!exists("
-          . $self->{object_name}
-          . "->{cmds}));";
+        $restore_string .=
+          '@{' . $self->{object_name} . "->{cmds}} = split(\$;, q~$cmds~) if (!exists(" . $self->{object_name} . "->{cmds}));";
     }
-    $restore_string .=
-      $self->{object_name} . "->{cmd_index} = q~$self->{cmd_index}~;\n"
+    $restore_string .= $self->{object_name} . "->{cmd_index} = q~$self->{cmd_index}~;\n"
       if $self->{cmd_index};
-    $restore_string .=
-      $self->{object_name} . "->{timeout} = q~$self->{timeout}~;\n"
+    $restore_string .= $self->{object_name} . "->{timeout} = q~$self->{timeout}~;\n"
       if $self->{timeout};
-    $restore_string .=
-      $self->{object_name} . "->{output} = q~$self->{output}~;\n"
+    $restore_string .= $self->{object_name} . "->{output} = q~$self->{output}~;\n"
       if $self->{output};
-    $restore_string .=
-      $self->{object_name} . "->{errlog} = q~$self->{errlog}~;\n"
+    $restore_string .= $self->{object_name} . "->{errlog} = q~$self->{errlog}~;\n"
       if $self->{errlog};
-    $restore_string .=
-      $self->{object_name} . "->{killsig} = q~$self->{killsig}~;\n"
+    $restore_string .= $self->{object_name} . "->{killsig} = q~$self->{killsig}~;\n"
       if $self->{killsig};
-    $restore_string .=
-      $self->{object_name} . "->{started} = q~$self->{started}~;\n"
+    $restore_string .= $self->{object_name} . "->{started} = q~$self->{started}~;\n"
       if $self->{started};
     $restore_string .= $self->{object_name} . "->{pid} = q~$self->{pid}~;\n"
       if $self->{pid};
@@ -215,15 +206,13 @@ sub start_next {
 
     if ( $type eq 'eval' ) {
         if ($main::OS_win) {
-            my $msg =
-              "Sorry, Process_Item eval fork only supported with linux.\n   cmd=$cmd";
+            my $msg = "Sorry, Process_Item eval fork only supported with linux.\n   cmd=$cmd";
             &main::print_log($msg);
             return;
         }
     }
     else {
-        ( $cmd_path, $cmd_args ) =
-          &main::find_pgm_path($cmd);    # From handy_utilities
+        ( $cmd_path, $cmd_args ) = &main::find_pgm_path($cmd);    # From handy_utilities
         $cmd = "$cmd_path $cmd_args";
     }
 
@@ -232,8 +221,7 @@ sub start_next {
     # Check to see if we have a previous 'start' to this object
     # has not finished yet.
     if ( $pid = $$self{pid} ) {
-        print
-          "Warning, a previous 'start' on this process has not finished yet\n";
+        print "Warning, a previous 'start' on this process has not finished yet\n";
 
         #        print "  The process will not be restarted:  cmd=$cmd\n";
         #        return;
@@ -249,8 +237,7 @@ sub start_next {
         open( STDOUT_REAL, ">&STDOUT" )
           or print "Process_Item Warning, can not backup STDOUT: $!\n";
         open( STDOUT, ">$$self{output}" )
-          or print
-          "Process_Item Warning, can not open output file $$self{output}: $!\n";
+          or print "Process_Item Warning, can not open output file $$self{output}: $!\n";
         print STDOUT_REAL '';    # To avoid the "used only once" perl -w warning
     }
 
@@ -259,8 +246,7 @@ sub start_next {
         open( STDERR_REAL, ">&STDERR" )
           or print "Process_Item Warning, can not backup STDERR: $!\n";
         open( STDERR, ">$$self{errlog}" )
-          or print
-          "Process_Item Warning, can not open errlog file $$self{errlog}: $!\n";
+          or print "Process_Item Warning, can not open errlog file $$self{errlog}: $!\n";
         print STDERR_REAL '';    # To avoid the "used only once" perl -w warning
     }
 
@@ -283,8 +269,7 @@ sub start_next {
         $cflag = 0;    # Avoid uninit warnings
 
         &Win32::Process::Create( $pid, $cmd_path, $cmd, 0, $cflag, '.' )
-          or warn
-          "Process_Item Warning, start Process error: cmd_path=$cmd_path\n -  cmd=$cmd   error=",
+          or warn "Process_Item Warning, start Process error: cmd_path=$cmd_path\n -  cmd=$cmd   error=",
           Win32::FormatMessage( Win32::GetLastError() ), "\n";
 
         open( STDOUT, ">&STDOUT_REAL" ) if $$self{output};
@@ -308,8 +293,7 @@ sub start_next {
               if $main::Debug{process};
             if ( $type eq 'eval' ) {
 
-                package main
-                  ; # Had to do this to get the 'speak' function recognized without having to &main::speak() it
+                package main;    # Had to do this to get the 'speak' function recognized without having to &main::speak() it
                 eval $cmd;
                 print "Process Eval results: $@\n";
 
@@ -330,8 +314,7 @@ sub start_next {
                 # check if nice_level defined and if so, use it
                 my $nice_level = $self->nice_level;
                 if ( defined $nice_level ) {
-                    print
-                      "Process start: adjusting nice level to: $nice_level\n"
+                    print "Process start: adjusting nice level to: $nice_level\n"
                       if $main::Debug{process};
                     exec "nice --adjustment=$nice_level $cmd_path $cmd_args";
                 }
@@ -424,8 +407,7 @@ sub harvest {
         if ( defined $$process{timeout}
             and $time > ( $$process{timeout} + $$process{started} ) )
         {
-            print
-              "Process timed out process=$$process{object_name} pid=$pid cmd=@{$$process{cmds}} timeout=$$process{timeout}\n"
+            print "Process timed out process=$$process{object_name} pid=$pid cmd=@{$$process{cmds}} timeout=$$process{timeout}\n"
               if $main::Debug{process};
             $$process{timed_out} = $time;
             $process->stop();
@@ -436,14 +418,12 @@ sub harvest {
         # last restart of misterhouse.  If the process was started before the last hard restart,
         # the process will not be a waiting child of misterhouse and will only appear in /proc.
         if (   ( $main::OS_win and $pid->Wait(0) )
-            or
-            ( !$main::OS_win and waitpid( $pid, 1 ) and !( -e "/proc/$pid" ) )
+            or ( !$main::OS_win and waitpid( $pid, 1 ) and !( -e "/proc/$pid" ) )
             or ( $$process{timed_out} ) )
         {
             # Mark as done or start the next cmd?
             if ( $$process{cmd_index} < @{ $$process{cmds} } ) {
-                print
-                  "Process starting next cmd process=$$process{object_name} pid=$pid index=$$process{cmd_index}\n"
+                print "Process starting next cmd process=$$process{object_name} pid=$pid index=$$process{cmd_index}\n"
                   if $main::Debug{process};
                 delete $$process{pid};
                 &start_next($process);
@@ -454,8 +434,7 @@ sub harvest {
                 $$process{done} = $time;
                 delete $$process{pid};
                 delete $$process{started};
-                print
-                  "Process done_now process=$$process{object_name} pid=$pid to=$$process{timed_out} cmd=@{$$process{cmds}}\n"
+                print "Process done_now process=$$process{object_name} pid=$pid to=$$process{timed_out} cmd=@{$$process{cmds}}\n"
                   if $main::Debug{process};
             }
         }
@@ -485,8 +464,7 @@ sub stop {
         $$process{runtime} = time - $$process{started};
         delete $$process{pid};
         delete $$process{started};
-        print
-          "\nKilling unfinished process id $pid for $process cmd @{$$process{cmds}}\n"
+        print "\nKilling unfinished process id $pid for $process cmd @{$$process{cmds}}\n"
           if $main::Debug{process};
         if ($main::OS_win) {
 
diff --git a/lib/Pushbullet.pm b/lib/Pushbullet.pm
index 7c6de2bac..52905342a 100644
--- a/lib/Pushbullet.pm
+++ b/lib/Pushbullet.pm
@@ -97,9 +97,7 @@ sub new {
     my ( $class, $params ) = @_;
 
     if ( defined $params && ref($params) ne 'HASH' ) {
-        &::print_log(
-            "[Pushbullet] ERROR!  Pushbullet->new() invalid parameter hash - Pushbullet disabled"
-        );
+        &::print_log( "[Pushbullet] ERROR!  Pushbullet->new() invalid parameter hash - Pushbullet disabled" );
         $params = {};
         $params->{disable} = 1;
     }
@@ -109,7 +107,7 @@ sub new {
     my $self = {};
 
     # Set configuration defaults
-    $self->{config}{speak} = 1;    # Speak notifications and acknowledgments
+    $self->{config}{speak}  = 1;                               # Speak notifications and acknowledgments
     $self->{config}{server} = 'https://api.pushbullet.com/';
 
     # mh.private.ini settings override the defaults
@@ -179,8 +177,8 @@ sub push_note {
 
     $params = $self->_check_params_hash($params);
     $params->{type} = "note";    #Force type to note when using this function
-    $params->{body}   = $message || " ";
-    $params->{title}  = $title || " ";
+    $params->{body}  = $message || " ";
+    $params->{title} = $title   || " ";
     $params->{action} = "POST";
     $params->{path}   = "v2/pushes";
 
@@ -205,9 +203,9 @@ sub push_link {
     my ( $self, $title, $url, $params ) = @_;
 
     $params = $self->_check_params_hash($params);
-    $params->{type} = "link";       #Force type to note when using this function
-    $params->{url} = $url || " ";
-    $params->{title}  = $title || " ";
+    $params->{type} = "link";    #Force type to note when using this function
+    $params->{url}   = $url   || " ";
+    $params->{title} = $title || " ";
     $params->{action} = "POST";
     $params->{path}   = "v2/pushes";
 
@@ -226,7 +224,7 @@ sub push_address {
 
     $params = $self->_check_params_hash($params);
     $params->{type} = "address";    #Force type to note when using this function
-    $params->{name} = $name || " ";
+    $params->{name}    = $name    || " ";
     $params->{address} = $address || " ";
     $params->{action}  = "POST";
     $params->{path}    = "v2/pushes";
@@ -286,7 +284,7 @@ sub push_file {
     $params->{type} = "file";    #Force type to note when using this function
     $params->{file_name} = $file_name || " ";
     $params->{file_type} = $file_type || " ";
-    $params->{file_url}  = $file_url || " ";
+    $params->{file_url}  = $file_url  || " ";
     $params->{action}    = "POST";
     $params->{path}      = "v2/pushes";
 
@@ -344,18 +342,15 @@ sub push_hash {
     my $disable = $params->{disable};
     my $note = ($disable) ? '- Notifications disabled' : '';
 
-    &::print_log( "[Pushbullet] Push Hash parameters: "
-          . Data::Dumper::Dumper( \$callparams ) )
+    &::print_log( "[Pushbullet] Push Hash parameters: " . Data::Dumper::Dumper( \$callparams ) )
       if TRACE;
 
     # Form browser and request
     my $browser = LWP::UserAgent->new;
-    my $req     = HTTP::Request->new(
-        $params->{action} => $params->{server} . $params->{path} );
+    my $req = HTTP::Request->new( $params->{action} => $params->{server} . $params->{path} );
     if ( keys $callparams ) {
         $req->content( JSON::encode_json($callparams) );
-        $req->content_type('application/json')
-          ;    # Posting JSON content is preferred
+        $req->content_type('application/json');    # Posting JSON content is preferred
     }
     $req->authorization_basic( $params->{token}, "" );
     my $resp;
@@ -373,8 +368,7 @@ sub push_hash {
 
     return if $disable;    # Don't check the response if posting is disabled
 
-    &::print_log(
-        "[Pushbullet] Notify results: " . Data::Dumper::Dumper( \$resp ) )
+    &::print_log( "[Pushbullet] Notify results: " . Data::Dumper::Dumper( \$resp ) )
       if TRACE;
 
     my $decoded_json = JSON::decode_json( $resp->content() );
@@ -388,9 +382,7 @@ sub push_hash {
         return $decoded_json->{'iden'};
     }
     else {
-        &::print_log(
-            "[Pushbullet] ERROR: POST Failed: Status: $decoded_json->{error}{type} - $decoded_json->{error}{message} "
-        );
+        &::print_log( "[Pushbullet] ERROR: POST Failed: Status: $decoded_json->{error}{type} - $decoded_json->{error}{message} " );
         return;
     }
 }
@@ -449,9 +441,7 @@ sub upload_file {
 sub _check_params_hash {
     my ( $self, $params ) = @_;
     if ( defined $params && ref($params) ne 'HASH' ) {
-        &::print_log(
-            "[Pushbullet] ERROR! called with invalid parameter hash - passed parameters ignored"
-        );
+        &::print_log( "[Pushbullet] ERROR! called with invalid parameter hash - passed parameters ignored" );
         return {};
     }
     else {
diff --git a/lib/Pushover.pm b/lib/Pushover.pm
index 0f30cef37..dc19cab8a 100644
--- a/lib/Pushover.pm
+++ b/lib/Pushover.pm
@@ -75,9 +75,8 @@ use LWP::UserAgent;
 use Digest::MD5;
 use JSON;
 
-use constant TRACE => 0;    # enable for verbose tracing
-use constant DUPWINDOW =>
-  60;    # Time period in seconds to check for a duplicate message
+use constant TRACE     => 0;     # enable for verbose tracing
+use constant DUPWINDOW => 60;    # Time period in seconds to check for a duplicate message
 
 =head2 METHODS
 
@@ -112,9 +111,7 @@ sub new {
     my ( $class, $params ) = @_;
 
     if ( defined $params && ref($params) ne 'HASH' ) {
-        &::print_log(
-            "[Pushover] ERROR!  Pushover->new() invalid parameter hash - Pushover disabled"
-        );
+        &::print_log( "[Pushover] ERROR!  Pushover->new() invalid parameter hash - Pushover disabled" );
         $params = {};
         $params->{disable} = 1;
     }
@@ -134,16 +131,13 @@ sub new {
 
     # initialize rudimentary duplicate message rate limiting
     my $lastSent = {};
-    $self->{_lastSent} =
-      $lastSent;              # Hash of message identifiers & time last sent
+    $self->{_lastSent} = $lastSent;    # Hash of message identifiers & time last sent
 
     # Internal parameters, Should not be overridden
     # Initialize array to track receipts and acknowledgements
     my $receipts = {};
-    $self->{_receipts} =
-      $receipts;    # Ref for the array of pending acknowledgments
-    $self->{_receiptTimer} =
-      Timer->new();    # Ref for the Timer object for acknowledgment checking
+    $self->{_receipts}     = $receipts;       # Ref for the array of pending acknowledgments
+    $self->{_receiptTimer} = Timer->new();    # Ref for the Timer object for acknowledgment checking
 
     my $note = ( $self->{disable} ) ? '- Notifications disabled' : '';
 
@@ -188,12 +182,8 @@ sub notify {
     my $disable = $self->{disable};
 
     if ( defined $params && ref($params) ne 'HASH' ) {
-        &::print_log(
-            "[Pushover] ERROR!  notify called with invalid parameter hash - parameters ignored"
-        );
-        &::print_log(
-            "[Pushover] Usage: ->push(\"Message\", { priority => 1, title => \"Some title\"})"
-        );
+        &::print_log( "[Pushover] ERROR!  notify called with invalid parameter hash - parameters ignored" );
+        &::print_log( "[Pushover] Usage: ->push(\"Message\", { priority => 1, title => \"Some title\"})" );
     }
     else {
         $disable = $params->{disable} if ( defined $params->{disable} );
@@ -204,7 +194,7 @@ sub notify {
     # Copy the calling hash since we need to modify it.
     if ( defined $params && ref($params) eq 'HASH' ) {
         foreach ( keys %{$params} ) {
-            next if ( $_ eq 'disable' );   # internal override, not for pushover
+            next if ( $_ eq 'disable' );    # internal override, not for pushover
             $callparms->{$_} = $params->{$_};
         }
     }
@@ -225,22 +215,15 @@ sub notify {
         $callparms->{expire} = 86400 if ( $callparms->{expire} > 86400 );
     }
 
-    &::print_log(
-        "[Pushover] Notify parameters: " . Data::Dumper::Dumper( \$callparms ) )
+    &::print_log( "[Pushover] Notify parameters: " . Data::Dumper::Dumper( \$callparms ) )
       if TRACE;
 
     my $msgsig =
-      Digest::MD5::md5_base64( $callparms->{message}
-          . $callparms->{user}
-          . $callparms->{priority}
-          . $callparms->{title} );
+      Digest::MD5::md5_base64( $callparms->{message} . $callparms->{user} . $callparms->{priority} . $callparms->{title} );
 
     if ( my $lasttime = $self->{_lastSent}{$msgsig} ) {
         if ( time() < $lasttime + DUPWINDOW ) {
-            &::print_log(
-                "[Pushover] Skipped duplicate notification: $callparms->{message} within "
-                  . DUPWINDOW
-                  . " seconds." );
+            &::print_log( "[Pushover] Skipped duplicate notification: $callparms->{message} within " . DUPWINDOW . " seconds." );
             return;
         }
     }
@@ -248,9 +231,7 @@ sub notify {
     $self->{_lastSent}{$msgsig} = time();
 
     my $resp;
-    $resp =
-      LWP::UserAgent->new()
-      ->post( $self->{server} . '1/messages.json', $callparms, )
+    $resp = LWP::UserAgent->new()->post( $self->{server} . '1/messages.json', $callparms, )
       unless $disable;
     &::print_log("[Pushover] message: $callparms->{message} $note");
     &::speak("Pushover notification $callparms->{message} $note")
@@ -258,8 +239,7 @@ sub notify {
 
     return if $disable;    # Don't check the response if posting is disabled
 
-    &::print_log(
-        "[Pushover] Notify results: " . Data::Dumper::Dumper( \$resp ) )
+    &::print_log( "[Pushover] Notify results: " . Data::Dumper::Dumper( \$resp ) )
       if TRACE;
 
     my $decoded_json = JSON::decode_json( $resp->content() );
@@ -276,9 +256,7 @@ sub notify {
 
     }
     else {
-        &::print_log(
-            "[Pushover] ERROR: POST Failed: Status: $decoded_json->{status} - $decoded_json->{errors} "
-        );
+        &::print_log( "[Pushover] ERROR: POST Failed: Status: $decoded_json->{status} - $decoded_json->{errors} " );
     }
 
     &::print_log( "[Pushover] " . Data::Dumper::Dumper( \$self ) ) if TRACE;
@@ -305,39 +283,27 @@ sub _checkReceipt {
     }
 
     foreach ( keys %{ $self->{_receipts} } ) {
-        my $resp =
-          LWP::UserAgent->new()
-          ->get(
-            "$self->{server}" . "1/receipts/$_.json?token=$self->{token}" );
+        my $resp = LWP::UserAgent->new()->get( "$self->{server}" . "1/receipts/$_.json?token=$self->{token}" );
         if ( $resp->is_success() ) {
-            &::print_log( "[Pushover] Get for Receipt check succeeded:"
-                  . Data::Dumper::Dumper( \$resp ) )
+            &::print_log( "[Pushover] Get for Receipt check succeeded:" . Data::Dumper::Dumper( \$resp ) )
               if TRACE;
             my $decoded_json = JSON::decode_json( $resp->content() );
             if ( $decoded_json->{acknowledged} ) {
-                &::print_log( "[Pushover] "
-                      . $self->{_receipts}{$_}
-                      . ": Message has been acknowledged" );
-                &::speak(
-                    "Pushover message acknowledged: $self->{_receipts}{$_}")
+                &::print_log( "[Pushover] " . $self->{_receipts}{$_} . ": Message has been acknowledged" );
+                &::speak("Pushover message acknowledged: $self->{_receipts}{$_}")
                   if $self->{speak};
                 delete $self->{_receipts}{$_};
             }
             elsif ( $decoded_json->{expired} ) {
-                &::speak(
-                    "Pushover message expired without acknowledment: $self->{_receipts}{$_}"
-                ) if $self->{speak};
-                &::print_log( "[Pushover] "
-                      . $self->{_receipts}{$_}
-                      . ": Message has expired without acknowledgment" );
+                &::speak( "Pushover message expired without acknowledment: $self->{_receipts}{$_}" ) if $self->{speak};
+                &::print_log( "[Pushover] " . $self->{_receipts}{$_} . ": Message has expired without acknowledgment" );
                 delete $self->{_receipts}{$_};
             }
 
             # else - still waiting for an ack or expiration.
         }
         else {
-            &::print_log( "[Pushover] ERROR: Get for receipt check failed:"
-                  . Data::Dumper::Dumper( \$resp ) );
+            &::print_log( "[Pushover] ERROR: Get for receipt check failed:" . Data::Dumper::Dumper( \$resp ) );
             delete $self->{_receipts}{$_};
         }
     }
diff --git a/lib/RCS_Item.pm b/lib/RCS_Item.pm
index 940ce8d06..94adb1bff 100644
--- a/lib/RCS_Item.pm
+++ b/lib/RCS_Item.pm
@@ -79,19 +79,10 @@ sub new {
         "Decode Table 4"
     );
 
-    my @RCS_table_req_status = (
-        "Request Temp",
-        "Request Setpoint",
-        "Request Mode",
-        "Request Fan",
-        "Request SB Mode",
-        "Request SB Delta"
-    );
+    my @RCS_table_req_status =
+      ( "Request Temp", "Request Setpoint", "Request Mode", "Request Fan", "Request SB Mode", "Request SB Delta" );
 
-    my @RCS_table_report_status = (
-        "Off",       "Heat",       "Cool",          "Auto",
-        "Fan is On", "Fan is Off", "Setback is On", "Setback is Off"
-    );
+    my @RCS_table_report_status = ( "Off", "Heat", "Cool", "Auto", "Fan is On", "Fan is Off", "Setback is On", "Setback is Off" );
 
     my $i = 0;
     for my $hc (qw(M N O P C D A B E F G H K L I J)) {
@@ -101,38 +92,27 @@ sub new {
         #       $self -> add ($id . '1' . $hc . 'PRESET_DIM1',   4 + $i . ' degrees', 'setpoint');
         #       $self -> add ($id . '1' . $hc . 'PRESET_DIM2',  20 + $i . ' degrees', 'setpoint');
         #       $self -> add ($id . '2' . $hc . 'PRESET_DIM1',  36 + $i . ' degrees', 'setpoint');
-        $self->add( $id . '2' . $hc . 'PRESET_DIM2',
-            52 + $i . ' degrees', 'setpoint' );
-        $self->add( $id . '3' . $hc . 'PRESET_DIM1',
-            68 + $i . ' degrees', 'setpoint' );
-        $self->add( $id . '3' . $hc . 'PRESET_DIM2',
-            84 + $i . ' degrees', 'setpoint' );
-        $self->add( $id . '9' . $hc . 'PRESET_DIM1',
-            100 + $i . ' degrees', 'setpoint' );
-        $self->add( $id . '9' . $hc . 'PRESET_DIM2',
-            116 + $i . ' degrees', 'setpoint' );
+        $self->add( $id . '2' . $hc . 'PRESET_DIM2', 52 + $i . ' degrees',  'setpoint' );
+        $self->add( $id . '3' . $hc . 'PRESET_DIM1', 68 + $i . ' degrees',  'setpoint' );
+        $self->add( $id . '3' . $hc . 'PRESET_DIM2', 84 + $i . ' degrees',  'setpoint' );
+        $self->add( $id . '9' . $hc . 'PRESET_DIM1', 100 + $i . ' degrees', 'setpoint' );
+        $self->add( $id . '9' . $hc . 'PRESET_DIM2', 116 + $i . ' degrees', 'setpoint' );
 
         # unit 4 -> send command
-        $self->add( $id . '4' . $hc . 'PRESET_DIM1',
-            $RCS_table_send_cmd[$i], 'cmd' );
-        $self->add( $id . '4' . $hc . 'PRESET_DIM2',
-            $RCS_table_send_cmd[ 16 + $i ], 'cmd' );
+        $self->add( $id . '4' . $hc . 'PRESET_DIM1', $RCS_table_send_cmd[$i],        'cmd' );
+        $self->add( $id . '4' . $hc . 'PRESET_DIM2', $RCS_table_send_cmd[ 16 + $i ], 'cmd' );
 
         # unit 5 -> request status
-        $self->add( $id . '5' . $hc . 'PRESET_DIM1',
-            $RCS_table_req_status[$i], 'request' )
+        $self->add( $id . '5' . $hc . 'PRESET_DIM1', $RCS_table_req_status[$i], 'request' )
           if $i < 6;
 
         # unit 6 -> report status
-        $self->add( $id . '6' . $hc . 'PRESET_DIM1',
-            $RCS_table_report_status[$i], 'status' )
+        $self->add( $id . '6' . $hc . 'PRESET_DIM1', $RCS_table_report_status[$i], 'status' )
           if $i < 8;
 
         # unit 10 -> echo responses
-        $self->add( $id . 'A' . $hc . 'PRESET_DIM1',
-            'Echo:' . $RCS_table_send_cmd[$i], 'echo' );
-        $self->add( $id . 'A' . $hc . 'PRESET_DIM2',
-            'Echo:' . $RCS_table_send_cmd[ 16 + $i ], 'echo' );
+        $self->add( $id . 'A' . $hc . 'PRESET_DIM1', 'Echo:' . $RCS_table_send_cmd[$i],        'echo' );
+        $self->add( $id . 'A' . $hc . 'PRESET_DIM2', 'Echo:' . $RCS_table_send_cmd[ 16 + $i ], 'echo' );
 
         # unit 11,12,13,14,15,16 -> report temperature
         # Disabled by default to minimize menu select lists size (do you really want to set your thermostat to -60?
@@ -140,22 +120,14 @@ sub new {
         #        $self -> add ($id . 'B' . $hc . 'PRESET_DIM2', -44 + $i . " degrees ", 'temp');
         #        $self -> add ($id . 'C' . $hc . 'PRESET_DIM1', -28 + $i . " degrees ", 'temp');
         #        $self -> add ($id . 'C' . $hc . 'PRESET_DIM2', -12 + $i . " degrees ", 'temp');
-        $self->add( $id . 'D' . $hc . 'PRESET_DIM1',
-            4 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'D' . $hc . 'PRESET_DIM2',
-            20 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'E' . $hc . 'PRESET_DIM1',
-            36 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'E' . $hc . 'PRESET_DIM2',
-            52 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'F' . $hc . 'PRESET_DIM1',
-            68 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'F' . $hc . 'PRESET_DIM2',
-            84 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'G' . $hc . 'PRESET_DIM1',
-            100 + $i . " degrees ", 'temp' );
-        $self->add( $id . 'G' . $hc . 'PRESET_DIM2',
-            116 + $i . " degrees ", 'temp' );
+        $self->add( $id . 'D' . $hc . 'PRESET_DIM1', 4 + $i . " degrees ",   'temp' );
+        $self->add( $id . 'D' . $hc . 'PRESET_DIM2', 20 + $i . " degrees ",  'temp' );
+        $self->add( $id . 'E' . $hc . 'PRESET_DIM1', 36 + $i . " degrees ",  'temp' );
+        $self->add( $id . 'E' . $hc . 'PRESET_DIM2', 52 + $i . " degrees ",  'temp' );
+        $self->add( $id . 'F' . $hc . 'PRESET_DIM1', 68 + $i . " degrees ",  'temp' );
+        $self->add( $id . 'F' . $hc . 'PRESET_DIM2', 84 + $i . " degrees ",  'temp' );
+        $self->add( $id . 'G' . $hc . 'PRESET_DIM1', 100 + $i . " degrees ", 'temp' );
+        $self->add( $id . 'G' . $hc . 'PRESET_DIM2', 116 + $i . " degrees ", 'temp' );
 
         $i++;
     }
@@ -216,8 +188,7 @@ sub list {
 
 sub list_by_type {
     my ( $self, $cmd_type ) = @_;
-    print
-      "RCS_item list: self=$self members=@{$$self{members_by_type}{$cmd_type}}\n"
+    print "RCS_item list: self=$self members=@{$$self{members_by_type}{$cmd_type}}\n"
       if $main::Debug{rcs};
     return sort @{ $$self{members_by_type}{$cmd_type} };
 }
diff --git a/lib/RCSs.pm b/lib/RCSs.pm
index b573f0dbe..224065511 100644
--- a/lib/RCSs.pm
+++ b/lib/RCSs.pm
@@ -52,7 +52,7 @@ sub serial_startup {
         $count = 0;
     }
 
-    if ( 1 == scalar @RCSs_Thermistat_Ports ) {   # Add hooks on first call only
+    if ( 1 == scalar @RCSs_Thermistat_Ports ) {    # Add hooks on first call only
         &::MainLoop_pre_add_hook( \&RCSs::check_for_data, 1 );
     }
 
@@ -208,15 +208,13 @@ sub _poll {
 
 sub heating_cycle_time {
     my ( $self, $time ) = @_;
-    print
-      "$::Time_Date: RCSs -> Heat cycle time $time IGNORED: controller enforces embedded cycle time\n"
+    print "$::Time_Date: RCSs -> Heat cycle time $time IGNORED: controller enforces embedded cycle time\n"
       unless $main::config_parms{no_log} =~ /RCSs/;
 }
 
 sub cooling_cycle_time {
     my ( $self, $time ) = @_;
-    print
-      "$::Time_Date: RCSs -> Cool cycle time $time IGNORED: controller enforces embedded cycle time\n"
+    print "$::Time_Date: RCSs -> Cool cycle time $time IGNORED: controller enforces embedded cycle time\n"
       unless $main::config_parms{no_log} =~ /RCSs/;
 }
 
diff --git a/lib/RCSsTR40.pm b/lib/RCSsTR40.pm
index 3f26aae97..eed8b297a 100644
--- a/lib/RCSsTR40.pm
+++ b/lib/RCSsTR40.pm
@@ -154,7 +154,7 @@ sub serial_startup {
 
     &::serial_port_create( $instance, $port, $speed );
 
-    if ( 1 == scalar( keys %RCSsTR40_Data ) ) {   # Add hooks on first call only
+    if ( 1 == scalar( keys %RCSsTR40_Data ) ) {    # Add hooks on first call only
         &::MainLoop_post_add_hook( \&RCSsTR40::poll_all, 1 );
         &::MainLoop_pre_add_hook( \&RCSsTR40::check_for_data, 1 );
     }
@@ -189,16 +189,13 @@ sub check_for_data {
             # User changed something and a status message was sent... but for some
             # reason the status message sent doesn't usually (ever?) contain the
             # actual change.  So, make sure we requset a full status update.
-            print
-              "RCSs_TR40: Received status report... requesting full report\n"
+            print "RCSs_TR40: Received status report... requesting full report\n"
               unless $main::config_parms{no_log} =~ /RCSsTR40/;
             $RCSsTR40_Data{$port_name}{'send_count'}++;
             $RCSsTR40_Data{$port_name}{'obj'}->_poll();
         }
         $main::Serial_Ports{$port_name}{data_record} = '';
-        if ( ( $RCSsTR40_Data{$port_name}{'obj'}->{'last_change'} + 5 ) ==
-            $main::Time )
-        {
+        if ( ( $RCSsTR40_Data{$port_name}{'obj'}->{'last_change'} + 5 ) == $main::Time ) {
             $RCSsTR40_Data{$port_name}{'obj'}->{'last_change'} = 0;
             $RCSsTR40_Data{$port_name}{'obj'}->_poll();
         }
@@ -222,15 +219,9 @@ sub new {
     bless $self, $class;
     $RCSsTR40_Data{$port_name}{'obj'}        = $self;
     $RCSsTR40_Data{$port_name}{'send_count'} = 0;
-    push(
-        @{ $$self{states} },
-        'temp_change',    'outside_temp_change', 'heat_sp_change',
-        'cool_sp_change', 'off',                 'heat',
-        'cool',           'auto',                'emerg_heat',
-        'invalid',        'fan_on',              'fan_auto',
-        'hold',           'run',                 'vacation',
-        'no_vacation'
-    );
+    push( @{ $$self{states} },
+        'temp_change', 'outside_temp_change', 'heat_sp_change', 'cool_sp_change', 'off', 'heat', 'cool', 'auto', 'emerg_heat',
+        'invalid', 'fan_on', 'fan_auto', 'hold', 'run', 'vacation', 'no_vacation' );
     $self->_get_times();
     $self->_poll();
     return $self;
@@ -488,8 +479,7 @@ sub create_schedule_entry {
     $hour =~ s/^\d$/0$hour/;
     $heat =~ s/^\d$/0$heat/;
     $cool =~ s/^\d$/0$cool/;
-    print
-      "$::Time_Date: RCSsTR40 -> Set Schedule: $day/$entry=$hour$min$heat$cool\n"
+    print "$::Time_Date: RCSsTR40 -> Set Schedule: $day/$entry=$hour$min$heat$cool\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     $self->_send_cmd("SE$day/$entry=$hour$min$heat$cool");
 }
@@ -557,13 +547,11 @@ sub send_text_msg {
     print "$::Time_Date: RCSsTR40 -> Send Text message: $msg\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     if ( $msg =~ /\"/ ) {
-        print
-          "$::Time_Date: RCSsTR40 -> send_text_msg ERROR message contains double-quotes: $msg\n";
+        print "$::Time_Date: RCSsTR40 -> send_text_msg ERROR message contains double-quotes: $msg\n";
         return;
     }
     if ( length($msg) > 80 ) {
-        print
-          "$::Time_Date: RCSsTR40 -> send_text_msg ERROR message is longer than 80 characters: $msg\n";
+        print "$::Time_Date: RCSsTR40 -> send_text_msg ERROR message is longer than 80 characters: $msg\n";
         return;
     }
     $self->_send_cmd("TM=\"$msg\"");
@@ -580,15 +568,13 @@ sub cool_setpoint {
     print "$::Time_Date: RCSsTR40 -> Cool setpoint $temp\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     if ( $temp !~ /^\d+$/ ) {
-        print
-          "$::Time_Date: RCSsTR40 -> cool_setpoint ERROR $temp not numeric\n";
+        print "$::Time_Date: RCSsTR40 -> cool_setpoint ERROR $temp not numeric\n";
         return;
     }
     if (   ( $temp < $$self{'cool_min_limit'} )
         or ( $temp > $$self{'cool_max_limit'} ) )
     {
-        print
-          "$::Time_Date: RCSsTR40 -> cool_setpoint WARNING temp '$temp' is outside of limits\n";
+        print "$::Time_Date: RCSsTR40 -> cool_setpoint WARNING temp '$temp' is outside of limits\n";
         return;
     }
     $$self{'cool_sp'}         = $temp;
@@ -607,15 +593,13 @@ sub heat_setpoint {
     print "$::Time_Date: RCSsTR40 -> Heat setpoint $temp\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     if ( $temp !~ /^\d+$/ ) {
-        print
-          "$::Time_Date: RCSsTR40 -> heat_setpoint ERROR $temp not numeric\n";
+        print "$::Time_Date: RCSsTR40 -> heat_setpoint ERROR $temp not numeric\n";
         return;
     }
     if (   ( $temp < $$self{'heat_min_limit'} )
         or ( $temp > $$self{'heat_max_limit'} ) )
     {
-        print
-          "$::Time_Date: RCSsTR40 -> heat_setpoint WARNING temp '$temp' is outside of limits\n";
+        print "$::Time_Date: RCSsTR40 -> heat_setpoint WARNING temp '$temp' is outside of limits\n";
         return;
     }
     $$self{'heat_sp'}         = $temp;
@@ -635,8 +619,7 @@ sub set_outside_temp {
     print "$::Time_Date: RCSsTR40 -> Set outside temp: $temp\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     if ( $temp !~ /^\d+$/ ) {
-        print
-          "$::Time_Date: RCSsTR40 -> set_outside_temp ERROR $temp not numeric\n";
+        print "$::Time_Date: RCSsTR40 -> set_outside_temp ERROR $temp not numeric\n";
         return;
     }
     $$self{'outside_temp'} = $temp;
@@ -656,8 +639,7 @@ sub set_remote_temp {
     print "$::Time_Date: RCSsTR40 -> Set remote temp: $temp\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     if ( $temp !~ /^\d+$/ ) {
-        print
-          "$::Time_Date: RCSsTR40 -> set_remote_temp ERROR $temp not numeric\n";
+        print "$::Time_Date: RCSsTR40 -> set_remote_temp ERROR $temp not numeric\n";
         return;
     }
     $self->_send_cmd("RT=$temp");
@@ -672,8 +654,7 @@ that the module automatically calls this once per hour.
 
 sub set_date_time {
     my ($self) = @_;
-    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday ) =
-      localtime $main::Time;
+    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday ) = localtime $main::Time;
     $Year += 1900;
     $Wday++;
     $Second =~ s/^\d$/0$Second/;
@@ -683,8 +664,7 @@ sub set_date_time {
     $Year =~ s/^\d\d(\d\d)$/$1/;
     my $time = "$Hour:$Minute:$Second";
     my $date = "$Month:$Mday:$Year";
-    print
-      "$::Time_Date: RCSsTR40 -> Set date ($date), time ($time), and weekday ($Wday)\n"
+    print "$::Time_Date: RCSsTR40 -> Set date ($date), time ($time), and weekday ($Wday)\n"
       unless $main::config_parms{no_log} =~ /RCSsTR40/;
     $self->_send_cmd("TIME=$time DATE=$date DOW=$Wday");
 }
@@ -717,9 +697,7 @@ sub auto_set_outside_temp {
 sub _check_auto_outside_temp {
     my ($self) = @_;
     if ( ref $$self{'auto_outside_temp_ref'} ) {
-        if ( ${ $$self{'auto_outside_temp_ref'} } !=
-            $$self{'last_auto_outside_temp'} )
-        {
+        if ( ${ $$self{'auto_outside_temp_ref'} } != $$self{'last_auto_outside_temp'} ) {
             $$self{'last_auto_outside_temp'} =
               ${ $$self{'auto_outside_temp_ref'} };
             if ( $$self{'last_auto_outside_temp'} ) {
@@ -878,15 +856,11 @@ sub _parse_data {
             $$self{'temp'} = $val;
             $self->_process_off_times();
             if ( $$self{'temp'} < $$self{'heat_sp'} ) {
-                &::print_log(
-                    "RCSsTR40: Temp $$self{temp} is less than $$self{heat_sp} (mode=$$self{mode})"
-                );
+                &::print_log( "RCSsTR40: Temp $$self{temp} is less than $$self{heat_sp} (mode=$$self{mode})" );
                 if (   ( $$self{'mode'} eq 'heat' )
                     or ( $$self{'mode'} eq 'auto' ) )
                 {
-                    &::print_log(
-                        "RCSsTR40: heat_start=$$self{heat_start}, heat_end=$$self{heat_end}, mot=$$self{mot}"
-                    );
+                    &::print_log( "RCSsTR40: heat_start=$$self{heat_start}, heat_end=$$self{heat_end}, mot=$$self{mot}" );
                     if ( $$self{'heat_end'} > $::Time ) {
 
                         # It was scheduled to turn off, so cancel that
@@ -935,8 +909,7 @@ sub _parse_data {
                     }
                 }
             }
-            if (    ( $$self{'temp'} >= $$self{'heat_sp'} )
-                and ( ( $$self{'temp'} <= $$self{'cool_sp'} ) )
+            if (   ( $$self{'temp'} >= $$self{'heat_sp'} ) and ( ( $$self{'temp'} <= $$self{'cool_sp'} ) )
                 or ( $$self{'mode'} eq 'off' ) )
             {
                 if ( $$self{'heat_start'} ) {
@@ -952,8 +925,8 @@ sub _parse_data {
                     elsif ( not $$self{'heat_end'} ) {
 
                         # Is running, schedule stop time
-                        if ( ( $$self{'heat_start'} + $$self{mrt} ) > $::Time )
-                        {
+                        if ( ( $$self{'heat_start'} + $$self{mrt} ) > $::Time ) {
+
                             # Schedule future stop
                             $$self{'heat_end'} =
                               ( $$self{'heat_start'} + $$self{mrt} );
@@ -977,8 +950,8 @@ sub _parse_data {
                     elsif ( not $$self{'cool_end'} ) {
 
                         # Is running, schedule stop time
-                        if ( ( $$self{'cool_start'} + $$self{mrt} ) > $::Time )
-                        {
+                        if ( ( $$self{'cool_start'} + $$self{mrt} ) > $::Time ) {
+
                             # Schedule future stop
                             $$self{'cool_end'} =
                               ( $$self{'cool_start'} + $$self{mrt} );
@@ -993,8 +966,7 @@ sub _parse_data {
             }
         }
         elsif ( $name eq 'OA' ) {
-            if ( $$self{'outside_temp'} and ( $$self{'outside_temp'} != $val ) )
-            {
+            if ( $$self{'outside_temp'} and ( $$self{'outside_temp'} != $val ) ) {
                 $self->set_receive('outside_temp_change');
             }
             $$self{'outside_temp'} = $val;
@@ -1023,8 +995,7 @@ sub _parse_data {
             $$self{'schedule_mode'} = $val;
         }
         elsif ( $name eq 'SPH' ) {
-            print
-              "Examining SPH: $val, $$self{heat_sp_pending}, $$self{heat_sp}, $$self{vacation}\n"
+            print "Examining SPH: $val, $$self{heat_sp_pending}, $$self{heat_sp}, $$self{vacation}\n"
               unless $main::config_parms{no_log} =~ /RCSsTR40/;
             if ( $val == 66 ) {
                 $vacation_sph = 1;
@@ -1050,8 +1021,7 @@ sub _parse_data {
             $$self{'heat_sp'} = $val;
         }
         elsif ( $name eq 'SPC' ) {
-            print
-              "Examining SPC: $val, $$self{cool_sp_pending}, $$self{cool_sp}, $$self{vacation}\n"
+            print "Examining SPC: $val, $$self{cool_sp_pending}, $$self{cool_sp}, $$self{vacation}\n"
               unless $main::config_parms{no_log} =~ /RCSsTR40/;
             if ( $val == 80 ) {
                 $vacation_spc = 1;
diff --git a/lib/RF_Item.pm b/lib/RF_Item.pm
index dd7129c93..d7fe82809 100644
--- a/lib/RF_Item.pm
+++ b/lib/RF_Item.pm
@@ -80,10 +80,7 @@ sub new {
     if (
             $id !~ /^[0-9a-f]{2}$/
         and $id !~ /^[0-9a-f]{4}$/    # CJB
-        and $id ne 'sensor'
-        and $id ne 'system'
-        and $id ne 'control'
-        and $id ne 'remote'
+        and $id ne 'sensor' and $id ne 'system' and $id ne 'control' and $id ne 'remote'
       )
     {
 
diff --git a/lib/RedRat.pm b/lib/RedRat.pm
index d367d956d..53f849308 100644
--- a/lib/RedRat.pm
+++ b/lib/RedRat.pm
@@ -38,9 +38,7 @@ package RedRat;
 @RedRat::ISA = ('Serial_Item');
 
 sub serial_startup {
-    &main::serial_port_create( 'RedRat',
-        $main::config_parms{RedRat_serial_port},
-        19200, 'none' );
+    &main::serial_port_create( 'RedRat', $main::config_parms{RedRat_serial_port}, 19200, 'none' );
 }
 
 sub new {
diff --git a/lib/RollFileHandle.pm b/lib/RollFileHandle.pm
index 21674622d..1c1a3cf90 100644
--- a/lib/RollFileHandle.pm
+++ b/lib/RollFileHandle.pm
@@ -95,8 +95,8 @@ sub new {
     my $newobj = new IO::File;    # this will give a typeglob (not a hashref)
     my $newref = {};
     $newref->{"RLF.logskel"} = $logbase;
-    bless $newobj;    #  IO::File blessed so it can call our functions()
-    bless $newref;    #our hashref
+    bless $newobj;                #  IO::File blessed so it can call our functions()
+    bless $newref;                #our hashref
     $known_objects{$newobj} = $newref;
 
     ## open the first version of the requested logfile
@@ -133,9 +133,9 @@ sub roll_logfile {
 
     $debug && print STDERR "roll_logfile: new file will be [$now_fname]\n";
 
-    $self->{"RLF.cur_fname"} = $now_fname; # install the new filename as current
+    $self->{"RLF.cur_fname"} = $now_fname;                   # install the new filename as current
 
-    $self_obj->SUPER::open( $self->{"RLF.cur_fname"} );    # (re)-open the file
+    $self_obj->SUPER::open( $self->{"RLF.cur_fname"} );      # (re)-open the file
 
     ## and if we were installed as a stdout trap, update the trap for the
     ##   new file handle
diff --git a/lib/Scene.pm b/lib/Scene.pm
index c7c1e506d..25e8558c6 100644
--- a/lib/Scene.pm
+++ b/lib/Scene.pm
@@ -111,10 +111,7 @@ sub add {
     my ( $self, $obj, $on_level, $ramp_rate ) = @_;
     if ( ref $obj ) {
         if ( $$self{members} && $$self{members}{$obj} ) {
-            print "[scene] An object ("
-              . $obj->{object_name}
-              . ") already exists "
-              . "in this scene.  Aborting add request.\n"
+            print "[scene] An object (" . $obj->{object_name} . ") already exists " . "in this scene.  Aborting add request.\n"
               if $main::Debug{scene};
             return;
         }
@@ -148,8 +145,7 @@ sub remove_member {
                 last if $member;
             }
             else {
-                &::print_log(
-                    "Unable to add object to scene " . $self->{object_name} );
+                &::print_log( "Unable to add object to scene " . $self->{object_name} );
             }
         }
     }
@@ -196,17 +192,12 @@ sub resume {
             my $original_state = $$self{members}{$obj_ref}{original_state};
             if ( ref $obj and defined $original_state ) {
                 $obj->set( $original_state, $self );
-                print "[scene] Restore object ("
-                  . $obj->{object_name}
-                  . ") state to scene "
-                  . $self->{object_name} . "\n"
+                print "[scene] Restore object (" . $obj->{object_name} . ") state to scene " . $self->{object_name} . "\n"
                   if $main::Debug{scene};
             }
             else {
                 my $obj_name = ($obj) ? $obj->{object_name} : 'unknown';
-                print
-                  "[scene] Unable to restore object ($obj_name) state to scene ("
-                  . $self->{object_name} . ")\n"
+                print "[scene] Unable to restore object ($obj_name) state to scene (" . $self->{object_name} . ")\n"
                   if $main::Debug{scene};
             }
         }
@@ -246,9 +237,7 @@ sub set {
                   if $main::Debug{scene};
             }
             else {
-                print "[scene] Unable to maintain scene ("
-                  . $self->{object_name}
-                  . ") state for object\n"
+                print "[scene] Unable to maintain scene (" . $self->{object_name} . ") state for object\n"
                   if $main::Debug{scene};
             }
         }
@@ -260,17 +249,11 @@ sub set {
 
                 #                $obj->set_receive($p_state, $self);
                 $obj->set( $p_state, $self );
-                print "[scene] Setting "
-                  . $obj->{object_name} . " to "
-                  . $p_state
-                  . " for scene: "
-                  . $self->{object_name} . "\n"
+                print "[scene] Setting " . $obj->{object_name} . " to " . $p_state . " for scene: " . $self->{object_name} . "\n"
                   if $main::Debug{scene};
             }
             else {
-                print "[scene] Unable to maintain scene ("
-                  . $self->{object_name}
-                  . ") state for object\n"
+                print "[scene] Unable to maintain scene (" . $self->{object_name} . ") state for object\n"
                   if $main::Debug{scene};
             }
         }
@@ -279,8 +262,7 @@ sub set {
     # create a "special" setby name as the tied_items in the main loop would otherwise
     # prohibit using $self if the passed $p_setby is not an object; if it is an object
     # then preserve as the setby chain needs to be maintained
-    my $m_setby =
-      ( ref $p_setby ) ? $p_setby : "scene [" . $self->{object_name} . "]";
+    my $m_setby = ( ref $p_setby ) ? $p_setby : "scene [" . $self->{object_name} . "]";
     if ( $p_state eq 'on' ) {
         print "[scene] Setting scene (" . $self->{object_name} . ") on\n"
           if $main::Debug{scene};
diff --git a/lib/SchoolDays.pm b/lib/SchoolDays.pm
index 7dd4ffdde..18a8edac8 100644
--- a/lib/SchoolDays.pm
+++ b/lib/SchoolDays.pm
@@ -66,11 +66,7 @@ sub new {
     foreach ( split( ",", $school_terms ) ) {
         my ( $start, $finish ) = split("-");
 
-        push @{ $self->{terms} },
-          [
-            $self->_convert_to_ISO8601_date($start),
-            $self->_convert_to_ISO8601_date($finish)
-          ];
+        push @{ $self->{terms} }, [ $self->_convert_to_ISO8601_date($start), $self->_convert_to_ISO8601_date($finish) ];
     }
 
     # Load inset dates
@@ -79,11 +75,7 @@ sub new {
         if (m/-/) {
             my ( $start, $finish ) = split("-");
 
-            push @{ $self->{insets} },
-              [
-                $self->_convert_to_ISO8601_date($start),
-                $self->_convert_to_ISO8601_date($finish)
-              ];
+            push @{ $self->{insets} }, [ $self->_convert_to_ISO8601_date($start), $self->_convert_to_ISO8601_date($finish) ];
         }
         else {
             my $date = $self->_convert_to_ISO8601_date($_);
@@ -96,8 +88,7 @@ sub new {
     foreach ( @{ $self->{terms} } ) {
         my ( $start, $finish ) = @{$_};
 
-        $self->_log(
-            "\t" . $self->_hr_date($start) . " - " . $self->_hr_date($finish) );
+        $self->_log( "\t" . $self->_hr_date($start) . " - " . $self->_hr_date($finish) );
     }
     $self->_log("In-session breaks:");
     foreach ( @{ $self->{insets} } ) {
@@ -107,9 +98,7 @@ sub new {
             $self->_log( "\t" . $self->_hr_date($start) );
         }
         else {
-            $self->_log( "\t"
-                  . $self->_hr_date($start) . " - "
-                  . $self->_hr_date($finish) );
+            $self->_log( "\t" . $self->_hr_date($start) . " - " . $self->_hr_date($finish) );
         }
     }
 
@@ -240,12 +229,10 @@ sub is_schoolday {
     if ( $testdate =~ /\// ) {
         $testdate = $self->_convert_to_ISO8601_date($testdate);
     }
-    $self->_log(
-        "is_schoolday($testdate, " . $self->_hr_date($testdate) . ")" );
+    $self->_log( "is_schoolday($testdate, " . $self->_hr_date($testdate) . ")" );
 
     # No school at the weekend
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime($testdate);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime($testdate);
     if ( ( $wday == 6 ) || ( $wday == 0 ) ) {
         return 0;
     }
diff --git a/lib/Serial_Item.pm b/lib/Serial_Item.pm
index b71b49cbc..88603d847 100644
--- a/lib/Serial_Item.pm
+++ b/lib/Serial_Item.pm
@@ -58,8 +58,7 @@ sub new {
     $self->{mainHash} = $mainHash;
     $self->set_standard_config;
     $self->set_interface($device_name) if $id and $id =~ /^X/;
-    $self->state_overload('off')
-      ;    # By default, do not process ~;: strings as substate/multistate
+    $self->state_overload('off');    # By default, do not process ~;: strings as substate/multistate
 
     return $self;
 }
@@ -100,8 +99,7 @@ sub stop {
         #       &Win32::SerialPort::debug(0);
     }
     else {
-        print
-          "Error in Serial_Item stop for port $port_name: Port is not started\n";
+        print "Error in Serial_Item stop for port $port_name: Port is not started\n";
     }
 }
 
@@ -121,8 +119,7 @@ sub set_dtr {
           if $main::Debug{serial};
     }
     else {
-        print
-          "Error, serial port set_dtr for $port_name failed, port has not been set\n";
+        print "Error, serial port set_dtr for $port_name failed, port has not been set\n";
     }
 }
 
@@ -145,8 +142,7 @@ sub set_rts {
           if $main::Debug{serial};
     }
     else {
-        print
-          "Error, serial port set_rts for $port_name failed, port has not been set\n";
+        print "Error, serial port set_rts for $port_name failed, port has not been set\n";
     }
 }
 
@@ -166,15 +162,13 @@ sub send_serial_data {
     unless ( $main::Serial_Ports{$port_name}{object}
         or lc $port_name eq 'ncpuxa' )
     {
-        print
-          "Error, serial port for $port_name has not been set: data=$serial_data\n";
+        print "Error, serial port for $port_name has not been set: data=$serial_data\n";
         return;
     }
 
     if ( lc $port_name eq 'homevision' ) {
         print "Using homevision to send: $serial_data\n";
-        &Homevision::send( $main::Serial_Ports{Homevision}{object},
-            $serial_data );
+        &Homevision::send( $main::Serial_Ports{Homevision}{object}, $serial_data );
     }
     elsif ( lc $port_name eq 'ncpuxa' ) {
         &main::print_log("Using ncpuxa to send: $serial_data");
@@ -212,8 +206,7 @@ sub send_x10_data {
 
     # Use proxy mh if present (avoids mh pauses for slow X10 xmits)
     return
-      if &main::proxy_send( $interface, 'send_x10_data', $serial_data,
-        $module_type );
+      if &main::proxy_send( $interface, 'send_x10_data', $serial_data, $module_type );
 
     # This function can either be called as a class method or a library function
 
@@ -224,8 +217,7 @@ sub send_x10_data {
     else {
         $isfunc = 1;
     }
-    print
-      "X10: interface=$interface isfunc=$isfunc save_unit=$x10_save_unit data=$serial_data\n"
+    print "X10: interface=$interface isfunc=$isfunc save_unit=$x10_save_unit data=$serial_data\n"
       if $main::Debug{x10};
 
     if ( $interface eq 'cm11' ) {
@@ -236,8 +228,7 @@ sub send_x10_data {
 
         # Standard 1-cm11 code
         if ( !$main::config_parms{cm11_bak_port} ) {
-            &ControlX10::CM11::send( $main::Serial_Ports{cm11}{object},
-                substr( $serial_data, 1 ) );
+            &ControlX10::CM11::send( $main::Serial_Ports{cm11}{object}, substr( $serial_data, 1 ) );
         }
 
         # Dual cm11 code
@@ -248,33 +239,22 @@ sub send_x10_data {
             if (   ( $main::cm11_objects{active}->state() eq 'on' )
                 && ( $main::cm11_objects{bak_active}->state() eq 'on' ) )
             {
-                if ( $main::cm11_objects{timer}->seconds_remaining() >=
-                    $main::cm11_objects{bak_timer}->seconds_remaining() )
-                {
+                if ( $main::cm11_objects{timer}->seconds_remaining() >= $main::cm11_objects{bak_timer}->seconds_remaining() ) {
                     print "db CM11: using primary cm11\n" if $main::Debug{cm11};
-                    &ControlX10::CM11::send(
-                        $main::Serial_Ports{cm11}{object},
-                        substr( $serial_data, 1 )
-                    );
+                    &ControlX10::CM11::send( $main::Serial_Ports{cm11}{object}, substr( $serial_data, 1 ) );
                 }
                 else {
                     print "db CM11: using backup cm11\n" if $main::Debug{cm11};
-                    &ControlX10::CM11::send(
-                        $main::Serial_Ports{cm11_bak}{object},
-                        substr( $serial_data, 1 ) );
+                    &ControlX10::CM11::send( $main::Serial_Ports{cm11_bak}{object}, substr( $serial_data, 1 ) );
                 }
             }
             elsif ( $main::cm11_objects{active}->state() eq 'on' ) {
                 print "db CM11: using primary cm11\n" if $main::Debug{cm11};
-                &ControlX10::CM11::send(
-                    $main::Serial_Ports{cm11}{object},
-                    substr( $serial_data, 1 )
-                );
+                &ControlX10::CM11::send( $main::Serial_Ports{cm11}{object}, substr( $serial_data, 1 ) );
             }
             elsif ( $main::cm11_objects{bak_active}->state() eq 'on' ) {
                 print "db CM11: using backup cm11\n" if $main::Debug{cm11};
-                &ControlX10::CM11::send( $main::Serial_Ports{cm11_bak}{object},
-                    substr( $serial_data, 1 ) );
+                &ControlX10::CM11::send( $main::Serial_Ports{cm11_bak}{object}, substr( $serial_data, 1 ) );
             }
             else {
                 print "db CM11: Error - no cm11's are working ...\n"
@@ -288,8 +268,7 @@ sub send_x10_data {
         # TI103 wants individual codes without X
         print "db1 TI103: Sending x10 data: $serial_data\n"
           if $main::Debug{ti103};
-        &ControlX10::TI103::send( $main::Serial_Ports{ti103}{object},
-            substr( $serial_data, 1 ) );
+        &ControlX10::TI103::send( $main::Serial_Ports{ti103}{object}, substr( $serial_data, 1 ) );
     }
 
     elsif ( $interface eq 'bx24' ) {
@@ -301,67 +280,48 @@ sub send_x10_data {
     elsif ( $interface eq 'lynx10plc' ) {
 
         # lynx10plc wants individual codes without X
-        &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object},
-            $serial_data, $module_type );
+        &Lynx10PLC::send_plc( $main::Serial_Ports{Lynx10PLC}{object}, $serial_data, $module_type );
     }
     elsif ( $interface eq 'cm17' ) {
 
         # cm17 wants A1K, not XA1AK
-        &ControlX10::CM17::send( $main::Serial_Ports{cm17}{object},
-            substr( $x10_save_unit, 1 ) . substr( $serial_data, 2 ) )
+        &ControlX10::CM17::send( $main::Serial_Ports{cm17}{object}, substr( $x10_save_unit, 1 ) . substr( $serial_data, 2 ) )
           if $isfunc;
     }
     elsif ( $interface eq 'homevision' ) {
 
         # homevision wants XA1AK
         if ($isfunc) {
-            print "Using homevision to send: "
-              . $x10_save_unit
-              . substr( $serial_data, 1 ) . "\n";
-            &Homevision::send(
-                $main::Serial_Ports{Homevision}{object},
-                $x10_save_unit . substr( $serial_data, 1 )
-            );
+            print "Using homevision to send: " . $x10_save_unit . substr( $serial_data, 1 ) . "\n";
+            &Homevision::send( $main::Serial_Ports{Homevision}{object}, $x10_save_unit . substr( $serial_data, 1 ) );
         }
     }
     elsif ( $interface eq 'homebase' ) {
 
         # homebase wants individual codes without X
         print "Using homebase to send: $serial_data\n";
-        &HomeBase::send_X10( $main::Serial_Ports{HomeBase}{object},
-            substr( $serial_data, 1 ) );
+        &HomeBase::send_X10( $main::Serial_Ports{HomeBase}{object}, substr( $serial_data, 1 ) );
     }
     elsif ( $interface eq 'stargate' ) {
 
         # Stargate wants individual codes without X
         print "Using stargate to send: $serial_data\n";
-        &Stargate::send_X10( $main::Serial_Ports{Stargate}{object},
-            substr( $serial_data, 1 ) );
+        &Stargate::send_X10( $main::Serial_Ports{Stargate}{object}, substr( $serial_data, 1 ) );
     }
     elsif ( $interface eq 'houselinc' ) {
 
         # houselinc wants XA1AK
         if ($isfunc) {
-            print "Using houselinc to send: "
-              . $x10_save_unit
-              . substr( $serial_data, 1 ) . "\n";
-            &HouseLinc::send_X10(
-                $main::Serial_Ports{HouseLinc}{object},
-                $x10_save_unit . substr( $serial_data, 1 )
-            );
+            print "Using houselinc to send: " . $x10_save_unit . substr( $serial_data, 1 ) . "\n";
+            &HouseLinc::send_X10( $main::Serial_Ports{HouseLinc}{object}, $x10_save_unit . substr( $serial_data, 1 ) );
         }
     }
     elsif ( $interface eq 'marrick' ) {
 
         # marrick wants XA1AK
         if ($isfunc) {
-            print "Using marrick to send: "
-              . $x10_save_unit
-              . substr( $serial_data, 1 ) . "\n";
-            &Marrick::send_X10(
-                $main::Serial_Ports{Marrick}{object},
-                $x10_save_unit . substr( $serial_data, 1 )
-            );
+            print "Using marrick to send: " . $x10_save_unit . substr( $serial_data, 1 ) . "\n";
+            &Marrick::send_X10( $main::Serial_Ports{Marrick}{object}, $x10_save_unit . substr( $serial_data, 1 ) );
         }
     }
     elsif ( $interface eq 'ncpuxa' ) {
@@ -378,8 +338,7 @@ sub send_x10_data {
         # Allow for +-xx%
         my $dim_amount = 3;
         if ( $command =~ /[\+\-]\d+/ ) {
-            $dim_amount =
-              int( 10 * abs($command) / 100 );    # about 10 levels to 100%
+            $dim_amount = int( 10 * abs($command) / 100 );    # about 10 levels to 100%
             $command = ( $command > 0 ) ? 'L' : 'M';
         }
 
@@ -412,8 +371,7 @@ sub send_x10_data {
         &X10_Wish::send( substr( $serial_data, 1 ) );
     }
     else {
-        print
-          "\nError, X10 interface not found: interface=$interface, data=$serial_data\n";
+        print "\nError, X10 interface not found: interface=$interface, data=$serial_data\n";
     }
 
 }
diff --git a/lib/Slinke.pm b/lib/Slinke.pm
index d13e58680..ae028e767 100644
--- a/lib/Slinke.pm
+++ b/lib/Slinke.pm
@@ -52,14 +52,13 @@ use vars qw( @ISA $VERSION @EXPORT );
 $VERSION = 1.00;
 @ISA     = qw(Exporter);
 
-@EXPORT =
-  qw( PORT_SL0 PORT_SL1 PORT_SL2 PORT_SL3 PORT_IR PORT_PAR PORT_SER PORT_SYS decodeIR );
+@EXPORT = qw( PORT_SL0 PORT_SL1 PORT_SL2 PORT_SL3 PORT_IR PORT_PAR PORT_SER PORT_SYS decodeIR );
 
 $Slinke::SLINKE_NUMPORTS = 8;
 $Slinke::SLINKE_CLK      = 20.0e6;
 $Slinke::PORT_IR_MAXML   = 15;
 $Slinke::IRSKEWADJUST    = -100e-6;
-$Slinke::MAXDATABLOCK    = 30;     # largest block the slinke can handle at once
+$Slinke::MAXDATABLOCK    = 30;        # largest block the slinke can handle at once
 
 %Slinke::PORTS = (
     PORT_SL0 => 0,
@@ -258,16 +257,15 @@ foreach my $i ( keys %Slinke::RESPONSES ) {
 
 # Error codes
 %Slinke::ERRORS = (
-    RSP_RX_ERROR     => [ "Receive Error",                                  0 ],
-    RSP_TX_TIMEOUT   => [ "Transmit Timeout Error - critical, will resume", 1 ],
-    RSP_CMD_ILLEGAL  => [ "Illegal Command - critical, will resume",        1 ],
-    RSP_IRFS_ILLEGAL => [ "Illegal Sample Period",                          0 ],
-    RSP_SERIALIN_OVERFLOW => [ "Receive overflow - critical, will resume", 1 ],
-    RSP_SERIALIN_OVERRUN  => [ "Receive overrun - critical, will resume",  1 ],
-    RSP_SERIALIN_FRAMEERROR =>
-      [ "Receive framing error - critical, will resume", 1 ],
-    RSP_BAUD_ILLEGAL => [ "Illegal Baud Rate",   0 ],
-    RSP_SEEPROMWRERR => [ "SEEPROM Write Error", 0 ],
+    RSP_RX_ERROR            => [ "Receive Error",                                  0 ],
+    RSP_TX_TIMEOUT          => [ "Transmit Timeout Error - critical, will resume", 1 ],
+    RSP_CMD_ILLEGAL         => [ "Illegal Command - critical, will resume",        1 ],
+    RSP_IRFS_ILLEGAL        => [ "Illegal Sample Period",                          0 ],
+    RSP_SERIALIN_OVERFLOW   => [ "Receive overflow - critical, will resume",       1 ],
+    RSP_SERIALIN_OVERRUN    => [ "Receive overrun - critical, will resume",        1 ],
+    RSP_SERIALIN_FRAMEERROR => [ "Receive framing error - critical, will resume",  1 ],
+    RSP_BAUD_ILLEGAL        => [ "Illegal Baud Rate",                              0 ],
+    RSP_SEEPROMWRERR        => [ "SEEPROM Write Error",                            0 ],
 );
 
 =item C<new>
@@ -334,9 +332,7 @@ sub new {
                 $self->{SERIALPORT}->close;
             }
             if ( !$args{DEVICE} ) {
-                die(    "Can't find a Slink-e on any of the following: "
-                      . join( " ", @portsToTry )
-                      . "\n" );
+                die( "Can't find a Slink-e on any of the following: " . join( " ", @portsToTry ) . "\n" );
             }
         }
     }
@@ -454,8 +450,7 @@ sub receive {
                     $finished = 1;
                 }
                 elsif ( $this->{VERSION} < 2.0 ) {
-                    my $str = $this->cleanupRLC(
-                        substr( $this->{PORTDATA}{$device}, 0, -1 ) );
+                    my $str = $this->cleanupRLC( substr( $this->{PORTDATA}{$device}, 0, -1 ) );
                     my @t = split / /, $str;
                     push @{ $this->{RECEIVED} },
                       {
@@ -476,8 +471,7 @@ sub receive {
 
                 ( $count, $rch ) = $this->{SERIALPORT}->read($datalen);
                 if ( $count != $datalen ) {
-                    warn
-                      "read of $device unsuccessful - read $count expected $datalen\n";
+                    warn "read of $device unsuccessful - read $count expected $datalen\n";
                     return undef;
                 }
                 if ( $device eq "PORT_IR" ) {
@@ -505,8 +499,7 @@ sub receive {
         }
 
         if ( !exists $Slinke::RESPONSEMAPS{$device} ) {
-            warn( __PACKAGE__
-                  . " package does not handle device '$device' yet\n" );
+            warn( __PACKAGE__ . " package does not handle device '$device' yet\n" );
             $this->{SERIALPORT}->input();
             return undef;
         }
@@ -537,8 +530,7 @@ sub receive {
         }
 
         if ( exists $Slinke::ERRORS{$response} ) {
-            warn
-              "ERROR $response on $device: $Slinke::ERRORS{ $response }->[0]\n";
+            warn "ERROR $response on $device: $Slinke::ERRORS{ $response }->[0]\n";
             if ( $Slinke::ERRORS{$response}->[1] ) {
                 $this->resume();
             }
@@ -552,9 +544,7 @@ sub receive {
                 $response = "0x" . uc( sprintf( "%02x", $response ) );
             }
 
-            warn( __PACKAGE__
-                  . " package does not handle response '$response' on device '$device' yet\n"
-            );
+            warn( __PACKAGE__ . " package does not handle response '$response' on device '$device' yet\n" );
             $this->{SERIALPORT}->input();
             return undef;
         }
@@ -637,12 +627,10 @@ sub int8ToRLC {
             if ( $oldsign != 33 ) {
 
                 # write out num first
-                $num = -$num if $sign == 0x80;  # use sign to indicate 0 periods
+                $num = -$num if $sign == 0x80;    # use sign to indicate 0 periods
 
-                $numtime =
-                  $num * $this->{IRSAMPLEPERIOD} + $Slinke::IRSKEWADJUST;
-                $numstr .=
-                  sprintf( "%.1lf ", $numtime * 1e6 ); # convert to microseconds
+                $numtime = $num * $this->{IRSAMPLEPERIOD} + $Slinke::IRSKEWADJUST;
+                $numstr .= sprintf( "%.1lf ", $numtime * 1e6 );    # convert to microseconds
                 $signallen += abs($numtime);
             }
 
@@ -987,8 +975,7 @@ sub setIRSamplingPeriod {
         $sampleRate *= 1e6;
         $minper     *= 1e6;
 
-        warn
-          "$sampleRate is too short of a sampling period ($minper is the shortest at this baud rate)\n";
+        warn "$sampleRate is too short of a sampling period ($minper is the shortest at this baud rate)\n";
         return undef;
     }
 
@@ -996,8 +983,7 @@ sub setIRSamplingPeriod {
     if ( $sampleRate > $maxper ) {
         $sampleRate *= 1e6;
         $maxper     *= 1e6;
-        warn
-          "$sampleRate is too long of a sampling period ($maxper is the longest)\n";
+        warn "$sampleRate is too long of a sampling period ($maxper is the longest)\n";
         return undef;
     }
 
@@ -1087,14 +1073,12 @@ sub setIRCarrier {
         my $count = $Slinke::SLINKE_CLK / 4.0 / $frequency;
         if ( $count == 0 ) {
             my $max = $Slinke::SLINKE_CLK / 4.0;
-            warn
-              "$frequency is too high of a carrier frequency ($max is the max)\n";
+            warn "$frequency is too high of a carrier frequency ($max is the max)\n";
             return undef;
         }
         elsif ( $count > 8 * 256 ) {
             my $min = $Slinke::SLINKE_CLK / 4.0 / 8.0 / 256.0;
-            warn
-              "$frequency is too low of a carrier frequency ($min is the minimum)\n";
+            warn "$frequency is too low of a carrier frequency ($min is the minimum)\n";
             return undef;
         }
 
@@ -1195,8 +1179,7 @@ sub setIRTimeoutPeriod {
     }
 
     if ( $period > 65536 ) {
-        warn
-          "$period sample periods is too long of a timeout period (65536 periods is the longest)\n";
+        warn "$period sample periods is too long of a timeout period (65536 periods is the longest)\n";
         return undef;
     }
 
@@ -1269,14 +1252,12 @@ sub setIRMinimumLength {
     my $length = shift;
 
     if ( $length < 0 ) {
-        warn
-          "$length is too short of a minimum message length (0 is the shortest)\n";
+        warn "$length is too short of a minimum message length (0 is the shortest)\n";
         return undef;
     }
 
     if ( $length > $Slinke::PORT_IR_MAXML ) {
-        warn
-          "$length is too long of a minimum message length ($Slinke::PORT_IR_MAXML is the longest)\n";
+        warn "$length is too long of a minimum message length ($Slinke::PORT_IR_MAXML is the longest)\n";
         return undef;
     }
 
@@ -1313,8 +1294,7 @@ sub requestIRTransmitPorts {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1337,8 +1317,7 @@ sub setIRTransmitPorts {
     my $port = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1377,8 +1356,7 @@ sub requestIRPolarity {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1409,8 +1387,7 @@ sub setIRPolarity {
     my $port = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1454,8 +1431,7 @@ sub requestIRReceivePorts {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1482,8 +1458,7 @@ sub setIRReceivePorts {
     my $port = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1533,8 +1508,7 @@ sub requestIRRoutingTable {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1578,8 +1552,7 @@ sub setIRRoutingTable {
     my @data = @_;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -1590,14 +1563,12 @@ sub setIRRoutingTable {
             my $count = int( $Slinke::SLINKE_CLK / 4.0 / $freq );
             if ( !$count ) {
                 my $max = $Slinke::SLINKE_CLK / 4.0;
-                warn
-                  "$freq is too high of a carrier frequency ($max is the max)\n";
+                warn "$freq is too high of a carrier frequency ($max is the max)\n";
                 return undef;
             }
             elsif ( $count >= 256 ) {
                 my $min = $Slinke::SLINKE_CLK / 4.0 / 256.0;
-                warn
-                  "$freq is too low of a carrier frequency ($min is the minimum)\n";
+                warn "$freq is too low of a carrier frequency ($min is the minimum)\n";
                 return undef;
             }
 
@@ -1726,8 +1697,7 @@ sub setHandshaking {
     my $handshaking = shift;
 
     if ( $handshaking < 0 || $handshaking > 3 ) {
-        warn
-          "$handshaking is not a valid port (0-0x03 is the acceptable range)\n";
+        warn "$handshaking is not a valid port (0-0x03 is the acceptable range)\n";
         return undef;
     }
 
@@ -1790,8 +1760,7 @@ sub setDirection {
     my $direction = shift;
 
     if ( $direction < 0 || $direction > 255 ) {
-        warn
-          "$direction is not a valid direction setting (0-0xFF is the acceptable range)\n";
+        warn "$direction is not a valid direction setting (0-0xFF is the acceptable range)\n";
         return undef;
     }
 
@@ -1926,8 +1895,7 @@ sub sendData {
         && $args{PORT} ne "PORT_SL3"
         && $args{PORT} ne "PORT_PAR" )
     {
-        warn
-          "PORT must be one of either: PORT_SL0, PORT_SL1, PORT_SL2, PORT_SL3 or PORT_PAR\n";
+        warn "PORT must be one of either: PORT_SL0, PORT_SL1, PORT_SL2, PORT_SL3 or PORT_PAR\n";
         return undef;
     }
 
@@ -1984,8 +1952,7 @@ sub txrx {
     }
 
     if ( defined $expectedResponse ) {
-        my ( $device, $response, $data ) = $this->receive(
-            EXPECTINPUT => ( $expectedResponse eq "RSP_EQBAUD" ? 0 : 1 ) );
+        my ( $device, $response, $data ) = $this->receive( EXPECTINPUT => ( $expectedResponse eq "RSP_EQBAUD" ? 0 : 1 ) );
 
         if ( $expectedResponse ne $response ) {
             my $str;
@@ -2048,8 +2015,7 @@ sub loadDefaults {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
@@ -2074,8 +2040,7 @@ sub saveDefaults {
     my $this = shift;
 
     if ( $this->{VERSION} < 2.0 ) {
-        warn
-          "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
+        warn "Current Slink-e version is $this->{VERSION} (need 2.0 or greater)\n";
         return undef;
     }
 
diff --git a/lib/SoapServer.pm b/lib/SoapServer.pm
index 0b77babe1..8699da8c3 100644
--- a/lib/SoapServer.pm
+++ b/lib/SoapServer.pm
@@ -50,8 +50,7 @@ sub handle {
 
     my $results = '';
 
-    my $length =
-      $headers->{'Content-Length'} || $headers->{'Content-length'} || 0;
+    my $length = $headers->{'Content-Length'} || $headers->{'Content-length'} || 0;
 
     if ( !$length ) {
         $self->response( HTTP::Response->new(411) )    # LENGTH REQUIRED
@@ -59,7 +58,7 @@ sub handle {
     elsif ( defined $SOAP::Constants::MAX_CONTENT_SIZE
         && $length > $SOAP::Constants::MAX_CONTENT_SIZE )
     {
-        $self->response( HTTP::Response->new(413) )   # REQUEST ENTITY TOO LARGE
+        $self->response( HTTP::Response->new(413) )    # REQUEST ENTITY TOO LARGE
     }
     else {
         # This appears to be broken.  MS .Net by default trys to use the HTTP 1.1 Continue header
@@ -72,21 +71,13 @@ sub handle {
 
         # stole this line from the http_server.pl file.  Just need to break the request down
         # I think SOAP will almost always be a POST request but better be sure
-        my ( $req_typ, $uri, $get_arg ) =
-          $headers->{'request'} =~ m|^(GET\|POST) (\/[^ \?]*)\??(\S+)? HTTP|;
+        my ( $req_typ, $uri, $get_arg ) = $headers->{'request'} =~ m|^(GET\|POST) (\/[^ \?]*)\??(\S+)? HTTP|;
 
         # Create  a new HTTP::Request to pass to the SOAP::Transport::HTTP::Server class
         $self->request(
             HTTP::Request->new(
                 $req_typ, $uri,
-                HTTP::Headers->new(
-                    map {
-                            (m/SOAPACTION/i)
-                          ? ('SOAPAction')
-                          : ($_) => $headers->{$_}
-                    } keys %$headers
-                ),
-                $content
+                HTTP::Headers->new( map { (m/SOAPACTION/i) ? ('SOAPAction') : ($_) => $headers->{$_} } keys %$headers ), $content
             )
         );
         $self->SOAP::Transport::HTTP::Server::handle;
diff --git a/lib/Socket_Item.pm b/lib/Socket_Item.pm
index b5ff9c67e..e987e9733 100644
--- a/lib/Socket_Item.pm
+++ b/lib/Socket_Item.pm
@@ -61,17 +61,13 @@ sub socket_item_by_id {
 =cut
 
 sub new {
-    my (
-        $class,      $id,       $state, $host_port, $port_name,
-        $host_proto, $datatype, $break, $broadcast
-    ) = @_;
+    my ( $class, $id, $state, $host_port, $port_name, $host_proto, $datatype, $break, $broadcast ) = @_;
 
     #    print "dbx1 creating socket on port $host_port name=$port_name\n";
     my $self = { state => '' };
 
     $port_name = $host_port unless $port_name;
-    print
-      "\n\nWarning: duplicate ID codes on different socket_Item objects: id=$id\n\n"
+    print "\n\nWarning: duplicate ID codes on different socket_Item objects: id=$id\n\n"
       if $id and $socket_item_by_id{$id};
     $$self{port_name}     = $port_name;
     $$self{host_port}     = $host_port;
@@ -83,8 +79,7 @@ sub new {
     $$self{broadcast}                          = $broadcast if $broadcast;
     &add( $self, $id, $state );
     bless $self, $class;
-    $self->state_overload('off')
-      ;    # By default, do not process ~;: strings as substate/multistate
+    $self->state_overload('off');    # By default, do not process ~;: strings as substate/multistate
     return $self;
 }
 
@@ -163,9 +158,7 @@ sub start {
             return $sock;
         }
         else {
-            print
-              "Socket_Item client start error:  could not start a tcp client socket\n"
-              . " - host=$host port=$port: $@\n";
+            print "Socket_Item client start error:  could not start a tcp client socket\n" . " - host=$host port=$port: $@\n";
         }
     }
     else {
@@ -273,9 +266,7 @@ sub peer {
         # if we are a server, then return the IP address of the latest client
         # to send data
         if ( $self->{server} ) {
-            my $port =
-              return $::Socket_Ports{$port_name}{client_ip_address} . ':'
-              . $::Socket_Ports{$port_name}{client_port};
+            my $port = return $::Socket_Ports{$port_name}{client_ip_address} . ':' . $::Socket_Ports{$port_name}{client_port};
         }
 
         # we are a client, ask the socket to return the IP address of our peer
@@ -285,9 +276,7 @@ sub peer {
         # if we are a server, then return the IP address of the latest client
         # to send data
         if ( $self->{server} ) {
-            return
-                &Socket::inet_ntoa( $::Socket_Ports{$port_name}{from_ip} ) . ':'
-              . $::Socket_Ports{$port_name}{from_port};
+            return &Socket::inet_ntoa( $::Socket_Ports{$port_name}{from_ip} ) . ':' . $::Socket_Ports{$port_name}{from_port};
         }
 
         # we are a client, ask the socket to return the IP address of our peer
@@ -316,8 +305,7 @@ sub said {
     }
     else {
         $data = $main::Socket_Ports{$port_name}{data_record};
-        $main::Socket_Ports{$port_name}{data_record} =
-          undef;    # Maybe this should be reset in main loop??
+        $main::Socket_Ports{$port_name}{data_record} = undef;    # Maybe this should be reset in main loop??
     }
     return $data;
 }
@@ -369,9 +357,8 @@ Use this to control echoing of incoming characters:
 sub set_echo {
     my ( $self, $echo ) = @_;
     my $port_name = $self->{port_name};
-    $self->{echo} = $echo;    # Not used, but for easy references
-    $main::config_parms{"${port_name}_echo"} =
-      $echo;                  # THIS is what gets quered by mh
+    $self->{echo} = $echo;                               # Not used, but for easy references
+    $main::config_parms{"${port_name}_echo"} = $echo;    # THIS is what gets quered by mh
 }
 
 =item C<set>
@@ -406,15 +393,13 @@ sub set {
 
     my $port_name = $self->{port_name};
 
-    print
-      "Socket_Item: self=$self port=$port_name state=$state ip=$ip_address data=$socket_data\n"
+    print "Socket_Item: self=$self port=$port_name state=$state ip=$ip_address data=$socket_data\n"
       if $main::Debug{socket};
 
     return if $main::Save{mode} and $main::Save{mode} eq 'offline';
 
     unless ( $main::Socket_Ports{$port_name}{sock} ) {
-        print
-          "Error, socket port $port_name has not been set: data=$socket_data\n";
+        print "Error, socket port $port_name has not been set: data=$socket_data\n";
         return;
     }
 
@@ -422,24 +407,17 @@ sub set {
     if ($ip_address) {
         if ( $main::Socket_Ports{$port_name}{clients} ) {
             if ( $ip_address =~ /^\d+$/ ) {
-                if (
-                    defined $main::Socket_Ports{$port_name}{clients}
-                    [$ip_address] )
-                {
-                    push @sockets,
-                      $main::Socket_Ports{$port_name}{clients}[$ip_address][0];
+                if ( defined $main::Socket_Ports{$port_name}{clients}[$ip_address] ) {
+                    push @sockets, $main::Socket_Ports{$port_name}{clients}[$ip_address][0];
                 }
                 else {
-                    print
-                      "Socket_Item: Error, set client ip number $ip_address is not active\n";
+                    print "Socket_Item: Error, set client ip number $ip_address is not active\n";
                 }
             }
             else {
                 for my $ptr ( @{ $main::Socket_Ports{$port_name}{clients} } ) {
-                    my ( $socka, $client_ip_address, $client_port, $data ) =
-                      @{$ptr};
-                    print
-                      "Testing socket client ip address: $client_ip_address:$client_port\n"
+                    my ( $socka, $client_ip_address, $client_port, $data ) = @{$ptr};
+                    print "Testing socket client ip address: $client_ip_address:$client_port\n"
                       if $main::Debug{socket};
                     push @sockets, $socka
                       if $socka and $client_ip_address =~ /$ip_address/
@@ -459,8 +437,7 @@ sub set {
     }
 
     unless (@sockets) {
-        print
-          "Error, socket port $port_name is not active on a socket_item set for data=$socket_data\n";
+        print "Error, socket port $port_name is not active on a socket_item set for data=$socket_data\n";
         return;
     }
 
diff --git a/lib/SqueezeboxCLI.pm b/lib/SqueezeboxCLI.pm
index fe6d508d4..056b5406f 100644
--- a/lib/SqueezeboxCLI.pm
+++ b/lib/SqueezeboxCLI.pm
@@ -88,8 +88,7 @@ sub new {
     $$self{players}         = {};
     $$self{reconnect_timer} = new Timer;
     $$self{squeezecenter} =
-      new Socket_Item( undef, undef, $$self{server} . ":" . $$self{port},
-        "squeezecenter_cli", 'tcp', 'record' );
+      new Socket_Item( undef, undef, $$self{server} . ":" . $$self{port}, "squeezecenter_cli", 'tcp', 'record' );
     $self->login();
     ::MainLoop_pre_add_hook( sub { $self->check_for_data(); }, 'persistent' );
     return $self;
@@ -122,9 +121,7 @@ sub reconnect_delay {
     my $action = sub { $self->reconnect() };
     if ( !$seconds ) {
         $seconds = 60;
-        $self->debug(
-            "Connection to squeezecenter lost, will try to connect again in 1 minute."
-        );
+        $self->debug( "Connection to squeezecenter lost, will try to connect again in 1 minute." );
     }
     $$self{reconnect_timer}->set( $seconds, $action );
 }
@@ -157,8 +154,7 @@ sub check_for_data {
         }
 
         if ( $data =~ /([\w|%]{27})\s+(.+)/ ) {
-            $self->debug(
-                "Passing message to player '$1' for further processing", 4 );
+            $self->debug( "Passing message to player '$1' for further processing", 4 );
 
             # Pass the message to the correct object for processing
             # but only do this for players we're supposed to manage
@@ -227,9 +223,7 @@ The following parameters are optional
 =cut
 
 sub new {
-    my ( $class, $name, $interface, $coupled_device, $auto_off_time,
-        $preheat_time )
-      = @_;
+    my ( $class, $name, $interface, $coupled_device, $auto_off_time, $preheat_time ) = @_;
     my $self = new Generic_Item();
     bless $self, $class;
     $$self{sb_name}        = $name;
@@ -266,17 +260,11 @@ sub process_cli_response {
     return if ( $response =~ /^menustatus/ );
     return if ( $response =~ /^displaynotify/ );
 
-    $self->debug(
-        $self->get_object_name()
-          . ": processing '$response', current state "
-          . $self->state(),
-        2
-    );
+    $self->debug( $self->get_object_name() . ": processing '$response', current state " . $self->state(), 2 );
 
     if ( $response =~ /power[:| ](\d)/ ) {
         my $command = ( $1 == 1 ) ? 'on' : 'off';
-        $self->debug(
-            $$self{object_name} . " power is " . $1 . " command is $command" );
+        $self->debug( $$self{object_name} . " power is " . $1 . " command is $command" );
         $self->set_now( $command, 'cli' );
 
         # Turn off the coupled device immediately if the SB is turned off
@@ -290,18 +278,10 @@ sub process_cli_response {
         $$self{mixer_volume} = $1;
         $self->debug( $$self{object_name} . " mixer volume is " . $1 );
     }
-    if (
-        (
-               $response =~ /^pause 1/
-            || $response =~ /mode[:| ][pause|stop]/
-            || $response =~ /playlist stop/
-        )
-        && $self->state() ne 'off'
-      )
+    if ( ( $response =~ /^pause 1/ || $response =~ /mode[:| ][pause|stop]/ || $response =~ /playlist stop/ )
+        && $self->state() ne 'off' )
     {
-        $self->debug( $$self{object_name}
-              . " we got mode pause and state is "
-              . $self->state() );
+        $self->debug( $$self{object_name} . " we got mode pause and state is " . $self->state() );
 
         $self->set_now( 'pause', 'cli' );
 
@@ -311,9 +291,7 @@ sub process_cli_response {
             # Program the auto-off timer
             my $action = sub { $self->set( 'off', 'timer' ); };
             $$self{auto_off_timer}->set( $$self{auto_off_time} * 60, $action );
-            $self->debug( $$self{object_name}
-                  . " auto-off timer set because current state is "
-                  . $self->state() );
+            $self->debug( $$self{object_name} . " auto-off timer set because current state is " . $self->state() );
         }
     }
     if ( $response =~ /pause 0/ || $response =~ /playlist newsong/ ) {
@@ -323,17 +301,12 @@ sub process_cli_response {
         $self->send_cmd("mode ?");
     }
     if ( $response =~ /mode[:| ]play/ ) {
-        $self->debug( $$self{object_name}
-              . " received mode play, now in "
-              . $self->state() );
+        $self->debug( $$self{object_name} . " received mode play, now in " . $self->state() );
 
         $self->set_now( 'play', 'cli' );
 
         # In case an auto-off timer is active we need to disable it when we start playing
-        $self->debug( $$self{object_name}
-              . " mode is "
-              . $self->state()
-              . ", auto-timeoff cleared " );
+        $self->debug( $$self{object_name} . " mode is " . $self->state() . ", auto-timeoff cleared " );
         $$self{auto_off_timer}->set(0);
 
         # Control the coupled device too if it is defined
@@ -381,8 +354,7 @@ Handle state changes of the Squeezeboxes
 sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
 
-    $self->debug(
-        $$self{object_name} . " in setstate with $state setby $set_by" );
+    $self->debug( $$self{object_name} . " in setstate with $state setby $set_by" );
 
     # If we're set by the CLI then we don't need to send out the command again
     # as we actually received it from the server
@@ -392,9 +364,7 @@ sub default_setstate {
     return -1 if ( $self->state eq $state );
 
     # Print debug info
-    $self->debug( "Request "
-          . $self->get_object_name
-          . " to change to state '$state' by '$set_by'" );
+    $self->debug( "Request " . $self->get_object_name . " to change to state '$state' by '$set_by'" );
 
     if ( $state =~ /^off/i ) {
         $self->send_cmd('power 0');
@@ -460,15 +430,13 @@ sub play_notification {
     {
 
         $self->debug( $$self{object_name}
-              . " Preheating the amplifier and delaying the notification. We'll be back when the speakers are on"
-        );
+              . " Preheating the amplifier and delaying the notification. We'll be back when the speakers are on" );
 
         # Turn on
         $$self{coupled_device}->set('on');
 
         # Program timer to play the notification later
-        my $action =
-          sub { $self->play_notification( $notification, $volume ); };
+        my $action = sub { $self->play_notification( $notification, $volume ); };
         $$self{preheat_timer}->set( $$self{preheat_time}, $action );
         return;
     }
@@ -490,8 +458,7 @@ sub play_notification {
     $self->send_cmd("time ?");
 
     # Save the current playlist
-    $self->send_cmd(
-        "playlist save prenotification_playlist_" . $$self{object_name} );
+    $self->send_cmd( "playlist save prenotification_playlist_" . $$self{object_name} );
 
     # Set the repeat to none
     $self->send_cmd("playlist repeat 0");
@@ -582,8 +549,7 @@ sub restore_sb_state {
 
     # Restore playlist/mode
     if ( $$self{prev_state}->{'state'} eq 'play' ) {
-        $self->send_cmd(
-            "playlist resume prenotification_playlist_" . $$self{object_name} );
+        $self->send_cmd( "playlist resume prenotification_playlist_" . $$self{object_name} );
         $self->send_cmd( "time " . $$self{'time'} );
     }
     else {
diff --git a/lib/Stargate.pm b/lib/Stargate.pm
index d352b1693..4eb99e087 100644
--- a/lib/Stargate.pm
+++ b/lib/Stargate.pm
@@ -71,14 +71,8 @@ B<>
 use Telephony_Item;
 use strict;
 
-my (
-    @stargatedigitalinput_object_list, @stargatevariable_object_list,
-    @stargateflag_object_list,         @stargaterelay_object_list
-);
-my (
-    @stargatethermostat_object_list, @stargatetelephone_object_list,
-    @stargateascii_object_list,      @stargateir_object_list
-);
+my ( @stargatedigitalinput_object_list, @stargatevariable_object_list,  @stargateflag_object_list,  @stargaterelay_object_list );
+my ( @stargatethermostat_object_list,   @stargatetelephone_object_list, @stargateascii_object_list, @stargateir_object_list );
 
 package Stargate;
 
@@ -93,13 +87,7 @@ This code create the serial port and registers the callbacks we need
 sub serial_startup {
     if ( $::config_parms{Stargate_serial_port} ) {
         my ($speed) = $::config_parms{Stargate_baudrate} || 9600;
-        if (
-            &::serial_port_create(
-                'Stargate', $::config_parms{Stargate_serial_port},
-                $speed,     'none'
-            )
-          )
-        {
+        if ( &::serial_port_create( 'Stargate', $::config_parms{Stargate_serial_port}, $speed, 'none' ) ) {
             init( $::Serial_Ports{Stargate}{object} );
             &::MainLoop_pre_add_hook( \&Stargate::UserCodePreHook, 1 );
             &::MainLoop_post_add_hook( \&Stargate::UserCodePostHook, 1 );
@@ -107,21 +95,17 @@ sub serial_startup {
     }
 }
 
-my $serial_data;           # Holds left over serial data
-my $last_variable_load;    # Holds first part of two message variable load data
-my $last_thermostat_address
-  ;                        # Holds first part of two message thermostat command
+my $serial_data;                # Holds left over serial data
+my $last_variable_load;         # Holds first part of two message variable load data
+my $last_thermostat_address;    # Holds first part of two message thermostat command
 my $last_caller_id;
 
 my $Last_Upload_Timer;
 my $Last_Upload_Variable;
 
-my $Thermostat_Upload_Count
-  ;    # We use this to track if all thermostats 'reported in'
-my @Thermostat_Upload_List
-  ;    # We use this to match thermostat uploads to the correct zone
-my @Thermostat_Upload_Data
-  ;    # We use this to match thermostat uploads to the correct zone
+my $Thermostat_Upload_Count;    # We use this to track if all thermostats 'reported in'
+my @Thermostat_Upload_List;     # We use this to match thermostat uploads to the correct zone
+my @Thermostat_Upload_Data;     # We use this to match thermostat uploads to the correct zone
 
 my ( @stargate_command_list, $transmitok );
 
@@ -188,13 +172,11 @@ sub UserCodePreHook {
             $serial_data .= $data;
             print "db Stargate serial data2=$serial_data...\n"
               if $main::Debug{stargate};
-            while ( my ( $record, $remainder ) =
-                $serial_data =~ /(.+?)[\r\n]+(.*)/s )
-            {
+            while ( my ( $record, $remainder ) = $serial_data =~ /(.+?)[\r\n]+(.*)/s ) {
+
                 #print "** $record\n";
                 $parse_packet = 1;
-                $serial_data =
-                  $remainder;    # Might have part of the next record left over
+                $serial_data  = $remainder;    # Might have part of the next record left over
 
                 print "db Stargate serial data3=$record remainder=$remainder.\n"
                   if $main::Debug{stargate};
@@ -234,8 +216,7 @@ sub UserCodePreHook {
                 ParseASCII($record);
 
                 # It looks like the user has the Stargate modem configured on our port as it's sending us ocassioanl init strings?
-                print
-                  "Stargate sent modem command to MH: $record.\nPlease move modem to different Stargate port\n"
+                print "Stargate sent modem command to MH: $record.\nPlease move modem to different Stargate port\n"
                   if $record =~ /^AT.*/ and $main::Debug{stargate};
                 next if $record =~ /^AT.*/;
 
@@ -254,8 +235,7 @@ sub UserCodePreHook {
             my ($port)   = shift @stargate_command_list;
             my ($output) = shift @stargate_command_list;
             print "Stargate send: " . $output . "\n" if $main::Debug{stargate};
-            $::Serial_Ports{Stargate}{object}
-              ->write( "##%a5" . $port . $output . "\r" );
+            $::Serial_Ports{Stargate}{object}->write( "##%a5" . $port . $output . "\r" );
         }
     }
 
@@ -297,8 +277,8 @@ sub ParseEchoCommand {
           or $bytes[1] eq '1'
           or $bytes[1] eq '8'
           or $bytes[1] eq '9';    # Only look at receive data for now
-         # Disable using the Stargate for X10 receive if so configured.  I am using the CM11a and just use
-         # the stargate for I/O and phone control (bsobel@vipmail.com)
+                                  # Disable using the Stargate for X10 receive if so configured.  I am using the CM11a and just use
+                                  # the stargate for I/O and phone control (bsobel@vipmail.com)
         next if $main::config_parms{Stargate_DisableX10Receive};
 
         my ( $house, $device );
@@ -380,8 +360,7 @@ sub ParseEchoCommand {
 
     # Check for thermostat state changes (part 2)
     elsif ( $command == 0x0b ) {
-        ParseThermostatData( $last_thermostat_address, $subcommand,
-            $commanddata );
+        ParseThermostatData( $last_thermostat_address, $subcommand, $commanddata );
     }
     else {
         print "$::Time_Now Unknown echo command:$data\n";
@@ -406,12 +385,9 @@ sub RequestThermostatUpload {
     ResetThermostatUpload();
 
     for my $current_object (@stargatethermostat_object_list) {
-        my $data =
-          "##%5f" . sprintf( "%02x", $current_object->{address} - 1 ) . "00\r";
-        if ( $::Serial_Ports{Stargate}{object}->write($data) == length($data) )
-        {
-            push( @Thermostat_Upload_List,
-                join( ',', $current_object->{address} - 1, time ) );
+        my $data = "##%5f" . sprintf( "%02x", $current_object->{address} - 1 ) . "00\r";
+        if ( $::Serial_Ports{Stargate}{object}->write($data) == length($data) ) {
+            push( @Thermostat_Upload_List, join( ',', $current_object->{address} - 1, time ) );
         }
     }
 
@@ -430,8 +406,7 @@ sub ParseThermostatUpload {
 
     # If the thermostat uploads got out of sync (somehow), reset and try again
     if ( $timediff > 30 ) {
-        print
-          "Stargate Thermostat out of sync data=$data timediff=$timediff Trying again\n"
+        print "Stargate Thermostat out of sync data=$data timediff=$timediff Trying again\n"
           if $main::Debug{stargate};
 
         ResetThermostatUpload();
@@ -455,9 +430,7 @@ sub ParseThermostatUpload {
             my ( $address, $data ) =
               split( ',', shift @Thermostat_Upload_Data );
 
-            print "Stargate Thermostat upload command for address:"
-              . $address
-              . " data=$data\n"
+            print "Stargate Thermostat upload command for address:" . $address . " data=$data\n"
               if $main::Debug{stargate};
 
             ParseThermostatData( $address, 0x00, hex substr( $data, 0, 2 ) );
@@ -522,8 +495,7 @@ sub ParseThermostatData {
         #        print "Stargate Thermostat #$data polling error\n";
     }
     else {
-        print
-          "Stargate Thermostat #$address subcommand:$subcommand data=$data\n";
+        print "Stargate Thermostat #$address subcommand:$subcommand data=$data\n";
     }
 }
 
@@ -537,13 +509,10 @@ sub SetThermostatState {
         my $newstate;
         $newstate = $state if $current_object->{$state} ne $statedata;
 
-        print "Stargate Thermostat #"
-          . $current_object->{address}
-          . " state change to $newstate:$statedata (internal=$state)\n"
+        print "Stargate Thermostat #" . $current_object->{address} . " state change to $newstate:$statedata (internal=$state)\n"
           if $newstate;
         $current_object->set_states_for_next_pass($newstate) if $newstate;
-        $current_object->set_states_for_next_pass(
-            $newstate . ":" . $statedata )
+        $current_object->set_states_for_next_pass( $newstate . ":" . $statedata )
           if $newstate;
 
         # Set the subitem state so we can check for changes later (and respond to state() requests)
@@ -569,10 +538,7 @@ sub SetDigitalInputState {
     my ( $base, $unitstates ) = @_;
 
     for my $current_object (@stargatedigitalinput_object_list) {
-        print $current_object->{address}
-          . " base=$base t1="
-          . ( $base - 1 ) * 8 . " t2="
-          . ( $base * 8 ) . "\n"
+        print $current_object->{address} . " base=$base t1=" . ( $base - 1 ) * 8 . " t2=" . ( $base * 8 ) . "\n"
           if $main::Debug{stargate};
 
         # Make sure the item is within the range of 8 status bits returned, skip if not
@@ -597,9 +563,7 @@ sub SetDigitalInputState {
               if $current_object->state ne 'off'
               and !( $unitstates & $unitbit );
         }
-        print "Stargate Digitial Input #"
-          . $current_object->{address}
-          . " state change to $newstate\n"
+        print "Stargate Digitial Input #" . $current_object->{address} . " state change to $newstate\n"
           if $newstate and $::config_parms{debug} =~ /StargateDigitalInput/i;
         $current_object->set_states_for_next_pass($newstate) if $newstate;
     }
@@ -658,9 +622,7 @@ sub ParseTelephoneData {
             SetTelephoneState( 'CO', "ring::" . ( $data - 0x40 ) );
         }
         else {
-            &::print_log(
-                "Stargate Telephone unknown subcommand:$subcommand data:$data\n"
-            );
+            &::print_log( "Stargate Telephone unknown subcommand:$subcommand data:$data\n" );
         }
     }
     elsif ( $subcommand eq 0x0f ) {
@@ -668,14 +630,11 @@ sub ParseTelephoneData {
             $last_caller_id = 1;
         }
         else {
-            &::print_log(
-                "Stargate Telephone unknown subcommand:$subcommand data:$data\n"
-            );
+            &::print_log( "Stargate Telephone unknown subcommand:$subcommand data:$data\n" );
         }
     }
     else {
-        &::print_log(
-            "Stargate Telephone unknown subcommand:$subcommand data:$data\n");
+        &::print_log("Stargate Telephone unknown subcommand:$subcommand data:$data\n");
     }
 
 }
@@ -753,9 +712,7 @@ sub SetFlagState {
         my $newstate;
         $newstate = $state if $current_object->state ne $state;
 
-        print "Stargate Flag #"
-          . $current_object->{address}
-          . " state change to $newstate\n"
+        print "Stargate Flag #" . $current_object->{address} . " state change to $newstate\n"
           if $newstate;
         $current_object->set_states_for_next_pass($newstate) if $newstate;
     }
@@ -802,9 +759,7 @@ sub SetVariableState {
         my $newstate;
         $newstate = $state if $current_object->state() ne $state;
 
-        print "Stargate Variable #"
-          . $current_object->{address}
-          . " state change to $newstate\n"
+        print "Stargate Variable #" . $current_object->{address} . " state change to $newstate\n"
           if $newstate ne undef;
         $current_object->set_states_for_next_pass($newstate)
           if $newstate ne undef;
@@ -829,10 +784,7 @@ sub SetRelayState {
     my ( $base, $unitstates ) = @_;
 
     for my $current_object (@stargaterelay_object_list) {
-        print $current_object->{address}
-          . " base=$base t1="
-          . ( $base - 1 ) * 8 . " t2="
-          . ( $base * 8 ) . "\n"
+        print $current_object->{address} . " base=$base t1=" . ( $base - 1 ) * 8 . " t2=" . ( $base * 8 ) . "\n"
           if $main::Debug{stargate};
 
         # Make sure the item is within the range of 8 status bits returned, skip if not
@@ -848,9 +800,7 @@ sub SetRelayState {
         $newstate = "off"
           if $current_object->state ne 'off' and !( $unitstates & $unitbit );
 
-        print "Stargate Relay #"
-          . $current_object->{address}
-          . " state change to $newstate\n"
+        print "Stargate Relay #" . $current_object->{address} . " state change to $newstate\n"
           if $newstate;
         $current_object->set_states_for_next_pass($newstate) if $newstate;
     }
@@ -872,9 +822,7 @@ sub SetIRState {
         my $newstate;
         $newstate = $state if $current_object->state ne $state;
 
-        print "Stargate IR #"
-          . $current_object->{address}
-          . " state change to $newstate\n"
+        print "Stargate IR #" . $current_object->{address} . " state change to $newstate\n"
           if $newstate;
         $current_object->set_states_for_next_pass($newstate) if $newstate;
 
@@ -930,11 +878,9 @@ sub read_time {
 
             #print "Stargate time string: $data\n";
             # Not sure about $second.  $wday looks like year, not 0-7??
-            my ( $year, $month, $mday, $wday, $hour, $minute, $second ) =
-              unpack( "A2A2A2A2A2A2A2", $data );
+            my ( $year, $month, $mday, $wday, $hour, $minute, $second ) = unpack( "A2A2A2A2A2A2A2", $data );
             print "Stargate time:  $hour:$minute:$second $month/$mday/$year\n";
-            return
-              wantarray
+            return wantarray
               ? ( $second, $minute, $hour, $mday, $month, $year, $wday )
               : " $hour:$minute:$second $month/$mday/$year";
         }
@@ -954,15 +900,14 @@ sub read_log {
     print "Reading Stargate log\n";
     if ( 6 == ( $temp = $serial_port->write("##%15\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # May need to paste data together to find real line breaks
+                                                   # May need to paste data together to find real line breaks
         my @log;
         my $buffer;
 
         # Read data in a buffer string
         while ( my $data = $serial_port->input ) {
             $buffer .= $data;
-            select undef, undef, undef,
-              100 / 1000;    # Need more/less/any delay here???
+            select undef, undef, undef, 100 / 1000;    # Need more/less/any delay here???
         }
 
         # Filter out extraneous stuff before splitting into list
@@ -1019,7 +964,7 @@ sub read_flags {
     print "Reading Stargate Flags\n";
     if ( 6 == ( $temp = $serial_port->write("##%10\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # How may flags?? Best look for end of data character ... \n\n??
+                                                   # How may flags?? Best look for end of data character ... \n\n??
         my @flags;
         while ( my $data = $serial_port->input ) {
             my ( $header, $flags ) = $data =~ /(\S+?)[\n\r]+(\S+)/;
@@ -1051,7 +996,7 @@ sub read_voicemail_count {
     &::print_log("VM count :$l_box:");
     if ( 7 == ( $temp = $serial_port->write("##%5c$l_box\r") ) or 1 ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               #5c0301\r\n  3 old messages 1 new
+                                                   #5c0301\r\n  3 old messages 1 new
         my $data = $serial_port->input;
         $data =~ /###5c(\d\d)(\d\d)/i;
         $count{new} = sprintf( "%d", $2 );
@@ -1069,17 +1014,13 @@ sub voicemail {
         return;
     }
 
-    my $serial_port  = $::Serial_Ports{Stargate}{object};
-    my %table_output = qw(lo 02 co 04 ic 08);
-    my %table_commands =
-      qw(first 01 next 02 repeat 04 stop 06 all 07 allnew 08 cid 05 delete 03 back 09 forward 0a);
+    my $serial_port    = $::Serial_Ports{Stargate}{object};
+    my %table_output   = qw(lo 02 co 04 ic 08);
+    my %table_commands = qw(first 01 next 02 repeat 04 stop 06 all 07 allnew 08 cid 05 delete 03 back 09 forward 0a);
     my $l_string;
 
     &::print_log("Play :$l_command:");
-    $l_string = "##%94"
-      . $table_commands{$l_command}
-      . $l_box . "00"
-      . $table_output{$l_output} . "\r";
+    $l_string = "##%94" . $table_commands{$l_command} . $l_box . "00" . $table_output{$l_output} . "\r";
     if ( 7 == ( $temp = $serial_port->write($l_string) ) or 1 ) {
 
         #	        select undef, undef, undef, 100 / 1000; # Give it a chance to respond
@@ -1098,14 +1039,13 @@ sub read_variables {
     print "Reading Stargate Variables\n";
     if ( 6 == ( $temp = $serial_port->write("##%12\r") ) ) {
         select undef, undef, undef, 100 / 1000;    # Give it a chance to respond
-               # May need to paste data together to find real line breaks
+                                                   # May need to paste data together to find real line breaks
         my @vars;
         my $buffer;
         while ( my $data = $serial_port->input ) {
             $buffer .= $data
-              unless ( $data =~ /#/ );    # ##0 is end of list marker
-            select undef, undef, undef,
-              100 / 1000;                 # Need more/less/any delay here???
+              unless ( $data =~ /#/ );             # ##0 is end of list marker
+            select undef, undef, undef, 100 / 1000;    # Need more/less/any delay here???
         }
         @vars = split /\r\n/, $buffer;
         my $count = @vars;
@@ -1133,8 +1073,7 @@ CC=00 (Checksum? doesn't appear to be used)
 
 sub set_time {
     my ($serial_port) = @_;
-    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst )
-      = localtime time;
+    my ( $Second, $Minute, $Hour, $Mday, $Month, $Year, $Wday, $Yday, $isdst ) = localtime time;
     $Month++;
     $Wday++;
     my $localtime = localtime time;
@@ -1157,19 +1096,13 @@ sub set_time {
     # Set daylight savings flag, this should be in mh.private.ini if your area uses DST
     $isdst = "00";    # was 01
                       #
-      #print ("DST=$isdst Y=$Year M=$Month D=$Mday DOW=$Wday H=$Hour M=$Minute\n");
+                      #print ("DST=$isdst Y=$Year M=$Month D=$Mday DOW=$Wday H=$Hour M=$Minute\n");
     my $set_time = sprintf(
         "%04x%04x%02x%02x%02d%02d%02d%02d%02d%02d",
         abs( $main::config_parms{latitude} ),
         abs( $main::config_parms{longitude} ),
         $main::config_parms{time_zone},
-        $isdst,
-        $Year,
-        $Month,
-        $Mday,
-        $Wday,
-        $Hour,
-        $Minute
+        $isdst, $Year, $Month, $Mday, $Wday, $Hour, $Minute
     );
 
     #Checksum not required, so set it to 00
@@ -1178,13 +1111,7 @@ sub set_time {
     print "Stargate set_time=$set_time checksum=$checksum\n"
       if $main::Debug{stargate};
 
-    if (
-        32 == (
-            $temp =
-              $serial_port->write( "##%05" . $set_time . $checksum . "\r" )
-        )
-      )
-    {
+    if ( 32 == ( $temp = $serial_port->write( "##%05" . $set_time . $checksum . "\r" ) ) ) {
         print "Stargate time has been updated to $localtime\n";
         return 1;
     }
@@ -1285,10 +1212,7 @@ sub set_audio {
 ##%5d010208 LiImConnect
 ##%5d000208 LiImDisConnect
 
-    my ($command) = "##%5d"
-      . $table_state{ lc($p_state) }
-      . $table_input{ lc($p_input) }
-      . $table_output{ lc($p_output) } . "\r";
+    my ($command) = "##%5d" . $table_state{ lc($p_state) } . $table_input{ lc($p_input) } . $table_output{ lc($p_output) } . "\r";
 
     #        print "Stargate Audio Input: $command\n";
     if ( 8 == $serial_port->write($command) ) {
@@ -1589,13 +1513,11 @@ sub default_setstate {
       or $state eq 'no'
       or $state eq 'false';
     if ( $state ne "set" and $state ne "clear" ) {
-        print
-          "StargateFlag invalid state:$state set (set|on|1|yes|true or clear|off|0|no|false)\n";
+        print "StargateFlag invalid state:$state set (set|on|1|yes|true or clear|off|0|no|false)\n";
         return -1;
     }
 
-    my ($command) = "##%25"
-      . sprintf( "%02x%02x", $self->{address}, $state eq "set" ? 1 : 0 ) . "\r";
+    my ($command) = "##%25" . sprintf( "%02x%02x", $self->{address}, $state eq "set" ? 1 : 0 ) . "\r";
 
     #print "Stargate flag command:$command\n";
 
@@ -1690,17 +1612,13 @@ sub default_setstate {
       or $state eq 'no'
       or $state eq 'false';
     if ( $state ne "set" and $state ne "clear" ) {
-        print
-          "StargateRelay invalid state:$state set (set|on|1|yes|true or clear|off|0|no|false)\n";
+        print "StargateRelay invalid state:$state set (set|on|1|yes|true or clear|off|0|no|false)\n";
         return -1;
     }
 
     # Set
     my ($command) = "##%330019"
-      . sprintf( "%02x%02x",
-        $l_address{ $self->{address} },
-        $state eq "set" ? $l_address{ $self->{address} } : 0 )
-      . "\r";
+      . sprintf( "%02x%02x", $l_address{ $self->{address} }, $state eq "set" ? $l_address{ $self->{address} } : 0 ) . "\r";
 
     #&main::print_log("Stargate relay:$command:");
     if ( length($command) != $self->{serial_port}->write($command) ) {
@@ -1889,8 +1807,7 @@ sub SendTheromostatCommand {
     my ( $self, $command, $data ) = @_;
     return undef unless defined $command;
 
-    my $output =
-      "##%5e" . sprintf( "%02x%02x%02x\r", $self->{address}, $command, $data );
+    my $output = "##%5e" . sprintf( "%02x%02x%02x\r", $self->{address}, $command, $data );
     $self->{serial_port}->write($output);
     return 1;
 }
@@ -1970,8 +1887,7 @@ sub set {
     # Clear
     &::print_log("SGTelephoneclass call $$self{line} ,$state,");
     if ( $state =~ /^callerid/i ) {
-        $state =~
-          /callerid::([a-z,A-Z]*)::([0-9]*)\s*([a-z,A-Z,\s]*)\s*([0-9]*)/;
+        $state =~ /callerid::([a-z,A-Z]*)::([0-9]*)\s*([a-z,A-Z,\s]*)\s*([0-9]*)/;
         $self->cid_name($3);
         $self->cid_number($2);
         $self->cid_type($1);
@@ -2350,11 +2266,7 @@ sub setstate_play {
     my ($command) =
         "##%286c0685"
       . $memorybank
-      . sprintf(
-        "%02x%02x%01x%01x",
-        $address, $repeatcount, $self->{alternateplay},
-        $self->{portmap}
-      ) . "00\r";
+      . sprintf( "%02x%02x%01x%01x", $address, $repeatcount, $self->{alternateplay}, $self->{portmap} ) . "00\r";
 
     print "Stargate IR command:$command\n";
 
@@ -2366,8 +2278,7 @@ sub setstate_play {
 
 sub default_setstate {
     my ( $self, $state ) = @_;
-    print
-      "StargateIR invalid state:$state set (must be play or play:repeatcount\n";
+    print "StargateIR invalid state:$state set (must be play or play:repeatcount\n";
     return;
 }
 1;
diff --git a/lib/Stargate485.pm b/lib/Stargate485.pm
index 49ed01a43..1c8199044 100644
--- a/lib/Stargate485.pm
+++ b/lib/Stargate485.pm
@@ -39,13 +39,7 @@ This code create the serial port and registers the callbacks we need
 sub serial_startup {
     if ( $::config_parms{Stargate485_serial_port} ) {
         my ($speed) = $::config_parms{Stargate485_baudrate} || 9600;
-        if (
-            &::serial_port_create(
-                'Stargate485', $::config_parms{Stargate485_serial_port},
-                $speed,        'none'
-            )
-          )
-        {
+        if ( &::serial_port_create( 'Stargate485', $::config_parms{Stargate485_serial_port}, $speed, 'none' ) ) {
             init( $::Serial_Ports{Stargate485}{object} );
             &::MainLoop_pre_add_hook( \&Stargate485::UserCodePreHook, 1 );
             &::MainLoop_post_add_hook( \&Stargate485::UserCodePostHook, 1 );
@@ -103,11 +97,8 @@ sub UserCodePreHook {
 
         # Check to see if we have a carrage return yet
         if ( $::Serial_Ports{'Stargate485'}{data} ) {
-            while ( my ( $record, $remainder ) =
-                $::Serial_Ports{'Stargate485'}{data} =~ /(.+?)[\r\n]+(.*)/s )
-            {
-                &::print_log(
-                    "Data from Stargate485: $record.  remainder=$remainder.")
+            while ( my ( $record, $remainder ) = $::Serial_Ports{'Stargate485'}{data} =~ /(.+?)[\r\n]+(.*)/s ) {
+                &::print_log("Data from Stargate485: $record.  remainder=$remainder.")
                   if $main::Debug{Stargate485};
                 $::Serial_Ports{'Stargate485'}{data_record} = $record;
                 $::Serial_Ports{'Stargate485'}{data}        = $remainder;
@@ -139,8 +130,7 @@ sub UserCodePreHook {
             ( my $output ) = shift @stargate485_command_list;
             print "Stargate COM1 to 485bus transmit: " . $output . "\n"
               if lc( $main::config_parms{debug} ) eq 'stargate485';
-            &Stargate::send_command( $::Serial_Ports{Stargate}{object},
-                "rs485", $output );
+            &Stargate::send_command( $::Serial_Ports{Stargate}{object}, "rs485", $output );
 
             #$::Serial_Ports{Stargate}{object}->write("##%a507" . $output . "\r");
             #}
@@ -281,8 +271,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sFM=(\d+)/ ) {
                 $object->set_states_for_next_pass("zonefanmode")
                   if ( $object->{zonefanmode} ne $1 );
-                $object->set_states_for_next_pass(
-                    "zonefanmode:" . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "zonefanmode:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{zonefanmode} ne $1 );
                 $object->{zonefanmode} = $1;
             }
@@ -290,8 +279,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sH1A=(\d+)/ ) {
                 $object->set_states_for_next_pass("heatingstage1")
                   if ( $object->{heatingstage1} ne $1 );
-                $object->set_states_for_next_pass( "heatingstage1:"
-                      . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "heatingstage1:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{heatingstage1} ne $1 );
                 $object->{heatingstage1} = $1;
             }
@@ -299,8 +287,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sH2A=(\d+)/ ) {
                 $object->set_states_for_next_pass("heatingstage2")
                   if ( $object->{heatingstage2} ne $1 );
-                $object->set_states_for_next_pass( "heatingstage2:"
-                      . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "heatingstage2:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{heatingstage2} ne $1 );
                 $object->{heatingstage2} = $1;
             }
@@ -308,8 +295,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sC1A=(\d+)/ ) {
                 $object->set_states_for_next_pass("coolingstage1")
                   if ( $object->{coolingstage1} ne $1 );
-                $object->set_states_for_next_pass( "coolingstage1:"
-                      . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "coolingstage1:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{coolingstage1} ne $1 );
                 $object->{coolingstage1} = $1;
             }
@@ -317,8 +303,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sC2A=(\d+)/ ) {
                 $object->set_states_for_next_pass("coolingstage2")
                   if ( $object->{coolingstage2} ne $1 );
-                $object->set_states_for_next_pass( "coolingstage2:"
-                      . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "coolingstage2:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{coolingstage2} ne $1 );
                 $object->{coolingstage2} = $1;
             }
@@ -326,8 +311,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sFA=(\d+)/ ) {
                 $object->set_states_for_next_pass("fanstatus")
                   if ( $object->{fanstatus} ne $1 );
-                $object->set_states_for_next_pass(
-                    "fanstatus:" . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "fanstatus:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{fanstatus} ne $1 );
                 $object->{fanstatus} = $1;
             }
@@ -335,8 +319,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sSCP=(\d+)/ ) {
                 $object->set_states_for_next_pass("shortcycle")
                   if ( $object->{shortcycle} ne $1 );
-                $object->set_states_for_next_pass(
-                    "shortcycle:" . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "shortcycle:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{shortcycle} ne $1 );
                 $object->{shortcycle} = $1;
             }
@@ -344,8 +327,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sSM=(O|H|C|A|I)/ ) {
                 $object->set_states_for_next_pass("systemmode")
                   if ( $object->{systemmode} ne $1 );
-                $object->set_states_for_next_pass(
-                    "systemmode:" . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "systemmode:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{systemmode} ne $1 );
                 $object->{systemmode} = $1;
             }
@@ -353,8 +335,7 @@ sub ParseThermostatData {
             if ( $record =~ /\sSF=(\d+)/ ) {
                 $object->set_states_for_next_pass("fancommand")
                   if ( $object->{fancommand} ne $1 );
-                $object->set_states_for_next_pass(
-                    "fancommand:" . &StargateRCSThermostat::ReturnString($1) )
+                $object->set_states_for_next_pass( "fancommand:" . &StargateRCSThermostat::ReturnString($1) )
                   if ( $object->{fancommand} ne $1 );
                 $object->{fancommand} = $1;
             }
@@ -441,35 +422,28 @@ sub GoToMenu {
 
 sub WriteText {
     my ( $self, $row, $text ) = @_;
-    my $output = "!TP"
-      . sprintf( "%2.2xT%2.2x0a%-10.10s00", $self->{address}, $row - 1, $text );
+    my $output = "!TP" . sprintf( "%2.2xT%2.2x0a%-10.10s00", $self->{address}, $row - 1, $text );
     push( @stargate485_command_list, $output );
 }
 
 sub ChangeText {
     my ( $self, $menu, $row, $text ) = @_;
 
-    my $output = "!TP"
-      . sprintf( "%2.2xm%2.2x%2.2x80%-10.10s00",
-        $self->{address}, $menu - 1, $row - 1, $text );
+    my $output = "!TP" . sprintf( "%2.2xm%2.2x%2.2x80%-10.10s00", $self->{address}, $menu - 1, $row - 1, $text );
     push( @stargate485_command_list, $output );
 }
 
 sub InvertText {
     my ( $self, $menu, $row ) = @_;
 
-    my $output = "!TP"
-      . sprintf( "%2.2xm%2.2x%2.2x30          30",
-        $self->{address}, $menu - 1, $row - 1 );
+    my $output = "!TP" . sprintf( "%2.2xm%2.2x%2.2x30          30", $self->{address}, $menu - 1, $row - 1 );
     push( @stargate485_command_list, $output );
 }
 
 sub UnInvertText {
     my ( $self, $menu, $row ) = @_;
 
-    my $output = "!TP"
-      . sprintf( "%2.2xm%2.2x%2.2x30          00",
-        $self->{address}, $menu - 1, $row - 1 );
+    my $output = "!TP" . sprintf( "%2.2xm%2.2x%2.2x30          00", $self->{address}, $menu - 1, $row - 1 );
     push( @stargate485_command_list, $output );
 }
 1;
@@ -590,8 +564,7 @@ sub default_setstate {
 
         # Valid mode $state is 0/O for off 1/H for heat, 2/C for cool, and 3/A for auto
         /^zonemode/i && do {
-            return $self->SendTheromostatCommand( "M",
-                uc( substr( $state, 1 ) ) );
+            return $self->SendTheromostatCommand( "M", uc( substr( $state, 1 ) ) );
         };
 
         # Valid mode $state is 0 or 1
@@ -601,8 +574,7 @@ sub default_setstate {
 
         # Valid mode $state is 0/O for off 1/H for heat, 2/C for cool, and 3/A for auto
         /^systemmode/i && do {
-            return $self->SendTheromostatCommand( "SM",
-                uc( substr( $state, 1 ) ) );
+            return $self->SendTheromostatCommand( "SM", uc( substr( $state, 1 ) ) );
         };
 
         # Valid mode $state is 0 or 1
@@ -708,8 +680,7 @@ sub ReturnCommand {
 sub SendTheromostatCommand {
     my ( $self, $device, $state ) = @_;
     return undef unless defined $state;
-    my $output = sprintf( "A=%u Z=%u O=MH %s=%s",
-        $self->{address}, $self->{zone}, $device, $state );
+    my $output = sprintf( "A=%u Z=%u O=MH %s=%s", $self->{address}, $self->{zone}, $device, $state );
     print "StargateThermostat output $output\n" if $main::Debug{Stargate485};
     push( @stargate485_command_list, $output );
     return 1;
diff --git a/lib/SunTime_mh.pm b/lib/SunTime_mh.pm
index b1dfb8973..beb81bab4 100644
--- a/lib/SunTime_mh.pm
+++ b/lib/SunTime_mh.pm
@@ -119,13 +119,13 @@ sub sun_time {
     }
 
     my $Q = .39782 * sin($M);               # Solar Declination
-    $Q = $Q / sqrt( -$Q * $Q + 1 );  # This is how the original author wrote it!
+    $Q = $Q / sqrt( -$Q * $Q + 1 );         # This is how the original author wrote it!
     $Q = atan2( $Q, 1 );
 
     my $S = $R - ( sin($Q) * sin($E) );
     $S = $S / ( cos($Q) * cos($E) );
 
-    return 'none' if abs($S) > 1;    # Null phenomenon
+    return 'none' if abs($S) > 1;           # Null phenomenon
 
     $S = $S / sqrt( -$S * $S + 1 );
     $S = $A - atan2( $S, 1 );
diff --git a/lib/SysDiag_xAP.pm b/lib/SysDiag_xAP.pm
index 1c824c969..0cd6dfcb7 100644
--- a/lib/SysDiag_xAP.pm
+++ b/lib/SysDiag_xAP.pm
@@ -83,8 +83,7 @@ sub new {
     print "Adding xAP_Item to SysDiag_xAP instance with address: $xap_address\n"
       if $::Debug{sysdiag};
     my $friendly_name = "xap_sysdiag_$instance" . "_$server";
-    &main::store_object_data( $xap_item, 'xAP_Item', $friendly_name,
-        $friendly_name );
+    &main::store_object_data( $xap_item, 'xAP_Item', $friendly_name, $friendly_name );
     $$self{xap_item} = $xap_item;
 
     # now tie our only xAP item to our self
@@ -98,12 +97,10 @@ sub add {
         for my $monitor (@monitors) {
             if ( $monitor->isa('AnalogSensor_Item') ) {
                 my $key = $monitor->type . "." . $monitor->id;
-                print "[SysDiag] Adding monitor: $key to "
-                  . "sysdiag: $$self{instance}\n"
+                print "[SysDiag] Adding monitor: $key to " . "sysdiag: $$self{instance}\n"
                   if $main::Debug{sysdiag};
                 $$self{m_monitors}{$key} = $monitor;
-                $self->SUPER::add($monitor)
-                  ;    # add it so that it can set this object
+                $self->SUPER::add($monitor);    # add it so that it can set this object
             }
         }
     }
@@ -131,8 +128,7 @@ sub _process_section {
     my ( $self, $section_name ) = @_;
     my $section = $$self{xap_item}{$section_name};
     for my $subsection_name ( keys %{$section} ) {
-        print "[SysDiag] Processing $section_name.$subsection_name: "
-          . $section->{$subsection_name} . ":"
+        print "[SysDiag] Processing $section_name.$subsection_name: " . $section->{$subsection_name} . ":"
           if $main::Debug{sysdiag};
 
         # now, copy it
@@ -141,14 +137,8 @@ sub _process_section {
 
         # locate the corresponding device if it exists
         # the naming convention must use a period as the delimitter
-        if (
-            exists(
-                $$self{m_monitors}{ $section_name . "." . $subsection_name }
-            )
-          )
-        {
-            my $monitor =
-              $$self{m_monitors}{ $section_name . "." . $subsection_name };
+        if ( exists( $$self{m_monitors}{ $section_name . "." . $subsection_name } ) ) {
+            my $monitor = $$self{m_monitors}{ $section_name . "." . $subsection_name };
             print "Exists $$section{$subsection_name} "
               if $main::Debug{sysdiag};
             $monitor->measurement( $$section{$subsection_name} );
diff --git a/lib/TED.pm b/lib/TED.pm
index df76b1fa1..718ee3b16 100644
--- a/lib/TED.pm
+++ b/lib/TED.pm
@@ -59,8 +59,7 @@ sub serial_startup {
     &::serial_port_create( $portname, $port, '19200', 'none', 'record' );
     $TED_Data{$portname}{'serial_port'} = $port;
 
-    if ( 1 == scalar( keys %TED_Data ) )
-    {    # add hooks on first call only - even though only one for now
+    if ( 1 == scalar( keys %TED_Data ) ) {    # add hooks on first call only - even though only one for now
         &::MainLoop_pre_add_hook( \&TED::check_for_data, 1 );
     }
 }
@@ -95,8 +94,7 @@ sub check_for_data {
     {
         $ted->{last_report} = $time;
         my $time_missing = $time - $ted->{update_time};
-        &::print_log(
-            "TED: Haven't heard from ted in 10 seconds, is something wrong?");
+        &::print_log("TED: Haven't heard from ted in 10 seconds, is something wrong?");
         return;
 
         #	my $port = $::Serial_Ports{$portname}{port};
@@ -111,9 +109,7 @@ sub check_for_data {
     {
         $ted->{squawk_time} = $time;
         my $last_good = $time - $ted->{good_packet_time};
-        &::print_log(
-            "TED: Haven't gotten a good packet from ted in $last_good seconds, is something wrong?"
-        ) unless $::Startup;
+        &::print_log( "TED: Haven't gotten a good packet from ted in $last_good seconds, is something wrong?" ) unless $::Startup;
     }
 }
 
@@ -130,8 +126,7 @@ sub process_incoming_data {
     }
 
     my $tedchars = $#pkt + 3;
-    printf( "%02d:%02d:%02d TED chars: $tedchars\n",
-        $main::Hour, $main::Minute, $main::Second )
+    printf( "%02d:%02d:%02d TED chars: $tedchars\n", $main::Hour, $main::Minute, $main::Second )
       if $main::Debug{ted};
     my $tedstr = pack "CCCC", $pkt[113], $pkt[114], $pkt[115], $pkt[116];
     my $start = pack "CC", $pkt[0], $pkt[1];
@@ -139,8 +134,7 @@ sub process_incoming_data {
     print_pkt(@pkt) if $main::Debug{ted};
 
     # new versions starting at 9.01 have two extra bytes in packet
-    my $tedcount =
-      $main::config_parms{ $portname . "_ask_for_data" } ? 282 : 280;
+    my $tedcount = $main::config_parms{ $portname . "_ask_for_data" } ? 282 : 280;
 
     if (    ( $start eq "\cP\cD" )
         and ( $tedstr eq "TED " )
@@ -160,9 +154,7 @@ sub process_incoming_data {
           int $main::Electric{SummerStart} / 32 + 1,
           $main::Electric{SummerStart} % 32 + 1;
         $main::Electric{SummerEnd} = ( ( $pkt[19] * 256 ) + $pkt[18] );
-        $main::Electric{SummerEnd} = sprintf "%d/%d",
-          int $main::Electric{SummerEnd} / 32 + 1,
-          $main::Electric{SummerEnd} % 32 + 1;
+        $main::Electric{SummerEnd} = sprintf "%d/%d", int $main::Electric{SummerEnd} / 32 + 1, $main::Electric{SummerEnd} % 32 + 1;
         $main::Electric{KwThresh1_0} = ( ( $pkt[21] * 256 ) + $pkt[20] );
         $main::Electric{KwThresh1_1} = ( ( $pkt[23] * 256 ) + $pkt[22] );
         $main::Electric{KwThresh1_2} = ( ( $pkt[25] * 256 ) + $pkt[24] );
@@ -187,29 +179,29 @@ sub process_incoming_data {
         $main::Electric{KwThresh4_3} = ( ( $pkt[63] * 256 ) + $pkt[62] );
         $main::Electric{KwThresh4_4} = ( ( $pkt[65] * 256 ) + $pkt[64] );
         $main::Electric{KwThresh4_5} = ( ( $pkt[67] * 256 ) + $pkt[66] );
-        $main::Electric{KwRate1_1} = ( ( $pkt[85] * 256 ) + $pkt[84] ) / 10000;
+        $main::Electric{KwRate1_1}   = ( ( $pkt[85] * 256 ) + $pkt[84] ) / 10000;
         $main::Electric{CurrentRate} = $main::Electric{KwRate1_1};
-        $main::Electric{KwRate1_2} = ( ( $pkt[87] * 256 ) + $pkt[86] ) / 10000;
-        $main::Electric{KwRate1_3} = ( ( $pkt[89] * 256 ) + $pkt[88] ) / 10000;
-        $main::Electric{KwRate1_4} = ( ( $pkt[91] * 256 ) + $pkt[90] ) / 10000;
-        $main::Electric{KwRate1_5} = ( ( $pkt[93] * 256 ) + $pkt[92] ) / 10000;
-        $main::Electric{KwRate2_1} = ( ( $pkt[95] * 256 ) + $pkt[94] ) / 10000;
-        $main::Electric{KwRate2_2} = ( ( $pkt[97] * 256 ) + $pkt[96] ) / 10000;
-        $main::Electric{KwRate2_3} = ( ( $pkt[99] * 256 ) + $pkt[98] ) / 10000;
+        $main::Electric{KwRate1_2}   = ( ( $pkt[87] * 256 ) + $pkt[86] ) / 10000;
+        $main::Electric{KwRate1_3}   = ( ( $pkt[89] * 256 ) + $pkt[88] ) / 10000;
+        $main::Electric{KwRate1_4}   = ( ( $pkt[91] * 256 ) + $pkt[90] ) / 10000;
+        $main::Electric{KwRate1_5}   = ( ( $pkt[93] * 256 ) + $pkt[92] ) / 10000;
+        $main::Electric{KwRate2_1}   = ( ( $pkt[95] * 256 ) + $pkt[94] ) / 10000;
+        $main::Electric{KwRate2_2}   = ( ( $pkt[97] * 256 ) + $pkt[96] ) / 10000;
+        $main::Electric{KwRate2_3}   = ( ( $pkt[99] * 256 ) + $pkt[98] ) / 10000;
         $main::Electric{KwRate2_4} =
           ( ( $pkt[101] * 256 ) + $pkt[100] ) / 10000;
         $main::Electric{KwRate2_5} =
           ( ( $pkt[103] * 256 ) + $pkt[102] ) / 10000;
-        $main::Electric{SalesTax} = ( ( $pkt[105] * 256 ) + $pkt[104] ) / 10000;
-        $main::Electric{MeterRead} = $pkt[106] + 1;
-        $main::Electric{Calibrate} = ( ( $pkt[108] * 256 ) + $pkt[107] ) / 1000;
+        $main::Electric{SalesTax}     = ( ( $pkt[105] * 256 ) + $pkt[104] ) / 10000;
+        $main::Electric{MeterRead}    = $pkt[106] + 1;
+        $main::Electric{Calibrate}    = ( ( $pkt[108] * 256 ) + $pkt[107] ) / 1000;
         $main::Electric{NumHouseCode} = $pkt[109] + 1;
         $main::Electric{HouseCode}    = $pkt[110];
         $main::Electric{HouseCode2}   = $pkt[111];
 
         $main::Electric{DlrPkKwHAlarm} =
           ( ( $pkt[123] * 256 ) + $pkt[122] ) / 100;
-        $main::Electric{PkKwAlarm} = ( ( $pkt[125] * 256 ) + $pkt[124] ) / 100;
+        $main::Electric{PkKwAlarm}   = ( ( $pkt[125] * 256 ) + $pkt[124] ) / 100;
         $main::Electric{DlrMthAlarm} = ( ( $pkt[127] * 256 ) + $pkt[126] ) / 10;
         $main::Electric{KwMtdAlarm}  = ( ( $pkt[129] * 256 ) + $pkt[128] );
         $main::Electric{LoValarm}    = ( ( $pkt[131] * 256 ) + $pkt[130] ) / 10;
@@ -220,41 +212,26 @@ sub process_incoming_data {
         $main::Electric{HiVrmsTdy} = ( ( $pkt[139] * 256 ) + $pkt[138] ) / 10;
         $main::Electric{stHiVtimTdy} =
           &get_time( ( ( $pkt[141] * 256 ) + $pkt[140] ) );
-        $main::Electric{LoVrmsMtd} = ( ( $pkt[143] * 256 ) + $pkt[142] ) / 10;
+        $main::Electric{LoVrmsMtd}    = ( ( $pkt[143] * 256 ) + $pkt[142] ) / 10;
         $main::Electric{LoVrmsMtdFlg} = ( $pkt[144] );
-        $main::Electric{HiVrmsMtd} = ( ( $pkt[146] * 256 ) + $pkt[145] ) / 10;
+        $main::Electric{HiVrmsMtd}    = ( ( $pkt[146] * 256 ) + $pkt[145] ) / 10;
         $main::Electric{HiVrmsMtdFlg} = ( $pkt[147] );
-        $main::Electric{KwPeakTdy}  = ( ( $pkt[149] * 256 ) + $pkt[148] ) / 100;
-        $main::Electric{DlrPeakTdy} = ( ( $pkt[151] * 256 ) + $pkt[150] ) / 100;
-        $main::Electric{KwPeakMtd}  = ( ( $pkt[153] * 256 ) + $pkt[152] ) / 100;
-        $main::Electric{DlrPeakMtd} = ( ( $pkt[155] * 256 ) + $pkt[154] ) / 100;
+        $main::Electric{KwPeakTdy}    = ( ( $pkt[149] * 256 ) + $pkt[148] ) / 100;
+        $main::Electric{DlrPeakTdy}   = ( ( $pkt[151] * 256 ) + $pkt[150] ) / 100;
+        $main::Electric{KwPeakMtd}    = ( ( $pkt[153] * 256 ) + $pkt[152] ) / 100;
+        $main::Electric{DlrPeakMtd}   = ( ( $pkt[155] * 256 ) + $pkt[154] ) / 100;
         $main::Electric{DlrTdySum} =
-          ( ( $pkt[159] * 256 * 256 * 256 ) +
-              ( $pkt[158] * 256 * 256 ) +
-              ( $pkt[157] * 256 ) +
-              ( $pkt[156] ) );
+          ( ( $pkt[159] * 256 * 256 * 256 ) + ( $pkt[158] * 256 * 256 ) + ( $pkt[157] * 256 ) + ( $pkt[156] ) );
         $main::Electric{DlrTdy} = $main::Electric{DlrTdySum} / 600000;
         $main::Electric{WattTdySum} =
-          ( ( $pkt[163] * 256 * 256 * 256 ) +
-              ( $pkt[162] * 256 * 256 ) +
-              ( $pkt[161] * 256 ) +
-              ( $pkt[160] ) );
+          ( ( $pkt[163] * 256 * 256 * 256 ) + ( $pkt[162] * 256 * 256 ) + ( $pkt[161] * 256 ) + ( $pkt[160] ) );
         $main::Electric{KwTdy} = $main::Electric{WattTdySum} / 60000;
         $main::Electric{KwhMtdCnt} =
-          ( ( $pkt[167] * 256 * 256 * 256 ) +
-              ( $pkt[166] * 256 * 256 ) +
-              ( $pkt[165] * 256 ) +
-              ( $pkt[164] ) );
+          ( ( $pkt[167] * 256 * 256 * 256 ) + ( $pkt[166] * 256 * 256 ) + ( $pkt[165] * 256 ) + ( $pkt[164] ) );
         $main::Electric{KwhMtdSum} =
-          ( ( $pkt[171] * 256 * 256 * 256 ) +
-              ( $pkt[170] * 256 * 256 ) +
-              ( $pkt[169] * 256 ) +
-              ( $pkt[168] ) ) / 60000;
+          ( ( $pkt[171] * 256 * 256 * 256 ) + ( $pkt[170] * 256 * 256 ) + ( $pkt[169] * 256 ) + ( $pkt[168] ) ) / 60000;
         $main::Electric{DlrMtdSum} =
-          ( ( $pkt[175] * 256 * 256 * 256 ) +
-              ( $pkt[174] * 256 * 256 ) +
-              ( $pkt[173] * 256 ) +
-              ( $pkt[172] ) ) / 600000;
+          ( ( $pkt[175] * 256 * 256 * 256 ) + ( $pkt[174] * 256 * 256 ) + ( $pkt[173] * 256 ) + ( $pkt[172] ) ) / 600000;
         $main::Electric{KWNow}      = ( ( $pkt[250] * 256 ) + $pkt[249] ) / 100;
         $main::Electric{DlrNow}     = ( ( $pkt[252] * 256 ) + $pkt[251] ) / 100;
         $main::Electric{VrmsNowDsp} = ( ( $pkt[254] * 256 ) + $pkt[253] ) / 10;
@@ -263,15 +240,9 @@ sub process_incoming_data {
         $main::Electric{KWProj}     = ( ( $pkt[260] * 256 ) + $pkt[259] );
         $main::Electric{AlarmStatus} = $pkt[261];
         $main::Electric{VRmsNow_1} =
-          ( ( $pkt[273] * 256 * 256 * 256 ) +
-              ( $pkt[272] * 256 * 256 ) +
-              ( $pkt[271] * 256 ) +
-              ( $pkt[270] ) );
+          ( ( $pkt[273] * 256 * 256 * 256 ) + ( $pkt[272] * 256 * 256 ) + ( $pkt[271] * 256 ) + ( $pkt[270] ) );
         $main::Electric{VRmsNow_2} =
-          ( ( $pkt[277] * 256 * 256 * 256 ) +
-              ( $pkt[276] * 256 * 256 ) +
-              ( $pkt[275] * 256 ) +
-              ( $pkt[274] ) );
+          ( ( $pkt[277] * 256 * 256 * 256 ) + ( $pkt[276] * 256 * 256 ) + ( $pkt[275] * 256 ) + ( $pkt[274] ) );
 
         if ( $main::Debug{ted} ) {
             print "HouseCode:      $main::Electric{HouseCode}\n";
@@ -282,10 +253,8 @@ sub process_incoming_data {
             printf "Calibration:    %.3f\n",   $main::Electric{Calibrate};
             print "Meter Read Day: $main::Electric{MeterRead}\n";
             print "VrmsNowDsp:     $main::Electric{VrmsNowDsp}\n";
-            print
-              "LoVrmsTdy:      $main::Electric{LoVrmsTdy} at $main::Electric{stLoVtimTdy}\n";
-            print
-              "HiVrmsTdy:      $main::Electric{HiVrmsTdy} at $main::Electric{stHiVtimTdy}\n";
+            print "LoVrmsTdy:      $main::Electric{LoVrmsTdy} at $main::Electric{stLoVtimTdy}\n";
+            print "HiVrmsTdy:      $main::Electric{HiVrmsTdy} at $main::Electric{stHiVtimTdy}\n";
             print "LoVrmsMtd:      $main::Electric{LoVrmsMtd}\n";
             print "HiVrmsMtd:      $main::Electric{HiVrmsMtd}\n";
 
diff --git a/lib/TI103.pm b/lib/TI103.pm
index ed9ad6f25..9f6824191 100644
--- a/lib/TI103.pm
+++ b/lib/TI103.pm
@@ -9,13 +9,12 @@ package ControlX10::TI103;
 #
 #-----------------------------------------------------------------------------
 use strict;
-use vars
-  qw($VERSION $LOGFILE $DEBUG @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $POWER_RESET);
+use vars qw($VERSION $LOGFILE $DEBUG @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $POWER_RESET);
 
 require Exporter;
 
-@ISA    = qw(Exporter);
-@EXPORT = qw( send_ti103 receive_ti103 read_ti103 dim_decode_ti103 ping_ti103);
+@ISA         = qw(Exporter);
+@EXPORT      = qw( send_ti103 receive_ti103 read_ti103 dim_decode_ti103 ping_ti103);
 @EXPORT_OK   = qw();
 %EXPORT_TAGS = (
     FUNC => [
@@ -28,7 +27,7 @@ require Exporter;
 Exporter::export_ok_tags('FUNC');
 
 $EXPORT_TAGS{ALL} = \@EXPORT_OK;
-($VERSION) = q$Revision$ =~ /: (\S+)/; # Note: cvs version reset when we moved to sourceforge
+($VERSION) = q$Revision$ =~ /: (\S+)/;    # Note: cvs version reset when we moved to sourceforge
 $DEBUG   = 0;
 $LOGFILE = "$main::config_parms{data_dir}/logs/TI103.log";
 
@@ -66,8 +65,7 @@ sub ping_ti103 {
 sub receive_buffer {
     my ($serial_port) = @_;
 
-    $LOGFILE =
-      "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
+    $LOGFILE = "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
     if ( exists $main::Debug{x10} ) {
         $DEBUG = ( $main::Debug{x10} >= 1 ) ? 1 : 0;
     }
@@ -271,8 +269,7 @@ sub send {
     $X10String =~ s/ON/J/;
     $X10String =~ s/OFF/K/;
 
-    $LOGFILE =
-      "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
+    $LOGFILE = "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
     if ( exists $main::Debug{x10} ) {
         $DEBUG = ( $main::Debug{x10} >= 1 ) ? 1 : 0;
     }
@@ -321,11 +318,10 @@ sub send {
                 $val = ( $val < 10 ) ? "0" . $val : $val;
                 $X10Cmd .= x10dup( $House . "X" . $val );
             }
-            elsif ( $Type eq "L" )
-            {    # fixme  Brighten as per Misterhouse way (+40)
+            elsif ( $Type eq "L" ) {    # fixme  Brighten as per Misterhouse way (+40)
                 $X10Cmd .= x10dup( $House . "B40" );
             }
-            elsif ( $Type eq "M" ) { # fixme Dimmer as per Misterhouse way (-40)
+            elsif ( $Type eq "M" ) {    # fixme Dimmer as per Misterhouse way (-40)
                 $X10Cmd .= x10dup( $House . "D40" );
             }
 
@@ -394,8 +390,7 @@ sub send {
     }
 
     if ( buffer_blk( $serial_port, $X10Cmd ) ) {
-        &main::print_log(
-            "TI103.pm: SendX10 Complete X10 command received [$Cmd]")
+        &main::print_log("TI103.pm: SendX10 Complete X10 command received [$Cmd]")
           if $DEBUG;
         return 1;
     }
@@ -413,8 +408,7 @@ sub read {
     # No harm done, but we would rather not wait :)
     my $tries = ($no_block) ? 1 : 30;
 
-    $LOGFILE =
-      "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
+    $LOGFILE = "$main::config_parms{data_dir}/logs/TI103.$main::Year_Month_Now.log";
     if ( exists $main::Debug{x10} ) {
         $DEBUG = ( $main::Debug{x10} >= 1 ) ? 1 : 0;
     }
@@ -444,23 +438,19 @@ sub read {
 sub dim_level_decode {
     my ($code) = @_;
 
-    my %table_hcodes =
-      qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
+    my %table_hcodes = qw(A 0110  B 1110  C 0010  D 1010  E 0001  F 1001  G 0101  H 1101
       I 0111  J 1111  K 0011  L 1011  M 0000  N 1000  O 0100  P 1100);
-    my %table_dcodes =
-      qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
+    my %table_dcodes = qw(1 0110  2 1110  3 0010  4 1010  5 0001  6 1001  7 0101  8 1101
       9 0111 10 1111 11 0011 12 1011 13 0000 14 1000 15 0100 16 1100
       A 1111  B 0011  C 1011  D 0000  E 1000  F 0100  G 1100);
 
     # Convert bit string to decimal
-    my $level_b = $table_hcodes{ substr( $code, 0, 1 ) }
-      . $table_dcodes{ substr( $code, 1, 1 ) };
+    my $level_b = $table_hcodes{ substr( $code, 0, 1 ) } . $table_dcodes{ substr( $code, 1, 1 ) };
     my $level_d = unpack( 'C', pack( 'B8', $level_b ) );
 
     # Varies from 36 to 201, by 11, then to 210 as a max.
     # 16 different values.  Round to nearest 5%, max of 95.
-    my $level_p =
-      int( 100 * $level_d / 211 );    # Do not allow 100% ... not a valid state?
+    my $level_p = int( 100 * $level_d / 211 );    # Do not allow 100% ... not a valid state?
     $level_p = $level_p - ( $level_p % 5 );
     print "TI103 debug: dim_code=$code leveld=$level_d level_p=$level_p\n"
       if $DEBUG;
@@ -468,7 +458,7 @@ sub dim_level_decode {
 }
 
 sub reset_ti103 {
-    return unless ( 1 == @_ );        # requires port number to reset
+    return unless ( 1 == @_ );                    # requires port number to reset
 }
 
 sub ping {
diff --git a/lib/Telephone_logger.pm b/lib/Telephone_logger.pm
index d02d3f5ef..8f3396462 100644
--- a/lib/Telephone_logger.pm
+++ b/lib/Telephone_logger.pm
@@ -46,7 +46,7 @@ sub serial_startup {
         $count = 0;
     }
 
-    if ( 1 == scalar @Telephone_logger_Ports ) {  # Add hooks on first call only
+    if ( 1 == scalar @Telephone_logger_Ports ) {    # Add hooks on first call only
         &::MainLoop_pre_add_hook( \&Telephone_logger::check_for_data, 1 );
     }
 }
diff --git a/lib/Telephony_DTMF.pm b/lib/Telephony_DTMF.pm
index 6e4669cb3..4ab72ca73 100644
--- a/lib/Telephony_DTMF.pm
+++ b/lib/Telephony_DTMF.pm
@@ -67,8 +67,7 @@ sub add {
 
 sub set {
     my ( $self, $p_state, $p_setby ) = @_;
-    &::print_log(
-        "Telephony DTMF state:$p_state:$p_setby" . $p_setby->address() );
+    &::print_log( "Telephony DTMF state:$p_state:$p_setby" . $p_setby->address() );
     $p_state = lc $p_state;
     if ( $p_state =~ /^dtmf/ ) {
         $p_state = $p_setby->dtmf();
diff --git a/lib/Telephony_Identifier.pm b/lib/Telephony_Identifier.pm
index 9df0d9c9d..90e3167a8 100644
--- a/lib/Telephony_Identifier.pm
+++ b/lib/Telephony_Identifier.pm
@@ -91,8 +91,7 @@ sub new {
     &open_port($self);
 
     unless ( $hooks_added++ ) {
-        &::MainLoop_pre_add_hook( \&Telephony_Identifier::check_for_data,
-            'persistent' );
+        &::MainLoop_pre_add_hook( \&Telephony_Identifier::check_for_data, 'persistent' );
     }
 
     $identifier_object = $self;
@@ -165,10 +164,7 @@ sub process_identifier_data {
         if ( $status eq '0' ) {    # On hook, idle (hangup)
             $msg .= "onhook (hangup)";
             if ( my $dtmf = $identifier_object->dtmf_buffer() ) {
-                &::logit(
-                    "$::config_parms{data_dir}/phone/logs/phone.$::Year_Month_Now.log",
-                    "O$dtmf"
-                );
+                &::logit( "$::config_parms{data_dir}/phone/logs/phone.$::Year_Month_Now.log", "O$dtmf" );
                 $identifier_object->dtmf_buffer('');
             }
             $identifier_object->SUPER::set('onhook');
@@ -176,8 +172,7 @@ sub process_identifier_data {
         }
         elsif ( $status eq '1' ) {    #ring start
             $identifier_object->SUPER::set( 'ring', 'identifier' );
-            $identifier_object->ring_count(
-                $identifier_object->ring_count() + 1 );
+            $identifier_object->ring_count( $identifier_object->ring_count() + 1 );
             $msg .= "ring #" . $identifier_object->ring_count();
         }
         elsif ( $status eq '2' ) {    #ring stop
@@ -226,8 +221,7 @@ sub process_identifier_data {
         ( $event, $digit, $line ) = split /,/, $data;
         $identifier_object->SUPER::dtmf($digit);
         $identifier_object->SUPER::set('dtmf');
-        $msg .=
-          "DTMF digit:$digit, buffer:" . $identifier_object->dtmf_buffer();
+        $msg .= "DTMF digit:$digit, buffer:" . $identifier_object->dtmf_buffer();
     }
     elsif ( $event eq '7' ) {    # Status
         $msg .= "status event";
diff --git a/lib/Telephony_Interface.pm b/lib/Telephony_Interface.pm
index 12d19e126..dcdd8bf2c 100644
--- a/lib/Telephony_Interface.pm
+++ b/lib/Telephony_Interface.pm
@@ -48,8 +48,7 @@ use Telephony_Item;
 package Telephony_Interface;
 @Telephony_Interface::ISA = ('Telephony_Item');
 
-my ( $hooks_added, @list_ports, %list_objects, %type_by_port, %caller_id_data,
-    $cid_server_connect, $cid_server_timer );
+my ( $hooks_added, @list_ports, %list_objects, %type_by_port, %caller_id_data, $cid_server_connect, $cid_server_timer );
 
 # US Robotics 56k Voice model 0525 -> rockewell
 
@@ -123,8 +122,7 @@ sub open_port {
         return if $main::Socket_Ports{$name};    # Already open
         &::print_log("Telephony_Interface port open:  n=$name t=$type p=$port")
           if $main::Debug{phone};
-        $cid_server_connect =
-          new Socket_Item( undef, undef, $port, $name, 'tcp', 'record' );
+        $cid_server_connect = new Socket_Item( undef, undef, $port, $name, 'tcp', 'record' );
         start $cid_server_connect;
         $cid_server_timer = new Timer;
         set $cid_server_timer 10;
@@ -141,9 +139,7 @@ sub open_port {
             $baudrate  = $table{$type}[1];
             $handshake = $table{$type}[2];
         }
-        &::print_log(
-            "Telephony_Interface port open:  n=$name t=$type p=$port b=$baudrate h=$handshake"
-        ) if $main::Debug{phone};
+        &::print_log( "Telephony_Interface port open:  n=$name t=$type p=$port b=$baudrate h=$handshake" ) if $main::Debug{phone};
         if ($port) {
             &::serial_port_create( $name, $port, $baudrate, $handshake );
             push( @::Generic_Serial_Ports, $name );
@@ -164,8 +160,7 @@ sub init {
     my $type   = lc $$self{type};
     if ( $table{$type} and my $init = $table{$type}[0] ) {
         &Serial_Item::send_serial_data( $name, $init );
-        &::print_log(
-            "$name interface, type=$type, has been initialized with $init");
+        &::print_log("$name interface, type=$type, has been initialized with $init");
     }
 }
 
@@ -201,11 +196,9 @@ sub check_for_data {
             elsif ( !( active $cid_server_connect)
                 && ( expired $cid_server_timer) )
             {
-                &::print_log(
-                    "Callerid: Socket is not active, attempting to reconnect.");
+                &::print_log("Callerid: Socket is not active, attempting to reconnect.");
                 start $cid_server_connect;
-                set $cid_server_timer 10
-                  ; # Set the timer for 10 seconds before we try again so we don't thrash
+                set $cid_server_timer 10;    # Set the timer for 10 seconds before we try again so we don't thrash
             }
         }
         elsif ( my $data = $main::Serial_Ports{$port}{data_record} ) {
@@ -249,11 +242,9 @@ sub process_phone_data {
 
     # Set all objects monitoring this port
     for my $object ( @{ $list_objects{$port} } ) {
-        &::print_log(
-            "Setting Telephony_Interface object $$object{name} to $data.");
+        &::print_log("Setting Telephony_Interface object $$object{name} to $data.");
         $object->SUPER::set('ring') if $data eq 'ring';
-        $object->ring_count( $object->ring_count() + 1 )
-          ;    # Where/when does this get reset??
+        $object->ring_count( $object->ring_count() + 1 );    # Where/when does this get reset??
     }
 }
 
@@ -287,8 +278,7 @@ sub process_cid_data {
         #  ###DATE01061252...NMBR...NAME-UNKNOWN CALLER-+++
         #  ###DATE01061252...NMBR...NAME-PRIVATE CALLER-+++
         #  ###DATE...NMBR...NAME MESSAGE WAITING+++
-        ( $date, $time, $number, $name ) =
-          $data =~ /DATE(\d{4})(\d{4})\.{3}NMBR(.*)\.{3}NAME(.*?)\++$/;
+        ( $date, $time, $number, $name ) = $data =~ /DATE(\d{4})(\d{4})\.{3}NMBR(.*)\.{3}NAME(.*?)\++$/;
         ($name)   = $data =~ /NAME(.*?)\++$/ unless $date;
         ($number) = $data =~ /NMBR(.+)\.{3}/ unless $name;
     }
@@ -299,11 +289,9 @@ sub process_cid_data {
     # NCID data=CID: *DATE*03272014*TIME*1734*LINE*1234*NMBR*2125551212*MESG*NONE*NAME*OUT-OF-AREA*
     # http://ncid.sourceforge.net/
     elsif ( $type eq 'ncid' ) {
-        ( $date, $time, $number, $name ) = $data =~
-          /CID:\s\*DATE\*(\d{8})\*TIME\*(\d{4})\*LINE\*[^\*]+\*NMBR\*(\d*)\*MESG\*.*\*NAME\*([^\*]+)\*$/;
-        &::print_log(
-            "Phone NCID: date='$date', time='$time', number='$number', name='$name'."
-        ) if $main::Debug{phone};
+        ( $date, $time, $number, $name ) =
+          $data =~ /CID:\s\*DATE\*(\d{8})\*TIME\*(\d{4})\*LINE\*[^\*]+\*NMBR\*(\d*)\*MESG\*.*\*NAME\*([^\*]+)\*$/;
+        &::print_log( "Phone NCID: date='$date', time='$time', number='$number', name='$name'." ) if $main::Debug{phone};
     }
     elsif ( $type eq 'zyxel' or $type eq 'motorola' ) {
         ($date)   = $data =~ /TIME: *(\S+)\s\S+/s;
@@ -334,9 +322,7 @@ sub process_cid_data {
     $number = '' unless $number;
 
     unless ( $name or $number ) {
-        &::print_log(
-            "Callerid data not parsed: p=$port t=$type d=$data date=$date time=$time number=$number name=$name"
-        );
+        &::print_log( "Callerid data not parsed: p=$port t=$type d=$data date=$date time=$time number=$number name=$name" );
         return;
     }
 
@@ -347,19 +333,16 @@ sub process_cid_data {
     my $cid_type = 'N';
     $cid_type = 'P' if $name =~ /private/i or uc $name eq 'P';
     $cid_type = 'U' if $name =~ /unknown/i or uc $name =~ /unavailable/i;
-    if ( $name =~ /-unknown name-/i )
-    {    #Netcallerid reports "-UNKNOWN NAME-"when it knows number, but not name
+    if ( $name =~ /-unknown name-/i ) {    #Netcallerid reports "-UNKNOWN NAME-"when it knows number, but not name
         $cid_type = 'N';
         $name     = '';
     }
     $cid_type = 'U' if uc $name eq 'O' or $number eq 'O';
     $cid_type = 'N'
-      if $number =~ /^[\d\- ]+$/;    # Override the type if the number is known
+      if $number =~ /^[\d\- ]+$/;          # Override the type if the number is known
 
     if ( $main::Debug{phone} ) {
-        &::print_log(
-            "Callerid data1: port=$port type=$type cid_type=$cid_type name=$name number=$number date=$date time=$time"
-        );
+        &::print_log( "Callerid data1: port=$port type=$type cid_type=$cid_type name=$name number=$number date=$date time=$time" );
         &::print_log("Callerid data2: data=$data.");
     }
 
diff --git a/lib/Telephony_xAP.pm b/lib/Telephony_xAP.pm
index cb707a2c5..20dcd685d 100644
--- a/lib/Telephony_xAP.pm
+++ b/lib/Telephony_xAP.pm
@@ -70,18 +70,14 @@ sub new {
     #&xAP::startup if $Reload;
     if ( !($p_xap) ) {
         $p_xap = new xAP_Item('Telephony.Info');
-        &main::store_object_data( $p_xap, 'xAP_Item', 'Telephony',
-            'Telephony' );
+        &main::store_object_data( $p_xap, 'xAP_Item', 'Telephony', 'Telephony' );
     }
     else {
         if ( !( $p_xap->isa('xAP_Item') ) ) {
             $p_xap = new xAP_Item($p_xap);
-            &main::store_object_data( $p_xap, 'xAP_Item', 'Telephony',
-                'Telephony' );
+            &main::store_object_data( $p_xap, 'xAP_Item', 'Telephony', 'Telephony' );
         }
-        &::print_log( "Initializing Telephony_xAP with xAP object: "
-              . $p_xap->class_name()
-              . "\n" );
+        &::print_log( "Initializing Telephony_xAP with xAP object: " . $p_xap->class_name() . "\n" );
     }
     $$self{xap_listeners}{ $p_xap->class_name() } = $p_xap;
     $$self{xap_listeners}{ $p_xap->class_name() }->tie_items($self);
@@ -90,11 +86,9 @@ sub new {
     $$self{vm}{changed} = undef;
 
     # init phone_line_names unless already init'd
-    &main::read_parm_hash( \%phone_line_names,
-        $main::config_parms{phone_line_names} )
+    &main::read_parm_hash( \%phone_line_names, $main::config_parms{phone_line_names} )
       unless %phone_line_names;
-    &main::read_parm_hash( \%phone_extension_names,
-        $main::config_parms{phone_extension_names} )
+    &main::read_parm_hash( \%phone_extension_names, $main::config_parms{phone_extension_names} )
       unless %phone_extension_names;
 
     return $self;
@@ -227,13 +221,10 @@ sub set {
         my $xap_listener = $$self{xap_listeners}{$class_name};
         if ( $p_setby eq $xap_listener ) {
             if ( lc $class_name eq 'telephony.info' ) {
-                if ( defined $xap_listener->state_now('incoming.callwithcid') )
-                {
+                if ( defined $xap_listener->state_now('incoming.callwithcid') ) {
                     $state = $self->callerid_hook($p_setby);
                 }
-                elsif (
-                    defined $xap_listener->state_now('outgoing.callcomplete') )
-                {
+                elsif ( defined $xap_listener->state_now('outgoing.callcomplete') ) {
                     $state = $self->outgoing_hook($p_setby);
                 }
                 else {
@@ -242,14 +233,10 @@ sub set {
 
             }
             elsif ( lc $class_name eq 'cid.meteor' ) {
-                if ( defined $xap_listener->state_now('incoming.callwithcid') )
-                {
-                    $state = $self->meteor_in_cid_hook( $p_setby,
-                        'incoming.callwithcid' );
+                if ( defined $xap_listener->state_now('incoming.callwithcid') ) {
+                    $state = $self->meteor_in_cid_hook( $p_setby, 'incoming.callwithcid' );
                 }
-                elsif (
-                    defined $xap_listener->state_now('outgoing.callcomplete') )
-                {
+                elsif ( defined $xap_listener->state_now('outgoing.callcomplete') ) {
                     $state = $self->meteor_out_complete_hook($p_setby);
                 }
                 else {
@@ -259,8 +246,7 @@ sub set {
             }
             elsif ( lc $class_name eq 'cid.incoming' ) {
                 if ( defined $xap_listener->state_now('cid.incoming') ) {
-                    $state =
-                      $self->meteor_in_cid_hook( $p_setby, 'cid.incoming' );
+                    $state = $self->meteor_in_cid_hook( $p_setby, 'cid.incoming' );
                 }
             }
             else {
@@ -347,9 +333,7 @@ sub new {
         &main::store_object_data( $p_xap, 'xAP_Item', 'MWI', 'MWI' );
     }
     else {
-        &::print_log( "Initializing MWI_xAP with xAP object: "
-              . $p_xap->class_name()
-              . "\n" );
+        &::print_log( "Initializing MWI_xAP with xAP object: " . $p_xap->class_name() . "\n" );
     }
     $$self{xap_listeners}{ $p_xap->class_name() } = $p_xap;
     $$self{xap_listeners}{ $p_xap->class_name() }->tie_items($self);
diff --git a/lib/Terminal_Menu.pm b/lib/Terminal_Menu.pm
index f6edc49c2..1b50d597d 100644
--- a/lib/Terminal_Menu.pm
+++ b/lib/Terminal_Menu.pm
@@ -216,30 +216,28 @@ sub new {
                                     #  Composite of 'border' flag and terminal
                                     #  size.
 
-    $$self{menuDepth}   = 0;        # Current depth
-    $$self{currentmenu} = [];       # All entries of the current menu
-    $$self{menu_offset} = 0;        # offset for multi page menu scrolling
-    $$self{menu_morepages} =
-      0;    # 1 = there is more than one page for the current menu
-    $$self{menu_elements} = 0;    # number of menu elements that currently
-                                  #  fit on one screen
-
-    $$self{key_layout} = 'phone'; # Defines the layout of the number pad
-
-    $$self{choice}   = undef;     # last selected menu entry
-    $$self{response} = undef;     # last response from Misterhouse
-
-    $$self{zoomed}           = 0; # 1 = Response is zoomed (full screen)
-    $$self{zoomed_offset}    = 0; # offset for multi page response scrolling
-    $$self{zoomed_morepages} = 0; # Flag indicating whether there are more
-                                  #  pages left to show in the full screen
-                                  #  response view
-
-    $$self{cmd} = '';   # Temporary buffer for the strings towards the terminal.
+    $$self{menuDepth}      = 0;     # Current depth
+    $$self{currentmenu}    = [];    # All entries of the current menu
+    $$self{menu_offset}    = 0;     # offset for multi page menu scrolling
+    $$self{menu_morepages} = 0;     # 1 = there is more than one page for the current menu
+    $$self{menu_elements}  = 0;     # number of menu elements that currently
+                                    #  fit on one screen
+
+    $$self{key_layout} = 'phone';   # Defines the layout of the number pad
+
+    $$self{choice}   = undef;       # last selected menu entry
+    $$self{response} = undef;       # last response from Misterhouse
+
+    $$self{zoomed}           = 0;   # 1 = Response is zoomed (full screen)
+    $$self{zoomed_offset}    = 0;   # offset for multi page response scrolling
+    $$self{zoomed_morepages} = 0;   # Flag indicating whether there are more
+                                    #  pages left to show in the full screen
+                                    #  response view
+
+    $$self{cmd}                = '';    # Temporary buffer for the strings towards the terminal.
     $$self{last_response_loop} = 0;
 
-    &::print_log(
-        "Terminal_Menu.pm: new \$p_menugroup=$p_menugroup \$self=$self")
+    &::print_log("Terminal_Menu.pm: new \$p_menugroup=$p_menugroup \$self=$self")
       if $::Debug{'Terminal_Menu'};
 
     # The first thing that the terminalmenu-client does is send the screen
@@ -328,17 +326,13 @@ sub set {
         $$self{terminal_width}  = $1;
         $$self{terminal_height} = $2;
         $$self{border} =
-          (       $$self{useborder}
-              and $$self{terminal_width} >= 22
-              and $$self{terminal_height} >= 18 ) ? 1 : 0;
+          ( $$self{useborder} and $$self{terminal_width} >= 22 and $$self{terminal_height} >= 18 ) ? 1 : 0;
         $updatescreen = 1;
     }
     elsif ( $state =~ m/^BORDER\s+(\d+)\s*$/i ) {
         $$self{useborder} = $1;
         $$self{border} =
-          (       $$self{useborder}
-              and $$self{terminal_width} >= 22
-              and $$self{terminal_height} >= 18 ) ? 1 : 0;
+          ( $$self{useborder} and $$self{terminal_width} >= 22 and $$self{terminal_height} >= 18 ) ? 1 : 0;
         $updatescreen = 1;
     }
     elsif ( $state =~ m/^COLOR\s+(\d+)\s*$/i ) {
@@ -363,8 +357,7 @@ sub set {
             $$self{ 'color_' . lc($entry) } = $color;
         }
         else {
-            &::print_log(
-                "Terminal_Menu.pm: Color entry \"$entry\" not valid ($state).");
+            &::print_log("Terminal_Menu.pm: Color entry \"$entry\" not valid ($state).");
         }
     }
     elsif ( $state =~ m/^NUMPAD-LAYOUT\s+(\S+)\s*$/i ) {
@@ -435,11 +428,8 @@ sub _select_menu {
 
     if ( not defined $p_menu ) {
         &::print_log(
-            "Terminal_Menu.pm: _select_menu: Menu not defined. Did you forget to load it? Does the menu file exist at all?"
-        );
-        $self->_send_to_terminal(
-            "print \"Menu undefined; Please check your Misterhouse configuration.\" \"bold red\""
-        );
+            "Terminal_Menu.pm: _select_menu: Menu not defined. Did you forget to load it? Does the menu file exist at all?" );
+        $self->_send_to_terminal( "print \"Menu undefined; Please check your Misterhouse configuration.\" \"bold red\"" );
         $self->_send_to_terminal("newline");
         $self->_flush_terminal();
         return;
@@ -451,14 +441,14 @@ sub _select_menu {
     ${ $$self{menuList} }[ $$self{menuDepth} ] = $p_menu;
 
     return
-      unless defined $$menus{ $$self{menuCurrent} };   # Guard against bad menus
+      unless defined $$menus{ $$self{menuCurrent} };    # Guard against bad menus
     $$self{itemCount} = @{ $$menus{ $$self{menuCurrent} }{items} };
 
     my $menu_name = undef;
     if ( $$self{menuCurrent} =~ /^states/ ) {
         my $l_menuPrevious = ${ $$self{menuList} }[ $$self{menuDepth} - 1 ];
         my $l_itemPrevious = ${ $$self{itemList} }[ $$self{menuDepth} - 1 ];
-        my $item = ${ $$menus{$l_menuPrevious}{items} }[ $l_itemPrevious - 1 ];
+        my $item           = ${ $$menus{$l_menuPrevious}{items} }[ $l_itemPrevious - 1 ];
 
         if ( $$item{A} and $$item{Dstates} ) {
             $menu_name = $$item{Dprefix} . '...' . $$item{Dsuffix};
@@ -531,9 +521,7 @@ sub _select_item {
             my $l_menuPrevious = ${ $$self{menuList} }[ $$self{menuDepth} - 1 ];
 
             #           my $response = &::menu_run("$$self{menugroup},$l_menuPrevious,$l_itemPrevious,$l_item,l");      # v2.96 and lower
-            my $response =
-              &::menu_run( $$self{menugroup}, $l_menuPrevious, $l_itemPrevious,
-                $l_item, 'l' );    # v2.97 and higher
+            my $response = &::menu_run( $$self{menugroup}, $l_menuPrevious, $l_itemPrevious, $l_item, 'l' );    # v2.97 and higher
             if ($response) {
                 $self->_response($response);
             }
@@ -545,9 +533,7 @@ sub _select_item {
             my $l_item = $$self{itemCurrent} - 1;
 
             #           my $response = &::menu_run("$$self{menugroup},$$self{menuCurrent},$l_item,,l");           # v2.96 and lower
-            my $response =
-              &::menu_run( $$self{menugroup}, $$self{menuCurrent}, $l_item,
-                undef, "l" );    # v2.97 and higher
+            my $response = &::menu_run( $$self{menugroup}, $$self{menuCurrent}, $l_item, undef, "l" );          # v2.97 and higher
             if ($response) {
                 $self->_response($response);
             }
@@ -562,9 +548,7 @@ sub _select_item {
         my $l_item = $$self{itemCurrent} - 1;
 
         #       my $response = &::menu_run("$$self{menugroup},$$self{menuCurrent},$l_item,,l");           # v2.96 and lower
-        my $response =
-          &::menu_run( $$self{menugroup}, $$self{menuCurrent}, $l_item, undef,
-            "l" );    # v2.97 and higher
+        my $response = &::menu_run( $$self{menugroup}, $$self{menuCurrent}, $l_item, undef, "l" );    # v2.97 and higher
         if ($response) {
             $self->_response($response);
         }
@@ -603,8 +587,7 @@ sub _exit_menu {
 sub _response {
     my ( $self, $response ) = @_;
 
-    &::print_log(
-        "Terminal_Menu.pm: _response \$self=$self \$response=$response")
+    &::print_log("Terminal_Menu.pm: _response \$self=$self \$response=$response")
       if $::Debug{'Terminal_Menu'} >= 2;
 
     $$self{response} = $response;
@@ -650,8 +633,7 @@ sub _handle_normal {
         if ( $$self{menu_morepages} ) {
             $$self{menu_offset} += $scroll_by;
             $$self{menu_offset} = 0
-              if ( $$self{menu_offset} >
-                ( scalar( @{ $$self{currentmenu} } ) - 2 ) );
+              if ( $$self{menu_offset} > ( scalar( @{ $$self{currentmenu} } ) - 2 ) );
             $self->_draw_screen();
         }
     }
@@ -806,8 +788,7 @@ sub _draw_menu {
         next if ( $i++ < $$self{menu_offset} );
         $entry = $self->_pad_and_trim( $entry, 5 );
         $self->_send_to_terminal("cursorpos $x $y");
-        $self->_send_to_terminal(
-            "print \" [$element] $entry\" \"$$self{color_menu}\"");
+        $self->_send_to_terminal("print \" [$element] $entry\" \"$$self{color_menu}\"");
         ++$y;
         last if $element >= $max_menu_height;
         $element++;
@@ -818,8 +799,7 @@ sub _draw_menu {
         $$self{menu_morepages} = 1;
         $$self{menu_elements}  = $element;
         $self->_send_to_terminal("cursorpos $x $y");
-        $self->_send_to_terminal(
-            "print \" [ENTER]=more...\" \"$$self{color_menu}\"");
+        $self->_send_to_terminal("print \" [ENTER]=more...\" \"$$self{color_menu}\"");
     }
 }
 
@@ -838,21 +818,17 @@ sub _draw_choice {
 
     if ( $choice_y < 3 ) {
         if ( defined $$self{choice} ) {
-            $self->_send_to_terminal(
-                "cursorpos " . ( $$self{terminal_width} - 1 ) . " 0" );
-            $self->_send_to_terminal(
-                "print \"$$self{choice}\" \"$$self{color_choice}\"");
+            $self->_send_to_terminal( "cursorpos " . ( $$self{terminal_width} - 1 ) . " 0" );
+            $self->_send_to_terminal("print \"$$self{choice}\" \"$$self{color_choice}\"");
             $self->_send_to_terminal("cursorpos $$self{terminal_width} 0");
         }
     }
     else {
         $self->_send_to_terminal("cursorpos $choice_x $choice_y");
-        $self->_send_to_terminal(
-            "print \"Your choice: \" \"$$self{color_choice_label}\"");
+        $self->_send_to_terminal("print \"Your choice: \" \"$$self{color_choice_label}\"");
         if ( defined $$self{choice} ) {
             my ( $x, $y ) = ( $$self{cursor_x}, $$self{cursor_y} );
-            $self->_send_to_terminal(
-                "print \"$$self{choice}\" \"$$self{color_choice}\"");
+            $self->_send_to_terminal("print \"$$self{choice}\" \"$$self{color_choice}\"");
             $self->_send_to_terminal("cursorpos $x $y");
         }
     }
@@ -913,8 +889,7 @@ sub _draw_normal_response {
 
     my ( $x, $y ) = ( $$self{cursor_x}, $$self{cursor_y} );
     $self->_send_to_terminal("cursorpos $response_x $response_y");
-    $self->_send_to_terminal(
-        "print \"$heading\" \"$$self{color_response_label}\"");
+    $self->_send_to_terminal("print \"$heading\" \"$$self{color_response_label}\"");
     $response_y += 1;
     $self->_send_to_terminal("cursorpos $response_x $response_y");
     $self->_send_to_terminal("print \"$response\" \"$$self{color_response}\"");
@@ -941,8 +916,7 @@ sub _draw_zoomed_response {
     ( $up, $down ) = ( '2', '8' ) if $$self{key_layout} eq 'phone';
 
     $self->_send_to_terminal("cursorpos $response_x $response_y");
-    $self->_send_to_terminal(
-        "print \"Result: [*]=back\" \"$$self{color_response_label}\"");
+    $self->_send_to_terminal("print \"Result: [*]=back\" \"$$self{color_response_label}\"");
 
     $Text::Wrap::columns = $$self{terminal_width} - ( $$self{border} ? 2 : 0 );
     my @lines = split( "\n", Text::Wrap::wrap( '', '', $response ) );
@@ -954,28 +928,21 @@ sub _draw_zoomed_response {
         $self->_send_to_terminal("cursorpos $response_x $response_y");
         $self->_send_to_terminal("print \"$line\" \"$$self{color_response}\"");
         last
-          if ( $$self{cursor_y} >=
-            $$self{terminal_height} - 1 - ( $$self{border} ? 1 : 0 ) );
+          if ( $$self{cursor_y} >= $$self{terminal_height} - 1 - ( $$self{border} ? 1 : 0 ) );
     }
 
     if ( $$self{zoomed_offset} ) {
-        $self->_send_to_terminal(
-            "cursorpos " . ( $$self{terminal_width} - 3 ) . " 0" );
+        $self->_send_to_terminal( "cursorpos " . ( $$self{terminal_width} - 3 ) . " 0" );
         $self->_send_to_terminal("print \"[$up]\" \"$$self{color_border}\"");
-        $self->_send_to_terminal(
-            "cursorpos " . ( $$self{terminal_width} - 2 ) . " 0" );
+        $self->_send_to_terminal( "cursorpos " . ( $$self{terminal_width} - 2 ) . " 0" );
     }
 
     $$self{zoomed_morepages} = 0;
     if ( $i < scalar @lines ) {
         $$self{zoomed_morepages} = 1;
-        $self->_send_to_terminal( "cursorpos "
-              . ( $$self{terminal_width} - 3 ) . " "
-              . ( $$self{terminal_height} - 1 ) );
+        $self->_send_to_terminal( "cursorpos " . ( $$self{terminal_width} - 3 ) . " " . ( $$self{terminal_height} - 1 ) );
         $self->_send_to_terminal("print \"[$down]\" \"$$self{color_border}\"");
-        $self->_send_to_terminal( "cursorpos "
-              . ( $$self{terminal_width} - 2 ) . " "
-              . ( $$self{terminal_height} - 1 ) );
+        $self->_send_to_terminal( "cursorpos " . ( $$self{terminal_width} - 2 ) . " " . ( $$self{terminal_height} - 1 ) );
     }
 }
 
@@ -990,10 +957,8 @@ sub _pad_and_trim {
 
     $indent = 0 if not defined $indent;
 
-    $text .= ' ' x
-      ( $$self{terminal_width} - length($text) - ( $$self{border} ? 1 : 0 ) );
-    $text = substr( $text, 0,
-        $$self{terminal_width} - $indent - ( $$self{border} ? 2 : 0 ) );
+    $text .= ' ' x ( $$self{terminal_width} - length($text) - ( $$self{border} ? 1 : 0 ) );
+    $text = substr( $text, 0, $$self{terminal_width} - $indent - ( $$self{border} ? 2 : 0 ) );
 
     return $text;
 }
diff --git a/lib/Text_Cmd.pm b/lib/Text_Cmd.pm
index 3b9f12ab5..0d6689008 100644
--- a/lib/Text_Cmd.pm
+++ b/lib/Text_Cmd.pm
@@ -77,9 +77,7 @@ sub set_matches {
         my ($state) = &check_match( $object, $text );
         next unless defined $state;
         set $object $state, $set_by, $respond;
-        &main::print_log(
-            "Text_Cmd match: '$text' matches $object->{object_name} text '$object->{text}'"
-        ) unless $no_log;
+        &main::print_log( "Text_Cmd match: '$text' matches $object->{object_name} text '$object->{text}'" ) unless $no_log;
         push @list_matches, $object;
     }
     return @list_matches;
diff --git a/lib/Timer.pm b/lib/Timer.pm
index 1bec8aecc..5aa5f94c2 100644
--- a/lib/Timer.pm
+++ b/lib/Timer.pm
@@ -47,8 +47,7 @@ B<>
 
 =cut
 
-my ( $class, $self, $id, $state, $action, $repeat, @timers_with_actions,
-    $resort_timers_with_actions, @sets_from_previous_pass );
+my ( $class, $self, $id, $state, $action, $repeat, @timers_with_actions, $resort_timers_with_actions, @sets_from_previous_pass );
 
 # This is called from mh each pass
 sub check_for_timer_actions {
@@ -77,8 +76,7 @@ sub expired_timers_with_actions {
 
         #       print "db3 s=$self ex=$self->{expire_time}\n";
         if ( !$self->{expire_time} ) {
-            shift
-              @timers_with_actions;  # These timers were 'unset' ... delete them
+            shift @timers_with_actions;    # These timers were 'unset' ... delete them
         }
 
         # Use this method avoids problems with Timer is called from X10_Items
@@ -91,8 +89,7 @@ sub expired_timers_with_actions {
             }
         }
         else {
-            last
-              ; # The first timer has not expired yet, so don't check the others
+            last;    # The first timer has not expired yet, so don't check the others
         }
     }
     return @expired_timers;
@@ -142,16 +139,13 @@ sub restore_string {
     $restore_string .= ", $self->{repeat}"    if $self->{repeat};
     $restore_string .= ";\n";
     $restore_string .= $self->{object_name} . "->set_from_last_pass();\n";
-    $restore_string .=
-      $self->{object_name} . "->{expire_time} = $expire_time;\n"
+    $restore_string .= $self->{object_name} . "->{expire_time} = $expire_time;\n"
       if $expire_time;
     $restore_string .= $self->{object_name} . "->{time} = q~$self->{time}~;\n"
       if $self->{time};
-    $restore_string .=
-      $self->{object_name} . "->{time_pause} = q~$self->{time_pause}~;\n"
+    $restore_string .= $self->{object_name} . "->{time_pause} = q~$self->{time_pause}~;\n"
       if $self->{time_pause};
-    $restore_string .=
-      $self->{object_name} . "->{time_adjust} = q~$self->{time_adjust}~;\n"
+    $restore_string .= $self->{object_name} . "->{time_adjust} = q~$self->{time_adjust}~;\n"
       if $self->{time_adjust};
 
     return $restore_string;
@@ -290,17 +284,13 @@ sub run_action {
         elsif ( $action_type eq '' ) {
 
             #       &::print_log("Action");
-            package main
-              ; # Had to do this to get the 'speak' function recognized without having to &main::speak() it
-            my $timer_name = $self->{object_name}
-              ;    # So we can use this in the timer action eval
-            $state = $self->{object_name}
-              ;    # So we can use this in the timer action eval
+            package main;    # Had to do this to get the 'speak' function recognized without having to &main::speak() it
+            my $timer_name = $self->{object_name};    # So we can use this in the timer action eval
+            $state = $self->{object_name};            # So we can use this in the timer action eval
             eval $action;
 
             package Timer;
-            print
-              "\nError in running timer action: action=$action\n error: $@\n"
+            print "\nError in running timer action: action=$action\n error: $@\n"
               if $@;
         }
         else {
@@ -362,8 +352,7 @@ sub hours_remaining {
 sub hours_remaining_now {
     ($self) = @_;
     return if inactive $self;
-    my $hours_left = int(
-        .5 + ( $self->{expire_time} - main::get_tickcount ) / ( 60 * 60000 ) );
+    my $hours_left = int( .5 + ( $self->{expire_time} - main::get_tickcount ) / ( 60 * 60000 ) );
     if (    $hours_left
         and $self->{hours_remaining} != $hours_left )
     {
@@ -431,13 +420,8 @@ Returns true if the timer is still running.
 
 sub active {
     ($self) = @_;
-    if (
-        (
-                $self->{expire_time}
-            and $self->{expire_time} >= main::get_tickcount
-        )
-        or ( $self->{set_next_pass} )
-      )
+    if (   ( $self->{expire_time} and $self->{expire_time} >= main::get_tickcount )
+        or ( $self->{set_next_pass} ) )
     {
         return 1;
     }
@@ -485,8 +469,7 @@ sub restart {
     $self->{time}        = time;
     $self->{time_adjust} = 0;
     $self->{time_pause}  = 0;
-    if ( $$self{expire_time} )
-    {    # If this timer is countdown type then restart it instead
+    if ( $$self{expire_time} ) {    # If this timer is countdown type then restart it instead
 
         #           $self->{expire_time} = ($$self{period} * 1000) + main::get_tickcount;
         #       push @sets_from_previous_pass, $self;
diff --git a/lib/Tivo_Control.pm b/lib/Tivo_Control.pm
index 6da17c59a..0ad56b6e6 100644
--- a/lib/Tivo_Control.pm
+++ b/lib/Tivo_Control.pm
@@ -95,11 +95,8 @@ sub startup {
         and $main::config_parms{tivocontrol_host}
         and $main::config_parms{tivocontrol_port} )
     {
-        my $port =
-          "$main::config_parms{tivocontrol_host}:$main::config_parms{tivocontrol_port}";
-        $tivo_socket =
-          new Socket_Item( undef, undef, $port, 'tivocontrol', 'tcp',
-            'record' );
+        my $port = "$main::config_parms{tivocontrol_host}:$main::config_parms{tivocontrol_port}";
+        $tivo_socket = new Socket_Item( undef, undef, $port, 'tivocontrol', 'tcp', 'record' );
         start $tivo_socket;
     }
 }
diff --git a/lib/UIRT2.pm b/lib/UIRT2.pm
index 63da3bff3..b859fc3ec 100644
--- a/lib/UIRT2.pm
+++ b/lib/UIRT2.pm
@@ -71,9 +71,8 @@ my $prev     = '';
 my $learning = 0;
 my $dbm_file = "$main::config_parms{data_dir}/uirt2_codes.dbm";
 my (
-    $db,          %DBM,              @learned,       $device,
-    $function,    $frequency,        $repeat,        @transmit_queue,
-    @learn_queue, $transmit_timeout, $learn_timeout, $receive_timeout
+    $db,     %DBM,            @learned,     $device,           $function,      $frequency,
+    $repeat, @transmit_queue, @learn_queue, $transmit_timeout, $learn_timeout, $receive_timeout
 );
 
 sub startup {
@@ -160,17 +159,10 @@ sub save_code {
             push @code2, $code;
         }
         else {
-            print
-              "UIRT2: Learning error, received more than two different codes \n";
+            print "UIRT2: Learning error, received more than two different codes \n";
         }
     }
-    set_ir_code(
-        $device,
-        $function,
-        raw_to_struct(
-            $frequency, $repeat, raw_average(@code1), raw_average(@code2)
-        )
-    );
+    set_ir_code( $device, $function, raw_to_struct( $frequency, $repeat, raw_average(@code1), raw_average(@code2) ) );
     print "UIRT2: Saved device $device function $function \n";
 }
 
@@ -369,9 +361,7 @@ sub transmit_pronto {
         $code = $code1 . ( unpack 'H2', pack 'C', $repeat | $frequency_bits );
     }
     else {
-        $code =
-          ( unpack 'H2', pack 'C', ( $code2 ? 0 : $repeat ) | $frequency_bits )
-          . $code1
+        $code = ( unpack 'H2', pack 'C', ( $code2 ? 0 : $repeat ) | $frequency_bits ) . $code1
           if $code1;
         $code .= ( unpack 'H2', pack 'C', $repeat | $frequency_bits ) . $code2
           if $code2;
@@ -431,8 +421,7 @@ sub raw_to_struct {
           if $main::Debug{UIRT2};
         $i = 0;
         foreach ( @bytes[ 4 .. $#bytes - 1 ] ) {
-            my $bit =
-              ( $_ > 1.5 * ( $i & 1 ? $small_gap : $small_pulse ) ) ? '1' : '0';
+            my $bit = ( $_ > 1.5 * ( $i & 1 ? $small_gap : $small_pulse ) ) ? '1' : '0';
             $bits .= $bit;
             push @{
                 $sums{
@@ -453,8 +442,7 @@ sub raw_to_struct {
             }
             push @struct, $sum ? ( $sum / ( $#{ $sums{$_} } + 1 ) ) : 0;
         }
-        push @struct,
-          unpack( 'C*', pack( ( $second ? 'b96' : 'b128' ), $bits ) );
+        push @struct, unpack( 'C*', pack( ( $second ? 'b96' : 'b128' ), $bits ) );
         $second++;
         $_ = unpack 'H*', pack 'C*', @struct;
     }
@@ -504,23 +492,17 @@ sub pronto_to_raw {
     my $repeat = shift;
     $pronto =~ s/\s+/ /gs;
     $pronto =~ s/[^0-9a-fA-F]//gs;
-    my @bytes = unpack 'n*', pack 'H*', $pronto;
-    my $kind  = shift @bytes;
-    my $units = shift(@bytes) * .241246;
-    my $frequency =
-      ( $kind == 0 && $units != 0.0 ) ? round( 1000.0 / $units ) : 0;
-    my $first  = shift(@bytes) * 2;
-    my $second = shift(@bytes) * 2;
+    my @bytes     = unpack 'n*', pack 'H*', $pronto;
+    my $kind      = shift @bytes;
+    my $units     = shift(@bytes) * .241246;
+    my $frequency = ( $kind == 0 && $units != 0.0 ) ? round( 1000.0 / $units ) : 0;
+    my $first     = shift(@bytes) * 2;
+    my $second    = shift(@bytes) * 2;
     map { $_ = round( $_ * $units / 50 ) } @bytes;
-    print "pronto_to_raw $pronto First $first second $second frequency  "
-      . $frequency . "\n"
+    print "pronto_to_raw $pronto First $first second $second frequency  " . $frequency . "\n"
       if $main::Debug{UIRT2};
     my ( $code1, $code2 );
-    $code1 = unpack 'H*',
-      pack( 'C*',
-        $bytes[ $first - 1 ] >> 8,
-        $bytes[ $first - 1 ] & 0xff,
-        @bytes[ 0 .. $first - 2 ], 0xff )
+    $code1 = unpack 'H*', pack( 'C*', $bytes[ $first - 1 ] >> 8, $bytes[ $first - 1 ] & 0xff, @bytes[ 0 .. $first - 2 ], 0xff )
       if $first;
     $code2 = unpack 'H*',
       pack( 'C*',
@@ -629,9 +611,7 @@ sub set_ir_code {
         $code = $code1 . ( unpack 'H2', pack 'C', $repeat | $frequency_bits );
     }
     else {
-        $code =
-          ( unpack 'H2', pack 'C', ( $code2 ? 0 : $repeat ) | $frequency_bits )
-          . $code1
+        $code = ( unpack 'H2', pack 'C', ( $code2 ? 0 : $repeat ) | $frequency_bits ) . $code1
           if $code1;
         $code .= ( unpack 'H2', pack 'C', $repeat | $frequency_bits ) . $code2
           if $code2;
diff --git a/lib/UPBPIM.pm b/lib/UPBPIM.pm
index 62be7e956..60006cf4f 100644
--- a/lib/UPBPIM.pm
+++ b/lib/UPBPIM.pm
@@ -334,8 +334,7 @@ sub _parse_data {
             #UPB No Acknowledgement
             elsif ( uc( substr( $data, 1, 1 ) ) eq 'N' ) {
                 $$self{xmit_in_progress} = 0;
-                &::print_log(
-                    "$self->object_name: Reports device does not respond");
+                &::print_log("$self->object_name: Reports device does not respond");
                 pop( @{ $$self{command_stack} } );
                 select( undef, undef, undef, .15 );
                 $self->process_command_stack();
diff --git a/lib/UPB_Device.pm b/lib/UPB_Device.pm
index 8b5c57f3b..294c9384f 100644
--- a/lib/UPB_Device.pm
+++ b/lib/UPB_Device.pm
@@ -72,10 +72,9 @@ our %message_types = (
     store  => 0x31,
 
     #UPB Core Reports
-    device_state_report  => 0x86,
-    device_status_report => 0x87,
-    device_variable_report =>
-      0xA9    #RCS Autosend (or request_rcs_variable response) data
+    device_state_report    => 0x86,
+    device_status_report   => 0x87,
+    device_variable_report => 0xA9    #RCS Autosend (or request_rcs_variable response) data
 );
 
 sub new {
@@ -135,11 +134,11 @@ sub set {
     #   &::print_log($self->get_object_name() . "::set($p_state, $p_setby)") if $main::Debug{upbd};
 
     if ( $p_setby eq $self->interface() ) {
-        my $network     = unpack( "C", pack( "H*", substr( $p_state, 4, 2 ) ) );
-        my $destination = unpack( "C", pack( "H*", substr( $p_state, 6, 2 ) ) );
-        my $source      = unpack( "C", pack( "H*", substr( $p_state, 8, 2 ) ) );
-        my $msg = unpack( "C", pack( "H*", substr( $p_state, 10, 2 ) ) );
-        my $l_state = $p_state;
+        my $network     = unpack( "C", pack( "H*", substr( $p_state, 4,  2 ) ) );
+        my $destination = unpack( "C", pack( "H*", substr( $p_state, 6,  2 ) ) );
+        my $source      = unpack( "C", pack( "H*", substr( $p_state, 8,  2 ) ) );
+        my $msg         = unpack( "C", pack( "H*", substr( $p_state, 10, 2 ) ) );
+        my $l_state     = $p_state;
         $p_state = undef;
         if ( $network == $self->network_id() or $network == 0 ) {
             if (   $destination == $self->device_id()
@@ -148,8 +147,7 @@ sub set {
             {
                 if ( !( $source != $self->device_id() and $msg >= 0x80 ) ) {
                     $p_state = $self->_xlate_upb_mh($l_state);
-                    &::print_log(
-                        $self->get_object_name() . "::set($p_state, $p_setby)" )
+                    &::print_log( $self->get_object_name() . "::set($p_state, $p_setby)" )
                       if $main::Debug{upbd};
                 }
             }
diff --git a/lib/UPB_Rain8.pm b/lib/UPB_Rain8.pm
index 7f51d943e..f554bfe75 100644
--- a/lib/UPB_Rain8.pm
+++ b/lib/UPB_Rain8.pm
@@ -50,9 +50,7 @@ sub new {
     bless $self, $class;
 
     for ( my $index = $p_deviceid; $index < 9; $index++ ) {
-        @{ $$self{devices} }[$index] =
-          new UPB_Device( $p_interface, $p_networkid,
-            $p_deviceid + $index - 1 );
+        @{ $$self{devices} }[$index] = new UPB_Device( $p_interface, $p_networkid, $p_deviceid + $index - 1 );
 
         #		@{$$self{devices}}[$index]->tie_items($self);
     }
diff --git a/lib/UPB_Thermostat.pm b/lib/UPB_Thermostat.pm
index cb58b6809..30832ac71 100644
--- a/lib/UPB_Thermostat.pm
+++ b/lib/UPB_Thermostat.pm
@@ -53,10 +53,7 @@ my %setback_modes = (
     'zone_setback'   => 6,
     'remote'         => 7     #FLAG ONLY
 );
-my @setback_modes = (
-    'off',     'night',          'away',         'vacation',
-    'special', 'system_setback', 'zone_setback', 'remote'
-);
+my @setback_modes = ( 'off', 'night', 'away', 'vacation', 'special', 'system_setback', 'zone_setback', 'remote' );
 
 # Variable 18 (operating mode)
 use constant OPERATING_MODE_H1A => 0x01;
@@ -209,36 +206,31 @@ sub _xlate_upb_mh {
         if ( $args[0] == 6 ) {    # AutoSend variable
             $$self{auto_send} = sprintf( "%d", $args[1] );
             $state = sprintf( "auto_send: %d", $args[1] );
-            &::print_log(
-                "UPBT:xlate_upb_mh: auto_send is " . $$self{auto_send} )
+            &::print_log( "UPBT:xlate_upb_mh: auto_send is " . $$self{auto_send} )
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 9 ) {    #inside temperature report
             $$self{temp} = sprintf( "%d", $args[1] );
             $state = $$self{temp} . " degrees";
-            &::print_log(
-                "UPBT:xlate_upb_mh: inside temp is " . $$self{inside_temp} )
+            &::print_log( "UPBT:xlate_upb_mh: inside temp is " . $$self{inside_temp} )
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 10 ) {    #outside temperature
             $$self{outside_temp} = sprintf( "%d", $args[1] );
             $state = sprintf( "outside_temp: %d", $args[1] );
-            &::print_log(
-                "UPBT:xlate_upb_mh: outside temp is " . $$self{outside_temp} )
+            &::print_log( "UPBT:xlate_upb_mh: outside temp is " . $$self{outside_temp} )
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 11 ) {    #heat setpoint temperature
             $$self{heat_sp_temp} = sprintf( "%d", $args[1] );
             $state = sprintf( "heat_sp_temp: %d", $args[1] );
-            &::print_log(
-                "UPBT:xlate_upb_mh: heat sp temp is " . $$self{heat_sp_temp} )
+            &::print_log( "UPBT:xlate_upb_mh: heat sp temp is " . $$self{heat_sp_temp} )
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 12 ) {    #cool setpoint temperature
             $$self{cool_sp_temp} = sprintf( "%d", $args[1] );
             $state = sprintf( "cool_sp_temp: %d", $args[1] );
-            &::print_log(
-                "UPBT:xlate_upb_mh: cool sp temp is " . $$self{cool_sp_temp} )
+            &::print_log( "UPBT:xlate_upb_mh: cool sp temp is " . $$self{cool_sp_temp} )
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 13 ) {    #system mode
@@ -260,13 +252,12 @@ sub _xlate_upb_mh {
         }
         elsif ( $args[0] == 16 ) {    #display lockout
             $$self{display_lockout} = ( $args[1] == 0 ) ? 'Unlocked' : 'Locked';
-            $state =
-              "display_lockout: " . ( $args[1] == 0 ) ? 'Unlocked' : 'Locked';
+            $state = "display_lockout: " . ( $args[1] == 0 ) ? 'Unlocked' : 'Locked';
             &::print_log("UPBT:xlate_upb_mh: Display Lockout $args[1]")
               if $main::Debug{upbt};
         }
         elsif ( $args[0] == 17 ) {    #send stat status
-             # 6 bytes, Temp, Heat SP, Cool SP, H/C Mode, Fan mode, Outside Temp, (temp of 191= not valid)
+                                      # 6 bytes, Temp, Heat SP, Cool SP, H/C Mode, Fan mode, Outside Temp, (temp of 191= not valid)
             $$self{temp}         = sprintf( "%d", $args[1] );
             $$self{heat_sp_temp} = sprintf( "%d", $args[2] );
             $$self{cool_sp_temp} = sprintf( "%d", $args[3] );
@@ -288,7 +279,7 @@ sub _xlate_upb_mh {
             $state = $$self{temp} . " degrees";
         }
         elsif ( $args[0] == 18 ) {    #send operating mode status
-             # 1 byte, bit encoded, B0= H1A, B1= H2A, B2= H3A, B4= C1A, B5= C2A, B6=FA
+                                      # 1 byte, bit encoded, B0= H1A, B1= H2A, B2= H3A, B4= C1A, B5= C2A, B6=FA
             &::print_log("UPBT:xlate_upb_mh: send operating mode status @args")
               if $main::Debug{upbt};
             $$self{operating_mode} = "Off" if ( $args[1] == 0 );
@@ -304,9 +295,7 @@ sub _xlate_upb_mh {
               if ( $args[1] & OPERATING_MODE_C1A );
             $$self{operating_mode} .= "|cooling, stage 2"
               if ( $args[1] & OPERATING_MODE_C2A );
-            &::print_log(
-                "UPBT:XLATE_UPB_MH current operating mode is: $$self{operating_mode}"
-            ) if $main::Debug{upbt};
+            &::print_log( "UPBT:XLATE_UPB_MH current operating mode is: $$self{operating_mode}" ) if $main::Debug{upbt};
             $state = "operating_mode_status: $$self{operating_mode}";
         }
         elsif ( $args[0] == 19 ) {    #send relay mode status
@@ -421,9 +410,7 @@ sub mode {
         }
 
         #    $self->set("set_rcs_variable:13 $modes{lc($state)}");
-        &::print_log(
-            "setting mode with command: set_rcs_variable:13 $modes{lc($state)}"
-        );
+        &::print_log( "setting mode with command: set_rcs_variable:13 $modes{lc($state)}" );
         return;
     }
     return $$self{mode};
@@ -441,9 +428,7 @@ sub setback_mode {
     if ( defined($state) ) {
 
         #    $self->set("set_rcs_variable:15 $setback_modes{$state}");
-        &::print_log(
-            "setting setbck_mode with command: set_rcs_variable:15 $setback_modes{$state}"
-        );
+        &::print_log( "setting setbck_mode with command: set_rcs_variable:15 $setback_modes{$state}" );
         return;
     }
     return $$self{setback_mode};
diff --git a/lib/USB_UIRT.pm b/lib/USB_UIRT.pm
index a4d9ba885..c12afb069 100644
--- a/lib/USB_UIRT.pm
+++ b/lib/USB_UIRT.pm
@@ -70,11 +70,9 @@ my $prev     = '';
 my $learning = 0;
 my $dbm_file = "$main::config_parms{data_dir}/usb_uirt_codes.dbm";
 my (
-    $db,                %DBM,              @learned,
-    $device,            $function,         $frequency,
-    $repeat,            @transmit_queue,   @learn_queue,
-    @learn_frequencies, $transmit_timeout, $learn_timeout,
-    $receive_timeout
+    $db,               %DBM,           @learned,        $device,      $function,
+    $frequency,        $repeat,        @transmit_queue, @learn_queue, @learn_frequencies,
+    $transmit_timeout, $learn_timeout, $receive_timeout
 );
 my ($DrvHandle);
 my $tx_timeout = 500;
@@ -84,15 +82,11 @@ my $rx_timeout = 600;
 $rx_timeout = $main::config_parms{usb_uirt_rx_timeout}
   if ( defined $main::config_parms{usb_uirt_rx_timeout} );
 
-use constant UUIRTDRV_CFG_LEDRX =>
-  0x01;    # Indicator LED on USB-UIRT blinks when remote signals are received
-use constant UUIRTDRV_CFG_LEDTX =>
-  0x02;    # Indicator LED on USB-UIRT lights during IR transmission
-use constant UUIRTDRV_CFG_LEGACYRX =>
-  0x04;    # Generate 'legacy' UIRT-compatible codes on receive
-use constant UUIRTDRV_CFG_XLEARN => 0x08;    # Extended Learn Timing (for debug)
-use constant UUIRTDRV_CFG_PREVUIR =>
-  0x10;    # Generate previous UIR code when Stop code is received
+use constant UUIRTDRV_CFG_LEDRX    => 0x01;    # Indicator LED on USB-UIRT blinks when remote signals are received
+use constant UUIRTDRV_CFG_LEDTX    => 0x02;    # Indicator LED on USB-UIRT lights during IR transmission
+use constant UUIRTDRV_CFG_LEGACYRX => 0x04;    # Generate 'legacy' UIRT-compatible codes on receive
+use constant UUIRTDRV_CFG_XLEARN   => 0x08;    # Extended Learn Timing (for debug)
+use constant UUIRTDRV_CFG_PREVUIR  => 0x10;    # Generate previous UIR code when Stop code is received
 
 use constant UUIRTDRV_IRFMT_UUIRT  => 0x0000;
 use constant UUIRTDRV_IRFMT_PRONTO => 0x0010;
@@ -128,23 +122,19 @@ if ( $^O eq 'MSWin32' ) {
     }
 
     # UUIRTDRV_API BOOL PASCAL UUIRTGetDrvInfo(unsigned int *puDrvVersion);
-    Win32::API->Import( 'uuirtdrv',
-        'BOOL UUIRTGetDrvInfo(PUINT puDrvVersion)' );
+    Win32::API->Import( 'uuirtdrv', 'BOOL UUIRTGetDrvInfo(PUINT puDrvVersion)' );
 
     # UUIRTDRV_API HUUHANDLE PASCAL UUIRTOpen(void);
     Win32::API->Import( 'uuirtdrv', 'HUUHANDLE  UUIRTOpen()' );
 
     # UUIRTDRV_API BOOL PASCAL UUIRTGetUUIRTInfo(HUUHANDLE hHandle, PUUINFO *puuInfo);
-    Win32::API->Import( 'uuirtdrv',
-        'BOOL UUIRTGetUUIRTInfo(HUUHANDLE hHandle, LPUUINFO lppuuInfo)' );
+    Win32::API->Import( 'uuirtdrv', 'BOOL UUIRTGetUUIRTInfo(HUUHANDLE hHandle, LPUUINFO lppuuInfo)' );
 
     # UUIRTDRV_API BOOL PASCAL UUIRTGetUUIRTConfig(HUUHANDLE hHandle, PUINT32 pUirtConfig);
-    Win32::API->Import( 'uuirtdrv',
-        'BOOL UUIRTGetUUIRTConfig(HUUHANDLE hHandle, PUINT pUirtConfig)' );
+    Win32::API->Import( 'uuirtdrv', 'BOOL UUIRTGetUUIRTConfig(HUUHANDLE hHandle, PUINT pUirtConfig)' );
 
     # UUIRTDRV_API BOOL PASCAL UUIRTSetUUIRTConfig(HUUHANDLE hHandle, UINT32 uConfig);
-    Win32::API->Import( 'uuirtdrv',
-        'BOOL UUIRTSetUUIRTConfig(HUUHANDLE hHandle, UINT uConfig)' );
+    Win32::API->Import( 'uuirtdrv', 'BOOL UUIRTSetUUIRTConfig(HUUHANDLE hHandle, UINT uConfig)' );
 
     # UUIRTDRV_API BOOL PASCAL UUIRTTransmitIR(HUUHANDLE hHandle, char *IRCode, int codeFormat, int repeatCount,
     #					 int inactivityWaitTime, HANDLE hEvent, void *reserved0, void *reserved1);
@@ -186,13 +176,11 @@ sub startup {
         }
     }
     else {
-        my $baudrate =
-          38400;    # this is arbitrary, Linux overrides it, Windows uses DLL
-        my $port = '/dev/ttyUSB0';
+        my $baudrate = 38400;            # this is arbitrary, Linux overrides it, Windows uses DLL
+        my $port     = '/dev/ttyUSB0';
         $port = $main::config_parms{usb_uirt_port}
           if $main::config_parms{usb_uirt_port};
-        &main::serial_port_create( 'USB_UIRT', $port, $baudrate, 'none',
-            'raw' );
+        &main::serial_port_create( 'USB_UIRT', $port, $baudrate, 'none', 'raw' );
         select undef, undef, undef, .05;
         &main::check_for_generic_serial_data('USB_UIRT');
         my $data = $main::Serial_Ports{USB_UIRT}{data};
@@ -275,18 +263,10 @@ sub save_code {
             push @code2, $code;
         }
         else {
-            print
-              "USB_UIRT: Learning error, received more than two different codes \n";
+            print "USB_UIRT: Learning error, received more than two different codes \n";
         }
     }
-    set_ir_code(
-        $device,
-        $function,
-        learnraw_to_pronto(
-            frequency_average(), $repeat,
-            raw_average(@code1), raw_average(@code2)
-        )
-    );
+    set_ir_code( $device, $function, learnraw_to_pronto( frequency_average(), $repeat, raw_average(@code1), raw_average(@code2) ) );
     print "USB_UIRT: Saved device $device function $function \n";
 }
 
@@ -384,8 +364,7 @@ sub process_raw {
         my $frequency = ( 1000000 / ( ( $pulse * 0.4 ) / ( $count - 0.5 ) ) );
         push @learn_frequencies, $frequency if $count;
         if ( @bytes < 2 ) {
-            print
-              "USB_UIRT: Oops, not enough bytes at end of learn sequence \n";
+            print "USB_UIRT: Oops, not enough bytes at end of learn sequence \n";
             return;
         }
         $code .= unpack 'H4', pack 'C2', splice @bytes, 0, 2;
@@ -399,10 +378,7 @@ sub process_raw {
 }
 
 sub get_version {
-    my (
-        $firmware_minor, $firmware_major, $protocol_minor, $protocol_major,
-        $firmware_day,   $firmware_month, $firmware_year
-    );
+    my ( $firmware_minor, $firmware_major, $protocol_minor, $protocol_major, $firmware_day, $firmware_month, $firmware_year );
     print "\nGetting UIRT Info...\n";
     if ( $^O eq 'MSWin32' ) {
         my $UirtInfo = Win32::API::Struct->new('UUINFO');
@@ -413,8 +389,7 @@ sub get_version {
             $protocol_minor = $UirtInfo->{protVersion} & 0xff;
             $firmware_month = $UirtInfo->{fwDateMonth};
             $firmware_day   = $UirtInfo->{fwDateDay};
-            $firmware_year  = $UirtInfo->{fwDateYear}
-              ; # Bruce updated this line for correct display on win32 platforms
+            $firmware_year  = $UirtInfo->{fwDateYear};           # Bruce updated this line for correct display on win32 platforms
         }
         else {
             PrintError();
@@ -424,14 +399,10 @@ sub get_version {
         usb_uirt_send(0x23);
         my $ret = get_response(8);
         return unless length $ret == 8;
-        (
-            $firmware_minor, $firmware_major, $protocol_minor,
-            $protocol_major, $firmware_day,   $firmware_month,
-            $firmware_year
-        ) = unpack 'C*', $ret;
+        ( $firmware_minor, $firmware_major, $protocol_minor, $protocol_major, $firmware_day, $firmware_month, $firmware_year ) =
+          unpack 'C*', $ret;
     }
-    printf "USB_UIRT Protocol Version %d.%d\n", $protocol_major,
-      $protocol_minor;
+    printf "USB_UIRT Protocol Version %d.%d\n", $protocol_major, $protocol_minor;
     printf "USB_UIRT Firmware Version %d.%d  Date %02d/%02d/20%02d\n",
       $firmware_major, $firmware_minor, $firmware_month, $firmware_day,
       $firmware_year;
@@ -464,10 +435,7 @@ sub get_config {
         $UirtConfig & UUIRTDRV_CFG_XLEARN   ? 1 : 0,
         $UirtConfig & UUIRTDRV_CFG_PREVUIR  ? 1 : 0,
     );
-    print "USB-UIRT TX timeout:"
-      . $tx_timeout
-      . " RX timeout:"
-      . $rx_timeout . "\n";
+    print "USB-UIRT TX timeout:" . $tx_timeout . " RX timeout:" . $rx_timeout . "\n";
     return $UirtConfig;
 }
 
@@ -554,13 +522,7 @@ sub transmit_raw {
         print "\nTransmitting UUIRT Raw code $code via USB-UIRT device...\n";
         my ( $reserved0, $reserved1 );
         my $IRCodeFormat = UUIRTDRV_IRFMT_UUIRT;
-        if (
-            !UUIRTTransmitIR(
-                $DrvHandle, $code, $IRCodeFormat, $repeat,
-                0,          0,     $reserved0,    $reserved1
-            )
-          )
-        {
+        if ( !UUIRTTransmitIR( $DrvHandle, $code, $IRCodeFormat, $repeat, 0, 0, $reserved0, $reserved1 ) ) {
             printf("\n\t*** ERROR calling UUIRTTransmitIR! ***");
             PrintError;
         }
@@ -610,13 +572,7 @@ sub transmit_pronto {
     if ( $^O eq 'MSWin32' ) {
         my ( $reserved0, $reserved1 );
         my $IRCodeFormat = UUIRTDRV_IRFMT_PRONTO;
-        if (
-            !UUIRTTransmitIR(
-                $DrvHandle, $pronto, $IRCodeFormat, $repeat,
-                0,          0,       $reserved0,    $reserved1
-            )
-          )
-        {
+        if ( !UUIRTTransmitIR( $DrvHandle, $pronto, $IRCodeFormat, $repeat, 0, 0, $reserved0, $reserved1 ) ) {
             printf("\n\t*** ERROR calling UUIRTTransmitIR! ***");
             PrintError;
         }
@@ -626,8 +582,7 @@ sub transmit_pronto {
         $transmit_timeout = &main::get_tickcount + $tx_timeout;
     }
     else {
-        &transmit_raw(
-            &encode_ir_string( &pronto_to_raw( $pronto, $repeat ) ) );
+        &transmit_raw( &encode_ir_string( &pronto_to_raw( $pronto, $repeat ) ) );
     }
     return;
 }
@@ -691,8 +646,7 @@ sub raw_to_struct {
           "raw_to_struct code $_\nsmall_gap : $small_gap  small_pulse : $small_pulse big_gap : $big_gap  big_pulse : $big_pulse \n";
         $i = 0;
         foreach ( @bytes[ 4 .. $#bytes - 1 ] ) {
-            my $bit =
-              ( $_ > 1.5 * ( $i & 1 ? $small_gap : $small_pulse ) ) ? '1' : '0';
+            my $bit = ( $_ > 1.5 * ( $i & 1 ? $small_gap : $small_pulse ) ) ? '1' : '0';
             $bits .= $bit;
             push @{
                 $sums{
@@ -713,8 +667,7 @@ sub raw_to_struct {
             }
             push @struct, $sum ? ( $sum / ( $#{ $sums{$_} } + 1 ) ) : 0;
         }
-        push @struct,
-          unpack( 'C*', pack( ( $second ? 'b96' : 'b128' ), $bits ) );
+        push @struct, unpack( 'C*', pack( ( $second ? 'b96' : 'b128' ), $bits ) );
         $second++;
         $_ = unpack 'H*', pack 'C*', @struct;
     }
@@ -763,13 +716,12 @@ sub pronto_to_raw {
     my $pronto = shift;
     my $repeat = shift;
     $pronto =~ s/[^0-9a-f]//igs;
-    my @bytes = unpack 'n*', pack 'H*', $pronto;
-    my $kind  = shift @bytes;
-    my $units = shift(@bytes) * .241246;
-    my $frequency =
-      ( $kind == 0 && $units != 0.0 ) ? round( 1000.0 / $units ) : 0;
-    my $first  = shift(@bytes) * 2;
-    my $second = shift(@bytes) * 2;
+    my @bytes     = unpack 'n*', pack 'H*', $pronto;
+    my $kind      = shift @bytes;
+    my $units     = shift(@bytes) * .241246;
+    my $frequency = ( $kind == 0 && $units != 0.0 ) ? round( 1000.0 / $units ) : 0;
+    my $first     = shift(@bytes) * 2;
+    my $second    = shift(@bytes) * 2;
     my $both;
     $both = 1 if $first and $second;
     my ( $code1, $code2 );
@@ -845,8 +797,7 @@ sub raw_to_pronto {
             $inter = round( $inter * 51.2 / $units );
             my $count;
             while ( my $byte = shift @raw ) {
-                push @bytes,
-                  ( $byte & 0x80 ) ? ( $byte & 0x7f ) << 8 | shift @raw : $byte;
+                push @bytes, ( $byte & 0x80 ) ? ( $byte & 0x7f ) << 8 | shift @raw : $byte;
                 $count++;
             }
             push @bytes, $inter;
@@ -950,9 +901,7 @@ sub encode_ir_string {
     if ( ( $freq, $code ) = $code1 =~ /^F(\d\d)\s*R(.*)/si ) {
         $code =~ s/\s+//gs;
         $frequency = unpack 'C', pack 'H2', $freq;
-        $code = 'R'
-          . ( unpack 'H4', pack 'CC', $frequency, $code2 ? 1 : $repeat )
-          . $code;
+        $code = 'R' . ( unpack 'H4', pack 'CC', $frequency, $code2 ? 1 : $repeat ) . $code;
         $code .= ' ' . ( unpack 'H4', pack 'CC', $frequency, $repeat ) . $code2
           if $code2;
     }
@@ -960,9 +909,7 @@ sub encode_ir_string {
         $code =~ s/\s+//gs;
         $frequency = 40 unless $frequency;
         $frequency = ( 2500 / $frequency );
-        $code      = 'R'
-          . ( unpack 'H4', pack 'CC', $frequency, $code2 ? 1 : $repeat )
-          . $code;
+        $code      = 'R' . ( unpack 'H4', pack 'CC', $frequency, $code2 ? 1 : $repeat ) . $code;
         $code .= ' ' . ( unpack 'H4', pack 'CC', $frequency, $repeat ) . $code2
           if $code2;
     }
@@ -972,8 +919,7 @@ sub encode_ir_string {
 
         # don't pass a frequency if you want to use the one in the pronto
         if ( $frequency =~ /\d+/ and $frequency != 0 ) {
-            $frequency = sprintf "%04x",
-              round( ( 1000 / $frequency ) / .241246 );
+            $frequency = sprintf "%04x", round( ( 1000 / $frequency ) / .241246 );
             $code1 =~ s/^0000 [0-9a-f](4) /0000 $frequency /;
         }
         $code = sprintf "P%02x %s", $repeat, $code1;
@@ -982,9 +928,7 @@ sub encode_ir_string {
         $code1 =~ s/\s+//gs;
         $frequency = 40 unless $frequency;
         $frequency = round( 2500 / $frequency );
-        $code =
-          ( unpack 'H4', pack 'CC', $frequency, ( $code2 ? 0 : $repeat ) )
-          . $code1
+        $code      = ( unpack 'H4', pack 'CC', $frequency, ( $code2 ? 0 : $repeat ) ) . $code1
           if $code1;
         $code .= ( unpack 'H2', pack 'C', $repeat ) . $code2 if $code2;
     }
@@ -1031,8 +975,7 @@ sub decode_ir_string {
         $repeat1 = unpack 'c', pack 'H2', $repeat1;
     }
     else {
-        ( $frequency1, $repeat1, $code1, $repeat2, $code2 ) =
-          unpack 'a2a2a50a2a42', $code;
+        ( $frequency1, $repeat1, $code1, $repeat2, $code2 ) = unpack 'a2a2a50a2a42', $code;
         $frequency1 = unpack 'C', pack 'H2', $frequency1;
         $frequency1 = $frequency1 ? round( 2500 / $frequency1 ) : 0;
         $repeat1 = unpack 'C', pack 'H2', $repeat1;
diff --git a/lib/Ultimeter.pm b/lib/Ultimeter.pm
index 6d2de340b..411c23711 100644
--- a/lib/Ultimeter.pm
+++ b/lib/Ultimeter.pm
@@ -51,9 +51,7 @@ package Ultimeter;
 @Ultimeter::ISA = ('Serial_Item');
 
 sub serial_startup {
-    &main::serial_port_create( 'Ultimeter',
-        $main::config_parms{Ultimeter_serial_port},
-        2400, 'none' );
+    &main::serial_port_create( 'Ultimeter', $main::config_parms{Ultimeter_serial_port}, 2400, 'none' );
 
     #Start complete record mode
     $main::Serial_Ports{Ultimeter}{object}->write(">K\n");
@@ -315,8 +313,7 @@ sub update_weather {
         $v   = substr( $data, 144, 4 );
         $vv  = hex($v);
         $vvv = $vv / 10.0;
-        $main::Weather{YesterdayBarometerLow} =
-          sprintf( "%.2f", $vvv * .02953 );
+        $main::Weather{YesterdayBarometerLow} = sprintf( "%.2f", $vvv * .02953 );
 
         #37 Yesterday's Low Barometer Time
         $v                                        = substr( $data, 148, 4 );
@@ -416,8 +413,7 @@ sub update_weather {
         $v = substr( $data, 204, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentOutdoorHumidity} ne "N/A" ) {
-            $main::Weather{YesterdayOutdoorLowHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{YesterdayOutdoorLowHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{YesterdayOutdoorLowHumidityTime} = "N/A";
@@ -448,8 +444,7 @@ sub update_weather {
         $v = substr( $data, 216, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentOutdoorHumidity} ne "N/A" ) {
-            $main::Weather{LongtermOutdoorLowHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{LongtermOutdoorLowHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{LongtermOutdoorLowHumidityTime} = "N/A";
@@ -491,8 +486,7 @@ sub update_weather {
         $v = substr( $data, 232, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentIndoorHumidity} ne "N/A" ) {
-            $main::Weather{YesterdayIndoorLowHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{YesterdayIndoorLowHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{YesterdayIndoorLowHumidityTime} = "N/A";
@@ -523,8 +517,7 @@ sub update_weather {
         $v = substr( $data, 244, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentIndoorHumidity} ne "N/A" ) {
-            $main::Weather{LongtermIndoorLowHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{LongtermIndoorLowHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{LongtermIndoorLowHumidityTime} = "N/A";
@@ -634,8 +627,7 @@ sub update_weather {
         $v   = substr( $data, 320, 4 );
         $vv  = hex($v);
         $vvv = $vv / 10.0;
-        $main::Weather{YesterdayBarometerHigh} =
-          sprintf( "%.2f", $vvv * .02953 );
+        $main::Weather{YesterdayBarometerHigh} = sprintf( "%.2f", $vvv * .02953 );
 
         #81 Yesterday's High Barometer Time
         $v                                         = substr( $data, 324, 4 );
@@ -651,8 +643,7 @@ sub update_weather {
         $v   = substr( $data, 332, 4 );
         $vv  = hex($v);
         $vvv = $vv / 10.0;
-        $main::Weather{LongtermBarometerHigh} =
-          sprintf( "%.2f", $vvv * .02953 );
+        $main::Weather{LongtermBarometerHigh} = sprintf( "%.2f", $vvv * .02953 );
 
         #84 Long Term High Barometer Time
         $v                                        = substr( $data, 336, 4 );
@@ -726,8 +717,7 @@ sub update_weather {
         $v = substr( $data, 380, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentOutdoorHumidity} ne "N/A" ) {
-            $main::Weather{YesterdayOutdoorHighHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{YesterdayOutdoorHighHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{YesterdayOutdoorHighHumidityTime} = "N/A";
@@ -758,8 +748,7 @@ sub update_weather {
         $v = substr( $data, 392, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentOutdoorHumidity} ne "N/A" ) {
-            $main::Weather{LongtermOutdoorHighHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{LongtermOutdoorHighHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{LongtermOutdoorHighHumidityTime} = "N/A";
@@ -801,8 +790,7 @@ sub update_weather {
         $v = substr( $data, 408, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentIndoorHumidity} ne "N/A" ) {
-            $main::Weather{YesterdayIndoorHighHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{YesterdayIndoorHighHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{YesterdayIndoorHighHumidityTime} = "N/A";
@@ -833,8 +821,7 @@ sub update_weather {
         $v = substr( $data, 420, 4 );
         $vv = hex($v);
         if ( $main::Weather{CurrentIndoorHumidity} ne "N/A" ) {
-            $main::Weather{LongtermIndoorHighHumidityTime} =
-              &ultimeter_time($vv);
+            $main::Weather{LongtermIndoorHighHumidityTime} = &ultimeter_time($vv);
         }
         else {
             $main::Weather{LongtermIndoorHighHumidityTime} = "N/A";
diff --git a/lib/Venstar_Colortouch.pm b/lib/Venstar_Colortouch.pm
index 1748257fc..937161860 100644
--- a/lib/Venstar_Colortouch.pm
+++ b/lib/Venstar_Colortouch.pm
@@ -56,11 +56,10 @@ sub new {
     bless $self, $class;
     $self->{data}                 = undef;
     $self->{child_object}         = undef;
-    $self->{config}->{cache_time} = 30;      #TODO fix cache timeouts
+    $self->{config}->{cache_time} = 30;                                           #TODO fix cache timeouts
     $self->{config}->{cache_time} = $::config_params{venstar_config_cache_time}
       if defined $::config_params{venstar_config_cache_time};
-    $self->{config}->{tz} = $::config_params{time_zone}
-      ;    #TODO Need to figure out DST for print runtimes
+    $self->{config}->{tz}           = $::config_params{time_zone};                #TODO Need to figure out DST for print runtimes
     $self->{config}->{poll_seconds} = 60;
     $self->{config}->{poll_seconds} = $poll if ($poll);
     $self->{config}->{poll_seconds} = 1
@@ -70,7 +69,7 @@ sub new {
     $self->{host}          = $host;
     $self->{debug}         = 0;
     $self->{loglevel}      = 1;
-    $self->{timeout}       = 15;      #300;
+    $self->{timeout}       = 15;                                                  #300;
 
     $self->_init;
     $self->{timer} = new Timer;
@@ -108,13 +107,9 @@ sub _init {
 
         if ( ( $stat->{api_ver} > 3 ) and ( $stat->{type} eq "residential" ) ) {
 
-            main::print_log(
-                "[Venstar Colortouch] Residental Venstar ColorTouch found with api level $stat->{api_ver}"
-            );
+            main::print_log( "[Venstar Colortouch] Residental Venstar ColorTouch found with api level $stat->{api_ver}" );
             if ( $self->poll() ) {
-                main::print_log( "[Venstar Colortouch:"
-                      . $self->{data}->{name}
-                      . "] Data Successfully Retrieved" );
+                main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Data Successfully Retrieved" );
                 $self->{active}                = 1;
                 $self->{previous}->{tempunits} = $self->{data}->{tempunits};
                 $self->{previous}->{name}      = $self->{data}->{name};
@@ -132,24 +127,21 @@ sub _init {
 
             }
             else {
-                main::print_log(
-                    "[Venstar Colortouch] Problem retrieving initial data");
+                main::print_log("[Venstar Colortouch] Problem retrieving initial data");
                 $self->{active} = 0;
                 return ('1');
             }
 
         }
         else {
-            main::print_log(
-                "[Venstar Colortouch] Unknown device " . $self->{host} );
+            main::print_log( "[Venstar Colortouch] Unknown device " . $self->{host} );
             $self->{active} = 0;
             return ('1');
         }
 
     }
     else {
-        main::print_log( "[Venstar Colortouch] Error. Unable to connect to "
-              . $self->{host} );
+        main::print_log( "[Venstar Colortouch] Error. Unable to connect to " . $self->{host} );
         $self->{active} = 0;
         return ('1');
     }
@@ -173,8 +165,7 @@ sub poll {
         $self->{data}->{retry}     = 0;
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "online" ) {
-                main::print_log
-                  "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "online", 'poll' );
             }
@@ -182,15 +173,11 @@ sub poll {
         return ('1');
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Problem retrieving poll data from "
-              . $self->{host} );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Problem retrieving poll data from " . $self->{host} );
         $self->{data}->{retry}++;
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "offline" ) {
-                main::print_log
-                  "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "offline", 'poll' );
             }
@@ -224,14 +211,11 @@ sub _get_JSON_data {
         my $isSuccessResponse = $responseCode < 400;
         $self->{updating} = 0;
         if ( !$isSuccessResponse ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Warning, failed to get data. Response code $responseCode"
-            );
+            main::print_log(
+                "[Venstar Colortouch:" . $self->{data}->{name} . "] Warning, failed to get data. Response code $responseCode" );
             if ( defined $self->{child_object}->{comm} ) {
                 if ( $self->{child_object}->{comm}->state() ne "offline" ) {
-                    main::print_log
-                      "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                    main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                       if ( $self->{loglevel} );
                     $self->{child_object}->{comm}->set( "offline", 'poll' );
                 }
@@ -241,8 +225,7 @@ sub _get_JSON_data {
         else {
             if ( defined $self->{child_object}->{comm} ) {
                 if ( $self->{child_object}->{comm}->state() ne "online" ) {
-                    main::print_log
-                      "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                    main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                       if ( $self->{loglevel} );
                     $self->{child_object}->{comm}->set( "online", 'poll' );
                 }
@@ -253,9 +236,7 @@ sub _get_JSON_data {
 
         # catch crashes:
         if ($@) {
-            print "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] ERROR! JSON parser crashed! $@\n";
+            print "[Venstar Colortouch:" . $self->{data}->{name} . "] ERROR! JSON parser crashed! $@\n";
             return ('0');
         }
         else {
@@ -263,9 +244,8 @@ sub _get_JSON_data {
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Warning, not fetching data due to operation in progress" );
+        main::print_log(
+            "[Venstar Colortouch:" . $self->{data}->{name} . "] Warning, not fetching data due to operation in progress" );
         return ('0');
     }
 }
@@ -287,12 +267,9 @@ sub _push_JSON_data {
         my ($sched) = $params =~ /schedule=(\d+)/;
         my $hum;
         my ($humsp)   = $params =~ /hum_setpoint=(\d+)/;
-        my ($dehumsp) = $params =~ /dehum_setpoint=(\d+)/
-          ;               #need to add in dehumidifier stuff at some point
+        my ($dehumsp) = $params =~ /dehum_setpoint=(\d+)/;    #need to add in dehumidifier stuff at some point
 
-        my ( $isSuccessResponse, $cunits, $caway, $csched, $chum, $chumsp,
-            $cdehumsp )
-          = $self->_get_setting_params;
+        my ( $isSuccessResponse, $cunits, $caway, $csched, $chum, $chumsp, $cdehumsp ) = $self->_get_setting_params;
 
         $units = $cunits if ( not defined $units );
         $units = 1 if ( ( $units eq "C" ) or ( $units eq "c" ) );
@@ -305,9 +282,7 @@ sub _push_JSON_data {
         $dehumsp = $cdehumsp if ( not defined $dehumsp );
 
         if ( $cunits ne $units ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing Units from $cunits to $units" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing Units from $cunits to $units" );
             $newunits = $units;
         }
         else {
@@ -315,9 +290,7 @@ sub _push_JSON_data {
         }
 
         if ( $caway ne $away ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing Away from $caway to $away" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing Away from $caway to $away" );
             $newaway = $away;
         }
         else {
@@ -325,9 +298,7 @@ sub _push_JSON_data {
         }
 
         if ( $csched ne $sched ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing Schedule from $csched to $sched" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing Schedule from $csched to $sched" );
             $newsched = $sched;
         }
         else {
@@ -335,8 +306,7 @@ sub _push_JSON_data {
         }
 
         if ( $chumsp ne $humsp ) {
-            print
-              "[Venstar Colortouch] Changing Humidity Setpoint from $chumsp to $humsp\n";
+            print "[Venstar Colortouch] Changing Humidity Setpoint from $chumsp to $humsp\n";
             $newhumsp = $humsp;
         }
         else {
@@ -344,18 +314,15 @@ sub _push_JSON_data {
         }
 
         if ( $cdehumsp ne $dehumsp ) {
-            print
-              "[Venstar Colortouch] Changing Dehumidity Setpoint from $cdehumsp to $dehumsp\n";
+            print "[Venstar Colortouch] Changing Dehumidity Setpoint from $cdehumsp to $dehumsp\n";
             $newdehumsp = $dehumsp;
         }
         else {
             $newdehumsp = $cdehumsp;
         }
 
-        $cmd =
-          "tempunits=$newunits&away=$newaway&schedule=$newsched&hum_setpoint=$newhumsp&dehum_setpoint=$newdehumsp";
-        main::print_log( "Sending Settings command $cmd to " . $self->{host} )
-          ;    # if $self->{debug};
+        $cmd = "tempunits=$newunits&away=$newaway&schedule=$newsched&hum_setpoint=$newhumsp&dehum_setpoint=$newdehumsp";
+        main::print_log( "Sending Settings command $cmd to " . $self->{host} );    # if $self->{debug};
 
     }
     elsif ( $type eq 'control' ) {
@@ -370,27 +337,20 @@ sub _push_JSON_data {
         my ($heattemp) = $params =~ /heattemp=(\d+)/;    #need decimals
         my ($cooltemp) = $params =~ /cooltemp=(\d+)/;
 
-        my (
-            $isSuccessResponse, $cmode,     $cfan,
-            $cheattemp,         $ccooltemp, $setpointdelta,
-            $minheat,           $maxheat,   $mincool,
-            $maxcool
-        ) = $self->_get_control_params;
+        my ( $isSuccessResponse, $cmode, $cfan, $cheattemp, $ccooltemp, $setpointdelta, $minheat, $maxheat, $mincool, $maxcool ) =
+          $self->_get_control_params;
 
         $mode     = $cmode     if ( not defined $mode );
         $fan      = $cfan      if ( not defined $fan );
         $heattemp = $cheattemp if ( !$heattemp );
         $cooltemp = $ccooltemp if ( !$cooltemp );
 
-        main::print_log(
-            "data1=$isSuccessResponse,$cmode,$cfan,$cheattemp,$ccooltemp,$setpointdelta"
-        );    #TODO pass object to get debug
+        main::print_log( "data1=$isSuccessResponse,$cmode,$cfan,$cheattemp,$ccooltemp,$setpointdelta" )
+          ;                                              #TODO pass object to get debug
         main::print_log("data2=$mode,$fan,$heattemp,$cooltemp");    #TODO debug
 
         if ( $cmode ne $mode ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing mode from $cmode to $mode" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing mode from $cmode to $mode" );
             $newmode = $mode;
         }
         else {
@@ -398,9 +358,7 @@ sub _push_JSON_data {
         }
 
         if ( $cfan ne $fan ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing fan from $cfan to $fan" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing fan from $cfan to $fan" );
             $newfan = $fan;
         }
         else {
@@ -408,9 +366,8 @@ sub _push_JSON_data {
         }
 
         if ( $heattemp ne $cheattemp ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing heat setpoint from $cheattemp to $heattemp" );
+            main::print_log(
+                "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing heat setpoint from $cheattemp to $heattemp" );
             $newheatsp = $heattemp;
         }
         else {
@@ -418,9 +375,8 @@ sub _push_JSON_data {
         }
 
         if ( $cooltemp ne $ccooltemp ) {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Changing cool setpoint from $ccooltemp to $cooltemp" );
+            main::print_log(
+                "[Venstar Colortouch:" . $self->{data}->{name} . "] Changing cool setpoint from $ccooltemp to $cooltemp" );
             $newcoolsp = $cooltemp;
         }
         else {
@@ -430,35 +386,28 @@ sub _push_JSON_data {
         if ( ( $newcoolsp > $maxcool ) or ( $newcoolsp < $mincool ) ) {
             main::print_log( "[Venstar Colortouch:"
                   . $self->{data}->{name}
-                  . "] Error: New cooling setpoint $newcoolsp out of bounds $mincool - $maxcool"
-            );
+                  . "] Error: New cooling setpoint $newcoolsp out of bounds $mincool - $maxcool" );
             $newcoolsp = $ccooltemp;
         }
 
         if ( ( $newheatsp > $maxheat ) or ( $newheatsp < $minheat ) ) {
             main::print_log( "[Venstar Colortouch:"
                   . $self->{data}->{name}
-                  . "] Error: New heating setpoint $newheatsp out of bounds $minheat - $maxheat"
-            );
+                  . "] Error: New heating setpoint $newheatsp out of bounds $minheat - $maxheat" );
             $newheatsp = $cheattemp;
         }
 
         if ( ( $newheatsp - $newcoolsp ) < $setpointdelta ) {
             main::print_log( "[Venstar Colortouch:"
                   . $self->{data}->{name}
-                  . "] Error: Cooling and Heating setpoints need to be less than setpoint $setpointdelta"
-            );
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Not setting setpoints" );
+                  . "] Error: Cooling and Heating setpoints need to be less than setpoint $setpointdelta" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Not setting setpoints" );
             $newcoolsp = $ccooltemp;
             $newheatsp = $cheattemp;
         }
 
-        $cmd =
-          "mode=$newmode&fan=$newfan&heattemp=$newheatsp&cooltemp=$newcoolsp";
-        main::print_log( "Sending Control command $cmd to " . $self->{host} )
-          ;    # if $self->{debug};
+        $cmd = "mode=$newmode&fan=$newfan&heattemp=$newheatsp&cooltemp=$newcoolsp";
+        main::print_log( "Sending Control command $cmd to " . $self->{host} );    # if $self->{debug};
 
     }
     else {
@@ -483,13 +432,11 @@ sub _push_JSON_data {
     print 'Response code: ' . $responseCode . "\n" if $self->{debug};
     my $isSuccessResponse = $responseCode < 400;
     if ( !$isSuccessResponse ) {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Warning, failed to push data. Response code $responseCode" );
+        main::print_log(
+            "[Venstar Colortouch:" . $self->{data}->{name} . "] Warning, failed to push data. Response code $responseCode" );
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "offline" ) {
-                main::print_log
-                  "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "offline", 'poll' );
             }
@@ -498,8 +445,7 @@ sub _push_JSON_data {
     else {
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{child_object}->{comm}->state() ne "online" ) {
-                main::print_log
-                  "[Venstar Colortouch] Communication Tracking object found. Updating..."
+                main::print_log "[Venstar Colortouch] Communication Tracking object found. Updating..."
                   if ( $self->{loglevel} );
                 $self->{child_object}->{comm}->set( "online", 'poll' );
             }
@@ -521,9 +467,7 @@ sub register {
 
     #my $name;
     #$name = $$object{object_name};  #TODO: Why can't we get the name of the child object?
-    &main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Registering $type child object" );
+    &main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Registering $type child object" );
     $self->{child_object}->{$type} = $object;
 
 }
@@ -532,18 +476,15 @@ sub _get_control_params {
     my ($self) = @_;
     my ( $isSuccessResponse, $info ) = $self->_get_JSON_data('info');
     return (
-        $isSuccessResponse,   $info->{mode},        $info->{fan},
-        $info->{heattemp},    $info->{cooltemp},    $info->{setpointdelta},
-        $info->{heattempmin}, $info->{heattempmax}, $info->{cooltempmin},
-        $info->{cooltempmax}
+        $isSuccessResponse,     $info->{mode},        $info->{fan},         $info->{heattemp},    $info->{cooltemp},
+        $info->{setpointdelta}, $info->{heattempmin}, $info->{heattempmax}, $info->{cooltempmin}, $info->{cooltempmax}
     );
 }
 
 sub _get_setting_params {
     my ($self) = @_;
     my ( $isSuccessResponse, $info ) = $self->_get_JSON_data('info');
-    return ( $isSuccessResponse, $info->{tempunits}, $info->{away},
-        $info->{schedule}, $info->{hum}, $info->{hum_setpoint},
+    return ( $isSuccessResponse, $info->{tempunits}, $info->{away}, $info->{schedule}, $info->{hum}, $info->{hum_setpoint},
         $info->{dehum_setpoint} );
 }
 
@@ -554,9 +495,7 @@ sub stop_timer {
         $self->{timer}->stop() if ( $self->{timer}->active() );
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Warning, stop_timer called but timer undefined" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Warning, stop_timer called but timer undefined" );
     }
 }
 
@@ -564,13 +503,10 @@ sub start_timer {
     my ($self) = @_;
 
     if ( defined $self->{timer} ) {
-        $self->{timer}->set( $self->{config}->{poll_seconds},
-            sub { &Venstar_Colortouch::_poll_check($self) }, -1 );
+        $self->{timer}->set( $self->{config}->{poll_seconds}, sub { &Venstar_Colortouch::_poll_check($self) }, -1 );
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Warning, start_timer called but timer undefined" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Warning, start_timer called but timer undefined" );
     }
 }
 
@@ -612,37 +548,20 @@ sub print_info {
     elsif ( $self->{data}->{info}->{availablemodes} == 3 ) {
         $type = "a cooling only";
     }
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Device "
-          . $self->{data}->{name} . " is "
-          . $type
-          . " Thermostat" );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Device " . $self->{data}->{name} . " is " . $type . " Thermostat" );
 
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Fan mode is set to "
-          . $fan[ $self->{data}->{info}->{fan} ] );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Fan is currently "
-          . $fanstate[ $self->{data}->{info}->{fanstate} ] );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] System mode is "
-          . $mode[ $self->{data}->{info}->{mode} ] );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] System is "
-          . $state[ $self->{data}->{info}->{state} ] );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Fan mode is set to " . $fan[ $self->{data}->{info}->{fan} ] );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Fan is currently " . $fanstate[ $self->{data}->{info}->{fanstate} ] );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] System mode is " . $mode[ $self->{data}->{info}->{mode} ] );
+    main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] System is " . $state[ $self->{data}->{info}->{state} ] );
 
     my $sch = " ";
     $sch = " not " if ( $self->{data}->{info}->{schedule} == 0 );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] System is"
-          . $sch
-          . "on a schedule" );
+    main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] System is" . $sch . "on a schedule" );
 
     main::print_log( "[Venstar Colortouch:"
           . $self->{data}->{name}
@@ -651,24 +570,13 @@ sub print_info {
 
     my $away = "home mode";
     $away = "away mode" if ( $self->{data}->{info}->{away} );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] System is currently on $away" );
+    main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] System is currently on $away" );
 
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Current Temperature: "
-          . $self->{data}->{info}->{spacetemp}
-          . "$unit" );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Current Humidity:"
-          . $self->{data}->{info}->{hum}
-          . "%" );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Current Temperature: " . $self->{data}->{info}->{spacetemp} . "$unit" );
+    main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Current Humidity:" . $self->{data}->{info}->{hum} . "%" );
 
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Current Setpoint\tMin\tMax" );
+    main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Current Setpoint\tMin\tMax" );
     main::print_log( "[Venstar Colortouch:"
           . $self->{data}->{name}
           . "] Heat:\t"
@@ -687,24 +595,15 @@ sub print_info {
           . "$unit\t"
           . $self->{data}->{info}->{cooltempmax}
           . "$unit" );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Humidity:\t"
-          . $self->{data}->{info}->{hum_setpoint}
-          . "%" )
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Humidity:\t" . $self->{data}->{info}->{hum_setpoint} . "%" )
       unless ( $self->{data}->{info}->{hum_setpoint} == 99 );
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Dehumidity:"
-          . $self->{data}->{info}->{dehum_setpoint}
-          . "%" )
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Dehumidity:" . $self->{data}->{info}->{dehum_setpoint} . "%" )
       unless ( $self->{data}->{info}->{dehum_setpoint} == 99 );
 
-    main::print_log( "[Venstar Colortouch:"
-          . $self->{data}->{name}
-          . "] Setpoint Delta: "
-          . $self->{data}->{info}->{setpointdelta}
-          . "$unit" );
+    main::print_log(
+        "[Venstar Colortouch:" . $self->{data}->{name} . "] Setpoint Delta: " . $self->{data}->{info}->{setpointdelta} . "$unit" );
 
     main::print_log( "[Venstar Colortouch:"
           . $self->{data}->{name}
@@ -724,9 +623,7 @@ sub print_info {
               . $self->{data}->{sensors}->{sensors}[1]->{temp} );
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Outdoor Temperature Sensor not connected" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Outdoor Temperature Sensor not connected" );
     }
 }
 
@@ -760,38 +657,31 @@ sub process_data {
     if ( $self->{previous}->{tempunits} != $self->{data}->{tempunits} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] Temperature Units changed from $self->{previous}->{tempunits} to $self->{data}->{tempunits}"
-        );
+              . "] Temperature Units changed from $self->{previous}->{tempunits} to $self->{data}->{tempunits}" );
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] This really isn't a regular operation. Should check Thermostat to confirm"
-        );
+              . "] This really isn't a regular operation. Should check Thermostat to confirm" );
         $self->{previous}->{tempunits} = $self->{data}->{tempunits};
     }
 
     if ( $self->{previous}->{name} ne $self->{data}->{name} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] Device Name changed from $self->{previous}->{name} to $self->{data}->{name}"
-        );
+              . "] Device Name changed from $self->{previous}->{name} to $self->{data}->{name}" );
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] This really isn't a regular operation. Should check Thermostat to confirm"
-        );
+              . "] This really isn't a regular operation. Should check Thermostat to confirm" );
         $self->{previous}->{name} = $self->{data}->{name};
     }
 
-    if ( $self->{previous}->{info}->{availablemodes} !=
-        $self->{data}->{info}->{availablemodes} )
-    {
+    if ( $self->{previous}->{info}->{availablemodes} != $self->{data}->{info}->{availablemodes} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Available Modes changed from $self->{previous}->{info}->{availablemodes} to $self->{data}->{info}->{availablemodes}"
         );
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] This really isn't a regular operation. Should check Thermostat to confirm"
-        );
+              . "] This really isn't a regular operation. Should check Thermostat to confirm" );
         $self->{previous}->{info}->{availablemodes} =
           $self->{data}->{info}->{availablemodes};
     }
@@ -799,20 +689,17 @@ sub process_data {
     if ( $self->{previous}->{info}->{fan} != $self->{data}->{info}->{fan} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] Fan changed from $fan[$self->{previous}->{info}->{fan}] to $fan[$self->{data}->{info}->{fan}]"
-        ) if ( $self->{loglevel} );
+              . "] Fan changed from $fan[$self->{previous}->{info}->{fan}] to $fan[$self->{data}->{info}->{fan}]" )
+          if ( $self->{loglevel} );
         $self->{previous}->{info}->{fan} = $self->{data}->{info}->{fan};
         if ( defined $self->{child_object}->{fanstate} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{fanstate}
-              ->set_mode( $fan[ $self->{data}->{info}->{fan} ] );
+            $self->{child_object}->{fanstate}->set_mode( $fan[ $self->{data}->{info}->{fan} ] );
         }
     }
 
-    if ( $self->{previous}->{info}->{fanstate} !=
-        $self->{data}->{info}->{fanstate} )
-    {
+    if ( $self->{previous}->{info}->{fanstate} != $self->{data}->{info}->{fanstate} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Fan state changed from $fanstate[$self->{previous}->{info}->{fanstate}] to $fanstate[$self->{data}->{info}->{fanstate}]"
@@ -822,21 +709,19 @@ sub process_data {
         if ( defined $self->{child_object}->{fanstate} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{fanstate}
-              ->set( $fanstate[ $self->{data}->{info}->{fanstate} ], 'poll' );
+            $self->{child_object}->{fanstate}->set( $fanstate[ $self->{data}->{info}->{fanstate} ], 'poll' );
         }
     }
 
     if ( $self->{previous}->{info}->{mode} != $self->{data}->{info}->{mode} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
-              . "] Mode changed from $mode[$self->{previous}->{info}->{mode}] to $mode[$self->{data}->{info}->{mode}]"
-        ) if ( $self->{loglevel} );
+              . "] Mode changed from $mode[$self->{previous}->{info}->{mode}] to $mode[$self->{data}->{info}->{mode}]" )
+          if ( $self->{loglevel} );
         $self->{previous}->{info}->{mode} = $self->{data}->{info}->{mode};
     }
 
-    if ( $self->{previous}->{info}->{state} != $self->{data}->{info}->{state} )
-    {
+    if ( $self->{previous}->{info}->{state} != $self->{data}->{info}->{state} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat state changed from $state[$self->{previous}->{info}->{state}] to $state[$self->{data}->{info}->{state}]"
@@ -845,33 +730,24 @@ sub process_data {
         $self->set( $state[ $self->{data}->{info}->{state} ], 'poll' );
     }
 
-    if ( $self->{previous}->{info}->{schedule} !=
-        $self->{data}->{info}->{schedule} )
-    {
+    if ( $self->{previous}->{info}->{schedule} != $self->{data}->{info}->{schedule} ) {
         my $sch = " ";
         my @sched;
         $sched[0] = "off";
         $sched[1] = "on";
         $sch = " not " if ( !$self->{data}->{info}->{schedule} );
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Thermostat state changed to"
-              . $sch
-              . "on a schedule" )
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Thermostat state changed to" . $sch . "on a schedule" )
           if ( $self->{loglevel} );
         $self->{previous}->{info}->{schedule} =
           $self->{data}->{info}->{schedule};
         if ( defined $self->{child_object}->{sched} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{sched}
-              ->set( $sched[ $self->{data}->{info}->{schedule} ], 'poll' );
+            $self->{child_object}->{sched}->set( $sched[ $self->{data}->{info}->{schedule} ], 'poll' );
         }
     }
 
-    if ( $self->{previous}->{info}->{schedulepart} !=
-        $self->{data}->{info}->{schedulepart} )
-    {
+    if ( $self->{previous}->{info}->{schedulepart} != $self->{data}->{info}->{schedulepart} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat schedule changed from $schedule[$self->{previous}->{info}->{schedulepart}] to $schedule[$self->{data}->{info}->{schedulepart}]"
@@ -883,17 +759,12 @@ sub process_data {
     if ( $self->{previous}->{info}->{away} != $self->{data}->{info}->{away} ) {
         my $away = "home mode";
         $away = "away mode" if ( $self->{data}->{info}->{away} );
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Thermostat occupency changed to"
-              . $away )
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Thermostat occupency changed to" . $away )
           if ( $self->{loglevel} );
         $self->{previous}->{info}->{away} = $self->{data}->{info}->{away};
     }
 
-    if ( $self->{previous}->{info}->{spacetemp} !=
-        $self->{data}->{info}->{spacetemp} )
-    {
+    if ( $self->{previous}->{info}->{spacetemp} != $self->{data}->{info}->{spacetemp} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat temperature changed from $self->{previous}->{info}->{spacetemp} to $self->{data}->{info}->{spacetemp}"
@@ -903,14 +774,11 @@ sub process_data {
         if ( defined $self->{child_object}->{temp} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{temp}
-              ->set( $self->{data}->{info}->{spacetemp}, 'poll' );
+            $self->{child_object}->{temp}->set( $self->{data}->{info}->{spacetemp}, 'poll' );
         }
     }
 
-    if ( $self->{previous}->{info}->{heattemp} !=
-        $self->{data}->{info}->{heattemp} )
-    {
+    if ( $self->{previous}->{info}->{heattemp} != $self->{data}->{info}->{heattemp} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat heating setpoint changed from $self->{previous}->{info}->{heattemp} to $self->{data}->{info}->{heattemp}"
@@ -919,9 +787,7 @@ sub process_data {
           $self->{data}->{info}->{heattemp};
     }
 
-    if ( $self->{previous}->{info}->{heattempmin} !=
-        $self->{data}->{info}->{heattempmin} )
-    {
+    if ( $self->{previous}->{info}->{heattempmin} != $self->{data}->{info}->{heattempmin} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat heating setpoint minimum changed from $self->{previous}->{info}->{heattempmin} to $self->{data}->{info}->{heattempmin}"
@@ -930,9 +796,7 @@ sub process_data {
           $self->{data}->{info}->{heattempmin};
     }
 
-    if ( $self->{previous}->{info}->{heattempmax} !=
-        $self->{data}->{info}->{heattempmax} )
-    {
+    if ( $self->{previous}->{info}->{heattempmax} != $self->{data}->{info}->{heattempmax} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat heating setpoint maximum changed from $self->{previous}->{info}->{heattempmax} to $self->{data}->{info}->{heattempmax}"
@@ -941,9 +805,7 @@ sub process_data {
           $self->{data}->{info}->{heattempmax};
     }
 
-    if ( $self->{previous}->{info}->{cooltemp} !=
-        $self->{data}->{info}->{cooltemp} )
-    {
+    if ( $self->{previous}->{info}->{cooltemp} != $self->{data}->{info}->{cooltemp} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat cooling setpoint changed from $self->{previous}->{info}->{cooltemp} to $self->{data}->{info}->{cooltemp}"
@@ -952,9 +814,7 @@ sub process_data {
           $self->{data}->{info}->{cooltemp};
     }
 
-    if ( $self->{previous}->{info}->{cooltempmin} !=
-        $self->{data}->{info}->{cooltempmin} )
-    {
+    if ( $self->{previous}->{info}->{cooltempmin} != $self->{data}->{info}->{cooltempmin} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat cooling setpoint minimum changed from $self->{previous}->{info}->{cooltempmin} to $self->{data}->{info}->{cooltempmin}"
@@ -963,9 +823,7 @@ sub process_data {
           $self->{data}->{info}->{cooltempmin};
     }
 
-    if ( $self->{previous}->{info}->{cooltempmax} !=
-        $self->{data}->{info}->{cooltempmax} )
-    {
+    if ( $self->{previous}->{info}->{cooltempmax} != $self->{data}->{info}->{cooltempmax} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat cooling setpoint maximum changed from $self->{previous}->{info}->{cooltempmax} to $self->{data}->{info}->{cooltempmax}"
@@ -974,9 +832,7 @@ sub process_data {
           $self->{data}->{info}->{cooltempmax};
     }
 
-    if ( $self->{previous}->{info}->{dehum_setpoint} !=
-        $self->{data}->{info}->{dehum_setpoint} )
-    {
+    if ( $self->{previous}->{info}->{dehum_setpoint} != $self->{data}->{info}->{dehum_setpoint} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat dehumidity setpoint changed from $self->{previous}->{info}->{dehum_setpoint} to $self->{data}->{info}->{dehum_setpoint}"
@@ -986,14 +842,11 @@ sub process_data {
         if ( defined $self->{child_object}->{dehum_sp} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{dehum_sp}
-              ->set( $self->{data}->{info}->{dehum_setpoint}, 'poll' );
+            $self->{child_object}->{dehum_sp}->set( $self->{data}->{info}->{dehum_setpoint}, 'poll' );
         }
     }
 
-    if ( $self->{previous}->{info}->{hum_setpoint} !=
-        $self->{data}->{info}->{hum_setpoint} )
-    {
+    if ( $self->{previous}->{info}->{hum_setpoint} != $self->{data}->{info}->{hum_setpoint} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat humidity setpoint changed from $self->{previous}->{info}->{hum_setpoint} to $self->{data}->{info}->{hum_setpoint}"
@@ -1003,8 +856,7 @@ sub process_data {
         if ( defined $self->{child_object}->{hum_sp} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{hum_sp}
-              ->set( $self->{data}->{info}->{hum_setpoint}, 'poll' );
+            $self->{child_object}->{hum_sp}->set( $self->{data}->{info}->{hum_setpoint}, 'poll' );
         }
     }
 
@@ -1013,9 +865,7 @@ sub process_data {
     #  $self->{previous}->{info}->{hum} = $self->{data}->{info}->{hum};
     #}
 
-    if ( $self->{previous}->{info}->{setpointdelta} !=
-        $self->{data}->{info}->{setpointdelta} )
-    {
+    if ( $self->{previous}->{info}->{setpointdelta} != $self->{data}->{info}->{setpointdelta} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat setpoint delta changed from $self->{previous}->{info}->{setpointdelta} to $self->{data}->{info}->{setpointdelta}"
@@ -1024,9 +874,7 @@ sub process_data {
           $self->{data}->{info}->{setpointdelta};
     }
 
-    if ( $self->{previous}->{sensors}->{sensors}[0]->{hum} !=
-        $self->{data}->{sensors}->{sensors}[0]->{hum} )
-    {
+    if ( $self->{previous}->{sensors}->{sensors}[0]->{hum} != $self->{data}->{sensors}->{sensors}[0]->{hum} ) {
         main::print_log( "[Venstar Colortouch:"
               . $self->{data}->{name}
               . "] Thermostat Humidity Sensor changed from $self->{previous}->{sensors}->{sensors}[0]->{hum} to $self->{data}->{sensors}->{sensors}[0]->{hum}"
@@ -1036,8 +884,7 @@ sub process_data {
         if ( defined $self->{child_object}->{hum} ) {
             main::print_log "Child object found. Updating..."
               if ( $self->{loglevel} );
-            $self->{child_object}->{hum}
-              ->set( $self->{data}->{sensors}->{sensors}[0]->{hum}, 'poll' );
+            $self->{child_object}->{hum}->set( $self->{data}->{sensors}->{sensors}[0]->{hum}, 'poll' );
         }
     }
 
@@ -1051,8 +898,7 @@ sub print_runtimes {
     for my $tstamp ( 0 .. $#{ $data->{runtimes} } ) {
 
         print $data->{runtimes}[$tstamp]->{ts} . " -> ";
-        print scalar localtime( ( $data->{runtimes}[$tstamp]->{ts} ) -
-              ( $self->{config}->{tz} * 60 * 60 + 1 ) );
+        print scalar localtime( ( $data->{runtimes}[$tstamp]->{ts} ) - ( $self->{config}->{tz} * 60 * 60 + 1 ) );
         main::print_log( "\tCooling: " . $data->{runtimes}[$tstamp]->{cool1} );
         main::print_log( "\tHeating: " . $data->{runtimes}[$tstamp]->{heat1} );
         main::print_log( "\tCooling 2: " . $data->{runtimes}[$tstamp]->{cool2} )
@@ -1243,23 +1089,18 @@ sub get_mode_humid {
 
 sub set_heat_sp {
     my ( $self, $value ) = @_;
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'control', "heattemp=$value" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'control', "heattemp=$value" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set heating setpoint to $value" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set heating setpoint to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 }
@@ -1267,23 +1108,18 @@ sub set_heat_sp {
 sub set_cool_sp {
     my ( $self, $value ) = @_;
 
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'control', "cooltemp=$value" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'control', "cooltemp=$value" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set cooling setpoint to $value" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set cooling setpoint to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 }
@@ -1291,23 +1127,19 @@ sub set_cool_sp {
 sub set_hum_sp {
     my ( $self, $value ) = @_;
 
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'settings', "hum_setpoint=$value" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'settings', "hum_setpoint=$value" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set humidity setpoint to $value" );
+            main::print_log(
+                "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set humidity setpoint to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 }
@@ -1315,23 +1147,19 @@ sub set_hum_sp {
 sub set_dehum_sp {
     my ( $self, $value ) = @_;
 
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'settings', "dehum_setpoint=$value" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'settings', "dehum_setpoint=$value" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set humidity setpoint to $value" );
+            main::print_log(
+                "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set humidity setpoint to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 }
@@ -1346,28 +1174,21 @@ sub set_schedule {
         $num = 1;
     }
     else {
-        main::print_log( "Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error, unknown schedule mode $value" );
+        main::print_log( "Venstar Colortouch:" . $self->{data}->{name} . "] Error, unknown schedule mode $value" );
         return ('0');
     }
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'settings', "schedule=$num" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'settings', "schedule=$num" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set schedule mode to $value" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set schedule mode to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
     }
 }
 
@@ -1401,24 +1222,19 @@ sub set_mode {
         return ('0');
     }
 
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'control', "mode=$num" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'control', "mode=$num" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {    #todo parse return value
             $self->poll;
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set mode to $value" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set mode to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 
@@ -1441,28 +1257,21 @@ sub set_fan {
         $num = 1;
     }
     else {
-        main::print_log( "Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error, unknown fan mode $value" );
+        main::print_log( "Venstar Colortouch:" . $self->{data}->{name} . "] Error, unknown fan mode $value" );
         return ('0');
     }
-    my ( $isSuccessResponse, $status ) =
-      $self->_push_JSON_data( 'control', "fan=$num" );
+    my ( $isSuccessResponse, $status ) = $self->_push_JSON_data( 'control', "fan=$num" );
     if ($isSuccessResponse) {
         if ( $status eq "success" ) {
             return (1);
         }
         else {
-            main::print_log( "[Venstar Colortouch:"
-                  . $self->{data}->{name}
-                  . "] Error. Could not set fan mode to $value" );
+            main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not set fan mode to $value" );
             return (0);
         }
     }
     else {
-        main::print_log( "[Venstar Colortouch:"
-              . $self->{data}->{name}
-              . "] Error. Could not send data to Thermostat" );
+        main::print_log( "[Venstar Colortouch:" . $self->{data}->{name} . "] Error. Could not send data to Thermostat" );
         return (0);
     }
 
@@ -1547,8 +1356,7 @@ sub set {
             $$self{master_object}->set_fan($p_state);
         }
         else {
-            main::print_log(
-                "[Venstar Colortouch Fan] Error. Unknown set state $p_state");
+            main::print_log("[Venstar Colortouch Fan] Error. Unknown set state $p_state");
         }
     }
 }
@@ -1620,9 +1428,7 @@ sub set {
             $$self{master_object}->set_hum_sp($p_state);
         }
         else {
-            main::print_log(
-                "[Venstar Colortouch Humidity_SP] Error. Unknown set state $p_state"
-            );
+            main::print_log( "[Venstar Colortouch Humidity_SP] Error. Unknown set state $p_state" );
         }
     }
 }
@@ -1656,9 +1462,7 @@ sub set {
             $$self{master_object}->set_schedule($p_state);
         }
         else {
-            main::print_log(
-                "[Venstar Colortouch Scheduler] Error. Unknown set state $p_state"
-            );
+            main::print_log( "[Venstar Colortouch Scheduler] Error. Unknown set state $p_state" );
         }
     }
 }
diff --git a/lib/Video_Inline.pm b/lib/Video_Inline.pm
index 8bc717265..4ab3830e7 100644
--- a/lib/Video_Inline.pm
+++ b/lib/Video_Inline.pm
@@ -74,11 +74,7 @@ package InLine;
 @InLine::ISA = ('Serial_Item');
 
 sub serial_startup {
-    &main::serial_port_create(
-        'InLine',
-        $main::config_parms{InLine_serial_port},
-        $main::config_parms{InLine_baudrate}, 'none'
-    );
+    &main::serial_port_create( 'InLine', $main::config_parms{InLine_serial_port}, $main::config_parms{InLine_baudrate}, 'none' );
     &::MainLoop_pre_add_hook( \&InLine::check_for_data, 1 );
     &::print_log("InLine Serial Port Initialized");
 }
diff --git a/lib/VirtualAudio.pm b/lib/VirtualAudio.pm
index b28d2da28..68243791f 100644
--- a/lib/VirtualAudio.pm
+++ b/lib/VirtualAudio.pm
@@ -488,9 +488,7 @@ sub new {
 
 sub _handle_resume {
     my ( $self, $vsource ) = @_;
-    &::print_log(
-        "VirtualAudio::Router::add_virtual_sources: attached_sources=$$self{attached_sources}"
-    );
+    &::print_log( "VirtualAudio::Router::add_virtual_sources: attached_sources=$$self{attached_sources}" );
     if ( $$self{'attached_sources'} =~ /\|$$vsource{name}=([^|]+)\|/ ) {
         unless ( $self->_is_source_being_used($1) ) {
             unless ( $self->get_real_source_number_for_vsource($vsource) ) {
@@ -538,9 +536,7 @@ sub remove_virtual_sources {
         if ( ref $vsource ) {
             $name = $vsource->{'name'};
         }
-        my $attached =
-          $self->get_real_source_number_for_vsource(
-            $$self{'virtual_sources'}{$name} );
+        my $attached = $self->get_real_source_number_for_vsource( $$self{'virtual_sources'}{$name} );
         if ( $attached > 0 ) {
             $self->_detach_virtual_source($attached);
         }
@@ -563,23 +559,18 @@ sub _is_source_being_used {
             }
         }
     }
-    &::print_log(
-        "VirtualAudio::Router::_is_source_being_used($source, $ignore_zone): returning $used"
-    );
+    &::print_log( "VirtualAudio::Router::_is_source_being_used($source, $ignore_zone): returning $used" );
     return $used;
 }
 
 sub _zone_started_using_source {
     my ( $self, $zone, $source ) = @_;
-    &::print_log(
-        "VirtualAudio::Router::_zone_started_using_source($zone, $source)");
+    &::print_log("VirtualAudio::Router::_zone_started_using_source($zone, $source)");
     unless ( $self->_is_source_being_used( $source, $zone ) ) {
 
         # Unless it was already being used, notify that it is in use
         if ( $$self{'sources'}->[$source] ) {
-            &::print_log(
-                "VirtualAudio::Router::_zone_started_using_source($zone, $source): Calling _in_use"
-            );
+            &::print_log( "VirtualAudio::Router::_zone_started_using_source($zone, $source): Calling _in_use" );
             $$self{'sources'}->[$source]->_in_use($source);
         }
     }
@@ -589,32 +580,23 @@ sub _zone_started_using_source {
 sub _detach_virtual_source {
     my ( $self, $source ) = @_;
     if ( $$self{'sources'}->[$source] ) {
-        $$self{'attached_sources'} =~
-          s/\|$$self{sources}->[$source]->{name}=[^|]+\|/|/g;
+        $$self{'attached_sources'} =~ s/\|$$self{sources}->[$source]->{name}=[^|]+\|/|/g;
         &::print_log(
             "VirtualAudio::Router::_detach_virtual_source($$self{sources}->[$source]->{name}): attached_sources=$$self{attached_sources}"
         );
-        &::print_log(
-            "VirtualAudio::Router::_detach_virtual_source($source): Calling _not_in_use"
-        );
+        &::print_log( "VirtualAudio::Router::_detach_virtual_source($source): Calling _not_in_use" );
         $$self{'sources'}->[$source]->_not_in_use($source);
-        &::print_log(
-            "VirtualAudio::Router::_detach_virtual_source($source): Calling _detach_from_source"
-        );
+        &::print_log( "VirtualAudio::Router::_detach_virtual_source($source): Calling _detach_from_source" );
         $$self{'sources'}->[$source]->_detach_from_source($source);
     }
 }
 
 sub _attach_virtual_source {
     my ( $self, $source, $vsource ) = @_;
-    &::print_log(
-        "VirtualAudio::Router::_attach_virtual_source($source, $$vsource{name})"
-    );
+    &::print_log( "VirtualAudio::Router::_attach_virtual_source($source, $$vsource{name})" );
     $self->_detach_virtual_source($source);
     $$self{'sources'}->[$source] = $vsource;
-    &::print_log(
-        "VirtualAudio::Router::_attach_virtual_source($source, $$vsource{name}): Calling _attach_to_source"
-    );
+    &::print_log( "VirtualAudio::Router::_attach_virtual_source($source, $$vsource{name}): Calling _attach_to_source" );
     $vsource->_attach_to_source($source);
 
     # Remember the assignment upon a restart
@@ -624,9 +606,7 @@ sub _attach_virtual_source {
     unless ( $$self{'attached_sources'} =~ /^\|/ ) {
         $$self{'attached_sources'} = "|$$self{'attached_sources'}";
     }
-    &::print_log(
-        "VirtualAudio::Router::_attach_virtual_source($$vsource{name}): attached_sources=$$self{attached_sources}"
-    );
+    &::print_log( "VirtualAudio::Router::_attach_virtual_source($$vsource{name}): attached_sources=$$self{attached_sources}" );
 }
 
 sub _find_unattached_preferred_source {
@@ -651,14 +631,11 @@ sub _find_unattached_preferred_source {
 
 sub _zone_stopped_using_source {
     my ( $self, $zone, $source ) = @_;
-    &::print_log(
-        "VirtualAudio::Router::_zone_stopped_using_source($zone, $source)");
+    &::print_log("VirtualAudio::Router::_zone_stopped_using_source($zone, $source)");
     $$self{'zones'}->[$zone] = 0;
     unless ( $self->_is_source_being_used($source) ) {
         if ( $$self{'sources'}->[$source] ) {
-            &::print_log(
-                "VirtualAudio::Router::_zone_stopped_using_source($zone, $source): Calling _not_in_use"
-            );
+            &::print_log( "VirtualAudio::Router::_zone_stopped_using_source($zone, $source): Calling _not_in_use" );
             $$self{'sources'}->[$source]->_not_in_use($source);
         }
         my $vsource = $self->_find_unattached_preferred_source();
@@ -745,21 +722,16 @@ sub _attach_best_vsource {
 
 sub specify_source_for_zone {
     my ( $self, $zone, $source ) = @_;
-    &::print_log(
-        "VirtualAudio::Router: zone $zone listening to source $source");
+    &::print_log("VirtualAudio::Router: zone $zone listening to source $source");
     if (   ( $zone !~ /^\d+$/ )
         or ( $zone < 1 )
         or ( $zone > $$self{'num_zones'} ) )
     {
-        &::print_log(
-            "VirtualAudio::Router::specify_source_for_zone(): ERROR: zone $zone out of range"
-        );
+        &::print_log( "VirtualAudio::Router::specify_source_for_zone(): ERROR: zone $zone out of range" );
         return;
     }
     if ( ( $source < 0 ) or ( $source > $$self{'num_sources'} ) ) {
-        &::print_log(
-            "VirtualAudio::Router::specify_source_for_zone(): ERROR: source $source out of range"
-        );
+        &::print_log( "VirtualAudio::Router::specify_source_for_zone(): ERROR: source $source out of range" );
         return;
     }
     return if ( $$self{'zones'}->[$zone] eq $source );
@@ -797,9 +769,7 @@ sub _attach_zone_to_source {
 sub select_virtual_source {
     my ( $self, $zone, $vsource ) = @_;
     if ( ( $zone < 1 ) or ( $zone > $$self{'num_zones'} ) ) {
-        &::print_log(
-            "VirtualAudio::Router::specify_source_for_zone(): ERROR: zone $zone out of range"
-        );
+        &::print_log( "VirtualAudio::Router::specify_source_for_zone(): ERROR: zone $zone out of range" );
         return 0;
     }
     unless ( ref $vsource and $vsource->isa('VirtualAudio::Source') ) {
@@ -807,28 +777,22 @@ sub select_virtual_source {
             $vsource = $$self{'virtual_sources'}{$vsource};
         }
         else {
-            &::print_log(
-                "VirtualAudio::Router::select_virtual_source(): ERROR: virtual source $vsource not found"
-            );
+            &::print_log( "VirtualAudio::Router::select_virtual_source(): ERROR: virtual source $vsource not found" );
             return 0;
         }
     }
-    &::print_log(
-        "VirtualAudio::Router: zone $zone requesting source $$vsource{name}");
+    &::print_log("VirtualAudio::Router: zone $zone requesting source $$vsource{name}");
     return $self->_attach_zone_to_source( $zone, $vsource );
 }
 
 sub _do_next_previous_virtual_source {
     my ( $self, $zone, @vsources ) = @_;
     if ( ( $zone < 1 ) or ( $zone > $$self{'num_zones'} ) ) {
-        &::print_log(
-            "VirtualAudio::Router::request_next/previous_virtual_source_for_zone(): ERROR: zone $zone out of range"
-        );
+        &::print_log( "VirtualAudio::Router::request_next/previous_virtual_source_for_zone(): ERROR: zone $zone out of range" );
         return 0;
     }
     my $curr_vsource = $self->get_virtual_source_obj_for_zone($zone);
-    &::print_log(
-        "VirtualAudio::Router: current source is $$curr_vsource{name}");
+    &::print_log("VirtualAudio::Router: current source is $$curr_vsource{name}");
     my $found = 0;
     foreach my $vsource (@vsources) {
         &::print_log("VirtualAudio::Router: checking source: $$vsource{name}");
@@ -836,22 +800,17 @@ sub _do_next_previous_virtual_source {
             if ($found) {
 
                 # Already found the current source, so take the next one...
-                &::print_log(
-                    "VirtualAudio::Router: found next source: $$vsource{name}");
+                &::print_log("VirtualAudio::Router: found next source: $$vsource{name}");
                 return $self->_attach_zone_to_source( $zone, $vsource );
             }
             elsif ( $curr_vsource eq $vsource ) {
-                &::print_log(
-                    "VirtualAudio::Router: found current source: $$vsource{name}"
-                );
+                &::print_log( "VirtualAudio::Router: found current source: $$vsource{name}" );
                 $found = 1;
             }
         }
         else {
             # No source currently selected... attach to first source found that is already attached
-            &::print_log(
-                "VirtualAudio::Router: attaching to first source: $$vsource{name}"
-            );
+            &::print_log( "VirtualAudio::Router: attaching to first source: $$vsource{name}" );
             if ( $self->get_real_source_number_for_vsource($vsource) ) {
                 return $self->_attach_zone_to_source( $zone, $vsource );
             }
@@ -860,8 +819,7 @@ sub _do_next_previous_virtual_source {
     if ($found) {
 
         # Found current source at end of list... give the first one
-        &::print_log(
-            "VirtualAudio::Router: looped around list: $vsources[0]->{name}");
+        &::print_log("VirtualAudio::Router: looped around list: $vsources[0]->{name}");
         return $self->_attach_zone_to_source( $zone, $vsources[0] );
     }
     return 0;
@@ -870,15 +828,13 @@ sub _do_next_previous_virtual_source {
 sub request_next_virtual_source_for_zone {
     my ( $self, $zone ) = @_;
     &::print_log("VirtualAudio::Router: zone $zone requesting next source");
-    return $self->_do_next_previous_virtual_source( $zone,
-        @{ $$self{'virtual_source_order'} } );
+    return $self->_do_next_previous_virtual_source( $zone, @{ $$self{'virtual_source_order'} } );
 }
 
 sub request_previous_virtual_source_for_zone {
     my ( $self, $zone ) = @_;
     &::print_log("VirtualAudio::Router: zone $zone requesting previous source");
-    return $self->_do_next_previous_virtual_source( $zone,
-        reverse @{ $$self{'virtual_source_order'} } );
+    return $self->_do_next_previous_virtual_source( $zone, reverse @{ $$self{'virtual_source_order'} } );
 }
 
 sub get_real_source_number_for_zone {
diff --git a/lib/Voice_Cmd.pm b/lib/Voice_Cmd.pm
index ed3c094d5..fbc1d2f9d 100644
--- a/lib/Voice_Cmd.pm
+++ b/lib/Voice_Cmd.pm
@@ -47,16 +47,10 @@ use strict;
 use HTML::Entities;    # So we can encode characters like <>& etc
 
 my ($cmd_num);
-my (
-    %cmd_by_num,      %cmd_state_by_num, %cmd_num_by_text,
-    %cmd_text_by_num, %cmd_text_by_vocab
-);
+my ( %cmd_by_num, %cmd_state_by_num, %cmd_num_by_text, %cmd_text_by_num, %cmd_text_by_vocab );
 my ( %cmd_word_list, %cmd_vocabs );
-my ( $Vcmd_ms, $Vmenu_ms, $Vcmd_viavoice, $Vcmd_sphinx2, $Vcmd_pocketsphinx );
-my (
-    $last_cmd_time, $last_cmd_num, $last_cmd_num_confirm,
-    $last_cmd_flag, $noise_this_pass
-);
+my ( $Vcmd_ms,       $Vmenu_ms, $Vcmd_viavoice, $Vcmd_sphinx2, $Vcmd_pocketsphinx );
+my ( $last_cmd_time, $last_cmd_num, $last_cmd_num_confirm, $last_cmd_flag, $noise_this_pass );
 
 my $confirm_timer = &Timer::new();
 
@@ -81,11 +75,9 @@ sub init {
         ) if $Vcmd_ms;
     }
     if ( $main::config_parms{voice_cmd} =~ /viavoice/i ) {
-        my $port =
-          "$main::config_parms{viavoice_host}:$main::config_parms{viavoice_port}";
+        my $port = "$main::config_parms{viavoice_host}:$main::config_parms{viavoice_port}";
         print "Creating Viavoice command object on $port\n";
-        $Vcmd_viavoice =
-          new main::Socket_Item( undef, undef, $port, 'viavoice' );
+        $Vcmd_viavoice = new main::Socket_Item( undef, undef, $port, 'viavoice' );
 
         #       buffer $Vcmd_viavoice 1;
         start $Vcmd_viavoice;
@@ -99,8 +91,7 @@ sub init {
         &mic('on');
     }
     if ( $main::config_parms{voice_cmd} =~ /sphinx2/i ) {
-        my $port = $main::config_parms{sphinx2_host} . ':'
-          . $main::config_parms{sphinx2_port};
+        my $port = $main::config_parms{sphinx2_host} . ':' . $main::config_parms{sphinx2_port};
         print "Creating Sphinx2 command object on $port\n";
 
         #$Vcmd_sphinx2 = new  Socket_Item(undef, undef, 'server_sphinx2');
@@ -120,17 +111,15 @@ sub reset {
 
         # Allow for new phrases to be added
         $Vcmd_viavoice->set("addtovocab");
-        select undef, undef, undef,
-          .1;    # Need this for now to avoid viavoice_server 'no data' error
+        select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
         $Vcmd_viavoice->set("mh");
-        undef %cmd_text_by_vocab;    # Only add new commands on reload
+        undef %cmd_text_by_vocab;          # Only add new commands on reload
     }
     else {
         undef %cmd_num_by_text;
         undef %cmd_by_num;
         &remove_voice_cmds
-          unless $main::Startup
-          ; # Must reload here, or cmd_by_num gets messed up (unless it is startup in which case it is empty)
+          unless $main::Startup;   # Must reload here, or cmd_by_num gets messed up (unless it is startup in which case it is empty)
     }
 }
 
@@ -143,7 +132,7 @@ sub activate {
         $Vmenu_ms->{Active} = 1;    # Called after all voice commands are added
 
         #       print "\n\nError in Speech VR object.  ", Win32::OLE->LastError(), "\n\n";
-        $Vcmd_ms->{CommandSpoken} = 0; # In case any lingering command was there
+        $Vcmd_ms->{CommandSpoken} = 0;    # In case any lingering command was there
     }
     if ($Vcmd_viavoice) {
 
@@ -179,7 +168,7 @@ sub activate {
 
 sub deactivate {
     return unless $Vcmd_ms;
-    $Vmenu_ms->{Active} = 0;    # Called after all voice commands are added
+    $Vmenu_ms->{Active} = 0;                     # Called after all voice commands are added
 }
 
 sub create_voice_command_object {
@@ -191,8 +180,7 @@ sub create_voice_command_object {
     $Vcmd_ms = Win32::OLE->new('Speech.VoiceCommand');
 
     unless ($Vcmd_ms) {
-        print "\n\nError, could not create Speech VR object.  ",
-          Win32::OLE->LastError(), "\n\n";
+        print "\n\nError, could not create Speech VR object.  ", Win32::OLE->LastError(), "\n\n";
         return;
     }
 
@@ -203,8 +191,7 @@ sub create_voice_command_object {
         return;
     }
 
-    print "Awakening speech command.  Currently it is at ", $Vcmd_ms->{Awake},
-      "\n"
+    print "Awakening speech command.  Currently it is at ", $Vcmd_ms->{Awake}, "\n"
       if $main::Debug{voice};
     $Vcmd_ms->{Awake} = 1;
     return $Vcmd_ms;
@@ -221,12 +208,7 @@ sub create_voice_command_menu_object {
     #define  VCMDMC_OPEN_ALWAYS     0x00000008
     #define  VCMDMC_OPEN_EXISTING   0x00000010
     #   $Vmenu_ms = $Vcmd_ms->MenuCreate($parms{'application'}, $parms{'state'}, 1033, "US English", hex(1)) or
-    unless (
-        $Vmenu_ms = $Vcmd_ms->MenuCreate(
-            $parms{'application'}, $parms{'state'}, 1033, "US English", 4
-        )
-      )
-    {
+    unless ( $Vmenu_ms = $Vcmd_ms->MenuCreate( $parms{'application'}, $parms{'state'}, 1033, "US English", 4 ) ) {
         print "\nError, could not create Vmenu:", Win32::OLE->LastError(), "\n";
         return;
     }
@@ -271,8 +253,7 @@ sub check_for_voice_cmd {
         # ... probably just stored up junk
         #       return if length($text) > 100;
 
-        $text = substr( $text, 1 )
-          ;    # Drop the leading 00 byte (not sure why we get that)
+        $text = substr( $text, 1 );    # Drop the leading 00 byte (not sure why we get that)
 
         # Drop the prefix, if present
         my $prefix = $main::config_parms{voice_cmd_prefix};
@@ -281,8 +262,7 @@ sub check_for_voice_cmd {
         $noise_this_pass = $text;
 
         #       ($cmd_heard) = $text =~ /^Said: (.+)/;
-        ($cmd_heard) = $text =~
-          /Said: (.+)/;    # Patch from the list ... not sure why this is needed
+        ($cmd_heard) = $text =~ /Said: (.+)/;    # Patch from the list ... not sure why this is needed
 
         if ( defined $cmd_heard ) {
             $noise_this_pass = 0;
@@ -299,8 +279,7 @@ sub check_for_voice_cmd {
                     &main::speak("Command aborted");
                 }
                 else {
-                    &main::speak(
-                        "Error in the confirm vocabulary. Contact support.");
+                    &main::speak("Error in the confirm vocabulary. Contact support.");
                 }
                 $last_cmd_num_confirm = 0;
                 &Timer::unset($confirm_timer);
@@ -346,8 +325,7 @@ sub check_for_voice_cmd {
     $last_cmd_flag = 0;
 
     if ( $number
-        and
-        ( !$waiting_for_command_num or $waiting_for_command_num eq $number ) )
+        and ( !$waiting_for_command_num or $waiting_for_command_num eq $number ) )
     {
         $waiting_for_command_num = undef;
         $ref                     = $cmd_by_num{$number};
@@ -364,9 +342,7 @@ sub check_for_voice_cmd {
         $cmd = lc($cmd);    # get ready to pack into recognition response
 
         $said = '1'
-          if !
-          defined
-          $said;    # Some Voice_Cmds have blank saids.  But allow for 0 state
+          if !defined $said;    # Some Voice_Cmds have blank saids.  But allow for 0 state
 
         # This could be set for either the current or next pass ... next pass is easier
 
@@ -412,9 +388,7 @@ sub check_for_voice_cmd {
             }
         }
         else {
-            &main::speak(
-                'no_chime=1 Voice command not found. Please restart Misterhouse and try again.'
-            );
+            &main::speak( 'no_chime=1 Voice command not found. Please restart Misterhouse and try again.' );
         }
 
     }
@@ -430,8 +404,7 @@ sub set {
 
     #   if ($$self{disabled}) { *** Does not work properly (disables all states)
     if ( $main::Disabled_Commands{ lc($cmd) } ) {    # ***
-        &main::print_log(
-            "Disabled command not run: $self->{text_by_state}{$state}");
+        &main::print_log("Disabled command not run: $self->{text_by_state}{$state}");
         return;
     }
     return if &main::check_for_tied_filters( $self, $state );
@@ -442,14 +415,12 @@ sub set {
 
     #    $respond = $main::Respond_Target unless $respond; # Pass default target along
     if ( $$self{xap_target} ) {
-        my $xap_target = $$self{xap_target};
-        my $xap_mh_prefix =
-          &xAP::get_mh_vendor_info() . '.' . &xAP::get_mh_device_info();
+        my $xap_target    = $$self{xap_target};
+        my $xap_mh_prefix = &xAP::get_mh_vendor_info() . '.' . &xAP::get_mh_device_info();
 
         # prepend the xAP prefix if it doesn't have it
         if ( $xap_target !~ /^$xap_mh_prefix/i ) {
-            $xap_target =
-              $xap_mh_prefix . "." . $xap_target . &xAP::XAP_REAL_DEVICE_NAME;
+            $xap_target = $xap_mh_prefix . "." . $xap_target . &xAP::XAP_REAL_DEVICE_NAME;
         }
         &xAP::sendXap(
             $$self{xap_target},
@@ -463,8 +434,7 @@ sub set {
           unless $no_log;
     }
     else {
-        &Generic_Item::set_states_for_next_pass( $self, $state, $set_by,
-            $respond );
+        &Generic_Item::set_states_for_next_pass( $self, $state, $set_by, $respond );
         &main::print_log("Running: $self->{text_by_state}{$state}")
           unless $no_log;
         print "db1 set voice cmd $self to $state set_by=$set_by r=$respond\n"
@@ -491,11 +461,9 @@ sub remove_voice_cmds {
         print "Undefining the Misterhouse ViaVoice vocabulary ... ";
         &mic('off');
         $Vcmd_viavoice->set("undefinevocab");
-        select undef, undef, undef,
-          .1;    # Need this for now to avoid viavoice_server 'no data' error
+        select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
         $Vcmd_viavoice->set("mh");
-        select undef, undef, undef,
-          .1;    # Need this for now to avoid viavoice_server 'no data' error
+        select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
         undef %cmd_by_num;
         undef %cmd_num_by_text;
         print "done\n";
@@ -592,8 +560,7 @@ sub _register {
     my ($self) = @_;
     my $text   = $self->{text};
     my $vocab  = $self->{vocab};
-    my $info =
-      $self->{info};    # Dang, info gets set AFTER we define the object :(
+    my $info   = $self->{info};    # Dang, info gets set AFTER we define the object :(
     $info  = ''   unless $info;
     $vocab = "mh" unless $vocab;
     my $description = "$text: $info\n";
@@ -606,15 +573,13 @@ sub _register {
     $i = 0;
     while ( $text =~ /([\[\{]?)([^\[\{\]\}]+)([\]\}]?)/g ) {
         my ( $l, $m, $r ) = ( $1, $2, $3 );
-        print
-          "Warning, unmatched brackets in Voice_Cmd text: text=$text l=$l m=$m r=$r\n"
+        print "Warning, unmatched brackets in Voice_Cmd text: text=$text l=$l m=$m r=$r\n"
           if $l  and !$r
           or !$l and $r;
         @{ $data[$i]{text} } = ($l) ? split( / *, */, $m, 999 ) : ($m);
         $data[$i]{last} = scalar @{ $data[$i]{text} } - 1;
         if ( $l eq '[' ) {
-            print
-              "Warning, more than one [] state bracket in Voice_Cmd text: i=$i l=$l r=$r text=$text\n"
+            print "Warning, more than one [] state bracket in Voice_Cmd text: i=$i l=$l r=$r text=$text\n"
               if $index_state;
             $index_state = $i;
         }
@@ -631,7 +596,7 @@ sub _register {
             $data[$j]{index} = 0 unless $data[$j]{index};
             $cmd .= $data[$j]{text}[ $data[$j]{index} ];
         }
-        $cmd =~ s/ +/ /g;  # Delete double blanks so 'set {the,} light on' works
+        $cmd =~ s/ +/ /g;    # Delete double blanks so 'set {the,} light on' works
 
         my $state = $data[$index_state]{text}[ $data[$index_state]{index} ]
           if defined $index_state;
@@ -715,8 +680,7 @@ sub _register2 {
     $cmd_num++;
     if ( $cmd_num_by_text{$text} ) {
         my $cmd = $cmd_by_num{ $cmd_num_by_text{$text} };
-        print
-          "\n\nWarning, duplicate Voice_Cmd Text: $text   Cmd: $$cmd{text}\n\n";
+        print "\n\nWarning, duplicate Voice_Cmd Text: $text   Cmd: $$cmd{text}\n\n";
     }
     print "db cmd=$cmd_num text=$text vocab=$vocab.\n" if $main::Debug{voice};
 
@@ -741,8 +705,7 @@ sub _register2 {
             $Vcmd_viavoice->set($text_vr);
 
             # We need better handshaking here ... not a delay!
-            select undef, undef, undef, .0002
-              ;    # Need this for now to avoid viavoice_server 'no data' error
+            select undef, undef, undef, .0002;    # Need this for now to avoid viavoice_server 'no data' error
 
             #           select undef, undef, undef, .0001; # Need this for now to avoid viavoice_server 'no data' error
         }
@@ -822,27 +785,22 @@ sub mic {
         warn "Error, Voice_Cmd::mic must be set to on or off: $state";
         return;
     }
-    select undef, undef, undef,
-      .1;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set( "mic" . $state );
 }
 
 sub definevocab {
     return unless $Vcmd_viavoice;
     my ( $vocab, @phrases ) = @_;
-    select undef, undef, undef,
-      .1;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set("definevocab");
-    select undef, undef, undef,
-      .1;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set($vocab);
-    select undef, undef, undef,
-      .1;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
     for my $phrase (@phrases) {
         $Vcmd_viavoice->set($phrase);
     }
-    select undef, undef, undef,
-      .1;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;    # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set('');
 }
 
@@ -850,13 +808,11 @@ sub addtovocab {
     return unless $Vcmd_viavoice;
     my ( $vocab, @phrases ) = @_;
     $Vcmd_viavoice->set("addtovocab");
-    select undef, undef, undef,
-      .5;    # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .5;    # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set($vocab);
     for my $phrase (@phrases) {
         $Vcmd_viavoice->set($phrase);
-        select undef, undef, undef,
-          .001;    # Need this for now to avoid viavoice_server 'no data' error
+        select undef, undef, undef, .001;    # Need this for now to avoid viavoice_server 'no data' error
     }
     $Vcmd_viavoice->set('');
 }
@@ -865,11 +821,9 @@ sub enablevocab {
     return unless $Vcmd_viavoice;
     my ($vocab) = @_;
     $Vcmd_viavoice->set("enablevocab");
-    select undef, undef, undef,
-      .1;          # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;          # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set($vocab);
-    select undef, undef, undef,
-      .1;          # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;          # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set('');
 }
 
@@ -877,21 +831,17 @@ sub disablevocab {
     return unless $Vcmd_viavoice;
     my ($vocab) = @_;
     $Vcmd_viavoice->set("disablevocab");
-    select undef, undef, undef,
-      .1;          # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;          # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set($vocab);
-    select undef, undef, undef,
-      .1;          # Need this for now to avoid viavoice_server 'no data' error
+    select undef, undef, undef, .1;          # Need this for now to avoid viavoice_server 'no data' error
     $Vcmd_viavoice->set('');
 }
 
 sub android_xml {
     my ( $self, $depth, $fields, $num_tags, $attributes ) = @_;
-    my @f = qw( text );
-    my $xml_objects =
-      $self->SUPER::android_xml( $depth, $fields, $num_tags + scalar(@f),
-        $attributes );
-    my $prefix = '  ' x $depth;
+    my @f           = qw( text );
+    my $xml_objects = $self->SUPER::android_xml( $depth, $fields, $num_tags + scalar(@f), $attributes );
+    my $prefix      = '  ' x $depth;
 
     foreach my $f (@f) {
         next unless $fields->{all} or $fields->{$f};
@@ -913,8 +863,7 @@ sub android_xml {
         }
 
         $value = "" unless defined $value;
-        $xml_objects .=
-          $self->android_xml_tag( $prefix, $f, $attributes, $value );
+        $xml_objects .= $self->android_xml_tag( $prefix, $f, $attributes, $value );
     }
     return $xml_objects;
 }
diff --git a/lib/Voice_Text.pm b/lib/Voice_Text.pm
index 0b51e4f77..6891300a8 100644
--- a/lib/Voice_Text.pm
+++ b/lib/Voice_Text.pm
@@ -8,8 +8,7 @@ use LWP::UserAgent;
 use LWP::ConnCache;
 
 use vars '$VTxt_version';
-my ( @VTxt, $VTxt_stream1, $VTxt_stream2, %VTxt_cards, $VTxt_festival,
-    $VTxt_mac );
+my ( @VTxt, $VTxt_stream1, $VTxt_stream2, %VTxt_cards, $VTxt_festival, $VTxt_mac );
 my ( $save_mute_esd, $save_change_volume, %pronouncable );
 my ( %voice_names, @voice_names, $voice_names_index, $VTxt_pid, $web_index );
 
@@ -34,17 +33,13 @@ sub init {
         and $main::config_parms{festival_host}
       )
     {
-        my $festival_address =
-          "$main::config_parms{festival_host}:$main::config_parms{festival_port}";
+        my $festival_address = "$main::config_parms{festival_host}:$main::config_parms{festival_port}";
         print " - creating festival TTS socket on $festival_address\n";
-        $VTxt_festival =
-          new Socket_Item( undef, undef, $festival_address, 'festival', 'tcp',
-            'raw' );
+        $VTxt_festival = new Socket_Item( undef, undef, $festival_address, 'festival', 'tcp', 'raw' );
     }
 
     if ( $main::config_parms{voice_text} =~ /ms/i and $main::OS_win ) {
-        print
-          " - creating MS TTS object for voice_text=$main::config_parms{voice_text} ...\n";
+        print " - creating MS TTS object for voice_text=$main::config_parms{voice_text} ...\n";
 
         # Test and default to the new SDK 5 SAPI
         $VTxt_version = lc $main::config_parms{voice_text};
@@ -62,9 +57,7 @@ sub init {
                         print " - sound card $i: $des\n";
                         if ( $main::config_parms{voice_text_cards} ) {
                             my $flag = 0;
-                            for my $card ( split ',',
-                                $main::config_parms{voice_text_cards} )
-                            {
+                            for my $card ( split ',', $main::config_parms{voice_text_cards} ) {
                                 if ( $i eq $card or $des =~ /$card/i ) {
                                     $flag = 1;
                                     $VTxt_cards{$card} = $i;
@@ -85,27 +78,18 @@ sub init {
                     print " - WARN: no sound card outputs are available\n";
                 }
                 $VTxt[0] = $VTxt[1]
-                  unless $VTxt[0]
-                  ;    # Default to the first card if specified one not found
+                  unless $VTxt[0];    # Default to the first card if specified one not found
 
                 # Create an object for to_file calls
                 $VTxt_stream1 = Win32::OLE->new('Sapi.SpVoice');
                 $VTxt_stream1 = undef
-                  unless defined
-                  $VTxt_stream1->GetVoices;    # undef it if now voices exist
+                  unless defined $VTxt_stream1->GetVoices;    # undef it if now voices exist
                 if ( defined $VTxt_stream1 ) {
-                    for (
-                        my $VoiceCnt = 0;
-                        $VoiceCnt < $VTxt_stream1->GetVoices->Count();
-                        $VoiceCnt++
-                      )
-                    {
-                        my $desc = $VTxt_stream1->GetVoices->Item($VoiceCnt)
-                          ->GetDescription;
+                    for ( my $VoiceCnt = 0; $VoiceCnt < $VTxt_stream1->GetVoices->Count(); $VoiceCnt++ ) {
+                        my $desc = $VTxt_stream1->GetVoices->Item($VoiceCnt)->GetDescription;
                         print " -- available voice: $desc\n";
                     }
-                    &set_voice( $main::config_parms{speak_voice},
-                        undef, undef, $VTxt_stream1 )
+                    &set_voice( $main::config_parms{speak_voice}, undef, undef, $VTxt_stream1 )
                       if $main::config_parms{speak_voice};
                 }
 
@@ -118,8 +102,7 @@ sub init {
         if ( $VTxt_version eq 'msv4' ) {
             $VTxt[0] = Win32::OLE->new('Speech.VoiceText');
             unless ( $VTxt[0] ) {
-                print "\n\nError, could not create ms Speech TTS object.  ",
-                  Win32::OLE->LastError(), "\n\n";
+                print "\n\nError, could not create ms Speech TTS object.  ", Win32::OLE->LastError(), "\n\n";
                 return;
             }
 
@@ -165,8 +148,7 @@ sub speak_text {
     if ( $parms{address} ) {
         my @address = split ',', $parms{address};
         delete $parms{address};
-        $parms{to_file} =
-          "$main::config_parms{html_alias_cache}/speak_address.$main::Second.wav";
+        $parms{to_file} = "$main::config_parms{html_alias_cache}/speak_address.$main::Second.wav";
 
         &speak_text(%parms);
 
@@ -174,8 +156,7 @@ sub speak_text {
         for my $address (@address) {
             my $address_code = $config_parms{voice_text_address_code};
             $address_code =~ s|\$address|$address|;
-            $address_code =~
-              s|\$url|http://$Info{IPAddress_local}:$config_parms{http_port}/cache/speak_address.$main::Second.wav|;
+            $address_code =~ s|\$url|http://$Info{IPAddress_local}:$config_parms{http_port}/cache/speak_address.$main::Second.wav|;
             print "Voice_text running address code: $address_code\n"
               if $main::Debug{voice};
             eval $address_code;
@@ -234,10 +215,8 @@ sub speak_text {
     if ( $speak_engine =~ /NaturalVoiceWine/i ) {
         my $wine_path = $main::config_parms{wine_path};
         $wine_path = 'wine' unless -e $wine_path;
-        my $nv_path = $main::config_parms{voice_text_naturalvoice}
-          ;    # DOS path to NatVox stuff
-        $speak_pgm =
-          "$wine_path '$nv_path/bin/ttsstandaloneplayer.exe' -- -data '$nv_path/data' -xml";
+        my $nv_path = $main::config_parms{voice_text_naturalvoice};    # DOS path to NatVox stuff
+        $speak_pgm = "$wine_path '$nv_path/bin/ttsstandaloneplayer.exe' -- -data '$nv_path/data' -xml";
     }
     elsif ( $speak_engine =~ /NaturalVoice/i ) {
         my $path = $main::config_parms{voice_text_naturalvoice};
@@ -287,8 +266,7 @@ sub speak_text {
 
     # Allow for a percentage volume number - Steve Switzer 1/19/2003
     my $mh_volume = state $main::mh_volume if $main::mh_volume;
-    print
-      "Voice_Text volume=$parms{volume}, mh_volume=$mh_volume vc=$vtxt_card\n"
+    print "Voice_Text volume=$parms{volume}, mh_volume=$mh_volume vc=$vtxt_card\n"
       if $main::Debug{voice};
     if ( $parms{volume} =~ /(\d+)\%$/ ) {
         $parms{volume} = int( $mh_volume * $1 / 100 );
@@ -306,8 +284,7 @@ sub speak_text {
 
     $parms{text} = &set_rate( $parms{rate}, $parms{text}, $vtxt_card )
       if $parms{rate};    # Allow for slow,normal,fast,wpm:###
-    $parms{text} =
-      &set_voice( $parms{voice}, $parms{text}, $speak_engine, $vtxt_card )
+    $parms{text} = &set_voice( $parms{voice}, $parms{text}, $speak_engine, $vtxt_card )
       if $parms{voice};
     $parms{text} = &set_volume( $parms{volume}, $parms{text}, $vtxt_card )
       if $parms{volume};
@@ -332,10 +309,8 @@ sub speak_text {
         if ( $VTxt_festival and not active $VTxt_festival) {
             if ( start $VTxt_festival) {
                 if ( $main::config_parms{festival_init_cmds} ) {
-                    print
-                      "Data sent to festival: $main::config_parms{festival_init_cmds}\n";
-                    set $VTxt_festival
-                      qq[$main::config_parms{festival_init_cmds}];
+                    print "Data sent to festival: $main::config_parms{festival_init_cmds}\n";
+                    set $VTxt_festival qq[$main::config_parms{festival_init_cmds}];
                 }
             }
         }
@@ -350,16 +325,12 @@ sub speak_text {
             # Change from relative to absolute path
             $parms{to_file} = "$main::Pgm_Path/$1"
               if $parms{to_file} =~ /^\.\/(.+)/;
-            $parms{text} =
-              qq[(utt.save.wave (utt.synth (Utterance Text "$parms{text}")) "$parms{to_file}" "riff")];
+            $parms{text} = qq[(utt.save.wave (utt.synth (Utterance Text "$parms{text}")) "$parms{to_file}" "riff")];
 
             # Use the festival server
             if ( $VTxt_festival and active $VTxt_festival) {
-                $parms{text} =~
-                  s/<\/?speaker.*?>//ig;    # Server does not do sable
-                &main::print_log(
-                    "Voice_text TTS:  Festival saving to file via server: $parms{to_file}\n"
-                ) if $main::Debug{voice};
+                $parms{text} =~ s/<\/?speaker.*?>//ig;    # Server does not do sable
+                &main::print_log( "Voice_text TTS:  Festival saving to file via server: $parms{to_file}\n" ) if $main::Debug{voice};
                 set $VTxt_festival $parms{text};
 
                 my $fork = 1 if $parms{async};
@@ -369,8 +340,7 @@ sub speak_text {
 
                     # we are the parent
                     if ( $fork and $pid ) {
-                        return
-                          ; # nothing else to do, the child is looking after the rest of the work
+                        return;                           # nothing else to do, the child is looking after the rest of the work
                     }
                 }
 
@@ -406,8 +376,7 @@ sub speak_text {
             else {
                 my $file = "$main::config_parms{data_dir}/mh_temp.festival.txt";
                 &main::file_write( $file, $parms{text} );
-                &main::print_log(
-                    "Voice_text TTS: Festival saving to file: $file\n")
+                &main::print_log("Voice_text TTS: Festival saving to file: $file\n")
                   if $main::Debug{voice};
                 my $fork = $parms{async};
                 if ($fork) {
@@ -463,13 +432,10 @@ sub speak_text {
                 }
                 $text = qq[<SABLE> $text </SABLE>];
             }
-            my $random =
-              int rand 1000;   # Use random file name so we can talk 2+ at once.
-            my $file =
-              "$main::config_parms{data_dir}/mh_temp.festival.$random.sable";
+            my $random = int rand 1000;    # Use random file name so we can talk 2+ at once.
+            my $file = "$main::config_parms{data_dir}/mh_temp.festival.$random.sable";
             &main::file_write( $file, $text );
-            print
-              "Voice_text TTS: $main::config_parms{voice_text_festival} --tts $file\n"
+            print "Voice_text TTS: $main::config_parms{voice_text_festival} --tts $file\n"
               if $main::Debug{voice};
             my $fork = $parms{async};
             if ($fork) {
@@ -477,12 +443,10 @@ sub speak_text {
 
                 # we are the parnet
                 if ( $fork and $pid ) {
-                    return;    # the child will look after the real work
+                    return;                # the child will look after the real work
                 }
             }
-            system(
-                "($main::config_parms{voice_text_festival} --tts $file ; rm $file) &"
-            );
+            system( "($main::config_parms{voice_text_festival} --tts $file ; rm $file) &" );
 
             # Send voice text to waiting web clients
             &web_hook_callback(%parms);
@@ -541,8 +505,7 @@ sub speak_text {
         $ua->conn_cache( LWP::ConnCache->new() );
         $ua->timeout(10);
 
-        my $random =
-          int rand 1000;    # Use random file name so we can talk 2+ at once.
+        my $random = int rand 1000;    # Use random file name so we can talk 2+ at once.
 
         # If being forced to file, use the filename being forced, otherwise, use a random temp file.
         my $out_file =
@@ -551,17 +514,15 @@ sub speak_text {
           : "$main::config_parms{data_dir}/mh_temp.google-$random.wav";
 
         # The temp file to store google's MP3 as
-        my $google_file =
-          "$main::config_parms{data_dir}/mh_temp.google-$random.mp3";
+        my $google_file = "$main::config_parms{data_dir}/mh_temp.google-$random.mp3";
 
         # Make the request, store the result in the google temp file
         my $language =
           ( $main::config_parms{language} )
           ? lc( $main::config_parms{language} )
           : "en";
-        my $ua_request = HTTP::Request->new(
-            'GET' => "http://translate.google.com/translate_tts?tl=$language&q="
-              . qq[ $parms{text} ] );
+        my $ua_request =
+          HTTP::Request->new( 'GET' => "http://translate.google.com/translate_tts?tl=$language&q=" . qq[ $parms{text} ] );
         my $ua_response = $ua->request( $ua_request, $google_file );
 
         # Log the failure
@@ -575,8 +536,7 @@ sub speak_text {
           ( $main::config_parms{sound_converter} )
           ? $main::config_parms{sound_converter}
           : "ffmpeg";
-        system( $sound_converter, '-v', 'panic', '-i', $google_file,
-            $out_file );
+        system( $sound_converter, '-v', 'panic', '-i', $google_file, $out_file );
         unlink($google_file);
 
         # Play the wav file, clean up only if we are not being forced to file
@@ -587,8 +547,7 @@ sub speak_text {
     elsif ($speak_pgm) {
         my $fork = 1
           unless $parms{to_file}
-          and !$parms{async}
-          ;    # Must wait for to_file requests, so http requests work
+          and !$parms{async};    # Must wait for to_file requests, so http requests work
 
         my $pid = fork if $fork;
 
@@ -628,29 +587,22 @@ sub speak_text {
             $speak_pgm_arg .= " -play $parms{play} " if $parms{play};
 
             if ( $speak_engine =~ /vv_tts/i ) {
-                $speak_pgm_arg .=
-                  " -engine " . $main::config_parms{vv_tts_engine}
+                $speak_pgm_arg .= " -engine " . $main::config_parms{vv_tts_engine}
                   if $main::config_parms{vv_tts_engine};
-                $speak_pgm_arg .=
-                  " -prescript " . $main::config_parms{vv_tts_prescript}
+                $speak_pgm_arg .= " -prescript " . $main::config_parms{vv_tts_prescript}
                   if $main::config_parms{vv_tts_prescript};
-                $speak_pgm_arg .=
-                  " -postscript " . $main::config_parms{vv_tts_postscript}
+                $speak_pgm_arg .= " -postscript " . $main::config_parms{vv_tts_postscript}
                   if $main::config_parms{vv_tts_postscript};
-                $speak_pgm_arg .=
-                  " -playcmd " . $main::config_parms{vv_tts_playcmd}
+                $speak_pgm_arg .= " -playcmd " . $main::config_parms{vv_tts_playcmd}
                   if $main::config_parms{vv_tts_playcmd};
-                $speak_pgm_arg .=
-                  " -default_sound " . $main::config_parms{vv_tts_default_sound}
+                $speak_pgm_arg .= " -default_sound " . $main::config_parms{vv_tts_default_sound}
                   if $main::config_parms{vv_tts_default_sound};
-                $speak_pgm_arg .=
-                  " -default_volume " . $main::config_parms{sound_volume}
+                $speak_pgm_arg .= " -default_volume " . $main::config_parms{sound_volume}
                   if $main::config_parms{sound_volume};
                 if (    $main::config_parms{vv_tts_pa_control}
                     and $main::config_parms{xcmd_file} )
                 {
-                    $speak_pgm_arg .= ' -pa_control -xcmd_file '
-                      . $main::config_parms{xcmd_file};
+                    $speak_pgm_arg .= ' -pa_control -xcmd_file ' . $main::config_parms{xcmd_file};
                     if ( $parms{rooms} ) {
                         $speak_pgm_arg .= ' -rooms ' . $parms{rooms};
                     }
@@ -673,8 +625,7 @@ sub speak_text {
                 $speak_pgm_arg .= ' -voice_volume ' . $parms{voice_volume}
                   if $parms{voice_volume};
                 $parms{voice} = ''
-                  unless $parms{voice} =~
-                  /^\d+$/;    # -voice supports numbers only
+                  unless $parms{voice} =~ /^\d+$/;    # -voice supports numbers only
                 $speak_pgm_arg .= ' -voice ' . "'$parms{voice}'"
                   if $parms{voice};
                 $speak_pgm_arg .= ' -to_file ' . $parms{to_file}
@@ -765,8 +716,7 @@ sub speak_text {
                   if $parms{to_file};
             }
 
-            print
-              "Voice_text TTS: f=$fork stdin=$speak_pgm_use_stdin p=$speak_pgm a=$speak_pgm_arg to_file=$parms{to_file}\n"
+            print "Voice_text TTS: f=$fork stdin=$speak_pgm_use_stdin p=$speak_pgm a=$speak_pgm_arg to_file=$parms{to_file}\n"
               if $main::Debug{voice};
 
             if ($speak_pgm_use_stdin) {
@@ -870,9 +820,8 @@ sub speak_text {
                     elsif ( $pid == 0 ) {
 
                         # we are the child process
-                        $VTxt_stream2 = Win32::OLE->new('Sapi.SpFileStream');
-                        $VTxt_stream2->{Format}->{Type} =
-                          22;    # see table above for constant defs
+                        $VTxt_stream2                   = Win32::OLE->new('Sapi.SpFileStream');
+                        $VTxt_stream2->{Format}->{Type} = 22;                                    # see table above for constant defs
                         $VTxt_stream2->{Format}->{Type} = $parms{compression}
                           if $parms{compression} =~ /^\d+$/;
                         $VTxt_stream2->{Format}->{Type} = 20
@@ -881,8 +830,7 @@ sub speak_text {
                           if $parms{compression} eq 'high';
                         $VTxt_stream2->Open( $parms{to_file}, 3, 0 );
                         $VTxt_stream1->{AudioOutputStream} = $VTxt_stream2;
-                        $VTxt_stream1->Speak( $parms{text}, 8 )
-                          ;      # Flags: 8=XML (no async, so we can close)
+                        $VTxt_stream1->Speak( $parms{text}, 8 );    # Flags: 8=XML (no async, so we can close)
                         $VTxt_stream2->Close;
 
                         # at this point, the file _should_ be ready for Audrey
@@ -902,9 +850,8 @@ sub speak_text {
                 }
                 else {
                     if ($VTxt_stream1) {
-                        $VTxt_stream2 = Win32::OLE->new('Sapi.SpFileStream');
-                        $VTxt_stream2->{Format}->{Type} =
-                          22;    # see table above for constant defs
+                        $VTxt_stream2                   = Win32::OLE->new('Sapi.SpFileStream');
+                        $VTxt_stream2->{Format}->{Type} = 22;                                    # see table above for constant defs
                         $VTxt_stream2->{Format}->{Type} = $parms{compression}
                           if $parms{compression} =~ /^\d+$/;
                         $VTxt_stream2->{Format}->{Type} = 20
@@ -912,15 +859,12 @@ sub speak_text {
                         $VTxt_stream2->{Format}->{Type} = 66
                           if $parms{compression} eq 'high';
                         $VTxt_stream2->Open( $parms{to_file}, 3, 0 );
-                        $VTxt_stream1->SetProperty( 'AudioOutputStream',
-                            $VTxt_stream2 );
+                        $VTxt_stream1->SetProperty( 'AudioOutputStream', $VTxt_stream2 );
                         if ( $parms{async} ) {
-                            $VTxt_stream1->Speak( $parms{text}, 1 + 8 )
-                              ;    # Flags: 1=async 8=XML
+                            $VTxt_stream1->Speak( $parms{text}, 1 + 8 );                         # Flags: 1=async 8=XML
                         }
                         else {
-                            $VTxt_stream1->Speak( $parms{text}, 8 )
-                              ;    # Flags: 8=XML (no async, so we can close)
+                            $VTxt_stream1->Speak( $parms{text}, 8 );    # Flags: 8=XML (no async, so we can close)
                             $VTxt_stream2->Close;
                             undef $VTxt_stream2;
 
@@ -929,8 +873,7 @@ sub speak_text {
                         }
                     }
                     else {
-                        &main::print_log(
-                            "WARN: no file could be produced for audrey.");
+                        &main::print_log("WARN: no file could be produced for audrey.");
                     }
                 }
             }
@@ -939,8 +882,7 @@ sub speak_text {
                 unless ($vtxt_card
                     and $vtxt_card->Speak( $parms{text}, 1 + 8 ) )
                 {
-                    print "Voice_Text error: parms=@_\n"
-                      ;    #  error=" .  Win32::OLE->LastError() . "\n";
+                    print "Voice_Text error: parms=@_\n";    #  error=" .  Win32::OLE->LastError() . "\n";
                 }
             }
         }
@@ -948,9 +890,7 @@ sub speak_text {
         # Older engine
         else {
             if ( $parms{to_file} ) {
-                &main::print_log(
-                    "speak -to_file not supported with tts engine msv4.  Text=$parms{text}"
-                );
+                &main::print_log( "speak -to_file not supported with tts engine msv4.  Text=$parms{text}" );
                 return;
             }
 
@@ -1005,7 +945,7 @@ sub speak_text {
 sub is_speaking {
     my ($card) = @_;
     $card = 0 unless $card;
-    $card = $VTxt_cards{$card} if $VTxt_cards{$card}; # Allow for text card name
+    $card = $VTxt_cards{$card} if $VTxt_cards{$card};    # Allow for text card name
 
     # Allow for a check of all cards
     if ( lc $card eq 'any' ) {
@@ -1106,8 +1046,7 @@ sub read_parms {
     {
         my ( $phonemes, $word, $cnt );
         open( WORDS, $pronouncable_list_file )
-          or print
-          "\nError, could not find the pronouncable word file $pronouncable_list_file: $!\n";
+          or print "\nError, could not find the pronouncable word file $pronouncable_list_file: $!\n";
         undef %pronouncable;
         while (<WORDS>) {
             next if /^\#/;
@@ -1258,8 +1197,7 @@ sub set_voice {
         $text = '';
         for my $word (@words) {
             $voice_names_index = 1 if ++$voice_names_index > @voice_names;
-            $text .=
-              "<voice required='Name=$voice_names[$voice_names_index-1]'>$word</voice> ";
+            $text .= "<voice required='Name=$voice_names[$voice_names_index-1]'>$word</voice> ";
         }
         return $text . '.';    # Add . or last word is not spoken??
     }
diff --git a/lib/Weather_Common.pm b/lib/Weather_Common.pm
index 4bab2bbfd..b16dae4aa 100644
--- a/lib/Weather_Common.pm
+++ b/lib/Weather_Common.pm
@@ -65,9 +65,8 @@ sub weather_updated {
     my $temp            = 'unknown';
 
     if ( defined $$w{TempOutdoor} ) {
-        $temp            = $$w{TempOutdoor};
-        $temperatureText = sprintf( '%.1f&deg;%s',
-            $$w{TempOutdoor}, $main::config_parms{weather_uom_temp} );
+        $temp = $$w{TempOutdoor};
+        $temperatureText = sprintf( '%.1f&deg;%s', $$w{TempOutdoor}, $main::config_parms{weather_uom_temp} );
 
         # assume for now that windchill and humidex are negligible
         $$w{WindChill}           = $$w{TempOutdoor};
@@ -86,8 +85,7 @@ sub weather_updated {
 
     # need temp and dewpoint in Celsius for formulas to work
     if ( $main::config_parms{weather_uom_temp} eq 'F' ) {
-        grep { $_ = &::convert_f2c($_) if $_ ne 'unknown' }
-          ( $temp, $dewpoint );
+        grep { $_ = &::convert_f2c($_) if $_ ne 'unknown' } ( $temp, $dewpoint );
     }
 
     # calculate dew point if missing, but we have temp and humid
@@ -96,8 +94,7 @@ sub weather_updated {
         and $$w{HumidOutdoorMeasured} )
     {
         my $humidity = $$w{HumidOutdoor};
-        $dewpoint = convert_humidity_to_dewpoint( $humidity, $temp )
-          ;    # $dewpoint is in Celsius at this point
+        $dewpoint = convert_humidity_to_dewpoint( $humidity, $temp );    # $dewpoint is in Celsius at this point
         $$w{DewOutdoor} =
             $main::config_parms{weather_uom_temp} eq 'F'
           ? &::convert_c2f($dewpoint)
@@ -112,10 +109,7 @@ sub weather_updated {
             and $temp >= -50
             and $temp <= 5 )
         {
-            my $windchill =
-              13.12 + 0.6215 * $temp -
-              11.37 * ( $windSpeed**0.16 ) +
-              0.3965 * $temp * ( $windSpeed**0.16 );
+            my $windchill = 13.12 + 0.6215 * $temp - 11.37 * ( $windSpeed**0.16 ) + 0.3965 * $temp * ( $windSpeed**0.16 );
             if ( $main::config_parms{weather_uom_temp} eq 'F' ) {
                 $windchill = &::convert_c2f($windchill);
             }
@@ -126,10 +120,8 @@ sub weather_updated {
     }
 
     if ( $temp ne 'unknown' and $dewpoint ne 'unknown' ) {
-        my $vapourPressureSaturation =
-          6.112 * 10.0**( 7.5 * $temp / ( 237.7 + $temp ) );
-        my $vapourPressure =
-          6.112 * 10.0**( 7.5 * $dewpoint / ( 237.7 + $dewpoint ) );
+        my $vapourPressureSaturation = 6.112 * 10.0**( 7.5 * $temp /     ( 237.7 + $temp ) );
+        my $vapourPressure           = 6.112 * 10.0**( 7.5 * $dewpoint / ( 237.7 + $dewpoint ) );
 
         # only calculate humidity if is isn't directly measured by something
         if ( !$$w{HumidOutdoorMeasured} ) {
@@ -154,8 +146,7 @@ sub weather_updated {
               unless $::config_parms{weather_use_heatindex};
         }
 
-        my $tempF =
-          &::convert_c2f($temp); # heat index works with fahrenheit temperatures
+        my $tempF = &::convert_c2f($temp);    # heat index works with fahrenheit temperatures
 
         # the heat index formula is only valid when Temp >= 80 deg F and Humidity >= 40%
         if ( $tempF >= 80 and $humidity >= 40 ) {
@@ -204,8 +195,7 @@ sub weather_updated {
 
     my $pressureText = 'unknown';
     if ( defined( $$w{BaromSea} ) ) {
-        $pressureText = sprintf( "%s %s",
-            $$w{BaromSea}, $main::config_parms{weather_uom_baro} );
+        $pressureText = sprintf( "%s %s", $$w{BaromSea}, $main::config_parms{weather_uom_baro} );
     }
 
     my $windDirName     = 'unknown';
@@ -227,13 +217,9 @@ sub weather_updated {
             $longWindText  = 'no wind';
         }
         else {
-            $shortWindText = sprintf( '%s %.0f %s',
-                $windDirName, $$w{WindAvgSpeed},
-                $main::config_parms{weather_uom_wind} );
+            $shortWindText = sprintf( '%s %.0f %s', $windDirName, $$w{WindAvgSpeed}, $main::config_parms{weather_uom_wind} );
 
-            $longWindText = sprintf( '%s at %.0f %s',
-                $windDirNameLong, $$w{WindAvgSpeed},
-                $main::config_parms{weather_uom_wind} );
+            $longWindText = sprintf( '%s at %.0f %s', $windDirNameLong, $$w{WindAvgSpeed}, $main::config_parms{weather_uom_wind} );
         }
 
         if ( defined $$w{WindGustSpeed}
@@ -245,17 +231,13 @@ sub weather_updated {
             }
             else {
                 $shortWindText = sprintf( '%s %.0f (%.0f) %s',
-                    $windDirName, $$w{WindAvgSpeed}, $$w{WindGustSpeed},
-                    $main::config_parms{weather_uom_wind} );
+                    $windDirName, $$w{WindAvgSpeed}, $$w{WindGustSpeed}, $main::config_parms{weather_uom_wind} );
                 if ( $$w{WindAvgSpeed} >= 1 ) {
-                    $longWindText .= sprintf( ' gusting to %.0f %s',
-                        $$w{WindGustSpeed},
-                        $main::config_parms{weather_uom_wind} );
+                    $longWindText .= sprintf( ' gusting to %.0f %s', $$w{WindGustSpeed}, $main::config_parms{weather_uom_wind} );
                 }
                 else {
                     $longWindText = sprintf( '%serly gusts of %.0f %s',
-                        $windDirNameLong, $$w{WindGustSpeed},
-                        $main::config_parms{weather_uom_wind} );
+                        $windDirNameLong, $$w{WindGustSpeed}, $main::config_parms{weather_uom_wind} );
                 }
             }
         }
@@ -272,15 +254,12 @@ sub weather_updated {
 
     $$w{Wind} = $shortWindText;
 
-    $$w{Summary_Short} =
-      sprintf( '%s%s %s', $temperatureText, $apparentTempText, $humidityText );
-    $$w{Summary} = $$w{Summary_Short} . " $pressureText $clouds $conditions";
-    $$w{Summary_Long} = "Temperature: $temperatureText";
+    $$w{Summary_Short} = sprintf( '%s%s %s', $temperatureText, $apparentTempText, $humidityText );
+    $$w{Summary}       = $$w{Summary_Short} . " $pressureText $clouds $conditions";
+    $$w{Summary_Long}  = "Temperature: $temperatureText";
     if ( $apparentTempText ne '' ) {
         $$w{Summary_Long} .=
-            '  Apparent Temperature: '
-          . $$w{TempOutdoorApparent} . '&deg;'
-          . $main::config_parms{weather_uom_temp};
+          '  Apparent Temperature: ' . $$w{TempOutdoorApparent} . '&deg;' . $main::config_parms{weather_uom_temp};
     }
     $$w{Summary_Long} .= "  Humidity: $humidityText";
     $$w{Summary_Long} .= "  Wind: $longWindText";
@@ -348,8 +327,7 @@ sub convert_humidity_to_dewpoint {
     return unless defined $humidity and defined $temp_celsius;
 
     # http://en.wikipedia.org/wiki/Dew_point
-    my $gamma = ( ( 17.271 * $temp_celsius ) / ( 237.7 + $temp_celsius ) ) +
-      log( $humidity / 100 );
+    my $gamma = ( ( 17.271 * $temp_celsius ) / ( 237.7 + $temp_celsius ) ) + log( $humidity / 100 );
     my $dew_point = ( 237.7 * $gamma ) / ( 17.271 - $gamma );
 
     # old calculations
@@ -422,8 +400,7 @@ sub convert_wind_dir_to_abbr {
     return 'unknown' if $dir !~ /^[\d \.]+$/;
 
     if ( $dir >= 0 and $dir <= 359 ) {
-        return qw{ N NNE NE ENE E ESE SE SSE S SSW SW WSW W WNW NW NNW }
-          [ ( ( $dir + 11.25 ) / 22.5 ) % 16 ];
+        return qw{ N NNE NE ENE E ESE SE SSE S SSW SW WSW W WNW NW NNW } [ ( ( $dir + 11.25 ) / 22.5 ) % 16 ];
     }
     return 'unknown';
 }
@@ -436,10 +413,9 @@ sub convert_wind_dir_to_text {
 
     if ( $dir >= 0 and $dir <= 359 ) {
         return (
-            'North', 'North Northeast', 'Northeast', 'East Northeast',
-            'East',  'East Southeast',  'Southeast', 'South Southeast',
-            'South', 'South Southwest', 'Southwest', 'West Southwest',
-            'West',  'West Northwest',  'Northwest', 'North Northwest'
+            'North',     'North Northeast', 'Northeast', 'East Northeast',  'East',      'East Southeast',
+            'Southeast', 'South Southeast', 'South',     'South Southwest', 'Southwest', 'West Southwest',
+            'West',      'West Northwest',  'Northwest', 'North Northwest'
         )[ ( ( $dir + 11.25 ) / 22.5 ) % 16 ];
     }
     return 'unknown';
@@ -496,11 +472,8 @@ sub populate_internet_weather {
     # keys if this happens.
 
     if ( $main::Weather{DewOutdoorUnder} ) {
-        &::print_log(
-            "Weather_Common: forcing use of internet for outdoor humidity and dewpoint as dewpoint is too low"
-        );
-        $main::Weather{HumidOutdoorMeasured} =
-          0;    # because our measurement is bad
+        &::print_log( "Weather_Common: forcing use of internet for outdoor humidity and dewpoint as dewpoint is too low" );
+        $main::Weather{HumidOutdoorMeasured} = 0;    # because our measurement is bad
         push( @keys, qw(HumidOutdoor DewOutdoor) );
     }
 
diff --git a/lib/Weather_Item.pm b/lib/Weather_Item.pm
index da32f7695..80a385e80 100644
--- a/lib/Weather_Item.pm
+++ b/lib/Weather_Item.pm
@@ -82,18 +82,15 @@ sub new {
     if ($type) {
         $type =~ s/\x20+/\x20/g;                           # consolidate spaces
         $type =~ s/([^0-9 \W]+)/item_transform($1)/egi;    # markup items
-        $type =~
-          s/(partly cloudy|partly sunny|mostly cloudy|mostly sunny|clear|cloudy)/"'" . ucfirst(lc($1)) . "'"/egi
-          ;    # normalize condition strings
-        $type =~ s/ = '/ eq '/gi;    # quote condition strings
+        $type =~ s/(partly cloudy|partly sunny|mostly cloudy|mostly sunny|clear|cloudy)/"'" . ucfirst(lc($1)) . "'"/egi
+          ;                                                # normalize condition strings
+        $type =~ s/ = '/ eq '/gi;                          # quote condition strings
 
-        $type =~ s/[^<>=]= /== /g; # double equal signs (no assignments allowed)
-            # *** test with super syntax as well as module function calls
+        $type =~ s/[^<>=]= /== /g;                         # double equal signs (no assignments allowed)
+                                                           # *** test with super syntax as well as module function calls
 
-        $type =~ s/&[^0-9 \W]+:{0,}[^0-9 \W]+\(.*\)//g
-          ;    # no function calls either (for safety)
-        $type =~ s/(state|item_transform|check_weather)//gi
-          ;    # short-circuit methods (hack)
+        $type =~ s/&[^0-9 \W]+:{0,}[^0-9 \W]+\(.*\)//g;         # no function calls either (for safety)
+        $type =~ s/(state|item_transform|check_weather)//gi;    # short-circuit methods (hack)
 
         # Save weather hash keys in member list (to be checked for existence in state sub before expression is evaluated)
 
@@ -129,16 +126,14 @@ sub state {
 
     # check that all members are defined
 
-    for ( @{ $self->{list} } )
-    {    # short-circuit evaluation if any member is undefined
+    for ( @{ $self->{list} } ) {    # short-circuit evaluation if any member is undefined
         $valid = 0 if !defined $main::Weather{$_};
     }
 
     my $results;
     if ($valid) {
         $results = eval $self->{type} if $valid;
-        print
-          "Weather_Item eval error: object=$self->{object_name} test=$self->{type} error=$@"
+        print "Weather_Item eval error: object=$self->{object_name} test=$self->{type} error=$@"
           if $@;
     }
 
diff --git a/lib/Weather_davisvantageproii.pm b/lib/Weather_davisvantageproii.pm
index a90bc13e1..73148472a 100644
--- a/lib/Weather_davisvantageproii.pm
+++ b/lib/Weather_davisvantageproii.pm
@@ -39,18 +39,12 @@ our $DavisVP_port;
 #our $lastRainReadingTime = undef;
 
 our (
-    $barometric_trend,  $next_rec,             $barometric_press,
-    $air_temp_inside,   $humidity_inside,      $air_temp,
-    $wind_speed,        $wind_speed_10min_ave, $wind_direction,
-    $relative_humidity, $rain_rate,            $uv,
-    $solar,             $rain_storm,           $storm_date,
-    $rain_day,          $rain_month,           $rain_year,
-    $day_ET,            $month_ET,             $year_ET,
-    $alarms_inside,     $alarms_rain,          $alarms_outside,
-    $batt_xmit,         $batt_cons,            $forecast_icon,
-    $forecast_rule,     $sunrise,              $sunset,
-    $dew_point_inside,  $dew_point_outside,    $crc,
-    $crc_calc,          $wptr,                 $data
+    $barometric_trend, $next_rec,             $barometric_press, $air_temp_inside,   $humidity_inside, $air_temp,
+    $wind_speed,       $wind_speed_10min_ave, $wind_direction,   $relative_humidity, $rain_rate,       $uv,
+    $solar,            $rain_storm,           $storm_date,       $rain_day,          $rain_month,      $rain_year,
+    $day_ET,           $month_ET,             $year_ET,          $alarms_inside,     $alarms_rain,     $alarms_outside,
+    $batt_xmit,        $batt_cons,            $forecast_icon,    $forecast_rule,     $sunrise,         $sunset,
+    $dew_point_inside, $dew_point_outside,    $crc,              $crc_calc,          $wptr,            $data
 );
 
 sub startup {
@@ -58,10 +52,8 @@ sub startup {
     $DavisVP_port = new Serial_Item( undef, undef, 'serial_davisvantageproii' );
     &requestData;
     &::MainLoop_pre_add_hook( \&Weather_davisvantageproii::update, 1 );
-    &::trigger_set(
-        '$New_Minute', '&Weather_davisvantageproii::requestData',
-        'NoExpire',    'davisvantageproii data request'
-    ) unless &::trigger_get('davisvantageproii data request');
+    &::trigger_set( '$New_Minute', '&Weather_davisvantageproii::requestData', 'NoExpire', 'davisvantageproii data request' )
+      unless &::trigger_get('davisvantageproii data request');
 }
 
 sub wake_up {
@@ -167,10 +159,9 @@ sub process {
     if ( $uv eq '255' ) { $uv = undef }
     $solar = unpack( "s", substr $data, 44, 2 );              # watt/m**2
     if ( $solar eq '32767' ) { $solar = undef }
-    $rain_storm = unpack( "s", substr $data, 46, 2 ) / 100;   # Inches per storm
+    $rain_storm = unpack( "s", substr $data, 46, 2 ) / 100;    # Inches per storm
 
-    $storm_date = unpack( "s", substr $data, 48, 2 )
-      ;    # Need to parse data (not sure what this is)
+    $storm_date = unpack( "s", substr $data, 48, 2 );          # Need to parse data (not sure what this is)
     $rain_day   = unpack( "s", substr $data, 50, 2 ) / 100;
     $rain_month = unpack( "s", substr $data, 52, 2 ) / 100;
     $rain_year  = unpack( "s", substr $data, 54, 2 ) / 100;
@@ -243,14 +234,10 @@ sub process {
 
     # these dewpoints will be in Celsius
     if ( $humidity_inside ne undef ) {
-        $dew_point_inside =
-          &::convert_humidity_to_dewpoint( $humidity_inside,
-            &::convert_f2c($air_temp_inside) );
+        $dew_point_inside = &::convert_humidity_to_dewpoint( $humidity_inside, &::convert_f2c($air_temp_inside) );
     }
     if ( $relative_humidity ne undef ) {
-        $dew_point_outside =
-          &::convert_humidity_to_dewpoint( $relative_humidity,
-            &::convert_f2c($air_temp) );
+        $dew_point_outside = &::convert_humidity_to_dewpoint( $relative_humidity, &::convert_f2c($air_temp) );
     }
 
     #	$rain_rate=undef;
@@ -285,8 +272,7 @@ sub process {
         #		);
     }
     if ( $main::config_parms{weather_uom_baro} eq 'mb' ) {
-        grep { $_ = &::convert_in2mb($_); }
-          ( $barometric_press, $barometer_sea );
+        grep { $_ = &::convert_in2mb($_); } ( $barometric_press, $barometer_sea );
     }
     if ( $main::config_parms{weather_uom_rain} eq 'mm' ) {
         grep { $_ = &::convert_in2mm($_); } ($rain_storm);
@@ -296,8 +282,7 @@ sub process {
         $rain_rate = sprintf( '%.0f', $rain_rate );    # round to nearest mm/hr
     }
     else {
-        $rain_rate =
-          sprintf( '%.2f', $rain_rate );    # round to nearest 0.01 in/hr
+        $rain_rate = sprintf( '%.2f', $rain_rate );    # round to nearest 0.01 in/hr
     }
     if ( $main::config_parms{weather_uom_wind} eq 'kph' ) {
         grep { $_ = &::convert_mile2km($_); } ($wind_speed);
@@ -390,38 +375,25 @@ sub CRC_CCITT {
 sub crc_table {
 
     my @crc_table = (
-        0x0,    0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
-        0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
-        0x1231, 0x210,  0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
-        0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-        0x2462, 0x3443, 0x420,  0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
-        0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
-        0x3653, 0x2672, 0x1611, 0x630,  0x76d7, 0x66f6, 0x5695, 0x46b4,
-        0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
-        0x48c4, 0x58e5, 0x6886, 0x78a7, 0x840,  0x1861, 0x2802, 0x3823,
-        0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
-        0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0xa50,  0x3a33, 0x2a12,
-        0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-        0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0xc60,  0x1c41,
-        0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
-        0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0xe70,
-        0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
-        0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
-        0x1080, 0xa1,   0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-        0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
-        0x2b1,  0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
-        0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-        0x34e2, 0x24c3, 0x14a0, 0x481,  0x7466, 0x6447, 0x5424, 0x4405,
-        0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
-        0x26d3, 0x36f2, 0x691,  0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
-        0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
-        0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x8e1,  0x3882, 0x28a3,
-        0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
-        0x4a75, 0x5a54, 0x6a37, 0x7a16, 0xaf1,  0x1ad0, 0x2ab3, 0x3a92,
-        0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
-        0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0xcc1,
-        0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
-        0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0xed1,  0x1ef0
+        0x0,    0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad,
+        0xe1ce, 0xf1ef, 0x1231, 0x210,  0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 0x9339, 0x8318, 0xb37b, 0xa35a,
+        0xd3bd, 0xc39c, 0xf3ff, 0xe3de, 0x2462, 0x3443, 0x420,  0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 0xa56a, 0xb54b,
+        0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 0x3653, 0x2672, 0x1611, 0x630,  0x76d7, 0x66f6, 0x5695, 0x46b4,
+        0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x840,  0x1861,
+        0x2802, 0x3823, 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, 0x5af5, 0x4ad4, 0x7ab7, 0x6a96,
+        0x1a71, 0xa50,  0x3a33, 0x2a12, 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, 0x6ca6, 0x7c87,
+        0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0xc60,  0x1c41, 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
+        0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0xe70,  0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a,
+        0x9f59, 0x8f78, 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 0x1080, 0xa1,   0x30c2, 0x20e3,
+        0x5004, 0x4025, 0x7046, 0x6067, 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 0x2b1,  0x1290,
+        0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
+        0x34e2, 0x24c3, 0x14a0, 0x481,  0x7466, 0x6447, 0x5424, 0x4405, 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e,
+        0xc71d, 0xd73c, 0x26d3, 0x36f2, 0x691,  0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 0xd94c, 0xc96d, 0xf90e, 0xe92f,
+        0x99c8, 0x89e9, 0xb98a, 0xa9ab, 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x8e1,  0x3882, 0x28a3, 0xcb7d, 0xdb5c,
+        0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0xaf1,  0x1ad0, 0x2ab3, 0x3a92,
+        0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83,
+        0x1ce0, 0xcc1,  0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, 0x6e17, 0x7e36, 0x4e55, 0x5e74,
+        0x2e93, 0x3eb2, 0xed1,  0x1ef0
     );
 }
 
diff --git a/lib/Weather_daviswm2.pm b/lib/Weather_daviswm2.pm
index 20b7ba0b3..3a153979d 100644
--- a/lib/Weather_daviswm2.pm
+++ b/lib/Weather_daviswm2.pm
@@ -8,9 +8,7 @@ use strict;
 use Weather_Common;
 eval 'use Digest::mhCRC qw(crc16);';
 if ($@) {
-    die(
-        "Weather_daviswm2:  Can't find the Digest::mhCRC package (mhCRC.pm).  Please ensure that it is installed.\n$@"
-    );
+    die( "Weather_daviswm2:  Can't find the Digest::mhCRC package (mhCRC.pm).  Please ensure that it is installed.\n$@" );
 }
 
 =begin comment
@@ -85,10 +83,8 @@ sub startup {
     $DavisWMII_port = new Serial_Item( undef, undef, 'serial_daviswm2' );
     &requestData;
     &::MainLoop_pre_add_hook( \&Weather_daviswm2::update, 1 );
-    &::trigger_set(
-        'new_minute(1)', '&Weather_daviswm2::requestData',
-        'NoExpire',      'daviswm2 data request'
-    ) unless &::trigger_get('daviswm2 data request');
+    &::trigger_set( 'new_minute(1)', '&Weather_daviswm2::requestData', 'NoExpire', 'daviswm2 data request' )
+      unless &::trigger_get('daviswm2 data request');
 }
 
 # called by trigger every minute
@@ -155,10 +151,8 @@ sub process {
     my $foundHeader = 0;
 
     my (
-        $indoor_temp,      $outdoor_temp, $wind_speed,
-        $wind_direction,   $barometer,    $indoor_humidity,
-        $outdoor_humidity, $total_rain,   $not_used,
-        $crc16,            $rain_rate
+        $indoor_temp,      $outdoor_temp, $wind_speed, $wind_direction, $barometer, $indoor_humidity,
+        $outdoor_humidity, $total_rain,   $not_used,   $crc16,          $rain_rate
     );
 
     # go through data until we have found a header
@@ -166,21 +160,16 @@ sub process {
     my $headerByte;
     while ( defined( $headerByte = shift(@data) ) ) {
         next if $headerByte != 1;    # need a 1 at start of data
-        &::print_log(
-            "daviswm2: found header, checking length and crc16 of remaining data"
-        ) if $::Debug{weather};
+        &::print_log( "daviswm2: found header, checking length and crc16 of remaining data" ) if $::Debug{weather};
         $data = pack( 'C*', @data );
         if ( length($data) < 17 ) {    # we need 17 bytes left to proceed
             &::print_log("daviswm2: not enough bytes left to process")
               if $::Debug{weather};
-            return
-              chr($headerByte) . $data; # need to return the header byte as well
+            return chr($headerByte) . $data;    # need to return the header byte as well
         }
         (
-            $indoor_temp,      $outdoor_temp, $wind_speed,
-            $wind_direction,   $barometer,    $indoor_humidity,
-            $outdoor_humidity, $total_rain,   $not_used,
-            $crc16
+            $indoor_temp,     $outdoor_temp,     $wind_speed, $wind_direction, $barometer,
+            $indoor_humidity, $outdoor_humidity, $total_rain, $not_used,       $crc16
         ) = unpack( 'vvCvvCCvvn', $data );
         if ( Digest::mhCRC::crc16( substr( $data, 0, 15 ) ) != $crc16 ) {
             &::print_log("daviswm2: wrong crc16, looking again for header")
@@ -249,9 +238,7 @@ sub process {
             }
         }
         if ( $::Debug{weather} ) {
-            &::print_log( "daviswm2:   "
-                  . localtime($btr_datetime)
-                  . " -> $btr_barom $btr_exflag $datediff" );
+            &::print_log( "daviswm2:   " . localtime($btr_datetime) . " -> $btr_barom $btr_exflag $datediff" );
         }
         $btr_tmp_counter++;
     }
@@ -264,8 +251,7 @@ sub process {
     my $btr_diff = $btr_sum_tail - $btr_sum_head;
 
     ## fetch last sample
-    my $btr_last_diff =
-      abs( $barometer - $barom_samples->Values( $barom_samples->Length - 2 ) );
+    my $btr_last_diff  = abs( $barometer - $barom_samples->Values( $barom_samples->Length - 2 ) );
     my $btr_last_value = $barom_samples->Values( $barom_samples->Length - 2 );
 
     &::print_log("daviswm2: last value($btr_last_value) diff($btr_last_diff)")
@@ -273,8 +259,7 @@ sub process {
 
     ## calculate tendency
     if ( $btr_last_diff >= .03 or $barom_samples->Length < 15 ) {
-        &::print_log(
-            "daviswm2: unsteading reading $btr_last_diff $btr_last_value")
+        &::print_log("daviswm2: unsteading reading $btr_last_diff $btr_last_value")
           if $::Debug{weather};
         $barom_tendency = "unsteady";
     }
@@ -300,22 +285,17 @@ sub process {
     my $barometer_sea = convert_local_barom_to_sea_in($barometer);
 
     # these dewpoints will be in Celsius
-    my $indoor_dewpoint =
-      &::convert_humidity_to_dewpoint( $indoor_humidity,
-        &::convert_f2c($indoor_temp) );
-    my $outdoor_dewpoint =
-      &::convert_humidity_to_dewpoint( $outdoor_humidity,
-        &::convert_f2c($outdoor_temp) );
+    my $indoor_dewpoint  = &::convert_humidity_to_dewpoint( $indoor_humidity,  &::convert_f2c($indoor_temp) );
+    my $outdoor_dewpoint = &::convert_humidity_to_dewpoint( $outdoor_humidity, &::convert_f2c($outdoor_temp) );
 
     $rain_rate = undef;
     if ( defined($lastRainReadingTime) ) {
         $rain_rate = ( $total_rain - $lastRainReading );    # delta in inches
         my $time_delta = ( time - $lastRainReadingTime );
         if ( $time_delta != 0 ) {
-            $rain_rate /= $time_delta;    # rate in inches per second
-            $rain_rate *= 3600;           # rate in inches per hour
-            if ( $rain_rate < 0 )
-            {    # if total rain was reset to zero, this could happen
+            $rain_rate /= $time_delta;                      # rate in inches per second
+            $rain_rate *= 3600;                             # rate in inches per hour
+            if ( $rain_rate < 0 ) {                         # if total rain was reset to zero, this could happen
                 $rain_rate = 0;
             }
         }
@@ -329,8 +309,7 @@ sub process {
         # remember, dewpoints are in Celsius by default
     }
     elsif ( $main::config_parms{weather_uom_temp} eq 'F' ) {
-        grep { $_ = &::convert_c2f($_); }
-          ( $indoor_dewpoint, $outdoor_dewpoint );
+        grep { $_ = &::convert_c2f($_); } ( $indoor_dewpoint, $outdoor_dewpoint );
     }
     if ( $main::config_parms{weather_uom_baro} eq 'mb' ) {
         grep { $_ = &::convert_in2mb($_); } ( $barometer, $barometer_sea );
@@ -343,8 +322,7 @@ sub process {
         $rain_rate = sprintf( '%.0f', $rain_rate );    # round to nearest mm/hr
     }
     else {
-        $rain_rate =
-          sprintf( '%.2f', $rain_rate );    # round to nearest 0.01 in/hr
+        $rain_rate = sprintf( '%.2f', $rain_rate );    # round to nearest 0.01 in/hr
     }
     if ( $main::config_parms{weather_uom_wind} eq 'kph' ) {
         grep { $_ = &::convert_mile2km($_); } ($wind_speed);
diff --git a/lib/Weather_vw.pm b/lib/Weather_vw.pm
index 947bb2c0d..5f0cfb784 100644
--- a/lib/Weather_vw.pm
+++ b/lib/Weather_vw.pm
@@ -50,8 +50,7 @@ sub UpdateVwWeather {
     #1.00,2001,12,25,13,48,30,0,0,182,32,54,72,46,29.82,33.37,0.00,0.00,0,0,0,0,0,0,0,0.00,0.0,0,46,71,48,31,0.00,1,1,-0.00,0,0,0
 
     if ($::New_Day) {
-        $main::Weather{WindHighDir} = undef $main::Weather{WindHighSpeed} =
-          undef;
+        $main::Weather{WindHighDir} = undef $main::Weather{WindHighSpeed} = undef;
 
         $main::Weather{HumidIndoorH}  = undef;
         $main::Weather{HumidIndoorL}  = undef;
@@ -161,8 +160,7 @@ sub UpdateVwWeather {
       if $main::Weather{TempOutdoor} < $main::Weather{TempOutdoorL}
       or $main::Weather{TempOutdoorL} eq undef;
 
-    $main::Weather{RainRecent} =
-      ::round( ( $main::Weather{RainTotal} - $raintotal_prev ), 2 )
+    $main::Weather{RainRecent} = ::round( ( $main::Weather{RainTotal} - $raintotal_prev ), 2 )
       if $raintotal_prev > 0;
     if ( $main::Weather{RainRecent} > 0 ) {
 
diff --git a/lib/Weather_wmr968.pm b/lib/Weather_wmr968.pm
index 651f96354..fe12e9295 100644
--- a/lib/Weather_wmr968.pm
+++ b/lib/Weather_wmr968.pm
@@ -160,8 +160,7 @@ sub read_wmr968 {
         # Check for valid datatype
         unless ($dtp) {
             my $length = @data;
-            printf( "     Bad weather data = group(%x) length($length)\n",
-                $group );
+            printf( "     Bad weather data = group(%x) length($length)\n", $group );
             return;
         }
 
@@ -189,8 +188,7 @@ sub read_wmr968 {
         # Control only the lower byte (lower 8 bits of the sum)
         $checksum2 &= 0xff;
         if ( $checksum1 != $checksum2 ) {
-            print
-              "     Warning, bad wmr968 type=$$dtp[0] checksum: cs1=$checksum1 cs2=$checksum2\n";
+            print "     Warning, bad wmr968 type=$$dtp[0] checksum: cs1=$checksum1 cs2=$checksum2\n";
             print "     data2 is @data2\ndata is @data\ngroup is $group\n\n";
             next;
         }
@@ -275,8 +273,7 @@ sub wx_rain {
           if $main::config_parms{weather_uom_rain} eq 'in';
     }
     unless ( $skip{RainTotalStartDate} ) {
-        $$wptr{RainTotalStartDate} = sprintf( "%02x%02x%02x%02x%02x",
-            $data[14], $data[13], $data[12], $data[11], $data[10] );
+        $$wptr{RainTotalStartDate} = sprintf( "%02x%02x%02x%02x%02x", $data[14], $data[13], $data[12], $data[11], $data[10] );
     }
 
     print "** RAIN GAUGE : $main::Time_Date\n"               if $debug;
@@ -284,14 +281,11 @@ sub wx_rain {
     print "       RainRateOver    ($$wptr{RainRateOver})\n"  if $debug;
     print "       RainTotalOver   ($$wptr{RainTotalOver})\n" if $debug;
     print "       YesterdayOver   ($$wptr{RainYestOver})\n"  if $debug;
-    print
-      "       RainRate        ($$wptr{RainRate} $main::config_parms{weather_uom_rainrate})\n"
+    print "       RainRate        ($$wptr{RainRate} $main::config_parms{weather_uom_rainrate})\n"
       if $debug;
-    print
-      "       RainTotal       ($$wptr{RainTotal} $main::config_parms{weather_uom_rain})\n"
+    print "       RainTotal       ($$wptr{RainTotal} $main::config_parms{weather_uom_rain})\n"
       if $debug;
-    print
-      "       RainYesterday   ($$wptr{RainYest} $main::config_parms{weather_uom_rain})\n"
+    print "       RainYesterday   ($$wptr{RainYest} $main::config_parms{weather_uom_rain})\n"
       if $debug;
     print "       RainTotalStartDate ($$wptr{RainTotalStartDate})\n" if $debug;
 }
@@ -334,11 +328,9 @@ sub wx_wind {
           sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10 +
           sprintf( '%u', 0x0f & $data[6] ) +
           sprintf( '%u', ( 0xf0 & $data[5] ) >> 4 ) * 0.1;
-        $$wptr{WindGustSpeed} =
-          sprintf( '%.0f', &main::convert_mps2kph( $$wptr{WindGustSpeed} ) )
+        $$wptr{WindGustSpeed} = sprintf( '%.0f', &main::convert_mps2kph( $$wptr{WindGustSpeed} ) )
           if $main::config_parms{weather_uom_wind} eq 'kph';
-        $$wptr{WindGustSpeed} =
-          sprintf( '%.0f', &main::convert_mps2mph( $$wptr{WindGustSpeed} ) )
+        $$wptr{WindGustSpeed} = sprintf( '%.0f', &main::convert_mps2mph( $$wptr{WindGustSpeed} ) )
           if $main::config_parms{weather_uom_wind} eq 'mph';
         $$wptr{WindGustDir} =
           sprintf( '%u', 0x0f & $data[5] ) * 100 +
@@ -351,11 +343,9 @@ sub wx_wind {
           sprintf( '%u', 0x0f & $data[8] ) * 10 +
           sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) +
           sprintf( '%u', 0x0f & $data[7] ) * 0.1;
-        $$wptr{WindAvgSpeed} =
-          sprintf( '%.0f', &main::convert_mps2kph( $$wptr{WindAvgSpeed} ) )
+        $$wptr{WindAvgSpeed} = sprintf( '%.0f', &main::convert_mps2kph( $$wptr{WindAvgSpeed} ) )
           if $main::config_parms{weather_uom_wind} eq 'kph';
-        $$wptr{WindAvgSpeed} =
-          sprintf( '%.0f', &main::convert_mps2mph( $$wptr{WindAvgSpeed} ) )
+        $$wptr{WindAvgSpeed} = sprintf( '%.0f', &main::convert_mps2mph( $$wptr{WindAvgSpeed} ) )
           if $main::config_parms{weather_uom_wind} eq 'mph';
         $$wptr{WindAvgSpeed} = sprintf( '%.0f', $$wptr{WindAvgSpeed} );
     }
@@ -375,12 +365,10 @@ sub wx_wind {
     print "       BatWind         ($$wptr{BatWind})\n"      if $debug;
     print "       WindGustOver    ($$wptr{WindGustOver})\n" if $debug;
     print "       WindAvgOver     ($$wptr{WindAvgOver})\n"  if $debug;
-    print
-      "       WindGustSpeed   ($$wptr{WindGustSpeed} $main::config_parms{weather_uom_wind})\n"
+    print "       WindGustSpeed   ($$wptr{WindGustSpeed} $main::config_parms{weather_uom_wind})\n"
       if $debug;
     print "       WindGustDir     ($$wptr{WindGustDir})\n" if $debug;
-    print
-      "       WindAvgSpeed    ($$wptr{WindAvgSpeed} $main::config_parms{weather_uom_wind})\n"
+    print "       WindAvgSpeed    ($$wptr{WindAvgSpeed} $main::config_parms{weather_uom_wind})\n"
       if $debug;
 
     #    print "       WindChill       ($$wptr{WindChill})\n" if $debug;
@@ -409,10 +397,7 @@ sub wx_time {
     #$$wptr{BatMain} = "Please check" if 0x80 & @data[3];
     $$wptr{BatMain} = ( ( $data[3] & 0x80 ) >> 7 ) ? 0 : 1;
 
-    $$wptr{DateMain} = sprintf( "%x%x%x%x%u%u",
-        $data[7], $data[6], $data[5], $data[4],
-        ( $data[3] & 0x70 ) >> 4,
-        $data[3] & 0x0F )
+    $$wptr{DateMain} = sprintf( "%x%x%x%x%u%u", $data[7], $data[6], $data[5], $data[4], ( $data[3] & 0x70 ) >> 4, $data[3] & 0x0F )
       if $debug;
 
     print "** MAIN UNIT - CLOCK : $main::Time_Date\n"   if $debug;
@@ -466,21 +451,15 @@ sub wx_inside {
           if $main::config_parms{weather_uom_temp} eq 'F';
 
         #Over/Under
-        $$wptr{TempIndoorOverUnder} =
-          ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1  : 0 ) *
-          ( ( 0x80 & $data[5] )          ? -1 : 1 );
+        $$wptr{TempIndoorOverUnder} = ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1 : 0 ) * ( ( 0x80 & $data[5] ) ? -1 : 1 );
     }
     $$wptr{DewIndoorUnder} = ( $data[3] & 0x10 ) >> 4;
 
     unless ( $skip{HumidIndoor} ) {
-        $$wptr{HumidIndoor} =
-          sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 +
-          sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
+        $$wptr{HumidIndoor} = sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
     }
     unless ( $skip{DewIndoor} ) {
-        $$wptr{DewIndoor} =
-          sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 +
-          sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
+        $$wptr{DewIndoor} = sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
         $$wptr{DewIndoor} = &main::convert_c2f( $$wptr{DewIndoor} )
           if $main::config_parms{weather_uom_temp} eq 'F';
     }
@@ -494,22 +473,19 @@ sub wx_inside {
         $$wptr{BaromSea} =
           &main::convert_local_barom_to_sea_mb( $$wptr{Barom} );
         if ( $main::config_parms{weather_uom_baro} eq 'in' ) {
-            grep { $_ = &main::convert_mb2in($_); }
-              ( $$wptr{Barom}, $$wptr{BaromSea} );
+            grep { $_ = &main::convert_mb2in($_); } ( $$wptr{Barom}, $$wptr{BaromSea} );
         }
     }
 
     print "** BARO-THERMO-HYGROMETER : $main::Time_Date\n" if $debug;
     print "       Device type     ($data[2])\n"            if $debug;
     print "       BatIndoor       ($$wptr{BatIndoor})\n"   if $debug;
-    print
-      "       TempIndoor      ($$wptr{TempIndoor} $main::config_parms{weather_uom_temp})\n"
+    print "       TempIndoor      ($$wptr{TempIndoor} $main::config_parms{weather_uom_temp})\n"
       if $debug;
     print "       TempIndoorOverUnder ($$wptr{TempIndoorOverUnder})\n"
       if $debug;
     print "       HumidIndoor     ($$wptr{HumidIndoor})\n" if $debug;
-    print
-      "       DewIndoor       ($$wptr{DewIndoor} $main::config_parms{weather_uom_temp})\n"
+    print "       DewIndoor       ($$wptr{DewIndoor} $main::config_parms{weather_uom_temp})\n"
       if $debug;
     print "       DewIndoorUnder  ($$wptr{DewIndoorUnder})\n" if $debug;
     print "       WxTendency      ($$wptr{WxTendency})\n"     if $debug;
@@ -548,39 +524,31 @@ sub wx_outside {
           if $main::config_parms{weather_uom_temp} eq 'F';
 
         #Over/Under
-        $$wptr{TempOutdoorOverUnder} =
-          ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1  : 0 ) *
-          ( ( 0x80 & $data[5] )          ? -1 : 1 );
+        $$wptr{TempOutdoorOverUnder} = ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1 : 0 ) * ( ( 0x80 & $data[5] ) ? -1 : 1 );
     }
     $$wptr{DewOutdoorUnder} = ( $data[3] & 0x10 ) >> 4;
 
     unless ( $skip{HumidOutdoor} ) {
-        $$wptr{HumidOutdoor} =
-          sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 +
-          sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
+        $$wptr{HumidOutdoor} = sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
 
         # Let Weather_Common know that we 'directly' measured humidity
         $$wptr{HumidOutdoorMeasured} = 1;
     }
     unless ( $skip{DewOutdoor} ) {
         if ( !$$wptr{DewOutdoorUnder} ) {
-            $$wptr{DewOutdoor} =
-              sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 +
-              sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
+            $$wptr{DewOutdoor} = sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
             $$wptr{DewOutdoor} = &main::convert_c2f( $$wptr{DewOutdoor} )
               if $main::config_parms{weather_uom_temp} eq 'F';
         }
     }
     print "** THERMO-HYGROMETER : $main::Time_Date\n"      if $debug;
     print "       BatOutdoor       ($$wptr{BatOutdoor})\n" if $debug;
-    print
-      "       TempOutdoor      ($$wptr{TempOutdoor} $main::config_parms{weather_uom_temp})\n"
+    print "       TempOutdoor      ($$wptr{TempOutdoor} $main::config_parms{weather_uom_temp})\n"
       if $debug;
     print "       TempOutdoorOverUnder ($$wptr{TempOutdoorOverUnder})\n"
       if $debug;
     print "       HumidOutdoor     ($$wptr{HumidOutdoor})\n" if $debug;
-    print
-      "       DewOutdoor       ($$wptr{DewOutdoor} $main::config_parms{weather_uom_temp})\n"
+    print "       DewOutdoor       ($$wptr{DewOutdoor} $main::config_parms{weather_uom_temp})\n"
       if $debug;
     print "       DewOutdoorUnder  ($$wptr{DewOutdoorUnder})\n" if $debug;
 
@@ -620,14 +588,11 @@ sub wx_spare {
           sprintf( '%u', ( 0x0f & $data[5] ) ) * 10 +
           sprintf( '%u', ( 0x30 & $data[5] ) >> 4 ) * 100;
         $$wptr{"TempSpare$copy"} *= -1 if 0x80 & $data[5];
-        $$wptr{"TempSpare$copy"} =
-          &main::convert_c2f( $$wptr{"TempSpare$copy"} )
+        $$wptr{"TempSpare$copy"} = &main::convert_c2f( $$wptr{"TempSpare$copy"} )
           if $main::config_parms{weather_uom_temp} eq 'F';
 
         #Over/Under
-        $$wptr{"TempSpareOverUnder$copy"} =
-          ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1  : 0 ) *
-          ( ( 0x80 & $data[5] )          ? -1 : 1 );
+        $$wptr{"TempSpareOverUnder$copy"} = ( ( ( $data[5] & 0x40 ) >> 6 ) ? 1 : 0 ) * ( ( 0x80 & $data[5] ) ? -1 : 1 );
     }
 
     # Get Dew & Humid if thermo-hygro
@@ -635,16 +600,11 @@ sub wx_spare {
         $$wptr{"DewSpareUnder$copy"} = ( $data[3] & 0x10 ) >> 4;
 
         unless ( $skip{"HumidSpare$copy"} ) {
-            $$wptr{"HumidSpare$copy"} =
-              sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 +
-              sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
+            $$wptr{"HumidSpare$copy"} = sprintf( '%u', ( 0x0f & $data[6] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[6] ) >> 4 ) * 10;
         }
         unless ( $skip{"DewSpare$copy"} ) {
-            $$wptr{"DewSpare$copy"} =
-              sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 +
-              sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
-            $$wptr{"DewSpare$copy"} =
-              &main::convert_c2f( $$wptr{"DewSpare$copy"} )
+            $$wptr{"DewSpare$copy"} = sprintf( '%u', ( 0x0f & $data[7] ) ) * 1 + sprintf( '%u', ( 0xf0 & $data[7] ) >> 4 ) * 10;
+            $$wptr{"DewSpare$copy"} = &main::convert_c2f( $$wptr{"DewSpare$copy"} )
               if $main::config_parms{weather_uom_temp} eq 'F';
         }
     }
@@ -654,18 +614,13 @@ sub wx_spare {
     print "       ChannelSpare    ($$wptr{ChannelSpare})\n" if $debug;
     print "       BatSpare$copy       (" . $$wptr{"BatSpare$copy"} . ")\n"
       if $debug;
-    print "       TempSpare$copy      ("
-      . $$wptr{"TempSpare$copy"}
-      . " $main::config_parms{weather_uom_temp})\n"
+    print "       TempSpare$copy      (" . $$wptr{"TempSpare$copy"} . " $main::config_parms{weather_uom_temp})\n"
       if $debug;
-    print "       TempSpareOverUnder$copy ("
-      . $$wptr{"TempSpareOverUnder$copy"} . ")\n"
+    print "       TempSpareOverUnder$copy (" . $$wptr{"TempSpareOverUnder$copy"} . ")\n"
       if $debug;
     print "       HumidSpare$copy     (" . $$wptr{"HumidSpare$copy"} . ")\n"
       if $debug;
-    print "       DewSpare$copy       ("
-      . $$wptr{"DewSpare$copy"}
-      . " $main::config_parms{weather_uom_temp})\n"
+    print "       DewSpare$copy       (" . $$wptr{"DewSpare$copy"} . " $main::config_parms{weather_uom_temp})\n"
       if $debug;
     print "       DewSpareUnder$copy  (" . $$wptr{"DewSpareUnder$copy"} . ")\n"
       if $debug;
@@ -688,8 +643,7 @@ sub wx_seq {
     my ( $wptr, $debug, @data ) = @_;
 
     $$wptr{BatMain} = ( ( $data[3] & 0x80 ) >> 7 ) ? 0 : 1;
-    $$wptr{MinuteMain} =
-      sprintf( "%u%u", ( $data[3] & 0x70 ) >> 4, $data[3] & 0x0F )
+    $$wptr{MinuteMain} = sprintf( "%u%u", ( $data[3] & 0x70 ) >> 4, $data[3] & 0x0F )
       if $debug;
 
     print "** MAIN UNIT - MINUTE : $main::Time_Date\n"    if $debug;
diff --git a/lib/Weather_wx200.pm b/lib/Weather_wx200.pm
index aef882056..04d0ef36a 100644
--- a/lib/Weather_wx200.pm
+++ b/lib/Weather_wx200.pm
@@ -98,8 +98,7 @@ sub read_wx200 {
         }
         $checksum2 &= 0xff;    # Checksum is lower 8 bits of the sum
         if ( $checksum1 != $checksum2 ) {
-            print
-              "Warning, bad wx200 type=$$dtp[0] checksum: cs1=$checksum1 cs2=$checksum2\n";
+            print "Warning, bad wx200 type=$$dtp[0] checksum: cs1=$checksum1 cs2=$checksum2\n";
             next;
         }
 
@@ -187,8 +186,7 @@ sub wx_baro {
           DewOutdoor
         );
     }
-    print
-      "baro = $$wptr{Barom}, $$wptr{BaromSea} dew=$$wptr{DewIndoor}, $$wptr{DewOutdoor}\n"
+    print "baro = $$wptr{Barom}, $$wptr{BaromSea} dew=$$wptr{DewIndoor}, $$wptr{DewOutdoor}\n"
       if $debug;
 
     #   $wx_counts{baro}++;
@@ -213,8 +211,7 @@ sub wx_rain {
       unless $skip{RainTotal};
 
     if ( $main::config_parms{weather_uom_rain} eq 'in' ) {
-        grep { $$wptr{$_} = &::convert_mm2in( $$wptr{$_} ) unless $skip{$_}; }
-          qw(
+        grep { $$wptr{$_} = &::convert_mm2in( $$wptr{$_} ) unless $skip{$_}; } qw(
           RainRate
           RainYest
           RainTotal
@@ -224,8 +221,7 @@ sub wx_rain {
       if $debug;
 
     $$wptr{SummaryRain} =
-      sprintf( "Rain Recent/Total: %3.1f / %4.1f  Barom: %4d",
-        $$wptr{RainYest}, $$wptr{RainTotal}, $$wptr{Barom} );
+      sprintf( "Rain Recent/Total: %3.1f / %4.1f  Barom: %4d", $$wptr{RainYest}, $$wptr{RainTotal}, $$wptr{Barom} );
 
     #   print "rain=@data\n";
     #   $wx_counts{rain}++;
@@ -259,21 +255,18 @@ sub wx_wind {
     #    }
 
     if ( $main::config_parms{weather_uom_wind} eq 'mph' ) {
-        grep { $$wptr{$_} = &::convert_mps2mph( $$wptr{$_} ) unless $skip{$_}; }
-          qw(
+        grep { $$wptr{$_} = &::convert_mps2mph( $$wptr{$_} ) unless $skip{$_}; } qw(
           WindAvgSpeed
           WindGustSpeed
         );
     }
     if ( $main::config_parms{weather_uom_wind} eq 'kph' ) {
-        grep { $$wptr{$_} = &::convert_mps2kph( $$wptr{$_} ) unless $skip{$_}; }
-          qw(
+        grep { $$wptr{$_} = &::convert_mps2kph( $$wptr{$_} ) unless $skip{$_}; } qw(
           WindAvgSpeed
           WindGustSpeed
         );
     }
-    print
-      "wind = $$wptr{WindGustSpeed}, $$wptr{WindAvgSpeed}, $$wptr{WindGustDir}, $$wptr{WindAvgDir}\n"
+    print "wind = $$wptr{WindGustSpeed}, $$wptr{WindAvgSpeed}, $$wptr{WindGustDir}, $$wptr{WindAvgDir}\n"
       if $debug;
 
     #   print "wind=@data\n";
diff --git a/lib/WebServices.pm b/lib/WebServices.pm
index 034110ac3..60f7f1a1a 100644
--- a/lib/WebServices.pm
+++ b/lib/WebServices.pm
@@ -57,8 +57,7 @@ sub SetItemState {
     $item =~ s/\$//;
     $item = '$main::' . $item;
 
-    my $eval_cmd =
-      qq[($item and ref($item) ne '' and ref($item) ne 'SCALAR' and $item->can('set')) ?
+    my $eval_cmd = qq[($item and ref($item) ne '' and ref($item) ne 'SCALAR' and $item->can('set')) ?
 		           ($item->set("$state", 'SOAP')) : ($item = "$state")];
 
     eval $eval_cmd;
diff --git a/lib/Weeder_Light.pm b/lib/Weeder_Light.pm
index 3674aba5c..1c852c5df 100644
--- a/lib/Weeder_Light.pm
+++ b/lib/Weeder_Light.pm
@@ -77,8 +77,7 @@ sub new {
     push( @{ $$self{states} }, 'on', 'off' );
 
     unless ( $#weeder_lights > 0 ) {
-        &::MainLoop_post_add_hook( \&Weeder_Light::_check_states,
-            'persistent' );
+        &::MainLoop_post_add_hook( \&Weeder_Light::_check_states, 'persistent' );
     }
     return $self;
 }
@@ -112,15 +111,13 @@ sub _check_state {
 
 sub setstate_off {
     my ( $self, $substate ) = @_;
-    main::print_log(
-        "Weeder_Light: setstate_off, curr_state=" . $self->{'detect'}->state );
+    main::print_log( "Weeder_Light: setstate_off, curr_state=" . $self->{'detect'}->state );
     if ( $self->{'detect'}->state ne main::OFF ) {
         main::print_log("Weeder_Light: turning light off");
         $self->{'toggle'}->set('press');
         my $timer = new Timer;
         set $timer 5, sub {
-            main::print_log(
-                "Weeder_Light: executing timer to check light status");
+            main::print_log("Weeder_Light: executing timer to check light status");
             $self->{'control'}->set('status');
         };
     }
@@ -128,15 +125,13 @@ sub setstate_off {
 
 sub setstate_on {
     my ( $self, $substate ) = @_;
-    main::print_log(
-        "Weeder_Light: setstate_on, curr_state=" . $self->{'detect'}->state );
+    main::print_log( "Weeder_Light: setstate_on, curr_state=" . $self->{'detect'}->state );
     if ( $self->{'detect'}->state ne main::ON ) {
         main::print_log("Weeder_Light: turning light on");
         $self->{'toggle'}->set('press');
         my $timer = new Timer;
         set $timer 5, sub {
-            main::print_log(
-                "Weeder_Light: executing timer to check light status");
+            main::print_log("Weeder_Light: executing timer to check light status");
             $self->{'control'}->set('status');
         };
     }
diff --git a/lib/X10_BX24.pm b/lib/X10_BX24.pm
index 4822d7254..3b163ae6e 100644
--- a/lib/X10_BX24.pm
+++ b/lib/X10_BX24.pm
@@ -157,8 +157,7 @@ package X10_BX24;
 @X10_BX24::ISA = ('Generic_Item');
 
 sub startup {
-    &main::serial_port_create( 'BX24', $main::config_parms{BX24_port},
-        19200, 'none', 'raw' );
+    &main::serial_port_create( 'BX24', $main::config_parms{BX24_port}, 19200, 'none', 'raw' );
 
     # Add hook only if serial port was created ok
     &::MainLoop_pre_add_hook( \&X10_BX24::check_for_data, 1 )
@@ -192,8 +191,7 @@ sub Stanley {
       if $main::config_parms{debug} eq 'BX24';
     if ( $StanleyCode !~ /^23/ ) {
 
-        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-            "BX24 Stanley Code Invalid ->  $StanleyCode" );
+        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "BX24 Stanley Code Invalid ->  $StanleyCode" );
         return 1;
     }
     my $PackLine = "H" . length($StanleyCode);
@@ -249,8 +247,7 @@ sub SendX10 {
     if ( scalar(@_) != 1 ) {
         &main::print_log("X10_BX24.pm: call to CM11a Invalid parameter [@_]")
           if $main::config_parms{debug} eq 'BX24';
-        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-            "BX24 call to CM11a Invalid parameter [@_]" );
+        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "BX24 call to CM11a Invalid parameter [@_]" );
         return;
     }
 
@@ -271,8 +268,7 @@ sub SendX10 {
     if ( uc($House) !~ /[A-P]/ ) {
         &main::print_log("X10_BX24.pm: invalid house code [$House]")
           if $main::config_parms{debug} eq 'BX24';
-        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-            "BX24 invalid house code [$House]" );
+        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "BX24 invalid house code [$House]" );
         $prev_X10 = '';
         return;
     }
@@ -292,9 +288,8 @@ sub SendX10 {
     }
     elsif ( $X10Type =~ /[JKLM\-\+\&]/ ) {
         if ( $prev_X10 eq '' ) {
-            &main::print_log(
-                "X10_BX24.pm: invalid CM11a command, no housecode defined  [@_]"
-            ) if $main::config_parms{debug} eq 'BX24';
+            &main::print_log( "X10_BX24.pm: invalid CM11a command, no housecode defined  [@_]" )
+              if $main::config_parms{debug} eq 'BX24';
             &::logit(
                 "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
                 "BX24 invalid CM11a command, no housecode defined  [@_]"
@@ -331,24 +326,21 @@ sub SendX10 {
             $Cmd = $prev_X10 . "D40";
         }
 
-        &main::print_log(
-            "X10_BX24.pm: SendX10 Complete X10 command received [$Cmd]")
+        &main::print_log("X10_BX24.pm: SendX10 Complete X10 command received [$Cmd]")
           if $main::config_parms{debug} eq 'BX24';
         $prev_X10 = '';
     }
     else {
         &main::print_log("X10_BX24.pm: Invalid CM11a command [@_]")
           if $main::config_parms{debug} eq 'BX24';
-        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-            "BX24 invalid CM11a command [@_]" );
+        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "BX24 invalid CM11a command [@_]" );
         $prev_X10 = '';
         return;
     }
 
     &main::print_log("X10_BX24.pm: Sending CM11a command [$Cmd]")
       if $main::config_parms{debug} eq 'BX24';
-    &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-        "BX24 Sending CM11a command [$Cmd]" );
+    &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "BX24 Sending CM11a command [$Cmd]" );
     $main::Serial_Ports{BX24}{object}->write("$Cmd");
 
     return;
@@ -456,16 +448,15 @@ sub check_for_data {
 
             &main::print_log("X10_BX24.pm: Keeping RX Unit [$prev_rx]")
               if $main::config_parms{debug} eq 'BX24';
-            return;    # we need to wait for action before processing
+            return;                  # we need to wait for action before processing
         }
         else {
-            if ( $prev_rx eq '' ) {  # it's a bright/dim, never rcv unit command
+            if ( $prev_rx eq '' ) {    # it's a bright/dim, never rcv unit command
                 $RX[1] = join( ' ', @RX );    # we rcv bright, keep housecode
             }
-            $data = "($prev_rx $RX[1] )"; # this will reproduce a similar RF cmd
+            $data = "($prev_rx $RX[1] )";     # this will reproduce a similar RF cmd
 
-            &main::print_log(
-                "X10_BX24.pm: Receive RX action [ $prev_rx $RX[1] ]")
+            &main::print_log("X10_BX24.pm: Receive RX action [ $prev_rx $RX[1] ]")
               if $main::config_parms{debug} eq 'BX24';
             $prev_rx = '';
         }
@@ -514,8 +505,7 @@ sub check_for_data {
         elsif ( $X10BX24 =~ /All Lights On/ ) {
             $X10Code = "X${House}O";
         }
-        elsif ( $X10BX24 =~ /All Units Off/ )
-        {    # sound like the On and Off message are different
+        elsif ( $X10BX24 =~ /All Units Off/ ) {    # sound like the On and Off message are different
             $X10Code = "X${House}P";
         }
         else {
@@ -523,7 +513,7 @@ sub check_for_data {
         }
 
         &main::process_serial_data($X10Code)
-          if $X10Code;   # This will act like the CM11a and declare a X10 action
+          if $X10Code;                             # This will act like the CM11a and declare a X10 action
         &main::print_log("BX24 Code: $X10BX24   X10 Code:$X10Code")
           if $main::config_parms{debug} eq 'BX24';
 
@@ -558,23 +548,19 @@ sub check_for_data {
                 my $CurrentStatus = "unknown";
 
                 # 00 and 04 is an open state (X10 Door/Window sensor)
-                $CurrentStatus =
-                  ( $StatusNum[0] eq '0' ) ? "open" : $CurrentStatus;
+                $CurrentStatus = ( $StatusNum[0] eq '0' ) ? "open" : $CurrentStatus;
 
                 # 80 and 84 is a close state (X10 Door/Window sensor)
-                $CurrentStatus =
-                  ( $StatusNum[0] eq '8' ) ? "close" : $CurrentStatus;
+                $CurrentStatus = ( $StatusNum[0] eq '8' ) ? "close" : $CurrentStatus;
                 if ( $CurrentStatus eq "unknown" ) {
-                    ::print_log
-                      "X10_BX24.pm: The security sensor $SensorName has an unknown status of [$Status_ID]";
+                    ::print_log "X10_BX24.pm: The security sensor $SensorName has an unknown status of [$Status_ID]";
                     ::logit(
                         "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
                         "$SensorName received unknown code [$data] from BX24"
                     );
                     return;
                 }
-                ::print_log
-                  "X10_BX24.pm: The security sensor $SensorName is now $CurrentStatus"
+                ::print_log "X10_BX24.pm: The security sensor $SensorName is now $CurrentStatus"
                   if $main::config_parms{debug} eq 'BX24';
                 $obj->set($CurrentStatus);
                 return;
@@ -582,8 +568,7 @@ sub check_for_data {
         }
 
         &main::print_log("Bad data [$TimeNow] [$data] received from BX24");
-        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log",
-            "Unknown data [$data] received from BX24" );
+        &::logit( "$::config_parms{data_dir}/logs/BX24.$::Year_Month_Now.log", "Unknown data [$data] received from BX24" );
 
     }
 
diff --git a/lib/X10_CMxx.pm b/lib/X10_CMxx.pm
index a53606925..b1aea35d7 100644
--- a/lib/X10_CMxx.pm
+++ b/lib/X10_CMxx.pm
@@ -76,9 +76,7 @@ sub startup {
         return;
     }
     if ( not open_fifo() ) {
-        &::print_log(
-            ">>>>> CMxx: still can't open fifo $fifo: $!. Will try again later <<<<<<"
-        );
+        &::print_log( ">>>>> CMxx: still can't open fifo $fifo: $!. Will try again later <<<<<<" );
         sleep 5;
     }
     else {
@@ -99,12 +97,9 @@ sub check_for_data {
     my $rv;
 
     if ( not $fifo_opened and &::new_minute() ) {
-        &::print_log(
-            ">>>>> CMxx: has not yet opened $fifo. Trying again now <<<<<<");
+        &::print_log(">>>>> CMxx: has not yet opened $fifo. Trying again now <<<<<<");
         if ( not open_fifo() ) {
-            &::print_log(
-                ">>>>> CMxx: still can't open fifo $fifo: $!. Will try again later <<<<<<"
-            );
+            &::print_log( ">>>>> CMxx: still can't open fifo $fifo: $!. Will try again later <<<<<<" );
         }
         else {
             $fifo_opened = 1;
@@ -146,9 +141,7 @@ sub check_for_data {
 
             # Unknown data isn't bad, it should just be recognized if it's valid data with a different
             # prefix, or ignored otherwise.
-            warn(
-                "Received $line from mochad, but does not start with known '5D 20/29', please fix me"
-            );
+            warn( "Received $line from mochad, but does not start with known '5D 20/29', please fix me" );
             next;
         }
         my $data = $line;
@@ -156,9 +149,8 @@ sub check_for_data {
         # Data gets sent multiple times
         #  - Check time
         #  - Process data only on the 2nd occurance, to avoid noise (seems essential)
-        my $duplicate_threshold =
-          1;    # 2nd occurance; set to 0 to omit duplicate check
-        my $duplicate_count = duplicate_count($data);
+        my $duplicate_threshold = 1;                        # 2nd occurance; set to 0 to omit duplicate check
+        my $duplicate_count     = duplicate_count($data);
         if ( $duplicate_count == $duplicate_threshold ) {
             my @bytes;
             my $byteidx = 0;
@@ -183,14 +175,12 @@ sub check_for_data {
         elsif ( $duplicate_count == 0 ) {
 
             # Ignore the first send so that we can filter RF noise by confirming 2 identical frames in a row.
-            &::print_log(
-                "CMxx: Ignoring first send of X10RF data from mochad (looking for confirmation resend): $line"
-            ) if $main::Debug{cmxx};
+            &::print_log( "CMxx: Ignoring first send of X10RF data from mochad (looking for confirmation resend): $line" )
+              if $main::Debug{cmxx};
         }
         else {
-            &::print_log(
-                "CMxx: Ignoring duplicate X10RF data from mochad (dupe cnt >= $duplicate_count): $line"
-            ) if $main::Debug{cmxx};
+            &::print_log( "CMxx: Ignoring duplicate X10RF data from mochad (dupe cnt >= $duplicate_count): $line" )
+              if $main::Debug{cmxx};
         }
     }
 }
@@ -206,9 +196,8 @@ sub duplicate_count {
         # most recent messages are always first in the queue
         for my $msg_ptr (@msg_buffer) {
             my %msg = %$msg_ptr;
-            if ( &X10_CMxx::is_within_timeout( $time, $msg{time}, $repeat_time )
-              )
-            {
+            if ( &X10_CMxx::is_within_timeout( $time, $msg{time}, $repeat_time ) ) {
+
                 # a match exists on the data; so, compare against the time stamp
                 if ( $raw_msg eq $msg{data} ) {
 
diff --git a/lib/X10_Interface.pm b/lib/X10_Interface.pm
index aa9a2187c..b39b181c9 100644
--- a/lib/X10_Interface.pm
+++ b/lib/X10_Interface.pm
@@ -28,10 +28,7 @@ sub check_for_x10_interface {
 
     return if not defined $self->{interface};
 
-    if (
-        grep ( { lc( $self->{interface} ) eq lc($_); } @X10_Interface_Names ) >
-        0 )
-    {
+    if ( grep ( { lc( $self->{interface} ) eq lc($_); } @X10_Interface_Names ) > 0 ) {
         my $interface = $self->{interface};
         $self->{X10Interface} = 1;
     }
@@ -105,7 +102,7 @@ sub processData {
             or    # extended direct dim cmd
             $data =~ /^([A-P]Z\S*)/
             or    # Extended Code cmd with arbitrary extended bytes
-            $data =~ /^([A-P]\d+\%)(\S*)/ or   # these are converted to &P above
+            $data =~ /^([A-P]\d+\%)(\S*)/ or    # these are converted to &P above
             $data =~ /^([A-P][\+\-]?\d+)(\S*)/
           )
         {
@@ -117,7 +114,7 @@ sub processData {
 
             $self->send_x10_data( $interface, 'X' . $chunk, $self->{type} );
 
-            &send_x10_data_hooks($chunk);      # Created by &add_hooks
+            &send_x10_data_hooks($chunk);       # Created by &add_hooks
 
         }
         else {
@@ -147,8 +144,7 @@ sub set_prev_pass_check {
     {
 
         my $item_name = $self->{object_name};
-        print
-          "X10 item set skipped on consecutive pass.  item=$item_name state= $state id=$state\n";
+        print "X10 item set skipped on consecutive pass.  item=$item_name state= $state id=$state\n";
         return 1;
     }
     return 0;
diff --git a/lib/X10_Items.pm b/lib/X10_Items.pm
index c9b194ba9..1766ba8cc 100644
--- a/lib/X10_Items.pm
+++ b/lib/X10_Items.pm
@@ -183,19 +183,16 @@ sub new {
             $self->add( $id . $hc . 'STATUS',                    'status' );
             $self->add( $id . $hc . 'STATUS_ON',                 'status on' );
             $self->add( $id . $hc . 'STATUS_OFF',                'status off' );
-            $self->add( $id,                                     'manual' )
-              ; # Used in Group.pm.  This is what we get with a manual kepress, with on ON/OFF after it
+            $self->add( $id, 'manual' );    # Used in Group.pm.  This is what we get with a manual kepress, with on ON/OFF after it
 
             if ( $self->{type} and $self->{type} =~ /(preset3)/i ) {
-                my @preset_dim_levels =
-                  qw(M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J);
+                my @preset_dim_levels = qw(M  N  O  P  C  D  A  B  E  F  G  H  K  L  I  J);
 
                 # 0% is MPRESET_DIM1
                 $self->add( $id . $preset_dim_levels[0] . 'PRESET_DIM1', "0%" );
 
                 # 100% is JPRESET_DIM2
-                $self->add( $id . $preset_dim_levels[15] . 'PRESET_DIM2',
-                    "100%" );
+                $self->add( $id . $preset_dim_levels[15] . 'PRESET_DIM2', "100%" );
 
                 # 30 levels, 1% to 99%
                 for ( my $percent = 1; $percent <= 99; $percent++ ) {
@@ -222,8 +219,7 @@ sub add {
     #print "self not defined\n" if not defined $self;
     #print "interface not defined\n" if $self and not defined $self->{interface};
 
-    if ( $$self{interface}->isa('Insteon_PLM')
-      )    # not sure if this is ever needed
+    if ( $$self{interface}->isa('Insteon_PLM') )    # not sure if this is ever needed
     {
         $self->{interface}->add_id_state( $id, $state );
     }
@@ -243,29 +239,25 @@ sub set_interface {
     # possible interface modules until we find one that will work with it
     if ($interface) {
         if ( X10_Interface->supports($interface) ) {
-            print
-              "[X10] for id $id, x10 interface supplied ($interface) and supported by X10_Interface\n"
+            print "[X10] for id $id, x10 interface supplied ($interface) and supported by X10_Interface\n"
               if $localDebug;
             $self->{interface} = new X10_Interface( undef, undef, $interface );
         }
         elsif ( Serial_Item->supports($interface) ) {
-            print
-              "[X10] for id $id, x10 interface supplied ($interface) and supported by Serial_Item\n"
+            print "[X10] for id $id, x10 interface supplied ($interface) and supported by Serial_Item\n"
               if $localDebug;
             $self->{interface} = new Serial_Item( undef, undef, $interface );
         }
         elsif ( defined $interface_object
             and $interface_object->isa('Insteon_PLM') )
         {
-            print
-              "[X10] for id $id, x10 interface supplied ($interface) and supported by an Insteon PLM\n"
+            print "[X10] for id $id, x10 interface supplied ($interface) and supported by an Insteon PLM\n"
               if $localDebug;
             $self->{interface} = $interface_object;
         }
         else {
             # we can't find a real interface, so use a Dummy_Interface
-            print
-              "[X10] warning, using dummy interface for id $id and supplied interface $interface\n"
+            print "[X10] warning, using dummy interface for id $id and supplied interface $interface\n"
               if $localDebug;
             $self->{interface} = new Dummy_Interface( $id, undef, $interface );
         }
@@ -273,14 +265,12 @@ sub set_interface {
     else {
         # an interface wasn't specified, we'll use the first one that we find
         if ( $interface = X10_Interface->lookup_interface ) {
-            print
-              "[X10] for id $id, x10 interface not supplied, supported by X10_Interface $interface\n"
+            print "[X10] for id $id, x10 interface not supplied, supported by X10_Interface $interface\n"
               if $localDebug;
             $self->{interface} = new X10_Interface( undef, undef, $interface );
         }
         elsif ( $interface = Serial_Item->lookup_interface ) {
-            print
-              "[X10] for id $id, x10 interface not supplied, supported by Serial_Item $interface\n"
+            print "[X10] for id $id, x10 interface not supplied, supported by Serial_Item $interface\n"
               if $localDebug;
             $self->{interface} = new Serial_Item( undef, undef, $interface );
         }
@@ -368,9 +358,7 @@ sub set {
         else {
             $state = 'on';
         }
-        &main::print_log(
-            "[X10] Toggling X10_Item object $self->{object_name} from $$self{state} to $state"
-        ) if $main::Debug{x10};
+        &main::print_log( "[X10] Toggling X10_Item object $self->{object_name} from $$self{state} to $state" ) if $main::Debug{x10};
     }
 
     # Make sure we do the right thing if light was off
@@ -401,8 +389,7 @@ sub set {
 
         # Round of to nearest 5 for dumb modules, since Serial Item rounds by 5
         $level_diff = 5 * int $level_diff / 5 unless $presetable;
-        &main::print_log(
-            "[X10] Changing light by $level_diff ($level_now * $change%)")
+        &main::print_log("[X10] Changing light by $level_diff ($level_now * $change%)")
           if $main::config_parms{x10_errata} >= 3;
         $state = $level_diff;
     }
@@ -416,21 +403,19 @@ sub set {
 
         # Round of to nearest 5 for dumb modules, since Serial Item rounds by 5
         $level_diff = 5 * int $level_diff / 5;
-        &main::print_log(
-            "[X10] Changing light by $level_diff ($level - $level_now)")
+        &main::print_log("[X10] Changing light by $level_diff ($level - $level_now)")
           if $main::config_parms{x10_errata} >= 3;
         $state = $level_diff;
     }
 
     $state = "+$state"
-      if $state =~ /^\d+$/; # In case someone trys a state of 30 instead of +30.
+      if $state =~ /^\d+$/;    # In case someone trys a state of 30 instead of +30.
 
     # Convert relative dims to direct dims for supported devices
     if ( $presetable and $state =~ /^([\+\-]?)(\d+)$/ ) {
         my $level = $$self{level};
         $level = 100
-          unless
-          defined $level;    # bright and dim from on or off will start at 100%
+          unless defined $level;    # bright and dim from on or off will start at 100%
         $level += $state;
         $level = 0   if $level < 0;
         $level = 100 if $level > 100;
@@ -784,8 +769,7 @@ sub new {
 
     $self->set_interface( $interface, $id );
 
-    print
-      "\n\nWarning: X10_Garage_Door object should not specify unit code; ignored\n\n"
+    print "\n\nWarning: X10_Garage_Door object should not specify unit code; ignored\n\n"
       if length($id) > 1;
     my $hc = substr( $id, 0, 1 );
     $id = "X$hc" . 'Z';
@@ -799,8 +783,7 @@ sub new {
     # "d" is door that caused transmission, numeric 1, 2, or 3
     # "ccc" is C=Closed, O=Open, indexed by door #
 
-    $self->add( $id . '00001d', '0000CCC' )
-      ;    # Only on initial power up of receiver; no doors enrolled.
+    $self->add( $id . '00001d', '0000CCC' );    # Only on initial power up of receiver; no doors enrolled.
 
     $self->add( $id . '01101d', '1001CCC' );
     $self->add( $id . '01111d', '1001OCC' );
@@ -1058,8 +1041,7 @@ sub new {
     $self->add( "X" . $hc . "F" . $hc . 'K', '15-off' );
     $self->add( "X" . $hc . "G" . $hc . 'K', '16-off' );
 
-    $self->{zone_runtimes} =
-      [ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 ];
+    $self->{zone_runtimes} = [ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 ];
     $self->{zone_runcount} = 0;
     $self->{zone_runnning} = 0;
     $self->{zone_delay}    = 10;
@@ -1073,15 +1055,13 @@ sub set_runtimes {
     my $count = @_;
 
     if ( &Timer::active( $self->{timer} ) ) {
-        print
-          "X10_IrrigationController: skipping set_runtimes because of running timer\n"
+        print "X10_IrrigationController: skipping set_runtimes because of running timer\n"
           if $main::Debug{x10};
         return;
     }
 
     if ( $count < 1 ) {
-        print
-          "X10_IrrigationController: set_runtimes called without data, ignoring\n";
+        print "X10_IrrigationController: set_runtimes called without data, ignoring\n";
     }
     else {
         $self->{zone_runtimes} = [@_];
@@ -1095,15 +1075,13 @@ sub set_rundelay {
     my ( $self, $rundelay ) = @_;
 
     if ( &Timer::active( $self->{timer} ) ) {
-        print
-          "X10_IrrigationController: skipping set_rundelay because of running timer\n"
+        print "X10_IrrigationController: skipping set_rundelay because of running timer\n"
           if $main::Debug{x10};
         return;
     }
 
     if ( $rundelay < 1 ) {
-        print
-          "X10_IrrigationController: set_rundelay called without data, ignoring\n";
+        print "X10_IrrigationController: set_rundelay called without data, ignoring\n";
     }
     else {
         $self->{zone_delay} = $rundelay;
@@ -1119,14 +1097,11 @@ sub set {
         $state = $1;
 
         if ( &Timer::active( $self->{timer} ) ) {
-            print
-              "X10_IrrigationController: skipping set_runtimes because of running timer\n"
+            print "X10_IrrigationController: skipping set_runtimes because of running timer\n"
               if $main::Debug{x10};
         }
         else {
-            print
-              "X10_IrrigationController set with times found: state=$1 times=$2\n"
-              ;    # if $main::Debug{x10};
+            print "X10_IrrigationController set with times found: state=$1 times=$2\n";    # if $main::Debug{x10};
             return if &main::check_for_tied_filters( $self, $state );
 
             my @runtimes = split ',', $2;
@@ -1139,8 +1114,7 @@ sub set {
 
     if ( lc($state) eq 'on' ) {
         if ( &Timer::active( $self->{timer} ) ) {
-            print
-              "X10_IrrigationController: skipping zone cascade because of running timer.\n"
+            print "X10_IrrigationController: skipping zone cascade because of running timer.\n"
               if $main::Debug{x10};
             return;
         }
@@ -1175,8 +1149,7 @@ sub all_zones_off {
         if (    $self->{zone_running} > 0
             and $self->{zone_running} <= $self->{zone_runcount} )
         {
-            $self->X10_IrrigationController::Inherit::set(
-                $self->{zone_running} . '-off' );
+            $self->X10_IrrigationController::Inherit::set( $self->{zone_running} . '-off' );
         }
     }
 
@@ -1224,10 +1197,9 @@ sub zone_cascade {
         # Set a timer to turn it off and turn the next zone on
         my $sprinkler_timer = $self->{timer};
         my $object          = $self->{object_name};
-        my $action = "$object->zone_delay($zone," . $runtime * 60 . ")";
+        my $action          = "$object->zone_delay($zone," . $runtime * 60 . ")";
         &Timer::set( $sprinkler_timer, $self->{zone_delay}, $action );
-        print
-          "X10_IrrigationController: Delaying zone $zone start for $self->{zone_delay} seconds\n"
+        print "X10_IrrigationController: Delaying zone $zone start for $self->{zone_delay} seconds\n"
           if $main::Debug{x10};
     }
     else {
@@ -1249,9 +1221,7 @@ sub zone_delay {
     my $action          = "$object->zone_cascade(" . ( $zone + 1 ) . ")";
     &Timer::set( $sprinkler_timer, $runtime, $action );
     $self->{zone_running} = $zone;
-    print "X10_IrrigationController: Running zone $zone for "
-      . ( $runtime / 60 )
-      . " minute(s)\n"
+    print "X10_IrrigationController: Running zone $zone for " . ( $runtime / 60 ) . " minute(s)\n"
       if $main::Debug{x10};
     return;
 }
@@ -1320,22 +1290,13 @@ sub new {
 
     # The following states are used by X10_Scene and avoid the set sequencing required by the above states
     # As a result, they are likely more safe and should be used in preference
-    $self->add( ( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'OGPGNGMGMG' ),
-        'set ramp rate' );
-    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'PGNGMGOGMG',
-        'set on level' );
+    $self->add( ( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'OGPGNGMGMG' ), 'set ramp rate' );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'PGNGMGOGMG', 'set on level' );
 
     #    $self-> add ('XOGNGMGPGMG' . substr($id, 1) . substr($id, 1, 1) . 'J' . 'MGNGOGPG',   'add to scene');
     $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'MGNGOGPG', 'add to scene' );
-    $self->add(
-        'XOGNGMGPGMG'
-          . substr( $id, 1 )
-          . substr( $id, 1, 1 ) . 'J'
-          . 'OGPGMGNG',
-        'remove from scene'
-    );
-    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'NGOGPGMG',
-        'set scene ramp rate' );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . substr( $id, 1, 1 ) . 'J' . 'OGPGMGNG', 'remove from scene' );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . 'NGOGPGMG', 'set scene ramp rate' );
     $self->add(
         'X'
           . substr( $id, 1 )
@@ -1401,20 +1362,8 @@ sub new {
     my ( $class, $id, $interface, $type ) = @_;
     my $self = &X10_Switchlinc::new( $class, $id, $interface, $type );
 
-    $self->add(
-        'XOGNGMGPGMG'
-          . substr( $id, 1 )
-          . substr( $id, 1, 1 ) . 'J'
-          . 'PGOGMGNGOG',
-        'lamp mode'
-    );
-    $self->add(
-        'XOGNGMGPGMG'
-          . substr( $id, 1 )
-          . substr( $id, 1, 1 ) . 'J'
-          . 'PGNGOGMGOG',
-        'appliance mode'
-    );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . substr( $id, 1, 1 ) . 'J' . 'PGOGMGNGOG', 'lamp mode' );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . substr( $id, 1, 1 ) . 'J' . 'PGNGOGMGOG', 'appliance mode' );
 
     return $self;
 }
@@ -1442,20 +1391,8 @@ sub new {
     $self->{x10_id}              = $id;
     $self->{interface}->{x10_id} = $id;
 
-    $self->add(
-        'XOGNGMGPGMG'
-          . substr( $id, 1 )
-          . substr( $id, 1, 1 ) . 'J'
-          . 'MGNGOGPG',
-        'add to scene'
-    );
-    $self->add(
-        'XOGNGMGPGMG'
-          . substr( $id, 1 )
-          . substr( $id, 1, 1 ) . 'J'
-          . 'OGPGMGNG',
-        'remove from scene'
-    );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . substr( $id, 1, 1 ) . 'J' . 'MGNGOGPG', 'add to scene' );
+    $self->add( 'XOGNGMGPGMG' . substr( $id, 1 ) . substr( $id, 1, 1 ) . 'J' . 'OGPGMGNG', 'remove from scene' );
     $self->add(
         'X'
           . substr( $id, 1 )
@@ -1598,24 +1535,22 @@ sub new {
     $id                          = "X$id";
     $self->{x10_id}              = $id;
     $self->{interface}->{x10_id} = $id;
-    $self->add( $id . $hc . 'J',                           'eco' );
-    $self->add( $id . $hc . 'K',                           'normal' );
-    $self->add( $id . $hc . 'J' . $hc . '+5',              'plus' );
-    $self->add( $id . $hc . 'J' . $hc . '-5',              'moins' );
-    $self->add( $id . $hc . 'J' . $hc . '+5' . $hc . '+5', 'plus2' );
-    $self->add( $id . $hc . 'J' . $hc . '-5' . $hc . '-5', 'moins2' );
-    $self->add( $id . $hc . 'J' . $hc . '+5' . $hc . '+5' . $hc . 'L',
-        'plus3' );
-    $self->add( $id . $hc . 'J' . $hc . '-5' . $hc . '-5' . $hc . 'M',
-        'moins3' );
-    $self->add( $id . $hc . 'J',  'off' );
-    $self->add( $id . $hc . 'K',  'on' );
-    $self->add( $id . $hc . '+5', 'brighten' );
-    $self->add( $id . $hc . '-5', 'dim' );
-    $self->add( $id . $hc . 'M',  'C+1' );
-    $self->add( $id . $hc . 'N',  'C-1' );
-    $self->add( $id . $hc . 'L',  'JN' );
-    $self->add( $id,              'manual' );
+    $self->add( $id . $hc . 'J',                                       'eco' );
+    $self->add( $id . $hc . 'K',                                       'normal' );
+    $self->add( $id . $hc . 'J' . $hc . '+5',                          'plus' );
+    $self->add( $id . $hc . 'J' . $hc . '-5',                          'moins' );
+    $self->add( $id . $hc . 'J' . $hc . '+5' . $hc . '+5',             'plus2' );
+    $self->add( $id . $hc . 'J' . $hc . '-5' . $hc . '-5',             'moins2' );
+    $self->add( $id . $hc . 'J' . $hc . '+5' . $hc . '+5' . $hc . 'L', 'plus3' );
+    $self->add( $id . $hc . 'J' . $hc . '-5' . $hc . '-5' . $hc . 'M', 'moins3' );
+    $self->add( $id . $hc . 'J',                                       'off' );
+    $self->add( $id . $hc . 'K',                                       'on' );
+    $self->add( $id . $hc . '+5',                                      'brighten' );
+    $self->add( $id . $hc . '-5',                                      'dim' );
+    $self->add( $id . $hc . 'M',                                       'C+1' );
+    $self->add( $id . $hc . 'N',                                       'C-1' );
+    $self->add( $id . $hc . 'L',                                       'JN' );
+    $self->add( $id,                                                   'manual' );
     return $self;
 }
 
@@ -1680,8 +1615,7 @@ sub new {
 ##    my ($class, $id, $name, $type) = @_;
 ##    my $self = X10_Item->new();
     my ( $class, $id, $name, $type, $interface ) = @_;
-    print
-      "[X10_Sensor] class=$class, id=$id, name=$name, interface=$interface\n"
+    print "[X10_Sensor] class=$class, id=$id, name=$name, interface=$interface\n"
       if $main::Debug{x10};
     my $self = X10_Item->new( $id, $interface, $type );
 
@@ -1714,19 +1648,16 @@ sub add {
         $id = 'X' . $id . $hc . 'J';
     }
 
-    &::print_log(
-        "[X10_Sensor] Adding X10_Sensor timer for $id, name=$name type=$type")
+    &::print_log("[X10_Sensor] Adding X10_Sensor timer for $id, name=$name type=$type")
       if $main::Debug{x10_sensor};
 
     #24 hour countdown Timer
     $self->{battery_timer} = new Timer;
     $self->{battery_timer}->set(
-        ( $main::config_parms{MS13_Battery_timer} )
-        ? $main::config_parms{MS13_Battery_timer}
+        ( $main::config_parms{MS13_Battery_timer} ) ? $main::config_parms{MS13_Battery_timer}
         : 24 * 60 * 60,
         (
-            ( $main::config_parms{MS13_Battery_action} )
-            ? $main::config_parms{MS13_Battery_action}
+            ( $main::config_parms{MS13_Battery_action} ) ? $main::config_parms{MS13_Battery_action}
             : "print_log"
           )
           . " \"rooms=all Battery timer for $name expired\"",
@@ -1793,12 +1724,10 @@ sub sensorhook {
     # must still be good, so reset the countdown timer $main::config_parms{MS13_Battery_timer} hours
     # default is 24 more hours if not specified:
     $ref->{battery_timer}->set(
-        ( $main::config_parms{MS13_Battery_timer} )
-        ? $main::config_parms{MS13_Battery_timer}
+        ( $main::config_parms{MS13_Battery_timer} ) ? $main::config_parms{MS13_Battery_timer}
         : 24 * 60 * 60,
         (
-            ( $main::config_parms{MS13_Battery_action} )
-            ? $main::config_parms{MS13_Battery_action}
+            ( $main::config_parms{MS13_Battery_action} ) ? $main::config_parms{MS13_Battery_action}
             : "print_log"
           )
           . " \"rooms=all Battery timer for $ref->{name} expired\"",
@@ -1831,9 +1760,7 @@ sub new {
     my $id           = $self->{x10_id};
     my ($house_code) = $id =~ /^X(.)/;
 
-    $self->add(
-        $id . $id . $id . $id . $id . $id . $id . $id . $house_code . 'O',
-        'attention' );
+    $self->add( $id . $id . $id . $id . $id . $id . $id . $id . $house_code . 'O', 'attention' );
 
     # 0% is MPRESET_DIM1
     $self->add( $id . $preset_dim_levels[0] . 'PRESET_DIM1', "0%" );
@@ -1944,10 +1871,9 @@ sub new {
         $unit_code = substr( $id, 2, 1 );
     }
 
-    my $unit_code_index =
-      ( $unit_code =~ /\d/ ) ? $unit_code : ord($unit_code) - 55;
+    my $unit_code_index = ( $unit_code =~ /\d/ ) ? $unit_code : ord($unit_code) - 55;
     my $offset =
-      ( int( ( $unit_code_index - 1 ) / 4 ) * 4 ) + 1;   # start of camera group
+      ( int( ( $unit_code_index - 1 ) / 4 ) * 4 ) + 1;    # start of camera group
 
     for ( 0 .. 3 ) {
         my $i = substr( $unit_codes, $_ + $offset - 1, 1 );
@@ -1973,8 +1899,7 @@ sub new {
     my ( $class, $id, $interface, $type ) = @_;
 
     if ( $id eq '' ) {
-        warn
-          'X10_6ButtonRemote You need to specify the X10 code of the first button e.g. H12';
+        warn 'X10_6ButtonRemote You need to specify the X10 code of the first button e.g. H12';
     }
 
     my $self = X10_Item->new( undef, $interface, $type );
diff --git a/lib/X10_JR21A.pm b/lib/X10_JR21A.pm
index b93511cca..013b11532 100644
--- a/lib/X10_JR21A.pm
+++ b/lib/X10_JR21A.pm
@@ -43,8 +43,7 @@ my $unit  = "1";
 sub startup {
 
     # The JR21A runs at 1200 N-8-1 DTR & RTS on
-    &main::serial_port_create( 'JR21A', $main::config_parms{JR21A_port},
-        1200, 'none', 'record' );
+    &main::serial_port_create( 'JR21A', $main::config_parms{JR21A_port}, 1200, 'none', 'record' );
 
     # Add hook only if serial port was created ok
     &::MainLoop_pre_add_hook( \&X10_JR21A::check_for_data, 1 )
@@ -61,8 +60,7 @@ sub startup {
 }
 
 # House codes A-P
-my %hcodes =
-  qw(6 A 7 B 4 C 5 D   8 E 9 F a G b H   e I f J c K d L   0 M 1 N 2 O 3 P );
+my %hcodes = qw(6 A 7 B 4 C 5 D   8 E 9 F a G b H   e I f J c K d L   0 M 1 N 2 O 3 P );
 
 # Unit codes: 1-9,A-G.  J/K => ON/OFF, O/P => All-ON/OFF L/M => bright/dim
 # Note on old keycahin remotes (HC40TX):
@@ -128,8 +126,7 @@ sub check_for_data {
         my $time = &main::get_tickcount;
         return
           if $hex eq $prev_data
-          and
-          ( $time < $prev_time + 600 or $main::Loop_Count < $prev_loop + 6 );
+          and ( $time < $prev_time + 600 or $main::Loop_Count < $prev_loop + 6 );
         $prev_data = $hex;
         $prev_time = $time;
         $prev_loop = $main::Loop_Count;
diff --git a/lib/X10_MR26.pm b/lib/X10_MR26.pm
index f7793bcd4..88851b802 100644
--- a/lib/X10_MR26.pm
+++ b/lib/X10_MR26.pm
@@ -46,8 +46,7 @@ sub startup {
     $main::config_parms{"MR26_break"} = pack( 'C', 0xad );
 
     #   &main::serial_port_create('MR26', $main::config_parms{MR26_port}, 9600, 'none', 'raw');
-    &main::serial_port_create( 'MR26', $main::config_parms{MR26_port},
-        9600, 'none' );
+    &main::serial_port_create( 'MR26', $main::config_parms{MR26_port}, 9600, 'none' );
 
     # Add hook only if serial port was created ok
     &::MainLoop_pre_add_hook( \&X10_MR26::check_for_data, 1 )
diff --git a/lib/X10_RF.pm b/lib/X10_RF.pm
index e89ca252a..e4d1e6574 100644
--- a/lib/X10_RF.pm
+++ b/lib/X10_RF.pm
@@ -126,7 +126,7 @@ sub decode_rf_bytes {
         return &rf_process_tv_remote( $module, @nbytes, @bbytes );
 
     }
-    elsif ( $lc_module ne 'mr26' ) {  # Can't receive the following with an MR26
+    elsif ( $lc_module ne 'mr26' ) {    # Can't receive the following with an MR26
 
         if ( &rf_is_security( $initial_checksum_good, @nbytes ) ) {
             &::print_log("$lc_module: this is x10 security data")
@@ -149,13 +149,11 @@ sub decode_rf_bytes {
 
     # If we made it to here, then we don't know what to do with the command.
     if ( !$initial_checksum_good ) {
-        &::print_log( "${uc_module}: bad initial checksum: "
-              . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" )
+        &::print_log( "${uc_module}: bad initial checksum: " . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" )
           if $main::Debug{$lc_module};
     }
     else {
-        &::print_log( "${uc_module}: bad checksum: "
-              . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" )
+        &::print_log( "${uc_module}: bad checksum: " . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" )
           if $main::Debug{$lc_module};
     }
 
@@ -172,11 +170,7 @@ sub rf_set_receiver {
 
     my $uc_module = uc $module;
 
-    for my $name (
-        &main::list_objects_by_type( 'X10_' . $uc_module ),
-        &main::list_objects_by_type('X10_RF_Receiver')
-      )
-    {
+    for my $name ( &main::list_objects_by_type( 'X10_' . $uc_module ), &main::list_objects_by_type('X10_RF_Receiver') ) {
 
         my $object = &main::get_object_by_name($name);
         $object->set($state);
@@ -202,8 +196,7 @@ sub rf_set_RF_Item {
             $object->set( $state, 'rf' );
             $matched = 1;
             if ( $main::Debug{$lc_module} ) {
-                &::print_log(
-                    "$item_id: " . substr( $name, 1 ) . " set $state" );
+                &::print_log( "$item_id: " . substr( $name, 1 ) . " set $state" );
             }
         }
     }
@@ -231,8 +224,7 @@ sub rf_get_RF_Item {
             my $state = $object->state;
             $matched = 1;
             if ( $main::Debug{$lc_module} ) {
-                &::print_log(
-                    "$item_id: " . substr( $name, 1 ) . " get $state" );
+                &::print_log( "$item_id: " . substr( $name, 1 ) . " get $state" );
             }
             return $state;
         }
diff --git a/lib/X10_RF_digimax.pm b/lib/X10_RF_digimax.pm
index 79ec963aa..781296121 100644
--- a/lib/X10_RF_digimax.pm
+++ b/lib/X10_RF_digimax.pm
@@ -80,8 +80,7 @@ sub rf_process_digimax210 {
     # Unlike other X-10 security devices, the Digimax's ID is 2 bytes long
     $device_id = $rbytes[0] * 256 + $rbytes[1];
 
-    if ( ( $rbytes[2] >> 4 ) == 0x00 )
-    {    # device has no set temperature (set temp always 0x00)
+    if ( ( $rbytes[2] >> 4 ) == 0x00 ) {    # device has no set temperature (set temp always 0x00)
         $state = "no set temp";
     }
     elsif ( ( $rbytes[2] >> 4 ) == 0x01 ) {    # demand for heat
@@ -94,7 +93,7 @@ sub rf_process_digimax210 {
         $state = "initialising";
     }
     else {
-        $state = "unknown";    # We should hopefully never get to here!
+        $state = "unknown";                    # We should hopefully never get to here!
     }
 
     $temperature = $rbytes[3];
@@ -107,8 +106,7 @@ sub rf_process_digimax210 {
     my $item_id = lc sprintf "%04x", $device_id;
 
     # Set the state of any items or classes associated with this device.
-    &rf_set_RF_Item( $module, "digimax210", "unmatched device 0x$item_id",
-        $item_id, undef, $state );
+    &rf_set_RF_Item( $module, "digimax210", "unmatched device 0x$item_id", $item_id, undef, $state );
 
     return $state;
 }
diff --git a/lib/X10_RF_powerline.pm b/lib/X10_RF_powerline.pm
index 17b5096fa..8e6a99f07 100644
--- a/lib/X10_RF_powerline.pm
+++ b/lib/X10_RF_powerline.pm
@@ -21,10 +21,7 @@ use X10_RF;
 #------------------------------------------------------------------------------
 
 # Map of house codes sent in RF data to normal house codes.
-my @hcodes = (
-    'M', 'E', 'C', 'K', 'O', 'G', 'A', 'I',
-    'N', 'F', 'D', 'L', 'P', 'H', 'B', 'J'
-);
+my @hcodes = ( 'M', 'E', 'C', 'K', 'O', 'G', 'A', 'I', 'N', 'F', 'D', 'L', 'P', 'H', 'B', 'J' );
 
 #------------------------------------------------------------------------------
 
@@ -103,8 +100,7 @@ sub rf_process_powerline {
         || ( ( $nbytes[0] & BIT1 ) && ( $nbytes[2] & BIT4 ) ) )
     {
 
-        &::print_log( "${uc_module}: invalid powerline data: "
-              . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" );
+        &::print_log( "${uc_module}: invalid powerline data: " . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" );
         return undef;
     }
 
@@ -131,20 +127,20 @@ sub rf_process_powerline {
         }
     }
     else {                                            # On/Off
-            # Build up the unit number.  Note that different RF
-            # transmitters use different bits for bit 2.
+                                                      # Build up the unit number.  Note that different RF
+                                                      # transmitters use different bits for bit 2.
         $un = 0;
 
         # From byte 1.
         $un = $un | BIT0 if $nbytes[0] & BIT3;
         $un = $un | BIT1 if $nbytes[0] & BIT4;
-        $un = $un | BIT2 if $nbytes[0] & BIT1;    # HR12A (normal)
+        $un = $un | BIT2 if $nbytes[0] & BIT1;        # HR12A (normal)
 
         # From byte 3.
-        $un = $un | BIT2 if $nbytes[2] & BIT4;    # RW724 (abnormal)
+        $un = $un | BIT2 if $nbytes[2] & BIT4;        # RW724 (abnormal)
         $un = $un | BIT3 if $nbytes[2] & BIT5;
 
-        $un++;                                    # Increment to make 1 based
+        $un++;                                        # Increment to make 1 based
 
         $dim_bit     = 'N/A';
         $not_all_bit = 'N/A';
@@ -153,18 +149,12 @@ sub rf_process_powerline {
     }
 
     if ( $main::Debug{$lc_module} ) {
-        &::print_log( sprintf "%s: reordered: byte 1: %s (0x%02x)",
-            $uc_module, $bbytes[0], $nbytes[0] );
-        &::print_log( sprintf "%s: reordered: byte 3: %s (0x%02x)",
-            $uc_module, $bbytes[2], $nbytes[2] );
-        &::print_log( sprintf "%s: intensity_bit = %s",
-            $uc_module, $intensity_bit ? $intensity_bit : 0 );
-        &::print_log( sprintf "%s: not_all_bit   = %s",
-            $uc_module, $not_all_bit ? $not_all_bit : 0 );
-        &::print_log( sprintf "%s: dim_bit       = %s",
-            $uc_module, $dim_bit ? $dim_bit : 0 );
-        &::print_log( sprintf "%s: off_bit       = %s",
-            $uc_module, $off_bit ? $off_bit : 0 );
+        &::print_log( sprintf "%s: reordered: byte 1: %s (0x%02x)", $uc_module, $bbytes[0], $nbytes[0] );
+        &::print_log( sprintf "%s: reordered: byte 3: %s (0x%02x)", $uc_module, $bbytes[2], $nbytes[2] );
+        &::print_log( sprintf "%s: intensity_bit = %s", $uc_module, $intensity_bit ? $intensity_bit : 0 );
+        &::print_log( sprintf "%s: not_all_bit   = %s", $uc_module, $not_all_bit   ? $not_all_bit   : 0 );
+        &::print_log( sprintf "%s: dim_bit       = %s", $uc_module, $dim_bit       ? $dim_bit       : 0 );
+        &::print_log( sprintf "%s: off_bit       = %s", $uc_module, $off_bit       ? $off_bit       : 0 );
     }
 
     # Build the state to send off for processing.
@@ -178,17 +168,12 @@ sub rf_process_powerline {
     elsif ( $cmd eq 'allon' )  { $state = "X${h}O"; }
     elsif ( $cmd eq 'alloff' ) { $state = "X${h}P"; }
     else {
-        &::print_log( "${uc_module}: unimplemented X10 command: "
-              . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" );
+        &::print_log( "${uc_module}: unimplemented X10 command: " . "$bbytes[0] $bbytes[1] $bbytes[2] $bbytes[3]" );
         return undef;
     }
 
     if ( $main::Debug{$lc_module} ) {
-        &::print_log(
-            sprintf "%s: STATE %s%s %s (%s)",
-            $uc_module, $h, ( $un == 0 ) ? '' : $un,
-            $state, $cmd
-        );
+        &::print_log( sprintf "%s: STATE %s%s %s (%s)", $uc_module, $h, ( $un == 0 ) ? '' : $un, $state, $cmd );
     }
 
     # Set states on X10_Items.
diff --git a/lib/X10_RF_rfxsensor.pm b/lib/X10_RF_rfxsensor.pm
index 94129c4b9..0e37e3898 100644
--- a/lib/X10_RF_rfxsensor.pm
+++ b/lib/X10_RF_rfxsensor.pm
@@ -51,9 +51,7 @@ sub rf_is_rfxsensor {
 
     # check parity bits here
     $found = $found
-      && ( $B3L ==
-        ( 0xf - ( ( $B0H + $B0L + $B1H + $B1L + $B2H + $B2L + $B3H ) & 0xf ) )
-      );
+      && ( $B3L == ( 0xf - ( ( $B0H + $B0L + $B1H + $B1L + $B2H + $B2L + $B3H ) & 0xf ) ) );
     return $found;
 }
 
@@ -81,52 +79,38 @@ sub rf_process_rfxsensor {
     $device_id = $rbytes[0] * 256 + $rbytes[1];
     $id        = $rbytes[0];
 
-    if ( $rbytes[3] & 0x10 )
-    {    # device has no set temperature (set temp always 0x00)
+    if ( $rbytes[3] & 0x10 ) {    # device has no set temperature (set temp always 0x00)
         use Switch;
         switch ( $rbytes[2] ) {
             case 0x01 {
-                &::print_log(
-                    "$module: rfxsensor: info: sensor addresses incremented")
+                &::print_log("$module: rfxsensor: info: sensor addresses incremented")
             }
             case 0x02 {
                 &::print_log("$module: rfxsensor: info: battery low detected")
             }
             case 0x03 {
-                &::print_log(
-                    "$module: rfxsensor: info: conversion not ready, 1 retry is done"
-                  )
+                &::print_log( "$module: rfxsensor: info: conversion not ready, 1 retry is done" )
             }
             case 0x81 {
-                &::print_log(
-                    "$module: rfxsensor: error: no 1-wire device connected")
+                &::print_log("$module: rfxsensor: error: no 1-wire device connected")
             }
             case 0x82 {
                 &::print_log("$module: rfxsensor: error: 1-Wire ROM CRC error")
             }
             case 0x83 {
-                &::print_log(
-                    "$module: rfxsensor: error: 1-Wire device connected is not a DS18B20 or DS2438"
-                  )
+                &::print_log( "$module: rfxsensor: error: 1-Wire device connected is not a DS18B20 or DS2438" )
             }
             case 0x84 {
-                &::print_log(
-                    "$module: rfxsensor: error: no end of read signal received from 1-Wire device"
-                  )
+                &::print_log( "$module: rfxsensor: error: no end of read signal received from 1-Wire device" )
             }
             case 0x85 {
-                &::print_log(
-                    "$module: rfxsensor: error: 1-Wire scratchpad CRC error")
+                &::print_log("$module: rfxsensor: error: 1-Wire scratchpad CRC error")
             }
             case 0x86 {
-                &::print_log(
-                    "$module: rfxsensor: error: temperature conversion not ready in time"
-                  )
+                &::print_log( "$module: rfxsensor: error: temperature conversion not ready in time" )
             }
             case 0x87 {
-                &::print_log(
-                    "$module: rfxsensor: error: A/D conversion not ready in time"
-                  )
+                &::print_log( "$module: rfxsensor: error: A/D conversion not ready in time" )
             }
         }
     }
@@ -146,40 +130,30 @@ sub rf_process_rfxsensor {
         # the humidity sensor so you don't get unmatched device errors
         elsif ( $id % 8 == 1 ) {
             $measurement *= 10;    # this is mVols from the A/D conversion
-            &::print_log(
-                "$module: rfxsensor: the A/D input is $measurement mVolts")
+            &::print_log("$module: rfxsensor: the A/D input is $measurement mVolts")
               if ( $main::Debug{$lc_module} );
 
             # get temperature
             my $tmp_id = $id - 1;
-            $tmp_id =
-              $tmp_id * 256 +
-              ( ( 0xf - ( $tmp_id >> 4 ) ) * 16 ) +
-              ( $tmp_id & 0xf );
+            $tmp_id = $tmp_id * 256 + ( ( 0xf - ( $tmp_id >> 4 ) ) * 16 ) + ( $tmp_id & 0xf );
             $tmp_id = lc sprintf "%04x", $tmp_id;
-            my $temperature = &rf_get_RF_Item( $module, 'rfxsensor',
-                "unmatched device $tmp_id", $tmp_id );
+            my $temperature = &rf_get_RF_Item( $module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id );
             if ( $main::config_parms{weather_uom_temp} == 'F' ) {
                 $temperature = &::convert_f2c($temperature);
             }
 
             # get supply voltage
             my $tmp_id = $id + 1;
-            $tmp_id =
-              $tmp_id * 256 +
-              ( ( 0xf - ( $tmp_id >> 4 ) ) * 16 ) +
-              ( $tmp_id & 0xf );
+            $tmp_id = $tmp_id * 256 + ( ( 0xf - ( $tmp_id >> 4 ) ) * 16 ) + ( $tmp_id & 0xf );
             $tmp_id = lc sprintf "%04x", $tmp_id;
-            my $supply_voltage = &rf_get_RF_Item( $module, 'rfxsensor',
-                "unmatched device $tmp_id", $tmp_id );
+            my $supply_voltage = &rf_get_RF_Item( $module, 'rfxsensor', "unmatched device $tmp_id", $tmp_id );
             if (    defined $temperature
                 and defined $supply_voltage
                 and $supply_voltage )
             {
                 $measurement =
                   ( ( ( $measurement / $supply_voltage ) - 0.16 ) / 0.0062 ) /
-                  ( 1.0546 - 0.00216 * $temperature )
-                  ;    # this is % relative humidity
+                  ( 1.0546 - 0.00216 * $temperature );    # this is % relative humidity
             }
             else {
                 &::print_log(
@@ -191,13 +165,13 @@ sub rf_process_rfxsensor {
 
         # and the 2nd sensor is the ds2438 supply voltage, create a dummy object even if you don't care
         elsif ( $id % 8 == 2 ) {
-            $measurement *= 10;    # this is mVols
+            $measurement *= 10;                           # this is mVols
         }
 
         # assume any other device ids are ds18b20 temperature sensors, since they are cheap
         else {
-            $measurement *= -1 if $rbytes[2] & 0x80;    # check for sign bit
-            $measurement = $measurement / 4 * .5;       # this is celcius
+            $measurement *= -1 if $rbytes[2] & 0x80;      # check for sign bit
+            $measurement = $measurement / 4 * .5;         # this is celcius
             if ( $main::config_parms{weather_uom_temp} == 'F' ) {
                 $measurement = &::convert_c2f($measurement);
             }
@@ -207,8 +181,7 @@ sub rf_process_rfxsensor {
     my $item_id = lc sprintf "%04x", $device_id;
 
     # Set the state of any items or classes associated with this device.
-    &rf_set_RF_Item( $module, 'rfxsensor', "unmatched device 0x$item_id",
-        $item_id, undef, $measurement );
+    &rf_set_RF_Item( $module, 'rfxsensor', "unmatched device 0x$item_id", $item_id, undef, $measurement );
 
     return $measurement;
 }
diff --git a/lib/X10_RF_security.pm b/lib/X10_RF_security.pm
index 9d402f8a0..f5b5e101b 100644
--- a/lib/X10_RF_security.pm
+++ b/lib/X10_RF_security.pm
@@ -85,12 +85,8 @@ sub rf_process_security {
     #   my $scode = $scodes{   unpack("H2", chr($cmd))};
     my $scode = $scodes{ lc( unpack( "H2", chr($cmd) ) ) };
     unless ( defined $scode ) {
-        &::print_log(
-            sprintf "%s: unimplemented security cmd device_id "
-              . "= 0x%02x, cmd = 0x%02x (%s %s %s %s)",
-            $uc_module, $device_id, $cmd, $bbytes[0],
-            $bbytes[1], $bbytes[2], $bbytes[3]
-        );
+        &::print_log( sprintf "%s: unimplemented security cmd device_id " . "= 0x%02x, cmd = 0x%02x (%s %s %s %s)",
+            $uc_module, $device_id, $cmd, $bbytes[0], $bbytes[1], $bbytes[2], $bbytes[3] );
         return undef;
     }
 
@@ -104,11 +100,8 @@ sub rf_process_security {
     my $item_id = lc sprintf "%02x", $device_id;
 
     if ( $main::Debug{$lc_module} ) {
-        &::print_log( sprintf "%s: security: device_id = 0x%02x, cmd = 0x%02x",
-            $uc_module, $device_id, $cmd );
-        &::print_log(
-            sprintf "%s: security: class_id = %s, "
-              . "item_id = %s, state = %s",
+        &::print_log( sprintf "%s: security: device_id = 0x%02x, cmd = 0x%02x", $uc_module, $device_id, $cmd );
+        &::print_log( sprintf "%s: security: class_id = %s, " . "item_id = %s, state = %s",
             $uc_module, $class_id, $item_id, $state );
     }
 
@@ -116,8 +109,7 @@ sub rf_process_security {
     &rf_set_receiver( $module, $state );
 
     # Set the state of any items or classes associated with this device.
-    &rf_set_RF_Item( $module, "security", "unmatched device 0x$item_id",
-        $item_id, $class_id, $state );
+    &rf_set_RF_Item( $module, "security", "unmatched device 0x$item_id", $item_id, $class_id, $state );
 
     return $state;
 }
diff --git a/lib/X10_RF_tv_remote.pm b/lib/X10_RF_tv_remote.pm
index 32eff7809..9ff6fd85f 100644
--- a/lib/X10_RF_tv_remote.pm
+++ b/lib/X10_RF_tv_remote.pm
@@ -43,9 +43,7 @@ sub rf_is_tv_remote {
     # The first two bytes must be complements of each other and contain
     # the command sent by the remote.  Byte 3 is always 0x77 and byte 4
     # is always 0x88.
-    return ( $initial_checksum_good
-          && $nbytes[2] == 0x77
-          && $nbytes[3] == 0x88 );
+    return ( $initial_checksum_good && $nbytes[2] == 0x77 && $nbytes[3] == 0x88 );
 }
 
 #------------------------------------------------------------------------------
@@ -75,26 +73,20 @@ sub rf_process_tv_remote {
     $cmd = $nbytes[0];
     $state = $vcodes{ unpack( "H2", chr($cmd) ) };
     unless ( defined $state ) {
-        &::print_log(
-            sprintf "%s: unimplemented tv remote command: "
-              . "0x%02x (%s %s %s %s)",
-            $uc_module, $cmd,       $bbytes[0],
-            $bbytes[1], $bbytes[2], $bbytes[3]
-        );
+        &::print_log( sprintf "%s: unimplemented tv remote command: " . "0x%02x (%s %s %s %s)",
+            $uc_module, $cmd, $bbytes[0], $bbytes[1], $bbytes[2], $bbytes[3] );
         return undef;
     }
 
     if ( $main::Debug{$lc_module} ) {
-        &::print_log( sprintf "%s: tv remote: state = %s (0x%02x)",
-            $uc_module, $state, $cmd );
+        &::print_log( sprintf "%s: tv remote: state = %s (0x%02x)", $uc_module, $state, $cmd );
     }
 
     # Set state of all MR26/W800 and X10_RF_Receiver objects.
     &rf_set_receiver( $module, $state );
 
     # Set the state of any items or classes associated with this device.
-    &rf_set_RF_Item( $module, "tv remote", "no remote defined",
-        "remote", undef, $state );
+    &rf_set_RF_Item( $module, "tv remote", "no remote defined", "remote", undef, $state );
 
     return $state;
 }
diff --git a/lib/X10_RedRat.pm b/lib/X10_RedRat.pm
index 1d1b2e7dc..f1edcd358 100644
--- a/lib/X10_RedRat.pm
+++ b/lib/X10_RedRat.pm
@@ -94,10 +94,8 @@ sub X10RR_send {
     my ( $house, $unit, $func, $lev ) = ( $cmd =~ /X(.)(..)(.)(..)/ );
     my $fullunit = $unit;
 
-    $buffer[0] = (
-        0x60, 0x70, 0x40, 0x50, 0x80, 0x90, 0xA0, 0xB0,
-        0xE0, 0xF0, 0xC0, 0xD0, 0x00, 0x10, 0x20, 0x30
-    )[ ord($house) - ord('A') ];
+    $buffer[0] =
+      ( 0x60, 0x70, 0x40, 0x50, 0x80, 0x90, 0xA0, 0xB0, 0xE0, 0xF0, 0xC0, 0xD0, 0x00, 0x10, 0x20, 0x30 )[ ord($house) - ord('A') ];
     if ( $unit > 8 ) {
         $buffer[0] |= 4;
         $unit -= 8;
@@ -113,26 +111,18 @@ sub X10RR_send {
 
     if ( $func eq "N" ) {    # send ON
         if ( not $X10RR{ "$house$fullunit" . "ON" } ) {
-            $X10RR{ "$house$fullunit" . "ON" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
-            $ir_x10->add( "$house$fullunit" . "ON",
-                $X10RR{ "$house$fullunit" . "ON" } );
+            $X10RR{ "$house$fullunit" . "ON" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
+            $ir_x10->add( "$house$fullunit" . "ON", $X10RR{ "$house$fullunit" . "ON" } );
         }
         $ir_x10->set( "$house$fullunit" . "ON" );
     }
     elsif ( $func eq "F" ) {    # send OFF
         $buffer[1] |= 0x20 if $fullunit ne "00";    # set "OFF" bit
         if ( not $X10RR{ "$house$fullunit" . "OFF" } ) {
-            $X10RR{ "$house$fullunit" . "OFF" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
-            $ir_x10->add( "$house$fullunit" . "OFF",
-                $X10RR{ "$house$fullunit" . "OFF" } );
+            $X10RR{ "$house$fullunit" . "OFF" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
+            $ir_x10->add( "$house$fullunit" . "OFF", $X10RR{ "$house$fullunit" . "OFF" } );
         }
         $ir_x10->set( "$house$fullunit" . "OFF" );
     }
@@ -140,23 +130,16 @@ sub X10RR_send {
 
         # send ON code
         if ( not $X10RR{ "$house$fullunit" . "ON" } ) {
-            $X10RR{ "$house$fullunit" . "ON" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
-            $ir_x10->add( "$house$fullunit" . "ON",
-                $X10RR{ "$house$fullunit" . "ON" } );
+            $X10RR{ "$house$fullunit" . "ON" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
+            $ir_x10->add( "$house$fullunit" . "ON", $X10RR{ "$house$fullunit" . "ON" } );
         }
         $ir_x10->set( "$house$fullunit" . "ON" );
         $buffer[0] &= 0xFB;
         $buffer[1] = 0x98;
         if ( not $X10RR{ "$house" . "B" } ) {
-            $X10RR{ "$house" . "B" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
+            $X10RR{ "$house" . "B" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
             $ir_x10->add( "$house" . "B", $X10RR{ "$house" . "B" } );
         }
         while ( $lev > 0 ) {
@@ -166,23 +149,16 @@ sub X10RR_send {
     }
     elsif ( $func eq "D" ) {
         if ( not $X10RR{ "$house$fullunit" . "ON" } ) {
-            $X10RR{ "$house$fullunit" . "ON" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
-            $ir_x10->add( "$house$fullunit" . "ON",
-                $X10RR{ "$house$fullunit" . "ON" } );
+            $X10RR{ "$house$fullunit" . "ON" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
+            $ir_x10->add( "$house$fullunit" . "ON", $X10RR{ "$house$fullunit" . "ON" } );
         }
         $ir_x10->set( "$house$fullunit" . "ON" );
         $buffer[0] &= 0xFB;
         $buffer[1] = 0x98;
         if ( not $X10RR{ "$house" . "D" } ) {
-            $X10RR{ "$house" . "D" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $buffer[0], $buffer[0] ^ 0xff,
-                $buffer[1], $buffer[1] ^ 0xff
-            );
+            $X10RR{ "$house" . "D" } =
+              gen_X10RR( sprintf "%08b%08b%08b%08b", $buffer[0], $buffer[0] ^ 0xff, $buffer[1], $buffer[1] ^ 0xff );
             $ir_x10->add( "$house" . "D", $X10RR{ "$house" . "D" } );
         }
         while ( $lev > 0 ) {
@@ -191,17 +167,11 @@ sub X10RR_send {
         }
     }
     elsif ( $func eq "X" ) {
-        $house = ( 6, 14, 2, 10, 1, 9, 5, 13, 7, 15, 3, 11, 0, 8, 4, 12 )
-          [ ord($house) - ord('A') ];
-        $unit =
-          ( 6, 14, 2, 10, 1, 9, 5, 13, 7, 15, 3, 11, 0, 8, 4, 12 )[ $unit - 1 ];
+        $house = ( 6, 14, 2, 10, 1, 9, 5, 13, 7, 15, 3, 11, 0, 8, 4, 12 )[ ord($house) - ord('A') ];
+        $unit  = ( 6, 14, 2, 10, 1, 9, 5, 13, 7, 15, 3, 11, 0, 8, 4, 12 )[ $unit - 1 ];
         my $code = 16 * $house + $unit;
         if ( not $X10RR{ "$house" . "X$lev" } ) {
-            $X10RR{ "$house" . "X$lev" } = gen_X10RR(
-                sprintf "%08b%08b%08b%08b",
-                $code, $code ^ 0xf0,
-                $lev, $lev ^ 0xff
-            );
+            $X10RR{ "$house" . "X$lev" } = gen_X10RR( sprintf "%08b%08b%08b%08b", $code, $code ^ 0xf0, $lev, $lev ^ 0xff );
             $ir_x10->add( "$house" . "X$lev", $X10RR{ "$house" . "X$lev" } );
         }
         $ir_x10->set( "$house" . "X$lev" );
diff --git a/lib/X10_Scene.pm b/lib/X10_Scene.pm
index 1687fe3af..2475e5895 100644
--- a/lib/X10_Scene.pm
+++ b/lib/X10_Scene.pm
@@ -163,14 +163,11 @@ sub add {
                 &::print_log( "The x10 object ("
                       . $obj->{x10_id}
                       . ") is not a member of "
-                      . "the switchlinc family and cannot be added to this scene!"
-                );
+                      . "the switchlinc family and cannot be added to this scene!" );
             }
         }
         else {
-            &::print_log( "Unable to add object to scene "
-                  . $self->{object_name}
-                  . " because it does not have an x10 address" );
+            &::print_log( "Unable to add object to scene " . $self->{object_name} . " because it does not have an x10 address" );
         }
     }
 }
@@ -192,8 +189,7 @@ sub remove_member {
                 last if $member;
             }
             else {
-                &::print_log(
-                    "Unable to add object to scene " . $self->{object_name} );
+                &::print_log( "Unable to add object to scene " . $self->{object_name} );
             }
         }
     }
@@ -246,15 +242,13 @@ sub enroll {
                       . " during enroll with ramp_rate: "
                       . $$self{members}{$x10_obj_ref}{ramp_rate} . "\n"
                       if $main::Debug{x10_scene};
-                    $x10_obj->set( $$self{members}{$x10_obj_ref}{ramp_rate},
-                        $self );
-                    $x10_obj->set( 'set scene ramp rate', $self );
+                    $x10_obj->set( $$self{members}{$x10_obj_ref}{ramp_rate}, $self );
+                    $x10_obj->set( 'set scene ramp rate',                    $self );
                     $$self{scene_item}->set('manual');
                 }
             }
             else {
-                &::print_log(
-                    "Unable to add object to scene " . $self->{object_name} );
+                &::print_log( "Unable to add object to scene " . $self->{object_name} );
             }
         }
     }
@@ -270,17 +264,12 @@ sub resume {
             my $original_state = $$self{members}{$x10_obj_ref}{original_state};
             if ( ref $x10_obj and defined $original_state ) {
                 $x10_obj->set( $original_state, $self );
-                print "[x10_scene] Restore object ("
-                  . $x10_obj->{object_name}
-                  . ") state to scene "
-                  . $self->{object_name} . "\n"
+                print "[x10_scene] Restore object (" . $x10_obj->{object_name} . ") state to scene " . $self->{object_name} . "\n"
                   if $main::Debug{x10_scene};
             }
             else {
                 my $obj_name = ($x10_obj) ? $x10_obj->{object_name} : 'unknown';
-                print
-                  "[x10_scene] Unable to restore object ($obj_name) state to scene ("
-                  . $self->{object_name} . ")\n"
+                print "[x10_scene] Unable to restore object ($obj_name) state to scene (" . $self->{object_name} . ")\n"
                   if $main::Debug{x10_scene};
             }
         }
@@ -298,8 +287,7 @@ sub set {
            $p_setby eq $$self{scene_item}
         && $p_setby->can('get_set_by')
         && (   ( ref $p_setby->get_set_by )
-            or
-            ( $p_setby->get_set_by eq "scene [" . $self->{object_name} . "]" ) )
+            or ( $p_setby->get_set_by eq "scene [" . $self->{object_name} . "]" ) )
       )
     {
         $is_cascade = 1;
@@ -319,8 +307,7 @@ sub set {
                       $x10_obj->state;
 
                     # sync the value for the on_level to the x10 object (as it's not communicated)
-                    $x10_obj->set_receive(
-                        $$self{members}{$x10_obj_ref}{on_level}, $self );
+                    $x10_obj->set_receive( $$self{members}{$x10_obj_ref}{on_level}, $self );
                     print "[x10_scene] Setting "
                       . $x10_obj->{object_name} . " to "
                       . $$self{members}{$x10_obj_ref}{on_level}
@@ -329,9 +316,7 @@ sub set {
                       if $main::Debug{x10_scene};
                 }
                 else {
-                    print "[x10_scene] Unable to maintain scene ("
-                      . $self->{object_name}
-                      . ") state for object\n"
+                    print "[x10_scene] Unable to maintain scene (" . $self->{object_name} . ") state for object\n"
                       if $main::Debug{x10_scene};
                 }
             }
@@ -352,9 +337,7 @@ sub set {
                       if $main::Debug{x10_scene};
                 }
                 else {
-                    print "[x10_scene] Unable to maintain scene ("
-                      . $self->{object_name}
-                      . ") state for object\n"
+                    print "[x10_scene] Unable to maintain scene (" . $self->{object_name} . ") state for object\n"
                       if $main::Debug{x10_scene};
                 }
             }
@@ -364,41 +347,30 @@ sub set {
         # create a "special" setby name as the tied_items in the main loop would otherwise
         # prohibit using $self if the passed $p_setby is not an object; if it is an object
         # then preserve as the setby chain needs to be maintained
-        my $m_setby =
-          ( ref $p_setby ) ? $p_setby : "scene [" . $self->{object_name} . "]";
+        my $m_setby = ( ref $p_setby ) ? $p_setby : "scene [" . $self->{object_name} . "]";
         if ( $p_state eq 'on' ) {
             $$self{scene_item}->set( 'on', $m_setby );
-            print "[x10_scene] Setting scene ("
-              . $self->{object_name}
-              . ") on\n"
+            print "[x10_scene] Setting scene (" . $self->{object_name} . ") on\n"
               if $main::Debug{x10_scene};
         }
         elsif ( $p_state eq 'off' ) {
             $$self{scene_item}->set( 'off', $m_setby );
-            print "[x10_scene] Setting scene ("
-              . $self->{object_name}
-              . ") off\n"
+            print "[x10_scene] Setting scene (" . $self->{object_name} . ") off\n"
               if $main::Debug{x10_scene};
         }
         elsif ( $p_state eq 'brighten' ) {
             $$self{scene_item}->set( 'brighten', $m_setby );
-            print "[x10_scene] Setting scene ("
-              . $self->{object_name}
-              . ") brighten\n"
+            print "[x10_scene] Setting scene (" . $self->{object_name} . ") brighten\n"
               if $main::Debug{x10_scene};
         }
         elsif ( $p_state eq 'dim' ) {
             $$self{scene_item}->set( 'dim', $m_setby );
-            print "[x10_scene] Setting scene ("
-              . $self->{object_name}
-              . ") dim\n"
+            print "[x10_scene] Setting scene (" . $self->{object_name} . ") dim\n"
               if $main::Debug{x10_scene};
         }
         elsif ( $p_state eq 'resume' ) {
             $self->resume();
-            print "[x10_scene] Setting scene ("
-              . $self->{object_name}
-              . ") resume\n"
+            print "[x10_scene] Setting scene (" . $self->{object_name} . ") resume\n"
               if $main::Debug{x10_scene};
         }
         elsif ( $p_state eq 'manual' ) {
diff --git a/lib/X10_W800.pm b/lib/X10_W800.pm
index da209d4d5..1580002d9 100644
--- a/lib/X10_W800.pm
+++ b/lib/X10_W800.pm
@@ -42,8 +42,7 @@ use X10_RF;
 sub startup {
 
     #  $main::config_parms{"W800_break"} = pack('C', 0xad);
-    &main::serial_port_create( 'W800', $main::config_parms{W800_port},
-        4800, 'none', 'raw' );
+    &main::serial_port_create( 'W800', $main::config_parms{W800_port}, 4800, 'none', 'raw' );
 
     # Add hook only if serial port was created ok
     &::MainLoop_pre_add_hook( \&X10_W800::check_for_data, 1 )
@@ -66,9 +65,7 @@ sub check_for_data {
     # Nothing to do if there is nothing in the buffer.
     unless ( $main::Serial_Ports{W800}{data} ) {
         if ( $prev_bad_checksums != 0 and !($prev_residual) ) {
-            &::print_log(
-                    "W800: failed to recover from bad checksums due to no data"
-                  . "(count=$prev_bad_checksums)" );
+            &::print_log( "W800: failed to recover from bad checksums due to no data" . "(count=$prev_bad_checksums)" );
             $prev_bad_checksums = 0;
         }
 
@@ -109,8 +106,7 @@ sub check_for_data {
               if $main::Debug{w800};
 
             if ( $prev_bad_checksums != 0 ) {
-                &::print_log( "W800: failed to recover from bad checksums "
-                      . "(count=$prev_bad_checksums)" );
+                &::print_log( "W800: failed to recover from bad checksums " . "(count=$prev_bad_checksums)" );
                 $prev_bad_checksums = 0;
             }
 
@@ -134,8 +130,7 @@ sub check_for_data {
         # Data gets sent multiple times
         #  - Check time
         #  - Process data only on the 2nd occurance, to avoid noise (seems essential)
-        my $duplicate_threshold =
-          1;    # 2nd occurance; set to 0 to omit duplicate check
+        my $duplicate_threshold = 1;    # 2nd occurance; set to 0 to omit duplicate check
         if ( &X10_W800::duplicate_count($data) == $duplicate_threshold ) {
 
             # If this is the first signs of new data in a while, make a note of the
@@ -173,8 +168,7 @@ sub check_for_data {
 
                 # Report if we recovered from previous bad checksums.
                 if ( $prev_bad_checksums != 0 ) {
-                    &::print_log( "W800: recovered from bad checksum "
-                          . "(count=$prev_bad_checksums)" );
+                    &::print_log( "W800: recovered from bad checksum " . "(count=$prev_bad_checksums)" );
                 }
 
                 # reset bad checksum counter since this one is ok
@@ -205,7 +199,7 @@ sub check_for_data {
         $prev_residual = $residual;
     }
     $reset_prev_residual_pending = 0;    # always clear the reset flag since
-         # it should only be reset on new data and prev_residual
+                                         # it should only be reset on new data and prev_residual
 
 }
 
@@ -220,9 +214,8 @@ sub duplicate_count {
         # most recent messages are always first in the queue
         for my $msg_ptr (@msg_buffer) {
             my %msg = %$msg_ptr;
-            if ( &X10_W800::is_within_timeout( $time, $msg{time}, $repeat_time )
-              )
-            {
+            if ( &X10_W800::is_within_timeout( $time, $msg{time}, $repeat_time ) ) {
+
                 # a match exists on the data; so, compare against the time stamp
                 if ( $raw_msg eq $msg{data} ) {
 
diff --git a/lib/X10_Wish.pm b/lib/X10_Wish.pm
index 9fdc83ca8..4d1e3b4f4 100644
--- a/lib/X10_Wish.pm
+++ b/lib/X10_Wish.pm
@@ -70,8 +70,7 @@ $EXPORT_TAGS{ALL} = \@EXPORT_OK;
 # @X10_Wish::ISA = ('Generic_Item');
 
 my %last_dev;
-my %hex2int =
-  qw( 0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 A 10 B 11 C 12 D 13 E 14 F 15 G 16 );
+my %hex2int    = qw( 0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 A 10 B 11 C 12 D 13 E 14 F 15 G 16 );
 my $readlength = 512;
 
 # file handle of log device file
@@ -129,8 +128,7 @@ sub startup {
 
         # set us up to check for data
         &::MainLoop_pre_add_hook( \&X10_Wish::check_for_data, 1 );
-        &main::print_log(
-            "Added X10_Wish::check_for_data hook in X10_Wish::startup")
+        &main::print_log("Added X10_Wish::check_for_data hook in X10_Wish::startup")
           if checkDebug();
     }
     else {
diff --git a/lib/X10_iplcs.pm b/lib/X10_iplcs.pm
index 6916be262..d1b62a442 100644
--- a/lib/X10_iplcs.pm
+++ b/lib/X10_iplcs.pm
@@ -12,14 +12,12 @@ sub startup {
 
     &::print_log("In IPLCS (Startup)\n") if $main::Debug{iplcs};
 
-    &main::serial_port_create( 'iplcs', $main::config_parms{iplcs_port},
-        4800, 'none', 'raw' );
+    &main::serial_port_create( 'iplcs', $main::config_parms{iplcs_port}, 4800, 'none', 'raw' );
 
     # Add hook only if serial port was created ok
     &::MainLoop_pre_add_hook( \&X10_iplcs::check_for_data, 1 )
       if $main::Serial_Ports{iplcs}{object};
-    &main::print_log(
-        "iplcs adding X10_iplcs-check_for_data into pre_add_hook\n")
+    &main::print_log("iplcs adding X10_iplcs-check_for_data into pre_add_hook\n")
       if $main::Serial_Ports{iplcs}{object};
 }
 
@@ -65,11 +63,9 @@ use constant EVENT => 0x45;    # 0x45 = Event Report <Event> See Event Pg 49
 # 0x46 =
 # 0x47 =
 # 0x48 =
-use constant DREPORT =>
-  0x49; # 0x49 = Debug report <Next Salad Addr hi> <addr lo> <Salad Instruction>
-use constant RcvX10 => 0x4A;  # 0x4A = X10 receive <Addr(00)/Cmd(01)> <X10 Byte>
-use constant RcvInsteon => 0x4F
-  ; # 0x4F = Insteon Received <Event ID> <Insteon msg ...(9 or 23 bytes> See Pg 43
+use constant DREPORT    => 0x49;    # 0x49 = Debug report <Next Salad Addr hi> <addr lo> <Salad Instruction>
+use constant RcvX10     => 0x4A;    # 0x4A = X10 receive <Addr(00)/Cmd(01)> <X10 Byte>
+use constant RcvInsteon => 0x4F;    # 0x4F = Insteon Received <Event ID> <Insteon msg ...(9 or 23 bytes> See Pg 43
 
 #        for Event IDs
 #
@@ -247,15 +243,10 @@ sub check_for_data {
         elsif ( $byte == RcvInsteon ) {
             $byte = shift(@bytes);
             printf( "Insteon: %s\n", substr( $hex, 4 ) ) if ($DEBUG);
-            $main::Serial_Ports{iplcs}{data} = ""
-              ; # (FIX ME) For now I'll drain the buffer but I should rethink this
+            $main::Serial_Ports{iplcs}{data} = "";    # (FIX ME) For now I'll drain the buffer but I should rethink this
         }
         else {
-            printf(
-                "Unknown 0x%02x %s [0x%02x]\n",
-                $byte, substr( $hex, 2 ),
-                $bytes[1]
-            );
+            printf( "Unknown 0x%02x %s [0x%02x]\n", $byte, substr( $hex, 2 ), $bytes[1] );
             $main::Serial_Ports{iplcs}{data} = substr( $data, 1 ) if ($DEBUG);
         }
     }
@@ -284,8 +275,7 @@ sub check_for_data {
             do {
                 $i++;
                 print "$i.";
-              } while ( ( $i <= $j ) && ( shift(@bytes) != STX ) )
-              ;    # Find the first STX (02) in the buffer
+            } while ( ( $i <= $j ) && ( shift(@bytes) != STX ) );    # Find the first STX (02) in the buffer
             print "\n";
             my $ldata = substr( $data, $i );
             if ($DEBUG) {
@@ -293,8 +283,7 @@ sub check_for_data {
                 $hex = unpack "H*", $ldata;
                 $data = $main::Serial_Ports{iplcs}{data};
                 my $l3 = length($data);
-                printf( "GRRR X10_iplcs Chk:[ %d vs. %d ]<%d> (%s)\n",
-                    $j, $l2, $l3, $hex );
+                printf( "GRRR X10_iplcs Chk:[ %d vs. %d ]<%d> (%s)\n", $j, $l2, $l3, $hex );
                 $main::Serial_Ports{iplcs}{data} = $ldata . $data;
             }
             else {
diff --git a/lib/Xantech.pm b/lib/Xantech.pm
index 40a5512e4..a9aa3c9f2 100644
--- a/lib/Xantech.pm
+++ b/lib/Xantech.pm
@@ -27,13 +27,7 @@ package Xantech;
 sub serial_startup {
     if ( $::config_parms{Xantech_serial_port} ) {
         my ($speed) = $::config_parms{Xantech_baudrate} || 9600;
-        if (
-            &::serial_port_create(
-                'Xantech', $::config_parms{Xantech_serial_port},
-                $speed,    'none'
-            )
-          )
-        {
+        if ( &::serial_port_create( 'Xantech', $::config_parms{Xantech_serial_port}, $speed, 'none' ) ) {
             init( $::Serial_Ports{Xantech}{object} );
 
             # Add to the generic list so check_for_generic_serial_data is called for us automatically
@@ -72,12 +66,8 @@ sub check_for_data {
         $main::Serial_Ports{Xantech}{data_record} = undef;
         print "Xantech data=$data\n" if $main::Debug{xantech};
 
-        my (
-            $f1, $f2, $f3,  $f4,  $f5,  $f6, $f7,
-            $f8, $f9, $f10, $f11, $f12, $f13
-          )
-          = $data =~
-          /\s*(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)/;
+        my ( $f1, $f2, $f3, $f4, $f5, $f6, $f7, $f8, $f9, $f10, $f11, $f12, $f13 ) =
+          $data =~ /\s*(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)\t(\w+)/;
 
         #        ::print_log "Xantech Data: " . $data . "\n";
         #        print "Xantech Decode: " . $f1 . $f2 . $f3 . " etc.\n";
@@ -95,13 +85,11 @@ sub check_for_data {
                   if ( $current_zone_object->{current_trim} ne $f3 );
                 $current_zone_object->set_states_for_next_pass("volume:$f4")
                   if ( $current_zone_object->{current_volume} ne $f4 );
-                $current_zone_object->set_states_for_next_pass(
-                    "presetbalance:$f5")
+                $current_zone_object->set_states_for_next_pass("presetbalance:$f5")
                   if ( $current_zone_object->{preset_balance} ne $f5 );
                 $current_zone_object->set_states_for_next_pass("balance:$f6")
                   if ( $current_zone_object->{current_balance} ne $f6 );
-                $current_zone_object->set_states_for_next_pass(
-                    "presettreble:$f7")
+                $current_zone_object->set_states_for_next_pass("presettreble:$f7")
                   if ( $current_zone_object->{preset_treble} ne $f7 );
                 $current_zone_object->set_states_for_next_pass("treble:$f8")
                   if ( $current_zone_object->{current_treble} ne $f8 );
@@ -109,14 +97,11 @@ sub check_for_data {
                   if ( $current_zone_object->{preset_bass} ne $f9 );
                 $current_zone_object->set_states_for_next_pass("bass:$f10")
                   if ( $current_zone_object->{current_bass} ne $f10 );
-                $current_zone_object->set_states_for_next_pass(
-                    $f11 == 1 ? 'on' : 'off' )
+                $current_zone_object->set_states_for_next_pass( $f11 == 1 ? 'on' : 'off' )
                   if ( $current_zone_object->{current_status} ne $f11 );
-                $current_zone_object->set_states_for_next_pass(
-                    $f12 == 1 ? 'mute:on' : 'mute:off' )
+                $current_zone_object->set_states_for_next_pass( $f12 == 1 ? 'mute:on' : 'mute:off' )
                   if ( $current_zone_object->{current_mute} ne $f12 );
-                $current_zone_object->set_states_for_next_pass(
-                    "maximumvolume:$f13")
+                $current_zone_object->set_states_for_next_pass("maximumvolume:$f13")
                   if ( $current_zone_object->{maximum_volume} ne $f13 );
 
                 # Apply settings for this zone
@@ -212,12 +197,8 @@ sub new {
     my $output = sprintf( "Z%2.2d", $zone );
     push( @xantech_command_list, $output );
 
-    push(
-        @{ $$self{states} },
-        'on',            'off',        'volume:max',
-        'volume:normal', 'volume:min', 'volume:+',
-        'volume:-',      'input:+',    'input:-'
-    );
+    push( @{ $$self{states} },
+        'on', 'off', 'volume:max', 'volume:normal', 'volume:min', 'volume:+', 'volume:-', 'input:+', 'input:-' );
 
     return $self;
 }
diff --git a/lib/ZWave_Items.pm b/lib/ZWave_Items.pm
index cd17e24be..9452487c2 100644
--- a/lib/ZWave_Items.pm
+++ b/lib/ZWave_Items.pm
@@ -34,9 +34,7 @@ sub set {
     my ( $self, $state, $set_by ) = @_;
 
     my $set_enter_time = &::gettimeofday();    # track the time in sub
-    &::print_log(
-        "ZWave_Item: Setting $self->{object_name} to $state, time=$set_enter_time"
-    );
+    &::print_log( "ZWave_Item: Setting $self->{object_name} to $state, time=$set_enter_time" );
     return if &main::check_for_tied_filters( $self, $state );
 
     $self->{set_by} = $set_by;
@@ -285,12 +283,11 @@ sub new {
 
     $self->{mode} = 'auto';
 
-    $self->{update_rate} = $update_rate;    # sets how often the item is polled
-    $self->{update_deferral_count} = 0;     # how many times update was deferred
-    $self->{instant_update} = $instant_update;
+    $self->{update_rate}           = $update_rate;      # sets how often the item is polled
+    $self->{update_deferral_count} = 0;                 # how many times update was deferred
+    $self->{instant_update}        = $instant_update;
 
-    $self->set_interface( $interface, $id, $type )
-      ;                                     # associate item with interface
+    $self->set_interface( $interface, $id, $type );     # associate item with interface
 
     $self->add( N . $id . 'L' . '99', 'on' );
     $self->add( N . $id . 'L' . '99', '100%' );
@@ -330,8 +327,7 @@ sub new {
     $self->add('dim');
     $self->add('manual');
 
-    $self->{set_open_loop} = 1
-      ; # means we can set the state before it is confirmed by a query of the device (faster)
+    $self->{set_open_loop} = 1;    # means we can set the state before it is confirmed by a query of the device (faster)
 
     #    foreach $key (%{$self}) {
     #	print "key $key\n";
@@ -360,8 +356,7 @@ sub processSetData {
             $state = 'on';
         }
         else {
-            &::print_log(
-                "Can't toggle unless state is on or off), state=$$self{state}")
+            &::print_log("Can't toggle unless state is on or off), state=$$self{state}")
               if $::config_parms{rzc0p_errata} >= 1;
         }
     }
@@ -389,8 +384,7 @@ sub processSetData {
         $self->{set_pending}   = 1;
 
         # go get the state
-        $self->{interface}
-          ->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
+        $self->{interface}->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
     }
 
     elsif ( $state eq 'off' ) {
@@ -408,8 +402,7 @@ sub processSetData {
         $self->{desired_level} = 0;
 
         # queue the status command
-        $self->{interface}
-          ->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
+        $self->{interface}->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
     }
 
     elsif ( $state eq 'on' ) {
@@ -417,15 +410,12 @@ sub processSetData {
 
         #	$data = '>N' . $self->{zwave_id} . 'ON';
         if ( $self->{resume} ) {
-            &::print_log(
-                "setting $self->{object_name} to resume level of $self->{resume}"
-            );
+            &::print_log( "setting $self->{object_name} to resume level of $self->{resume}" );
             $data = '>N' . $self->{zwave_id} . 'L' . $self->{resume};
             $self->{desired_level} = $self->{resume};
         }
         else {
-            &::print_log(
-                "No resume level for $self->{object_name}, setting to 99");
+            &::print_log("No resume level for $self->{object_name}, setting to 99");
             $data = '>N' . $self->{zwave_id} . 'L99';
             $self->{desired_level} = '099';
         }
@@ -439,8 +429,7 @@ sub processSetData {
         # fix this should be resume level
         #	$self->{level} = 99 if $self->{set_open_loop};
         # force the status command to complete now
-        $self->{interface}
-          ->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 1 );
+        $self->{interface}->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 1 );
     }
     else {
         &::print_log("ZWave Light Error: Unrecognized incoming state $state\n")
@@ -473,12 +462,10 @@ sub convert_percents {
             #	    print "relative percentage $amount to be added to current value\n";
 
             my $level_diff = int( $desired_level_now * ( $amount / 100 ) );
-            &main::print_log(
-                "Relative percent: Changing light by $level_diff ($level_now * $amount%)"
-            );
+            &main::print_log( "Relative percent: Changing light by $level_diff ($level_now * $amount%)" );
             $data = $desired_level_now + $level_diff;
         }
-        else {    # '##%'        - set brightness to ## percent
+        else {                             # '##%'        - set brightness to ## percent
 
             #	    print "absolute percent of $amount\n";
             $data = $amount;
@@ -569,8 +556,7 @@ sub processSetData {
             $data = 'on';
         }
         else {
-            &::print_log(
-                "Zwave_appliance: Can't toggle state that's not off/on");
+            &::print_log("Zwave_appliance: Can't toggle state that's not off/on");
         }
     }
 
@@ -613,8 +599,7 @@ sub processSetData {
     else { &::print_log("ZWave_Appliance: got unsupported command $data\n"); }
 
     # get the status of the operation
-    $self->{interface}
-      ->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
+    $self->{interface}->send_zwave_data( $self, '>?N' . $self->{zwave_id}, 1, 1, 0, 0 );
 }
 
 return 1;
diff --git a/lib/Zmtrigger_Item.pm b/lib/Zmtrigger_Item.pm
index 8605afe43..a40513c75 100644
--- a/lib/Zmtrigger_Item.pm
+++ b/lib/Zmtrigger_Item.pm
@@ -73,9 +73,7 @@ sub new {
         $self->{monitor_id} = $monitor_id;
     }
     else {
-        &::print_log(
-            "[Zmtrigger_Item] WARN You must specify a monitor_id when creating a new Zmtrigger_Item"
-        );
+        &::print_log( "[Zmtrigger_Item] WARN You must specify a monitor_id when creating a new Zmtrigger_Item" );
         return;
     }
     if ( defined $max_duration ) {
@@ -117,38 +115,29 @@ sub set {
     #  Build the data stream
     my $data = $self->{monitor_id};
     if ( $state eq "on" ) {
-        $data .= "|on+"
-          . $self->{max_duration} . "|"
-          . $self->{score} . "|"
-          . $self->{description};
+        $data .= "|on+" . $self->{max_duration} . "|" . $self->{score} . "|" . $self->{description};
     }
     elsif ( $state eq "off" ) {
         $data .= "|cancel";
     }
     else {
-        &::print_log(
-            "[Zmtrigger_Item] WARN A valid state(on,off) must be specified when calling SET"
-        );
+        &::print_log( "[Zmtrigger_Item] WARN A valid state(on,off) must be specified when calling SET" );
         return;
     }
 
     if ( !defined $zm_connect ) {    # If not already, Create the Socket_Item
-        my $address = $main::config_parms{zm_server_address} . ":"
-          . $main::config_parms{zm_server_port};
+        my $address = $main::config_parms{zm_server_address} . ":" . $main::config_parms{zm_server_port};
 
-        &::print_log(
-            "[Zmtrigger_Item] Creating Socket_Item zm_connect at:-$address-");
+        &::print_log("[Zmtrigger_Item] Creating Socket_Item zm_connect at:-$address-");
         $zm_connect = new Socket_Item( undef, undef, $address );
     }
 
     start $zm_connect;               # Connect the telnet session
-    if ( active $zm_connect)
-    {    # send the data to the telnet session if it is active
-        &::print_log(
-            "[Zmtrigger_Item] Active connection found sending:-$data-");
+    if ( active $zm_connect) {       # send the data to the telnet session if it is active
+        &::print_log("[Zmtrigger_Item] Active connection found sending:-$data-");
         set $zm_connect $data;
     }
-    stop $zm_connect;    # Disconnect the telnet session
+    stop $zm_connect;                # Disconnect the telnet session
 
 }
 
diff --git a/lib/ZoneMinder_xAP.pm b/lib/ZoneMinder_xAP.pm
index 2bdb8683a..f16a7fba8 100644
--- a/lib/ZoneMinder_xAP.pm
+++ b/lib/ZoneMinder_xAP.pm
@@ -207,30 +207,23 @@ sub new {
     $$self{m_write} = 0;
 
     if ($monitor_name) {
-        $monitor_name =
-          lc $monitor_name;    # convert to lowercase to be consistent w/ xAP
-        my $xap_address =
-          "zm.zoneminder.$ZoneMinder_xAP::device_name:$monitor_name";
-        my $xap_item = new xAP_Item( 'VMI.*', $xap_address );
+        $monitor_name = lc $monitor_name;    # convert to lowercase to be consistent w/ xAP
+        my $xap_address   = "zm.zoneminder.$ZoneMinder_xAP::device_name:$monitor_name";
+        my $xap_item      = new xAP_Item( 'VMI.*', $xap_address );
         my $friendly_name = "xap_zm_$monitor_name";
-        &main::store_object_data( $xap_item, 'xAP_Item', $friendly_name,
-            $friendly_name );
+        &main::store_object_data( $xap_item, 'xAP_Item', $friendly_name, $friendly_name );
         $$self{xap_item} = $xap_item;
         $$self{xap_item}->tie_items($self);
-        $$self{monitor_name} = $monitor_name;
-        $$self{m_light_blanking_duration} =
-          5;    # defaults to 5 seconds to allow minor delay plus ramp
-        $$self{m_light_blanking_timer} = new Timer();
-        $$self{m_auto_off_duration} =
-          120;    # automatically set to idle if no track reports
-        $$self{m_auto_off_timer} = new Timer();
+        $$self{monitor_name}              = $monitor_name;
+        $$self{m_light_blanking_duration} = 5;               # defaults to 5 seconds to allow minor delay plus ramp
+        $$self{m_light_blanking_timer}    = new Timer();
+        $$self{m_auto_off_duration}       = 120;             # automatically set to idle if no track reports
+        $$self{m_auto_off_timer}          = new Timer();
         $self->restore_data('m_id');
         $self->add(@p_objects);
     }
     else {
-        &::print_log(
-            "You must supply a monitor name when creating a new ZM_MonitorItem\n"
-        );
+        &::print_log( "You must supply a monitor name when creating a new ZM_MonitorItem\n" );
     }
 
     return $self;
@@ -244,26 +237,17 @@ sub add_item {
         $self->SUPER::add_item($p_object);
     }
     elsif ( $p_object->isa('Light_Item') ) {
-        print "Adding "
-          . $p_object->{object_name} . " to "
-          . $self->name
-          . " for use in suspend/resume motion analysis\n"
+        print "Adding " . $p_object->{object_name} . " to " . $self->name . " for use in suspend/resume motion analysis\n"
           if $main::Debug{zone_minder};
-        $p_object->tie_items($self)
-          ; # tie--don't add since we don't need to do lookup and don't want to cascade state
+        $p_object->tie_items($self);    # tie--don't add since we don't need to do lookup and don't want to cascade state
     }
     elsif ( $p_object->isa('Photocell_Item') ) {
-        print "Adding "
-          . $p_object->{object_name} . " to "
-          . $self->name
-          . " for use in suspend/resume motion analysis\n"
+        print "Adding " . $p_object->{object_name} . " to " . $self->name . " for use in suspend/resume motion analysis\n"
           if $main::Debug{zone_minder};
         $self->SUPER::add_item($p_object);
     }
     else {
-        print "WARNING!! objects of type "
-          . ref($p_object)
-          . " cannot be added to ZM_MonitorItems!"
+        print "WARNING!! objects of type " . ref($p_object) . " cannot be added to ZM_MonitorItems!"
           if $main::Debug{zone_minder};
     }
 
@@ -383,8 +367,7 @@ sub set {
                         if (@zones) {
                             for my $zone (@zones) {
                                 if ( lc $zone_name eq lc $zone->name ) {
-                                    $zone->set_alarm_event( $id, $self,
-                                        %zone_data );
+                                    $zone->set_alarm_event( $id, $self, %zone_data );
                                 }
                             }
                         }
@@ -428,17 +411,14 @@ sub set {
 
         # check to see if any Photocell_Items exist; if so and they are light then
         # don't perform any blanking operation
-        for my $photocell ( my @photocells =
-            $self->find_members('Photocell_Item') )
-        {
+        for my $photocell ( my @photocells = $self->find_members('Photocell_Item') ) {
             if ( $photocell->state eq 'light' ) {
                 $photo_continue = 0;
                 last;
             }
         }
         if ( $photo_continue && $self->light_blanking_duration ) {
-            $$self{m_light_blanking_timer}
-              ->set( $self->light_blanking_duration, $self );
+            $$self{m_light_blanking_timer}->set( $self->light_blanking_duration, $self );
             $self->suspend_motion_analysis();
         }
     }
@@ -646,20 +626,15 @@ sub set_alarm_event {
     my ( $self, $alarm_id, $p_setby, %zone_data ) = @_;
     if ( $zone_data{state} eq 'on' ) {
         if ( $$self{m_delayMotionTimerTime} ) {
-            $$self{m_delayMotionTimer}
-              ->set( $$self{m_delayMotionTimerTime}, $self );
-            print "zm_ZoneItem("
-              . $self->name
-              . "):: [$alarm_id] started motion w/ delay: $$self{m_delayMotionTimerTime}\n"
+            $$self{m_delayMotionTimer}->set( $$self{m_delayMotionTimerTime}, $self );
+            print "zm_ZoneItem(" . $self->name . "):: [$alarm_id] started motion w/ delay: $$self{m_delayMotionTimerTime}\n"
               if $main::Debug{zone_minder};
         }
         else {
             $$self{m_delayStillTimer}->unset();    # cancel the still timer
-            print "zm_ZoneItem("
-              . $self->name
-              . "):: [$alarm_id] started motion w/o delay\n"
+            print "zm_ZoneItem(" . $self->name . "):: [$alarm_id] started motion w/o delay\n"
               if $main::Debug{zone_minder};
-            $self->set( 'motion', $p_setby );    # be consistent w/ Motion_Item
+            $self->set( 'motion', $p_setby );      # be consistent w/ Motion_Item
         }
     }
     else {
@@ -670,8 +645,7 @@ sub set_alarm_event {
         $self->totalscore( $zone_data{totalscore} );
         $self->avgscore( $zone_data{avgscore} );
         if ( $$self{m_delayStillTimerTime} ) {
-            $$self{m_delayStillTimer}
-              ->set( $$self{m_delayStillTimerTime}, $self );
+            $$self{m_delayStillTimer}->set( $$self{m_delayStillTimerTime}, $self );
             print "zm_ZoneItem("
               . $self->name
               . "):: [$alarm_id] stopped w/ delay: $$self{m_delayStillTimerTime}; "
@@ -688,7 +662,7 @@ sub set_alarm_event {
               . "maxscore:$zone_data{maxscore}, frames:$zone_data{frames}, alarmframes:$zone_data{alarmframes}, "
               . "duration:$zone_data{duration}, totalscore:$zone_data{totalscore}, avgscore:$zone_data{avgscore}\n"
               if $main::Debug{zone_minder};
-            $self->set( 'still', $p_setby );    # be consistent w/ Motion_Item
+            $self->set( 'still', $p_setby );        # be consistent w/ Motion_Item
         }
     }
 }
diff --git a/lib/ajax.pm b/lib/ajax.pm
index dd7819c30..5748bc9f5 100644
--- a/lib/ajax.pm
+++ b/lib/ajax.pm
@@ -46,16 +46,15 @@ sub new {
 
     bless $self, $class;
 
-    &main::print_log(
-        "creating ChangeWaiter object for socket $socket and sub $sub")
+    &main::print_log("creating ChangeWaiter object for socket $socket and sub $sub")
       if $main::Debug{ajax};
 
     $sub =~ s/^/&main::/;
     ${ $$self{waitingSocket} } = $socket;
     ${ $$self{expireTime} }    = time() + 60;
-    ${ $$self{changed} } = 0;    # Flag if at least on state is changed
-    ${ $$self{event} } = "&ChangeChecker::setWaiterToChanged ('$self')";
-    ${ $$self{sub} }   = $sub;
+    ${ $$self{changed} }       = 0;                                                # Flag if at least on state is changed
+    ${ $$self{event} }         = "&ChangeChecker::setWaiterToChanged ('$self')";
+    ${ $$self{sub} }           = $sub;
 
     return $self;
 }
@@ -77,22 +76,18 @@ sub checkForUpdate {
     my ($self) = @_;
 
     if ( ${ $$self{expireTime} } < time() ) {
-        &main::print_log(
-            "checkForUpdate waiter for sub ${$$self{sub}} timed out, closing socket"
-        ) if $main::Debug{ajax};
+        &main::print_log( "checkForUpdate waiter for sub ${$$self{sub}} timed out, closing socket" ) if $main::Debug{ajax};
 
         # Sending a status code makes it easier to distinish No Content from a lost
         # connection on the client end.
-        &::print_socket_fork( ${ $$self{waitingSocket} },
-            "HTTP/1.0 204 No Content\n\n" );
+        &::print_socket_fork( ${ $$self{waitingSocket} }, "HTTP/1.0 204 No Content\n\n" );
         ${ $$self{waitingSocket} }->close;
         return 1;
     }
 
     my $xml = eval ${ $$self{sub} };
     if ($@) {
-        &main::print_log(
-            "checkForUpdate syntax error in sub ${$$self{sub}}\n\t$@")
+        &main::print_log("checkForUpdate syntax error in sub ${$$self{sub}}\n\t$@")
           if $main::Debug{ajax};
         return 1;
     }
diff --git a/lib/caddx.pm b/lib/caddx.pm
index 3bfa20568..c05f343f3 100644
--- a/lib/caddx.pm
+++ b/lib/caddx.pm
@@ -128,8 +128,7 @@ sub process_msg {
     ##   number saved as part of the zone name:-(
     ################
     if ( length( $msg->{partition} ) > 0 ) {
-        print
-          "Partition Message: Partition $msg->{partition}: Armed $msg->{armed} : Stay $msg->{stay}"
+        print "Partition Message: Partition $msg->{partition}: Armed $msg->{armed} : Stay $msg->{stay}"
           if $main::Debug{caddx};
         my $prttn = $msg->{partition};
 
@@ -263,8 +262,7 @@ sub default_setstate {
 
         # if we're turning off (and not already in quiesce mode)
         my $sn = $self->state();
-        print
-          " caddx set $self->{object_name}: from: state_now [$sn] to: $state\n"
+        print " caddx set $self->{object_name}: from: state_now [$sn] to: $state\n"
           if $main::Debug{caddx};
         if ( $state =~ /off/i && $self->state() =~ /on/i ) {
             print " caddx set $self->{object_name} deferring: $state \n"
diff --git a/lib/console_utils.pl b/lib/console_utils.pl
index 5af1179f3..3749d0f80 100644
--- a/lib/console_utils.pl
+++ b/lib/console_utils.pl
@@ -26,8 +26,7 @@ sub choose_menu {
 
     #===============
 
-    local ( $CON_IN, $CON_OUT, @choices ) =
-      @_;    # Could use my, but then need to pass CON_OUT to highlight subs
+    local ( $CON_IN, $CON_OUT, @choices ) = @_;    # Could use my, but then need to pass CON_OUT to highlight subs
 
     # save settings
     my $oldT = $CON_OUT->Title();
@@ -99,11 +98,7 @@ sub choose_menu {
                     if (    ( $mX >= $cX + 1 and $mX <= $cX + $dX )
                         and ( $mY == $cY + $m ) )
                     {
-                        $return = (
-                            "",          "testInfo",
-                            "testBox",   "testScroll",
-                            "testTitle", "testWindow"
-                        )[$m];
+                        $return = ( "", "testInfo", "testBox", "testScroll", "testTitle", "testWindow" )[$m];
                         $key = 27;
                     }
                 }
@@ -173,14 +168,10 @@ sub highlightMenu {
     my $m;
     for $m ( 1 .. 3 ) {
         if ( $m == $menu ) {
-            $CON_OUT->FillAttr(
-                $FG_BLACK | $BG_WHITE, $menulen[$m],
-                $menupos[$m],          $wTop + 1
-            );
+            $CON_OUT->FillAttr( $FG_BLACK | $BG_WHITE, $menulen[$m], $menupos[$m], $wTop + 1 );
         }
         else {
-            $CON_OUT->FillAttr( $FG_WHITE | $BG_BLUE,
-                $menulen[$m], $menupos[$m], $wTop + 1 );
+            $CON_OUT->FillAttr( $FG_WHITE | $BG_BLUE, $menulen[$m], $menupos[$m], $wTop + 1 );
         }
     }
 }
@@ -192,12 +183,10 @@ sub highlightTest {
     my ($i) = @_;
     for $m ( 1 .. 5 ) {
         if ( $m == $i ) {
-            $CON_OUT->FillAttr( $FG_BLACK | $BG_WHITE,
-                43, $wLeft + 1, $wTop + 13 + $m );
+            $CON_OUT->FillAttr( $FG_BLACK | $BG_WHITE, 43, $wLeft + 1, $wTop + 13 + $m );
         }
         else {
-            $CON_OUT->FillAttr( $FG_WHITE | $BG_BLUE,
-                43, $wLeft + 1, $wTop + 13 + $m );
+            $CON_OUT->FillAttr( $FG_WHITE | $BG_BLUE, 43, $wLeft + 1, $wTop + 13 + $m );
         }
     }
 }
diff --git a/lib/dss_interface.pm b/lib/dss_interface.pm
index 7a52361e1..a6d4e39ff 100644
--- a/lib/dss_interface.pm
+++ b/lib/dss_interface.pm
@@ -45,9 +45,7 @@ sub new {
     my %commands;
     my $doIt;
     my $type = uc $main::config_parms{ $portname . "_type" };
-    &main::serial_port_create( $portname,
-        $main::config_parms{ $portname . "_port" },
-        9600, 'none', 'raw' );
+    &main::serial_port_create( $portname, $main::config_parms{ $portname . "_port" }, 9600, 'none', 'raw' );
     if ( $main::Serial_Ports{$portname}{object} ) {
         push( @DSS_Ports, $portname );
     }
diff --git a/lib/example_interface.pm b/lib/example_interface.pm
index a36d8ffac..f87ca1e5a 100644
--- a/lib/example_interface.pm
+++ b/lib/example_interface.pm
@@ -52,9 +52,7 @@ package example_interface;
 @example_interface::ISA = ('Serial_Item');
 
 sub startup {
-    &main::serial_port_create( 'example_interface',
-        $main::config_parms{example_interface_port},
-        4800, 'none' );
+    &main::serial_port_create( 'example_interface', $main::config_parms{example_interface_port}, 4800, 'none' );
     &::MainLoop_pre_add_hook( \&example_interface::check_for_data, 1 );
 }
 
diff --git a/lib/floorplan.pl b/lib/floorplan.pl
index 24770a318..818734598 100644
--- a/lib/floorplan.pl
+++ b/lib/floorplan.pl
@@ -36,8 +36,7 @@ =head2 METHODS
 
 my $object_name = shift || '$Property';
 my $object = &get_object_by_name($object_name);
-return &html_page( 'FloorPlan',
-    "No $object_name Group found to generate a floorplan from" )
+return &html_page( 'FloorPlan', "No $object_name Group found to generate a floorplan from" )
   unless $object;
 
 my $html = "<meta http-equiv='refresh' content='10;URL='>";
@@ -72,13 +71,9 @@ sub web_fp    #render table representation of objects and their co-ordinates
         for my $obj (@l_objs) {
             ( $l_x, $l_y, $l_w, $l_h ) = $obj->get_fp_location();
             if ( $l_x ne "" ) {    #Only do items with co-ordinates
-                for ( my $h = $l_y;
-                    $h < $l_y + $l_h;
-                    $h++ )    # Create Virtual Frame Buffer of object blocks
+                for ( my $h = $l_y; $h < $l_y + $l_h; $h++ )    # Create Virtual Frame Buffer of object blocks
                 {
-                    for ( my $w = $l_x;
-                        $w < $l_x + $l_w;
-                        $w++ )    # Create Virtual Frame buffer of object blocks
+                    for ( my $w = $l_x; $w < $l_x + $l_w; $w++ )    # Create Virtual Frame buffer of object blocks
                     {
                         $l_fp[$w][$h] = $obj;
                         $l_xmax = $w if $l_xmax < $w;
@@ -89,37 +84,27 @@ sub web_fp    #render table representation of objects and their co-ordinates
         }
         $l_html .= web_fp_item($p_obj) . "<br>";
         if ( @l_objs > 0 ) {
-            $l_html .=
-                "<table border='0' width='"
-              . $l_xmax * $l_xscale
-              . "' height='"
-              . $l_ymax * $l_yscale . "'>\n";
-            for ( my $x = 0;
-                $x <= $l_xmax;
-                $x++ )    #initialize table with (hopefully) accurate sizing
+            $l_html .= "<table border='0' width='" . $l_xmax * $l_xscale . "' height='" . $l_ymax * $l_yscale . "'>\n";
+            for ( my $x = 0; $x <= $l_xmax; $x++ )                  #initialize table with (hopefully) accurate sizing
             {
                 $l_html .= "<td></td>";
             }
-            for ( my $y = 0;
-                $y <= $l_ymax;
-                $y++ )    #Create HTML Table stucture of Virtual Frame buffer
+            for ( my $y = 0; $y <= $l_ymax; $y++ )                  #Create HTML Table stucture of Virtual Frame buffer
             {
                 $l_html .= "<tr>\n";
-                $l_html .=
-                  "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
+                $l_html .= "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
                 $l_html .= "</td>\n";
                 for ( my $x = 0; $x <= $l_xmax; $x++ ) {
                     $l_obj = $l_fp[$x][$y];
-                    if ( $l_obj ne "" ) {   #Only do if object is at coordinates
+                    if ( $l_obj ne "" ) {                           #Only do if object is at coordinates
                         if ( $l_rendered{$l_obj} eq '' ) {
                             $l_rendered{$l_obj} = 1;
-                            ( $l_x, $l_y, $l_w, $l_h ) =
-                              $l_obj->get_fp_location();
+                            ( $l_x, $l_y, $l_w, $l_h ) = $l_obj->get_fp_location();
                             if ( $l_x eq '' ) { $l_x = 1; }
                             if ( $l_y eq '' ) { $l_y = 1; }
                             if ( $l_w eq '' ) { $l_w = 1; }
                             if ( $l_h eq '' ) { $l_h = 1; }
-                            if ( $l_obj->isa('Group') ) {    #recurse groups
+                            if ( $l_obj->isa('Group') ) {           #recurse groups
                                 $l_html .=
                                     "\t<td bgcolor='$l_bcolor' width='"
                                   . $l_xscale * $l_w
@@ -129,9 +114,9 @@ sub web_fp    #render table representation of objects and their co-ordinates
                                 $l_html .= web_fp($l_obj);
                             }
                             else {
-                                $l_html .= "\t<td bgcolor='"
-                                  . web_fp_idle_color( $l_obj, $l_acolor,
-                                    $l_bcolor )
+                                $l_html .=
+                                    "\t<td bgcolor='"
+                                  . web_fp_idle_color( $l_obj, $l_acolor, $l_bcolor )
                                   . "' colspan='$l_w' rowspan='$l_h'>";
                                 $l_html .= web_fp_item($l_obj);
                             }
@@ -139,11 +124,7 @@ sub web_fp    #render table representation of objects and their co-ordinates
                         }
                     }
                     else {    #Blank space
-                        $l_html .=
-                            "\t<td width='"
-                          . $l_xscale
-                          . "' height='"
-                          . $l_yscale . "'>";
+                        $l_html .= "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
                         $l_html .= "</td>\n";
                     }
                 }
@@ -259,8 +240,7 @@ sub web_fp_item    #render all items based on type
         $l_text .= ':' . $p_obj->state();
     }
     if ( $l_state ne '' ) {
-        $l_html .=
-          "<a href='/bin/SET;referer?" . $p_obj->{object_name} . "=$l_state'>";
+        $l_html .= "<a href='/bin/SET;referer?" . $p_obj->{object_name} . "=$l_state'>";
     }
     if ( $l_image ne '' ) {
         $l_html .= "<img src='/graphics/$l_image' border=0 alt='$l_text'>";
@@ -274,17 +254,15 @@ sub web_fp_item    #render all items based on type
     return $l_html;
 }
 
-sub web_fp_idle_color #Fade color from acolor to bcolor over idle_time of object
+sub web_fp_idle_color    #Fade color from acolor to bcolor over idle_time of object
 {
     my ( $p_object, $p_acolor, $p_bcolor, $p_maxtime ) = @_;
 
     my ( $l_ared, $l_agreen, $l_ablue ) = $p_acolor =~ /#*(..)(..)(..)/;
     my ( $l_bred, $l_bgreen, $l_bblue ) = $p_bcolor =~ /#*(..)(..)(..)/;
 
-    ( $l_ared, $l_agreen, $l_ablue ) =
-      ( hex $l_ared, hex $l_agreen, hex $l_ablue );
-    ( $l_bred, $l_bgreen, $l_bblue ) =
-      ( hex $l_bred, hex $l_bgreen, hex $l_bblue );
+    ( $l_ared, $l_agreen, $l_ablue ) = ( hex $l_ared, hex $l_agreen, hex $l_ablue );
+    ( $l_bred, $l_bgreen, $l_bblue ) = ( hex $l_bred, hex $l_bgreen, hex $l_bblue );
 
     my ( $l_red, $l_green, $l_blue );
     my $l_time;
@@ -322,10 +300,7 @@ sub web_fp_idle_color #Fade color from acolor to bcolor over idle_time of object
         $l_blue = int( $l_ablue + ( ( $l_bblue - $l_ablue ) * ($l_percent) ) );
     }
 
-    return ("#"
-          . sprintf( "%02X", $l_red )
-          . sprintf( "%02X", $l_green )
-          . sprintf( "%02X", $l_blue ) );
+    return ( "#" . sprintf( "%02X", $l_red ) . sprintf( "%02X", $l_green ) . sprintf( "%02X", $l_blue ) );
 }
 
 sub web_fp_camera_popup {
diff --git a/lib/handy_net_utilities.pl b/lib/handy_net_utilities.pl
index 2c6878db9..383f75db8 100644
--- a/lib/handy_net_utilities.pl
+++ b/lib/handy_net_utilities.pl
@@ -104,8 +104,7 @@ sub main::net_connect_check {
     if ( $^O eq "linux" ) {
         my $if = lc( $main::config_parms{net_connect_if} );
         if ( $if eq "" ) {
-            print
-              "mh.ini parm net_connect and net_connect_if is not defined.  net connection assumed.\n";
+            print "mh.ini parm net_connect and net_connect_if is not defined.  net connection assumed.\n";
             return $prev_state = 1;
         }
         $prev_state = 0;
@@ -124,9 +123,7 @@ sub main::net_connect_check {
     }
 
     # Windows 95/98
-    my $status = &main::registry_get(
-        'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\RemoteAccess',
-        'Remote Connection' );
+    my $status = &main::registry_get( 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\RemoteAccess', 'Remote Connection' );
 
     #   print "db s=", unpack('H8', $status), ".\n";
     if ( unpack( 'H8', $status ) eq '01000000' ) {
@@ -140,18 +137,14 @@ sub main::net_connect_check {
     }
 }
 
-my (
-    $DNS_resolver_request, $DNS_resolver_address, $DNS_resolver_requester,
-    $DNS_resolver_time,    %DNS_cache
-);
+my ( $DNS_resolver_request, $DNS_resolver_address, $DNS_resolver_requester, $DNS_resolver_time, %DNS_cache );
 
 # This is the good, background way
 sub main::net_domain_name_start {
     ( $DNS_resolver_requester, $DNS_resolver_address ) = @_;
 
     # Allow for port name to be used.
-    $DNS_resolver_address =
-      $main::Socket_Ports{$DNS_resolver_address}{client_ip_address}
+    $DNS_resolver_address = $main::Socket_Ports{$DNS_resolver_address}{client_ip_address}
       if $main::Socket_Ports{$DNS_resolver_address}
       and $main::Socket_Ports{$DNS_resolver_address}{client_ip_address};
 
@@ -162,22 +155,19 @@ sub main::net_domain_name_start {
     # in addition to triggering net_domain_name_done
     if ( $DNS_cache{$DNS_resolver_address} ) {
         $DNS_resolver_request++;
-        $DNS_resolver_time = time -
-          100;    # Pretend we time out, so we also respond on next _done check
-                  # If cached, return data
+        $DNS_resolver_time = time - 100;    # Pretend we time out, so we also respond on next _done check
+                                            # If cached, return data
         return &net_domain_name_parse2( $DNS_cache{$DNS_resolver_address} );
     }
     elsif ($main::DNS_resolver) {
-        $DNS_resolver_request =
-          $main::DNS_resolver->bgsend($DNS_resolver_address);
-        $DNS_resolver_time = time;
+        $DNS_resolver_request = $main::DNS_resolver->bgsend($DNS_resolver_address);
+        $DNS_resolver_time    = time;
 
         #       print "db $main::Time_Date DNS starting search $main::Time, t=$DNS_resolver_time, a=$DNS_resolver_address\n";
     }
     else {
         $DNS_resolver_request++;
-        $DNS_resolver_time =
-          time - 100;    # Pretend we time out, so we respond on the next pass
+        $DNS_resolver_time = time - 100;    # Pretend we time out, so we respond on the next pass
     }
     return;
 }
@@ -298,14 +288,11 @@ sub main::net_ftp {
     $dir      = $main::config_parms{net_www_dir}      unless $dir;
     $passive  = 0                                     unless $passive;
 
-    print
-      "net_ftp error: 'server'   parm missing (check net_www_server   in mh.ini)\n"
+    print "net_ftp error: 'server'   parm missing (check net_www_server   in mh.ini)\n"
       unless $server;
-    print
-      "net_ftp error: 'user'     parm missing (check net_www_user     in mh.ini)\n"
+    print "net_ftp error: 'user'     parm missing (check net_www_user     in mh.ini)\n"
       unless $user;
-    print
-      "net_ftp error: 'password' parm missing (check net_www_password in mh.ini)\n"
+    print "net_ftp error: 'password' parm missing (check net_www_password in mh.ini)\n"
       unless $password;
 
     return unless $server and $user and $password;
@@ -313,11 +300,8 @@ sub main::net_ftp {
     print "Logging into web server $server as $user...\n";
 
     my $ftp;
-    unless ( $ftp =
-        Net::FTP->new( $server, timeout => $timeout, Passive => $passive ) )
-    {
-        print
-          "Unable to connect to ftp server $server timeout=$timeout passive=$passive: $@\n";
+    unless ( $ftp = Net::FTP->new( $server, timeout => $timeout, Passive => $passive ) ) {
+        print "Unable to connect to ftp server $server timeout=$timeout passive=$passive: $@\n";
         return "failed on connect";
     }
     unless ( $ftp->login( $user, $password ) ) {
@@ -341,8 +325,7 @@ sub main::net_ftp {
     }
     if ( $command eq 'put' ) {
         unless ( $ftp->put( $file, $file_remote ) ) {
-            print
-              " \x07Unable to put file $file into $server as $file_remote: $@\n";
+            print " \x07Unable to put file $file into $server as $file_remote: $@\n";
             return "failed on put";
         }
     }
@@ -374,8 +357,7 @@ sub main::net_ftp {
     return "was successful";
 }
 
-use vars
-  qw($aim_connection $icq_connection $jabber_connection $msn_connection %msn_connections %msn_queue %im_queue);
+use vars qw($aim_connection $icq_connection $jabber_connection $msn_connection %msn_connections %msn_queue %im_queue);
 
 eval 'use Net::Jabber';
 
@@ -417,15 +399,13 @@ sub main::net_jabber_signon {
     $options{componentname} = $component if ($component);
     my $success = $jabber_connection->Connect(%options);
     unless ($success) {
-        print
-          "  - Error:  Jabber server is down or connection was not allowed. jc=$jabber_connection: '$@'\n";
+        print "  - Error:  Jabber server is down or connection was not allowed. jc=$jabber_connection: '$@'\n";
         undef $jabber_connection;
         return;
     }
 
     if ($component) {
-        $jabber_connection->{STREAM}->{SIDS}
-          ->{ $jabber_connection->{SESSION}->{id} }->{hostname} = $component;
+        $jabber_connection->{STREAM}->{SIDS}->{ $jabber_connection->{SESSION}->{id} }->{hostname} = $component;
     }
 
     $jabber_connection->SetCallBacks(
@@ -443,8 +423,7 @@ sub main::net_jabber_signon {
         resource => $resource
     );
     if ( $result[0] ne "ok" ) {
-        print
-          "  - Error: Jabber Authorization failed: $result[0] - $result[1]\n";
+        print "  - Error: Jabber Authorization failed: $result[0] - $result[1]\n";
         undef $jabber_connection;
         return;
     }
@@ -502,8 +481,7 @@ sub jabber::InIQ {
     my $type  = $iq->GetType();
     my $query = $iq->GetQuery();
     my $xmlns = $query->GetXMLNS();
-    &main::display( "$main::Time_Date $from\nIQ $query:  " . $xmlns,
-        0, "Jabber IQ from $from", 'fixed' );
+    &main::display( "$main::Time_Date $from\nIQ $query:  " . $xmlns, 0, "Jabber IQ from $from", 'fixed' );
     &main::Jabber_IQ_hooks( $sid, $iq );
 }
 
@@ -539,8 +517,7 @@ sub main::net_jabber_send {
     $subject  = "Misterhouse"                             unless $subject;
 
     unless ( $from and $password and $to ) {
-        print
-          "\nError, net_jabber_send called with a missing argument:  from=$from to=$to password=$password\n";
+        print "\nError, net_jabber_send called with a missing argument:  from=$from to=$to password=$password\n";
         return;
     }
 
@@ -608,11 +585,8 @@ sub main::net_msn_signoff {
 
 sub MSN::status {
     my ( $self, $username, $newstatus ) = @_;
-    print "MSN ${username}'s status changed from "
-      . $self->buddystatus($username)
-      . " to $newstatus.\n";
-    &main::MSNim_Status_hooks( $username, $newstatus,
-        $self->buddystatus($username), 'MSN' );
+    print "MSN ${username}'s status changed from " . $self->buddystatus($username) . " to $newstatus.\n";
+    &main::MSNim_Status_hooks( $username, $newstatus, $self->buddystatus($username), 'MSN' );
 }
 
 sub MSN::message {
@@ -663,8 +637,7 @@ sub main::net_msn_send {
     $to       = $main::config_parms{net_msn_name_send} unless $to;
 
     unless ( $from and $password and $to ) {
-        print
-          "\nError, net_msn_send called with a missing argument:  from=$from to=$to password=$password\n";
+        print "\nError, net_msn_send called with a missing argument:  from=$from to=$to password=$password\n";
         return;
     }
     print "Sending MSN message to $to\n";
@@ -760,22 +733,16 @@ sub main::get_oscar_connection {
 
     # I got not buddies?   'invalid capability' on buddy_list_transfer
     #   $im_connection = Net::OSCAR->new(capabilities => [qw(typing_status extended_status buddy_icons file_transfer buddy_list_transfer)]);
-    $im_connection = Net::OSCAR->new(
-        capabilities => [
-            qw(typing_status extended_status buddy_icons file_transfer                    )
-        ]
-    );
+    $im_connection =
+      Net::OSCAR->new( capabilities => [ qw(typing_status extended_status buddy_icons file_transfer                    ) ] );
     $im_connection->set_callback_im_in( \&oscar::cb_imin );
     $im_connection->set_callback_buddy_in( \&oscar::cb_buddyin );
     $im_connection->set_callback_buddy_out( \&oscar::cb_buddyout );
     $im_connection->set_callback_error( \&oscar::cb_error );
     $im_connection->set_callback_signon_done( \&oscar::cb_signondone );
-    $im_connection->set_callback_connection_changed(
-        \&oscar::cb_connectionchanged );
-    $im_connection->set_callback_buddy_icon_uploaded(
-        \&oscar::cb_buddyiconuploaded );
-    $im_connection->set_callback_buddy_icon_downloaded(
-        \&oscar::cb_buddyicondownloaded );
+    $im_connection->set_callback_connection_changed( \&oscar::cb_connectionchanged );
+    $im_connection->set_callback_buddy_icon_uploaded( \&oscar::cb_buddyiconuploaded );
+    $im_connection->set_callback_buddy_icon_downloaded( \&oscar::cb_buddyicondownloaded );
     $im_connection->set_callback_buddylist_ok( \&oscar::cb_buddylistok );
 
     #   $im_connection -> set_callback_buddylist_changed(\&oscar::cb_buddylistchanged);
@@ -856,11 +823,11 @@ sub oscar::buddylist_changed {
 
     print "Buddylist was changed:\n";
     foreach (@changes) {
-        printf( "\t%s: %s %s\n",
-            $_->{action}, $_->{type},
-            ( $_->{type} == 1 )
+        printf(
+            "\t%s: %s %s\n", $_->{action}, $_->{type}, ( $_->{type} == 1 )
             ? ( $_->{group} . "/" . $_->{buddy} )
-            : $_->{group} );
+            : $_->{group}
+        );
     }
 }
 
@@ -1022,8 +989,7 @@ sub oscar::buddychange {
 sub oscar::cb_imin {
     my ( $oscar, $from, $message, $away ) = @_;
 
-    my $plaintext = HTML::FormatText->new( lm => 0, rm => 150 )
-      ->format( HTML::TreeBuilder->new()->parse($message) );
+    my $plaintext = HTML::FormatText->new( lm => 0, rm => 150 )->format( HTML::TreeBuilder->new()->parse($message) );
     chomp $plaintext;
 
     my $net = oscar::get_net($oscar);
@@ -1075,8 +1041,7 @@ sub main::net_im_process_queue {
     my $parms;
     my $num_items = scalar @{ $im_queue{$pgm} };
     while ( defined( $parms = shift @{ $im_queue{$pgm} } ) && $num_items ) {
-        &main::print_log(
-            "Trying again to send $pgm message to " . $$parms{to} );
+        &main::print_log( "Trying again to send $pgm message to " . $$parms{to} );
         if ( $$parms{to} eq $recipient ) {
             &main::net_im_send(%$parms);
         }
@@ -1102,10 +1067,8 @@ sub main::net_im_send {
     my $pgm = lc $parms{pgm};
     my $to  = $parms{to};
     print "net_im_send pgm=$pgm to=$to\n" if $main::Debug{im};
-    &::logit(
-        "$main::config_parms{data_dir}/logs/net_im.$::Year_Month_Now.log",
-        "to=$to from=$parms{from} pgm=$pgm text=$parms{text}"
-    );
+    &::logit( "$main::config_parms{data_dir}/logs/net_im.$::Year_Month_Now.log",
+        "to=$to from=$parms{from} pgm=$pgm text=$parms{text}" );
 
     return if &main::net_im_do_send(%parms) != 0;
 
@@ -1156,8 +1119,7 @@ sub main::net_im_do_send {
     }
 
     unless ( $from and $password and $to ) {
-        print
-          "\nError, net_im_send called with a missing argument:  from=$from to=$to password=$password\n";
+        print "\nError, net_im_send called with a missing argument:  from=$from to=$to password=$password\n";
         return 0;
     }
 
@@ -1219,15 +1181,14 @@ sub main::net_mail_send_old {
     $subject = $parms{subject};
     $account = $parms{account};
 
-    $account = $main::config_parms{net_mail_send_account}        unless $server;
-    $server  = $main::config_parms{"net_mail_${account}_server"} unless $server;
-    $from = $main::config_parms{"net_mail_${account}_address"} unless $from;
-    $to = $main::config_parms{"net_mail_${account}_address"} unless $to;
-    $subject = "Email from Mister House" unless $subject;
-    $text = $parms{text};
+    $account = $main::config_parms{net_mail_send_account}         unless $server;
+    $server  = $main::config_parms{"net_mail_${account}_server"}  unless $server;
+    $from    = $main::config_parms{"net_mail_${account}_address"} unless $from;
+    $to      = $main::config_parms{"net_mail_${account}_address"} unless $to;
+    $subject = "Email from Mister House"                          unless $subject;
+    $text    = $parms{text};
 
-    print
-      "net_mail_send error: 'server' parm missing (check net_mail_server in mh.ini)\n"
+    print "net_mail_send error: 'server' parm missing (check net_mail_server in mh.ini)\n"
       unless $server;
     print "net_mail_send error: 'to' parm missing\n" unless $to;
 
@@ -1236,9 +1197,7 @@ sub main::net_mail_send_old {
     use Net::SMTP;
     print "Logging into mail server $server to send msg to $to\n";
 
-    unless ( $smtp =
-        Net::SMTP->new( $server, Timeout => 10, Debug => $parms{debug} ) )
-    {
+    unless ( $smtp = Net::SMTP->new( $server, Timeout => 10, Debug => $parms{debug} ) ) {
         print "Unable to log into mail server $server: $@\n";
         return;
     }
@@ -1251,11 +1210,7 @@ sub main::net_mail_send_old {
 
 sub main::net_mail_send {
     my %parms = @_;
-    my (
-        $from, $to,       $subject, $text, $server,
-        $port, $smtp,     $account, $mime, $baseref,
-        $file, $filename, $service
-    );
+    my ( $from, $to, $subject, $text, $server, $port, $smtp, $account, $mime, $baseref, $file, $filename, $service );
     my ( $smtpusername, $smtppassword, $smtpencrypt );
 
     $server       = $parms{server};
@@ -1280,20 +1235,19 @@ sub main::net_mail_send {
     $server = $main::config_parms{"net_mail_${account}_server_send"}
       unless $server;
     $server = $main::config_parms{"net_mail_${account}_server"} unless $server;
-    $server = 'localhost' unless $server;
-    $port = $main::config_parms{"net_mail_${account}_server_send_port"}
+    $server = 'localhost'                                       unless $server;
+    $port   = $main::config_parms{"net_mail_${account}_server_send_port"}
       unless $port;
-    $port = 25                                                 unless $port;
-    $from = $main::config_parms{"net_mail_${account}_address"} unless $from;
-    $to   = $main::config_parms{"net_mail_${account}_address"} unless $to;
-    $subject = "Email from Misterhouse" unless $subject;
+    $port    = 25                                                 unless $port;
+    $from    = $main::config_parms{"net_mail_${account}_address"} unless $from;
+    $to      = $main::config_parms{"net_mail_${account}_address"} unless $to;
+    $subject = "Email from Misterhouse"                           unless $subject;
 
     #    $baseref = 'localhost'                                        unless $baseref;
     $service = $main::config_parms{"net_mail_${account}_service"};
     $service = "smtp" unless $service;
 
-    my $timeout =
-      $main::config_parms{"net_mail_${account}_server_send_timeout"};
+    my $timeout = $main::config_parms{"net_mail_${account}_server_send_timeout"};
     $timeout = 20 unless $timeout;
 
     $smtpusername = $main::config_parms{"net_mail_${account}_user"}
@@ -1313,11 +1267,9 @@ sub main::net_mail_send {
         return;
     }
 
-    print
-      "Sending $service mail with account $account from $from to $to on $server $port\n";
+    print "Sending $service mail with account $account from $from to $to on $server $port\n";
 
-    print
-      "net_mail_send error: 'server' parm missing (check net_mail_server in mh.ini)\n"
+    print "net_mail_send error: 'server' parm missing (check net_mail_server in mh.ini)\n"
       unless $server;
     print "net_mail_send error: 'to' parm missing\n" unless $to;
 
@@ -1440,8 +1392,7 @@ sub main::net_mail_send {
     }
     else {
 
-        eval
-          "use Net::SMTP_auth";   # Not on all installs, so eval to avoid errors
+        eval "use Net::SMTP_auth";    # Not on all installs, so eval to avoid errors
         print "NET::SMTP_auth eval error: $@\n" if $@;
 
         use Net::SMTP;
@@ -1459,8 +1410,7 @@ sub main::net_mail_send {
             print "Unable to Authenticate on mail server $server $port: $@\n";
             return;
         }
-        print 'Authenticating SMTP using encryption ', $smtpencrypt,
-          " for username ", $smtpusername, "\n"
+        print 'Authenticating SMTP using encryption ', $smtpencrypt, " for username ", $smtpusername, "\n"
           if $parms{debug};
 
         # set SMTP username and password if we have them
@@ -1499,8 +1449,8 @@ sub main::net_mail_login {
     $server   = $parms{server};
     $port     = $parms{port};
     $ping     = $parms{ping};
-    $account = ( $parms{account} ) ? "net_mail_" . $parms{account} : "net_mail";
-    $user = $main::config_parms{ $account . "_user" } unless $user;
+    $account  = ( $parms{account} ) ? "net_mail_" . $parms{account} : "net_mail";
+    $user     = $main::config_parms{ $account . "_user" } unless $user;
     $password = $main::config_parms{ $account . "_password" } unless $password;
     $server   = $main::config_parms{ $account . "_server" } unless $server;
     $port     = $main::config_parms{ $account . "_server_port" } unless $port;
@@ -1607,13 +1557,8 @@ sub main::net_mail_summary {
     my $msgnum = $parms{last};
     while ($msgnum) {
         print "getting msg $msgnum\n" if $main::Debug{net};
-        my $msg_ptr =
-          $pop->top( $msgnum, $main::config_parms{net_mail_scan_size} );
-        my (
-            $date,    $date_received, $from,        $from_name,
-            $sender,  $to,            $cc,          $replyto,
-            $subject, $header,        $header_flag, $body
-        );
+        my $msg_ptr = $pop->top( $msgnum, $main::config_parms{net_mail_scan_size} );
+        my ( $date, $date_received, $from, $from_name, $sender, $to, $cc, $replyto, $subject, $header, $header_flag, $body );
         $header_flag = 1;
         my $i = 0;
         for (@$msg_ptr) {
@@ -1679,10 +1624,8 @@ sub main::net_mail_summary {
         # '"last, first: org (sub-org)" <email@email.com>'
         #$' <email@email.com>'
 
-        if ( $from =~ m/^\</ )
-        { #just an email address with no friendly name, so just return the email address
-            ($from_name) =
-              $from =~ /^\<(.*)\>$/;    #remove < and > from email address
+        if ( $from =~ m/^\</ ) {    #just an email address with no friendly name, so just return the email address
+            ($from_name) = $from =~ /^\<(.*)\>$/;    #remove < and > from email address
         }
         else {
 
@@ -1703,23 +1646,20 @@ sub main::net_mail_summary {
 
             #       $from_name =~ tr/"//;
             $from_name =~ s/\"//g;    # "first last"
-            $from_name = "$2 $1" if $from_name =~ /(\S+), +(\S+)/; # last, first
-            $from_name =~ s/://g;    #:'s have no place in an email address
+            $from_name = "$2 $1" if $from_name =~ /(\S+), +(\S+)/;    # last, first
+            $from_name =~ s/://g;                                     #:'s have no place in an email address
 
             #       $from_name =~ s/ (\S)\. / $1 /;  # Drop the "." after middle initial abreviation.
             # Spammers blank this out, so no point in warning about it
         }
-        print
-          "Warning, net_mail_summary: No From name found: from=$from, header=$header\n"
+        print "Warning, net_mail_summary: No From name found: from=$from, header=$header\n"
           unless $from_name;
 
         my $age_msg = int( ( time - str2time($date_received) ) / 60 );
-        print
-          "Warning, net_mail_summary: age is negative: age=$age_msg, date=$date_received\n"
+        print "Warning, net_mail_summary: age is negative: age=$age_msg, date=$date_received\n"
           if $age_msg < 0;
 
-        print
-          "msgnum=$msgnum  age=$age_msg date=$date_received from=$from sender=$sender to=$to subject=$subject\n"
+        print "msgnum=$msgnum  age=$age_msg date=$date_received from=$from sender=$sender to=$to subject=$subject\n"
           if $parms{debug} or $main::Debug{net};
 
         #       print "db m=$msgnum mf=$parms{first} a=$age_msg a=$parms{age} d=$date_received from=$from \n";
@@ -1848,15 +1788,13 @@ sub main::net_socket_check {
             return 1;
         }
         else {
-            print
-              "socket_check:  $protocol port is down on host=$host port=$port: $@\n"
+            print "socket_check:  $protocol port is down on host=$host port=$port: $@\n"
               if $main::Debug{socket};
             return 0;
         }
     }
     else {
-        print
-          "socket_check error:  address is not in the host:port form.  address=$host_port\n";
+        print "socket_check error:  address is not in the host:port form.  address=$host_port\n";
         return 0;
     }
 }
diff --git a/lib/handy_tk_utilities.pl b/lib/handy_tk_utilities.pl
index a7a55afe4..336440c09 100644
--- a/lib/handy_tk_utilities.pl
+++ b/lib/handy_tk_utilities.pl
@@ -47,8 +47,7 @@ sub tk_setup_geometry {
     if (
         $config_parms{tk_geometry}
         and (  $Startup
-            or $config_parms{tk_geometry} ne
-            $config_parms{tk_geometry_startup} )
+            or $config_parms{tk_geometry} ne $config_parms{tk_geometry_startup} )
       )
     {
         print "Setting geometry to $config_parms{tk_geometry}\n";
@@ -62,7 +61,7 @@ sub tk_setup_cascade_menus {
     if ( $config_parms{tk_commands} ) {
 
         print "Creating Command menu\n";
-        $Tk_objects{menu_commands}->menu->delete( 0, 'end' ); # Delete old menus
+        $Tk_objects{menu_commands}->menu->delete( 0, 'end' );    # Delete old menus
 
         for my $category ( &list_code_webnames('Voice_Cmd') ) {
 
@@ -84,11 +83,7 @@ sub tk_setup_cascade_menus {
                 unless ( $Tk_objects{menu_command_by_cat}{$category} ) {
                     $Tk_objects{menu_command_by_cat}{$category} =
                       $Tk_objects{menu_commands}->menu->Menu;
-                    &tk_cascade_entry(
-                        $category,
-                        $Tk_objects{menu_commands},
-                        $Tk_objects{menu_command_by_cat}{$category}
-                    );
+                    &tk_cascade_entry( $category, $Tk_objects{menu_commands}, $Tk_objects{menu_command_by_cat}{$category} );
                 }
 
                 #                $Tk_objects{menu_command_by_cat}{$category}->
@@ -102,17 +97,14 @@ sub tk_setup_cascade_menus {
                 $filename =~ s/_/\x20/g;
                 $filename =~ ucfirst($filename);
 
-                if ( my ( $prefix, $states, $suffix ) =
-                    $text =~ /^(.*)\[(.+?)\](.*)$/ )
-                {
+                if ( my ( $prefix, $states, $suffix ) = $text =~ /^(.*)\[(.+?)\](.*)$/ ) {
                     for my $state ( split( ',', $states ) ) {
                         my $text2 = "$prefix$state$suffix";
                         my $text3 = "$filename: $text2";
                         $Tk_objects{menu_command_by_cat}{$category}->add(
                             'command',
-                            -label => $text3,
-                            -command =>
-                              sub { &run_voice_cmd( $text2, undef, 'tk' ) }
+                            -label   => $text3,
+                            -command => sub { &run_voice_cmd( $text2, undef, 'tk' ) }
                         );
                     }
                 }
@@ -162,19 +154,11 @@ sub tk_setup_cascade_menus {
             $Tk_objects{menu_items_by_type}{$object_type} =
               $Tk_objects{menu_items}->menu->Menu;
 
-            &configure_element( 'window',
-                \$Tk_objects{menu_items_by_type}{$object_type} );
-            &tk_cascade_entry( $object_type, $Tk_objects{menu_items},
-                $Tk_objects{menu_items_by_type}{$object_type} );
+            &configure_element( 'window', \$Tk_objects{menu_items_by_type}{$object_type} );
+            &tk_cascade_entry( $object_type, $Tk_objects{menu_items}, $Tk_objects{menu_items_by_type}{$object_type} );
 
             # Sort by filename first, then object name
-            for my $object (
-                sort {
-                         $a->{filename} cmp $b->{filename}
-                      or $a->{object_name} cmp $b->{object_name}
-                } @objects
-              )
-            {
+            for my $object ( sort { $a->{filename} cmp $b->{filename} or $a->{object_name} cmp $b->{object_name} } @objects ) {
 
                 next if $$object{hidden};
 
@@ -193,8 +177,7 @@ sub tk_setup_cascade_menus {
                     $filename = ucfirst($filename);
 
                     # *** This should be another cascade!
-                    my $object_name = "$filename: "
-                      . &pretty_object_name( $object->{object_name} );
+                    my $object_name = "$filename: " . &pretty_object_name( $object->{object_name} );
                     &tk_cascade_entry(
                         $object_name,
                         $Tk_objects{menu_items_by_type}{$object_type},
@@ -222,8 +205,7 @@ sub tk_setup_cascade_menus {
               )->pack( -side => 'left', -padx => 0 )
               unless $Tk_objects{menu_groups};
 
-            $Tk_objects{menu_groups}->menu->delete( 0, 'end' )
-              ;    # Delete old menus
+            $Tk_objects{menu_groups}->menu->delete( 0, 'end' );    # Delete old menus
 
             for my $group_name ( &list_objects_by_type('Group') ) {
                 my $group = &get_object_by_name($group_name);
@@ -234,36 +216,22 @@ sub tk_setup_cascade_menus {
                 $Tk_objects{menu_groups_by_group}{$group} =
                   $Tk_objects{menu_groups}->menu->Menu;
 
-                &configure_element( 'window',
-                    \$Tk_objects{menu_groups_by_group}{$group} );
+                &configure_element( 'window', \$Tk_objects{menu_groups_by_group}{$group} );
 
-                &tk_cascade_entry(
-                    $group_name,
-                    $Tk_objects{menu_groups},
-                    $Tk_objects{menu_groups_by_group}{$group}
-                );
+                &tk_cascade_entry( $group_name, $Tk_objects{menu_groups}, $Tk_objects{menu_groups_by_group}{$group} );
 
                 # Add an entry for the group
-                &tk_object_states( $group, 'menu_groups',
-                    $Tk_objects{menu_groups_by_group}{$group} );
+                &tk_object_states( $group, 'menu_groups', $Tk_objects{menu_groups_by_group}{$group} );
 
                 # Sort by filename first, then object name
-                for my $object (
-                    sort {
-                             $a->{filename} cmp $b->{filename}
-                          or $a->{object_name} cmp $b->{object_name}
-                    } list $group)
+                for my $object ( sort { $a->{filename} cmp $b->{filename} or $a->{object_name} cmp $b->{object_name} } list $group)
                 {
                     next if $$object{hidden};
-                    if ( my $menu =
-                        &tk_object_states( $object, 'menu_groups' ) )
-                    {
+                    if ( my $menu = &tk_object_states( $object, 'menu_groups' ) ) {
                         $Tk_objects{menu_items_by_object}{$object} = $menu;
                         my $filename    = $object->{filename};
-                        my $object_name = "$filename: "
-                          . &pretty_object_name( $object->{object_name} );
-                        &tk_cascade_entry( $object_name,
-                            $Tk_objects{menu_groups_by_group}{$group}, $menu );
+                        my $object_name = "$filename: " . &pretty_object_name( $object->{object_name} );
+                        &tk_cascade_entry( $object_name, $Tk_objects{menu_groups_by_group}{$group}, $menu );
                     }
                 }
             }
@@ -283,16 +251,14 @@ sub tk_object_states {
     my ( $object, $menu_parent, $menu ) = @_;
 
     return
-      unless $object
-      ;    # *** Looks like a warning needed here (for calling code's developer)
+      unless $object;    # *** Looks like a warning needed here (for calling code's developer)
 
     # Already have this object's menu created
     return $Tk_objects{menu_items_by_object}{$object}
       if !$menu
-      and $Tk_objects{menu_items_by_object}{$object}
-      ;    # Already have this object's menu created
+      and $Tk_objects{menu_items_by_object}{$object};    # Already have this object's menu created
 
-    return unless $object->{states}; # Only create menus for objects with states
+    return unless $object->{states};                     # Only create menus for objects with states
     my @states      = @{ $object->{states} };
     my $object_type = ref $object;
 
@@ -304,7 +270,7 @@ sub tk_object_states {
     return unless $states[0];
 
     $menu = $Tk_objects{$menu_parent}->menu->Menu
-      unless $menu;                  # Create a new menu unless given
+      unless $menu;                                      # Create a new menu unless given
     $menu->add(
         'command',
         -label   => 'Log',
@@ -388,9 +354,7 @@ sub tk_mbutton {
     my ( $label, $pvar ) = @_;
     $Tk_objects{mbutton}{$pvar}->destroy
       if $Tk_objects{mbutton}{$pvar} and Exists( $Tk_objects{mbutton}{$pvar} );
-    $Tk_objects{mbutton}{$pvar} =
-      $Tk_objects{menu_bar}->Button( -text => $label, -command => $pvar )
-      ->pack(qw/-side right/);
+    $Tk_objects{mbutton}{$pvar} = $Tk_objects{menu_bar}->Button( -text => $label, -command => $pvar )->pack(qw/-side right/);
 }
 
 =item C<tk_checkbutton>
@@ -450,8 +414,7 @@ sub tk_checkbutton {
 sub tk_command_list {
     my ($parent) = @_;
 
-    my $list = $parent->Scrolled(
-        qw/Tree -separator : -exportselection 1 -scrollbars osoe /);
+    my $list = $parent->Scrolled(qw/Tree -separator : -exportselection 1 -scrollbars osoe /);
     &configure_element( 'edit', \$list );
 
     # These 2 commands give a 'can not find delegate.pl' msg on tk 8.020 (ok on 8.015).
@@ -461,16 +424,13 @@ sub tk_command_list {
     my $f = $parent->Frame->pack( -side => 'top', -fill => 'x' );
 
     #    $f->Label(-text => "Command or Search:")->pack(-side => 'left', -fill => 'x');
-    $Tk_objects{command} =
-      $f->BrowseEntry( -width => 20 )
-      ->pack( -side => 'left', -fill => 'x', -expand => 1 );
+    $Tk_objects{command} = $f->BrowseEntry( -width => 20 )->pack( -side => 'left', -fill => 'x', -expand => 1 );
 
     #    $Tk_objects{command}->Subwidget('entry')->configure(-bg => 'white');
 
     # *** Need execute_tk_command sub (looks at textbox)
 
-    $Tk_objects{command}
-      ->configure( -command => sub { print "testing browseentry @_"; } );
+    $Tk_objects{command}->configure( -command => sub { print "testing browseentry @_"; } );
 
     my $entry = $Tk_objects{command}->Subwidget('entry');
     &configure_element( 'edit', \$entry );
@@ -507,8 +467,7 @@ sub tk_command_list {
             my $cmd = "@_";
             if ( $cmd =~ /^(.*?): / ) {
                 $cmd =~ s/^(.*?): //;
-                $Tk_objects{command}->Subwidget('entry')
-                  ->configure( -text => $cmd );
+                $Tk_objects{command}->Subwidget('entry')->configure( -text => $cmd );
                 &process_external_command( $cmd, 0, 'tk' );
             }
         }
@@ -556,8 +515,7 @@ sub tk_command_list {
 
                 $list->autosetmode();
             }
-            $Tk_objects{command}->insert( 'end', $cmd )
-              ;    # add to MRU (*** check if there already, move to top)
+            $Tk_objects{command}->insert( 'end', $cmd );    # add to MRU (*** check if there already, move to top)
         }
     );
     return $list;
@@ -566,8 +524,7 @@ sub tk_command_list {
 sub tk_scalebar {
     return
       unless $Reload
-      and $Tk_objects{grid}
-      ; # a crutch for ailing code that creates widgets at the wrong time (better to let them break!)
+      and $Tk_objects{grid};    # a crutch for ailing code that creates widgets at the wrong time (better to let them break!)
     my $tk;
     my ( $pvar, $col, $label, $from, $to, $row, $show_label ) = @_;
 
@@ -682,9 +639,7 @@ sub tk_entry {
         &configure_element( 'label', \$Tk_objects{entry}{$label} );
 
         if ( ref $pvar ne 'SCALAR' and $pvar->can('set') ) {
-            $Tk_objects{entry}{$pvar} =
-              $Tk_objects{grid}
-              ->Entry( -textvariable => \$$pvar{state}, -width => 12 );
+            $Tk_objects{entry}{$pvar} = $Tk_objects{grid}->Entry( -textvariable => \$$pvar{state}, -width => 12 );
 
             $Tk_objects{entry}{$pvar}->bind(
                 '<Return>',
@@ -697,8 +652,7 @@ sub tk_entry {
         else {
             $Tk_objects{entry}{$pvar} =
               $Tk_objects{grid}->Entry( -textvariable => $pvar, -width => 12 );
-            $Tk_objects{entry}{$pvar}
-              ->bind( '<Return>', sub { $Tk_results{$label} = $$pvar } );
+            $Tk_objects{entry}{$pvar}->bind( '<Return>', sub { $Tk_results{$label} = $$pvar } );
         }
 
         &configure_element( 'edit', \$Tk_objects{entry}{$pvar} );
@@ -797,8 +751,7 @@ sub tk_label {
 
         #           Label(-relief => 'sunken', -textvariable => $pvar, -anchor => 'w', -font => $font1);
 
-        &configure_element( 'log', \$Tk_objects{label}{$pvar} )
-          ;    # these are log-like (need fixed-width font)
+        &configure_element( 'log', \$Tk_objects{label}{$pvar} );    # these are log-like (need fixed-width font)
 
         push( @widgets, $Tk_objects{label}{$pvar} );
     }
@@ -828,10 +781,9 @@ sub configure_element {
 
     if ( defined $$p_element ) {
 
-        $font   = &get_scheme_parameter( $type, 'font' );
-        $color  = &get_scheme_parameter( $type, 'color' );
-        $colors = &get_scheme_parameter( $type, 'colors' )
-          ;    #for multi-color progress bars
+        $font         = &get_scheme_parameter( $type, 'font' );
+        $color        = &get_scheme_parameter( $type, 'color' );
+        $colors       = &get_scheme_parameter( $type, 'colors' );        #for multi-color progress bars
         $bgcolor      = &get_scheme_parameter( $type, 'bgcolor' );
         $relief       = &get_scheme_parameter( $type, 'relief' );
         $border_width = &get_scheme_parameter( $type, 'borderwidth' );
@@ -851,9 +803,8 @@ sub configure_element {
 
             $$p_element->configure(
                 -colors => [
-                    0,  $colors[0], 12, $colors[0], 25, $colors[1],
-                    37, $colors[1], 50, $colors[2], 63, $colors[2],
-                    75, $colors[3], 87, $colors[3]
+                    0,  $colors[0], 12, $colors[0], 25, $colors[1], 37, $colors[1],
+                    50, $colors[2], 63, $colors[2], 75, $colors[3], 87, $colors[3]
                 ]
               )
               if defined $colors
@@ -870,27 +821,24 @@ sub configure_element {
         }
     }
     else {
-        warn
-          "Undefined element passed to configure_element type=$type $p_element";
+        warn "Undefined element passed to configure_element type=$type $p_element";
     }
 }
 
 sub get_scheme_parameter {
-    my $type = shift; #window *** or menu, frame, edit, log, progress or toolbar
+    my $type      = shift;    #window *** or menu, frame, edit, log, progress or toolbar
     my $parameter = shift;    #borderwidth, relief, bgcolor or font
 
     # *** Validate
 
     my $key = "tk_$parameter";
-    if ( $parameter eq 'font' )
-    {    # for backwards compatibility (tk_font_fixed, tk_font_menus, etc.)
-            #	$key .= '_menus' if $type eq 'window' or $type eq 'frame';
+    if ( $parameter eq 'font' ) {    # for backwards compatibility (tk_font_fixed, tk_font_menus, etc.)
+                                     #	$key .= '_menus' if $type eq 'window' or $type eq 'frame';
         $key .= '_window' if $type eq 'window';
         $key .= '_fixed'  if $type eq 'log';
         $key .= '_edit'   if $type eq 'edit';
         $key .= '_label'
-          if $type eq 'label'
-          ; # *** label widget sends this or log, depending on parameter passed to it
+          if $type eq 'label';       # *** label widget sends this or log, depending on parameter passed to it
     }
     else {
         $key .= "_$type";
@@ -930,9 +878,7 @@ sub tk_mlabel {
 
     $Tk_objects{mlabel}{$name}->destroy()
       if $Tk_objects{mlabel}{$name} and Exists( $Tk_objects{mlabel}{$name} );
-    $Tk_objects{mlabel}{$name} =
-      $Tk_objects{menu_bar}
-      ->Label( -relief => 'sunken', -textvariable => $pvar2 );
+    $Tk_objects{mlabel}{$name} = $Tk_objects{menu_bar}->Label( -relief => 'sunken', -textvariable => $pvar2 );
 
     &configure_element( 'edit', $Tk_objects{mlabel}{$name} );
 
@@ -987,8 +933,7 @@ sub tk_radiobutton {
       and Exists( $Tk_objects{radiobutton}{$pvar} );
     my @widgets;
     my @text = @$ptext
-      if $ptext
-      ; # Copy, so we can do shift and still have the origial $ptext array available for html widget
+      if $ptext;    # Copy, so we can do shift and still have the origial $ptext array available for html widget
     for my $value (@$pvalue) {
         my $text = shift @text;
         $text = $value unless defined $text;
@@ -1014,9 +959,7 @@ sub tk_radiobutton {
 
         #       &configure_element('frame', $widget);
     }
-    $Tk_objects{radiobutton}{$pvar} =
-      $Tk_objects{grid}->Label( -text => $label )
-      ->grid( @widgets, -sticky => 'w' );
+    $Tk_objects{radiobutton}{$pvar} = $Tk_objects{grid}->Label( -text => $label )->grid( @widgets, -sticky => 'w' );
 
     #   $Tk_objects{radiobutton}{$pvar} = $Tk_objects{grid}->Label(-text => $label);
     #   &configure_element('frame', $Tk_objects{radiobutton}{$pvar});
@@ -1033,20 +976,14 @@ sub help_about {
         app         => 'help',
         window_name => 'about',
         buttons     => 1,
-        help =>
-          'This is the about box. The System Info button displays OS and program status.'
+        help        => 'This is the about box. The System Info button displays OS and program status.'
     );
     unless ( $win->{activated} ) {
         play 'about';
         my $tk;
-        $tk =
-          $win->{MW}{top_frame}->Label( -text => "$title $Version PID: $$" )
-          ->pack(qw/-expand yes -fill both -side top/);
+        $tk = $win->{MW}{top_frame}->Label( -text => "$title $Version PID: $$" )->pack(qw/-expand yes -fill both -side top/);
         &configure_element( 'label', \$tk );
-        $tk =
-          $win->{MW}{bottom_frame}
-          ->Button( -text => "System Info...", -command => \&system_info )
-          ->pack(qw/-side right/);
+        $tk = $win->{MW}{bottom_frame}->Button( -text => "System Info...", -command => \&system_info )->pack(qw/-side right/);
         &configure_element( 'button', \$tk );
 
         # easter egg (plays goofy WAV file)
@@ -1062,12 +999,9 @@ sub tk_setup_windows {
     print " - setting up the main window\n";
     eval { $MW = MainWindow->new(); };
     if ($@) {
-        print
-          " - WARN: failed to setup main window.  This may be a x-windows permissions problem,\n";
-        print
-          " -        a ssh forwarding problem or some other x-windows related problem.\n";
-        print
-          " -        You may wish to try \"wish\" to debug.  If using ssh, look into ForwardX11Trusted option\n";
+        print " - WARN: failed to setup main window.  This may be a x-windows permissions problem,\n";
+        print " -        a ssh forwarding problem or some other x-windows related problem.\n";
+        print " -        You may wish to try \"wish\" to debug.  If using ssh, look into ForwardX11Trusted option\n";
         return;
     }
     $MW->withdraw;    # Hide the window until we are all set up
@@ -1080,9 +1014,9 @@ sub tk_setup_windows {
     # and we don't mess with manual changes.
     $config_parms{tk_geometry_startup} = $config_parms{tk_geometry};
 
-    $MW->iconname('Misterhouse'); # Loads tk icon resource
-                                  # Older build gives 'bitmap not defined' error
-     # $MW->iconbitmap($Pgm_Root . '/web/favicon.ico') unless $^O eq 'MSWin32' and &Win32::BuildNumber < 810;
+    $MW->iconname('Misterhouse');    # Loads tk icon resource
+                                     # Older build gives 'bitmap not defined' error
+        # $MW->iconbitmap($Pgm_Root . '/web/favicon.ico') unless $^O eq 'MSWin32' and &Win32::BuildNumber < 810;
     my $icon_image = $MW->Photo(
         -file   => "${Pgm_Root}/web/favicon.gif",
         -format => 'gif'
@@ -1129,9 +1063,8 @@ sub tk_setup_windows {
     &configure_element( 'window', \$Tk_objects{menu_view} );
 
     $Tk_objects{menu_view}->command(
-        -label => 'in Browser',
-        -command =>
-          sub { &browser("http://localhost:$config_parms{http_port}") }
+        -label   => 'in Browser',
+        -command => sub { &browser("http://localhost:$config_parms{http_port}") }
     );
     $Tk_objects{menu_view}->separator();
 
@@ -1139,8 +1072,7 @@ sub tk_setup_windows {
 
     if ( $config_parms{tk_schemes} ) {
         $Tk_objects{menu_view_schemes} = $Tk_objects{menu_view}->menu->Menu;
-        &tk_cascade_entry( 'Schemes', $Tk_objects{menu_view},
-            $Tk_objects{menu_view_schemes} );
+        &tk_cascade_entry( 'Schemes', $Tk_objects{menu_view}, $Tk_objects{menu_view_schemes} );
 
         &configure_element( 'window', \$Tk_objects{menu_view_schemes} );
 
@@ -1194,11 +1126,9 @@ sub tk_setup_windows {
 
     &configure_element( 'window', \$Tk_objects{menu_tools} );
 
-    $Tk_objects{menu_tools}
-      ->command( -label => 'Undo last action', -command => \&undo_last_action );
+    $Tk_objects{menu_tools}->command( -label => 'Undo last action', -command => \&undo_last_action );
 
-    $Tk_objects{menu_tools}
-      ->command( -label => 'Triggers...', -command => \&browse_triggers );
+    $Tk_objects{menu_tools}->command( -label => 'Triggers...', -command => \&browse_triggers );
 
     $Tk_objects{menu_tools}->separator();
 
@@ -1206,8 +1136,7 @@ sub tk_setup_windows {
 
     &configure_element( 'window', \$Tk_objects{menu_tools_set_password} );
 
-    &tk_cascade_entry( 'Set Password', $Tk_objects{menu_tools},
-        $Tk_objects{menu_tools_set_password} );
+    &tk_cascade_entry( 'Set Password', $Tk_objects{menu_tools}, $Tk_objects{menu_tools_set_password} );
 
     $Tk_objects{menu_tools_set_password}->command(
         -label     => 'Guest',
@@ -1232,9 +1161,7 @@ sub tk_setup_windows {
         -variable => \$config_parms{console_speech}
     );
 
-    $Tk_objects{menu_tools_echoes} =
-      $Tk_objects{menu_tools}->command( -label => 'Echo' )
-      ;    # This is a dynamic cascade...
+    $Tk_objects{menu_tools_echoes} = $Tk_objects{menu_tools}->command( -label => 'Echo' );    # This is a dynamic cascade...
 
     $Tk_objects{menu_tools}->separator;
 
@@ -1273,8 +1200,7 @@ sub tk_setup_windows {
 
     &configure_element( 'window', \$Tk_objects{menu_file_debug} );
 
-    &tk_cascade_entry( 'Debug', $Tk_objects{menu_file},
-        $Tk_objects{menu_file_debug} );
+    &tk_cascade_entry( 'Debug', $Tk_objects{menu_file}, $Tk_objects{menu_file_debug} );
 
     #Loop through debug options (should build dynamically like "list debug options"
 
diff --git a/lib/handy_utilities.pl b/lib/handy_utilities.pl
index 10348489a..7dc771a4f 100644
--- a/lib/handy_utilities.pl
+++ b/lib/handy_utilities.pl
@@ -62,7 +62,7 @@ sub main::batch {
     #   print BAT ":exit\necho on\ndel $bat_file\nexit\n";
     close BAT;
     system("start /min command /c $bat_file")
-      ; # Use cmd so the console will disappear when done ... exit after delete doesn't work :(
+      ;    # Use cmd so the console will disappear when done ... exit after delete doesn't work :(
 
     #   system("start /min cmd /c $bat_file"); # Use cmd so the console will disappear when done ... exit after delete doesn't work :(
 }
@@ -123,8 +123,7 @@ sub main::file_tail {
 
     # Get the last few lines of a file
     $records = 3 unless $records;
-    my $bytes =
-      $records * 400;    # Guess on where to put the file pointer ... faster
+    my $bytes = $records * 400;    # Guess on where to put the file pointer ... faster
     seek DATA, -$bytes, 2;
     my @data = <DATA>;
     $records = @data if @data < $records;
@@ -139,8 +138,7 @@ sub main::file_read_dir {
     my %files;
     for my $dir (@dirs) {
         opendir( DIR, $dir )
-          or print
-          "\nError in file_dir_read, can not open directory:  $dir. $!\n";
+          or print "\nError in file_dir_read, can not open directory:  $dir. $!\n";
         my @files = readdir(DIR);
         close DIR;
 
@@ -170,11 +168,9 @@ sub main::file_read {
     # Read is faster than <> (?)
     else {
         binmode LOG
-          unless $textmode
-          ;   # Don't use this on wantarray ... chomp will only get \n, not \r\n
+          unless $textmode;    # Don't use this on wantarray ... chomp will only get \n, not \r\n
         my ( $data, $buffer );
-        while ( read( LOG, $buffer, 8192 ) )
-        {     # 8*2**10 bytes ... is this optimal??
+        while ( read( LOG, $buffer, 8192 ) ) {    # 8*2**10 bytes ... is this optimal??
             $data .= $buffer;
         }
         close LOG;
@@ -182,11 +178,11 @@ sub main::file_read {
     }
 }
 
-sub main::file_write {    # Same as fileit
+sub main::file_write {                            # Same as fileit
     my ( $file, $data ) = @_;
     open( LOG, ">$file" )
       or print "Warning, could not open file_write $file: $!\n";
-    binmode LOG;          # Without this, \n newlines get messed up
+    binmode LOG;                                  # Without this, \n newlines get messed up
     print LOG $data;
 
     #   print LOG $data . "\n";
@@ -254,8 +250,7 @@ sub main::find_pgm_path {
     print "db Finding program path=$pgm_path\n" if $::Debug{misc};
 
     unless ( $pgm_path = &main::which($pgm_path) ) {
-        print
-          "Warning, new Process:  Can not find path to pgm=$pgm, pgm_path=$pgm_path arg=$pgm_args\n";
+        print "Warning, new Process:  Can not find path to pgm=$pgm, pgm_path=$pgm_path arg=$pgm_args\n";
 
         #       return;
     }
@@ -304,7 +299,7 @@ sub main::get_tickcount {
         }
     }
     $time += 2**32
-      if $time < 0;  # This wraps to negative after 25 days.  Resets after 49 :(
+      if $time < 0;                                        # This wraps to negative after 25 days.  Resets after 49 :(
     return $time;
 }
 
@@ -312,7 +307,7 @@ sub main::logit {
     my ( $log_file, $log_data, $log_format, $head_tail ) = @_;
     $log_format = 14 unless defined $log_format;
     unless ( $log_format == 0 ) {
-        $log_data =~ s/[\n\r]+/ /g;    # So log only takes one line.
+        $log_data =~ s/[\n\r]+/ /g;                        # So log only takes one line.
         my $time_date = &main::time_date_stamp($log_format);
         $log_data = "$time_date $log_data\n";
     }
@@ -482,8 +477,7 @@ sub main::memory_used {
         }
         last if $perf_pid;
     }
-    return ( $perf_mem_virt / 1024000, $perf_mem_real / 1024000,
-        $perf_cpu / 10**7 );
+    return ( $perf_mem_virt / 1024000, $perf_mem_real / 1024000, $perf_cpu / 10**7 );
 }
 
 sub main::my_use {
@@ -491,8 +485,7 @@ sub main::my_use {
     eval "use $module";
     if ($@) {
         print "\nError in loading module=$module:\n  $@";
-        print
-          "\n - See install.html for instructions on how to install perl module $module\n\n";
+        print "\n - See install.html for instructions on how to install perl module $module\n\n";
     }
     return $@;
 }
@@ -612,8 +605,7 @@ sub main::read_mh_opts {
             # Do this, since %config_parms may be a 'my' var, which can not
             # be change directly outside of the main program.
             $value =~ s/\$config_parms/\$\$ref_parms/g;
-            print
-              "read_mh_opts .ini parm evaled:  parm==$parm\n   value=$value\n"
+            print "read_mh_opts .ini parm evaled:  parm==$parm\n   value=$value\n"
               if $debug;
             eval "\$value = qq[$value]";
             print "   value=$value\n" if $debug;
@@ -685,8 +677,7 @@ sub main::read_opts {
                 $$ref_parms{ $key . "_MHINTERNAL_filename" } = $config_file;
             }
         }
-        print main::STDOUT
-          "parm vc=$value_continued key=$key value=$$ref_parms{$key} file=$config_file\n"
+        print main::STDOUT "parm vc=$value_continued key=$key value=$$ref_parms{$key} file=$config_file\n"
           if $debug;
     }
     close CONFIG;
@@ -926,11 +917,8 @@ sub main::run {
         my $pgm_path2 = $pgm_path;
         $pgm_path2 = "\"$pgm_path2\"" if $pgm_path2 =~ /\x20/;
 
-        my $pid =
-          Win32::Process::Create( $process, $pgm_path, "$pgm_path2 $pgm_args",
-            0, $cflag, '.' )
-          or print
-          "Warning, run error: pgm_path=$pgm_path\n  -   pgm=$pgm   error=",
+        my $pid = Win32::Process::Create( $process, $pgm_path, "$pgm_path2 $pgm_args", 0, $cflag, '.' )
+          or print "Warning, run error: pgm_path=$pgm_path\n  -   pgm=$pgm   error=",
           Win32::FormatMessage( Win32::GetLastError() ), "\n";
         push( @Processes, [ $process, $pgm ] );
 
@@ -960,8 +948,7 @@ sub main::run_old {
         # Running system will leave a CMD window up after it has finished :(
         # Unless ... you use cmd /c :)
         # Need to use cmd with nt??
-        $pgm = qq[command "/e:4000 /c $pgm"]
-          ;    # Do this so the cmd window dissapears after the command is done
+        $pgm = qq[command "/e:4000 /c $pgm"];    # Do this so the cmd window dissapears after the command is done
 
         my $start = '';
         $start = 'start /min';
@@ -970,7 +957,7 @@ sub main::run_old {
         $pgm   = "$start $pgm";
     }
     else {
-        $pgm = "./$pgm";    # Not all systems have the current dir in the path
+        $pgm = "./$pgm";                         # Not all systems have the current dir in the path
         $pgm .= " &" unless $mode eq 'inline';
     }
     print "\nrunning command: $pgm\n";
@@ -1137,26 +1124,16 @@ sub main::time_date_stamp {
     }
 
     my @time_data = ( $style == 19 ) ? gmtime($time) : localtime($time);
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday ) =
-      @time_data[ 0, 1, 2, 3, 4, 5, 6 ];
-
-    my ( $day, $day_long, $month, $month_long, $year_full, $time_date_stamp,
-        $time_ampm, $ampm );
-
-    $day = ( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" )[$wday];
-    $day_long = (
-        "Sunday",   "Monday", "Tuesday",  "Wednesday",
-        "Thursday", "Friday", "Saturday", "Sunday"
-    )[$wday];
-    $month = (
-        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-    )[$mon];
-    $month_long = (
-        "January",   "February", "March",    "April",
-        "May",       "June",     "July",     "August",
-        "September", "October",  "November", "December"
-    )[$mon];
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday ) = @time_data[ 0, 1, 2, 3, 4, 5, 6 ];
+
+    my ( $day, $day_long, $month, $month_long, $year_full, $time_date_stamp, $time_ampm, $ampm );
+
+    $day      = ( "Sun",    "Mon",    "Tue",     "Wed",       "Thu",      "Fri",    "Sat",      "Sun" )[$wday];
+    $day_long = ( "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" )[$wday];
+    $month = ( "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" )[$mon];
+    $month_long =
+      ( "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" )
+      [$mon];
     $mon++;
 
     $year_full = $year + 1900;
@@ -1191,20 +1168,16 @@ sub main::time_date_stamp {
       : ( $mon, $mday );
 
     if ( $style == 1 ) {
-        $time_date_stamp = sprintf( "%s, %02d/%02d/$year_format  %02d:%02d %s",
-            $day_long, @day_month, $year, $hour, $min, $ampm );
+        $time_date_stamp = sprintf( "%s, %02d/%02d/$year_format  %02d:%02d %s", $day_long, @day_month, $year, $hour, $min, $ampm );
     }
     elsif ( $style == 2 ) {
-        $time_date_stamp = sprintf( "%s %s %02d %02d:%02d %s",
-            $day_long, $month, $mday, $hour, $min, $year_full );
+        $time_date_stamp = sprintf( "%s %s %02d %02d:%02d %s", $day_long, $month, $mday, $hour, $min, $year_full );
     }
     elsif ( $style == 3 ) {
-        $time_date_stamp = sprintf( "%s, %s %02d at %2d %s",
-            $day_long, $month, $mday, $hour, $ampm );
+        $time_date_stamp = sprintf( "%s, %s %02d at %2d %s", $day_long, $month, $mday, $hour, $ampm );
     }
     elsif ( $style == 4 ) {
-        $time_date_stamp = sprintf( "%2d:%02d %s on %s, %s %02d",
-            $hour, $min, $ampm, $day_long, $month, $mday );
+        $time_date_stamp = sprintf( "%2d:%02d %s on %s, %s %02d", $hour, $min, $ampm, $day_long, $month, $mday );
     }
     elsif ( $style == 5 ) {
         $time_date_stamp = sprintf( "%2d:%02d %s", $hour, $min, $ampm );
@@ -1213,63 +1186,52 @@ sub main::time_date_stamp {
         $time_date_stamp = sprintf( "%s, %s %2d", $day, $month, $mday );
     }
     elsif ( $style == 7 ) {
-        $time_date_stamp =
-          sprintf( "%s %02d:%02d%s", $day, $hour, $min, $ampm );
+        $time_date_stamp = sprintf( "%s %02d:%02d%s", $day, $hour, $min, $ampm );
     }
     elsif ( $style == 8 ) {
         $time_date_stamp = sprintf( "%2d:%02d", $hour, $min );
     }
     elsif ( $style == 9 ) {
-        $time_date_stamp = sprintf( "%02d/%02d/$year_format  %02d:%02d %s",
-            @day_month, $year, $hour, $min, $ampm );
+        $time_date_stamp = sprintf( "%02d/%02d/$year_format  %02d:%02d %s", @day_month, $year, $hour, $min, $ampm );
     }
     elsif ( $style == 10 ) {
         $time_date_stamp = sprintf( "%04d_%02d", $year_full, $mon );
     }
     elsif ( $style == 11 ) {
-        $time_date_stamp =
-          sprintf( "%02d/%02d/$year_format", @day_month, $year );
+        $time_date_stamp = sprintf( "%02d/%02d/$year_format", @day_month, $year );
     }
     elsif ( $style == 12 ) {
-        $time_date_stamp = sprintf( "%02d/%02d/$year_format %02d:%02d:%02d",
-            @day_month, $year, $hour, $min, $sec );
+        $time_date_stamp = sprintf( "%02d/%02d/$year_format %02d:%02d:%02d", @day_month, $year, $hour, $min, $sec );
     }
     elsif ( $style == 13 ) {
         $time_date_stamp = sprintf( "%02d:%02d:%02d", $hour, $min, $sec );
     }
     elsif ( $style == 14 ) {
-        $time_date_stamp = sprintf( "%s %02d/%02d/$year_format %02d:%02d:%02d",
-            $day, @day_month, $year, $hour, $min, $sec );
+        $time_date_stamp = sprintf( "%s %02d/%02d/$year_format %02d:%02d:%02d", $day, @day_month, $year, $hour, $min, $sec );
     }
     elsif ( $style == 15 ) {
-        $time_date_stamp =
-          sprintf( "%s, %s %s", $day_long, $month_long, &main::plural2($mday) );
+        $time_date_stamp = sprintf( "%s, %s %s", $day_long, $month_long, &main::plural2($mday) );
     }
     elsif ( $style == 16 ) {
-        $time_date_stamp = sprintf( "%02d/%02d/$year_format %02d:%02d:%02d %s",
-            @day_month, $year, $hour, $min, $sec, $ampm );
+        $time_date_stamp = sprintf( "%02d/%02d/$year_format %02d:%02d:%02d %s", @day_month, $year, $hour, $min, $sec, $ampm );
     }
     elsif ( $style == 17 ) {
-        $time_date_stamp = sprintf( "%s-%02d-%02d %02d:%02d:%02d",
-            $year_full, $mon, $mday, $hour, $min, $sec );
+        $time_date_stamp = sprintf( "%s-%02d-%02d %02d:%02d:%02d", $year_full, $mon, $mday, $hour, $min, $sec );
     }
     elsif ( $style == 18 ) {
         $time_date_stamp = sprintf( "%04d%02d%02d", $year_full, $mon, $mday );
     }
     elsif ( $style == 19 ) {
-        $time_date_stamp = sprintf( "%s, %2d %s %4d %02d:%02d:%02d GMT",
-            $day, $mday, $month, $year_full, $hour, $min, $sec );
+        $time_date_stamp = sprintf( "%s, %2d %s %4d %02d:%02d:%02d GMT", $day, $mday, $month, $year_full, $hour, $min, $sec );
     }
     elsif ( $style == 20 ) {
-        $time_date_stamp = sprintf( "%04d%02d%02d%02d%02d%02d",
-            $year_full, $mon, $mday, $hour, $min, $sec );
+        $time_date_stamp = sprintf( "%04d%02d%02d%02d%02d%02d", $year_full, $mon, $mday, $hour, $min, $sec );
     }
     elsif ( $style == 21 ) {
         $time_date_stamp = sprintf( "%2d:%02d $day $mday", $hour, $min );
     }
     elsif ( $style == 22 ) {
-        $time_date_stamp = sprintf( "%s, %s %2d %2d:%02d%s",
-            $day, $month, $mday, $hour, $min, $ampm );
+        $time_date_stamp = sprintf( "%s, %s %2d %2d:%02d%s", $day, $month, $mday, $hour, $min, $ampm );
     }
     elsif ( $style == 23 ) {
         my $diff = $time - $main::Time;
@@ -1280,12 +1242,9 @@ sub main::time_date_stamp {
         my $a_week  = 7 * $a_day;
         my $a_month = 30 * $a_day;
         my $a_year  = 365 * $a_day;
-        my (
-            $now_sec, $now_min,  $now_hour, $now_mday,
-            $now_mon, $now_year, $now_wday
-        ) = localtime();
-        my $today = &::timelocal( 0, 0, 0, $now_mday, $now_mon, $now_year );
-        my $tomorrow = $today + $a_day;
+        my ( $now_sec, $now_min, $now_hour, $now_mday, $now_mon, $now_year, $now_wday ) = localtime();
+        my $today          = &::timelocal( 0, 0, 0, $now_mday, $now_mon, $now_year );
+        my $tomorrow       = $today + $a_day;
         my $twodayshence   = $today + 2 * $a_day;
         my $yesterday      = $today - $a_day;
         my $thisweek       = $today - $now_wday * $a_day;
@@ -1302,8 +1261,7 @@ sub main::time_date_stamp {
         my $lastyear       = $thisyear - $a_year;
 
         if ( $diff < 60 ) {
-            $time_date_stamp =
-              "$diff Seconds " . ( $past ? "ago" : "from now" );
+            $time_date_stamp = "$diff Seconds " . ( $past ? "ago" : "from now" );
         }
         elsif ( $diff < 120 ) {
             $time_date_stamp = "1 Minute " . ( $past ? "ago" : "from now" );
@@ -1316,27 +1274,19 @@ sub main::time_date_stamp {
             or $diff < 12 * 60 * 60 )
         {
             my $t = &::round( $diff / ( 60 * 60 ) );
-            $time_date_stamp =
-                "$t Hour"
-              . ( $t != 1 ? "s "  : " " )
-              . ( $past   ? "ago" : "from now" );
+            $time_date_stamp = "$t Hour" . ( $t != 1 ? "s " : " " ) . ( $past ? "ago" : "from now" );
         }
         elsif ( $past and $time > $yesterday ) {
-            $time_date_stamp =
-              "Yesterday at " . sprintf( "%2d:%02d %s", $hour, $min, $ampm );
+            $time_date_stamp = "Yesterday at " . sprintf( "%2d:%02d %s", $hour, $min, $ampm );
         }
         elsif ( not $past and $time < $twodayshence ) {
-            $time_date_stamp =
-              "Tomorrow at " . sprintf( "%2d:%02d %s", $hour, $min, $ampm );
+            $time_date_stamp = "Tomorrow at " . sprintf( "%2d:%02d %s", $hour, $min, $ampm );
         }
         elsif ( ( $time > $thisweek and $time < $nextweek )
             or $diff < 4 * $a_day )
         {
             my $t = int( $diff / ($a_day) + 1 );
-            $time_date_stamp =
-                "$t Day"
-              . ( $t != 1 ? "s "  : " " )
-              . ( $past   ? "ago" : "from now" );
+            $time_date_stamp = "$t Day" . ( $t != 1 ? "s " : " " ) . ( $past ? "ago" : "from now" );
         }
         elsif ( $past and $time > $lastweek ) {
             $time_date_stamp = "Last Week";
@@ -1348,10 +1298,7 @@ sub main::time_date_stamp {
             or $diff < 3 * $a_week )
         {
             my $t = int( $diff / ($a_week) + 1 );
-            $time_date_stamp =
-                "$t Week"
-              . ( $t != 1 ? "s "  : " " )
-              . ( $past   ? "ago" : "from now" );
+            $time_date_stamp = "$t Week" . ( $t != 1 ? "s " : " " ) . ( $past ? "ago" : "from now" );
         }
         elsif ( $past and $time > $lastmonth ) {
             $time_date_stamp = "Last Month";
@@ -1363,10 +1310,7 @@ sub main::time_date_stamp {
             or $diff < 4 * $a_month )
         {
             my $t = int( $diff / ($a_month) + 1 );
-            $time_date_stamp =
-                "$t Month"
-              . ( $t != 1 ? "s "  : " " )
-              . ( $past   ? "ago" : "from now" );
+            $time_date_stamp = "$t Month" . ( $t != 1 ? "s " : " " ) . ( $past ? "ago" : "from now" );
         }
         elsif ( $past and $time > $lastyear ) {
             $time_date_stamp = "Last Year";
@@ -1376,38 +1320,28 @@ sub main::time_date_stamp {
         }
         else {
             my $t = int( $diff / ($a_year) + 1 );
-            $time_date_stamp =
-                "$t Year"
-              . ( $t != 1 ? "s "  : " " )
-              . ( $past   ? "ago" : "from now" );
+            $time_date_stamp = "$t Year" . ( $t != 1 ? "s " : " " ) . ( $past ? "ago" : "from now" );
         }
     }
     else {
         $time_date_stamp = "time_date_stamp format=$style not recognized";
     }
     return wantarray
-      ? (
-        $time_date_stamp, $sec, $min, $hour, $ampm,
-        $day_long, $mon, $mday, $year
-      )
+      ? ( $time_date_stamp, $sec, $min, $hour, $ampm, $day_long, $mon, $mday, $year )
       : $time_date_stamp;
 }
 
 sub main::time_add {
     my ($time_date) = @_;
     my $time2 = &main::my_str2time($time_date);
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime($time2);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime($time2);
     $time_date = sprintf( "%d:%02d", $hour, $min );
     return $time_date;
 }
 
 sub main::time_diff {
     my ( $time1, $time2, $nearest_unit, $format ) = @_;
-    my (
-        $diff,  $nu,    $seconds, $minutes, $hours, $days,
-        $weeks, $years, @diff,    $last,    $string
-    );
+    my ( $diff, $nu, $seconds, $minutes, $hours, $days, $weeks, $years, @diff, $last, $string );
     $diff = abs( $time2 - $time1 );
 
     undef $nu;
@@ -1453,11 +1387,7 @@ sub main::time_diff {
     $weeks -= 52 * $years;
 
     if ( $format eq 'numeric' ) {
-        $string = sprintf(
-            "%3d days %02d:%02d:%02d",
-            7 * ( 52 * $years + $weeks ) + $days,
-            $hours, $minutes, $seconds
-        );
+        $string = sprintf( "%3d days %02d:%02d:%02d", 7 * ( 52 * $years + $weeks ) + $days, $hours, $minutes, $seconds );
     }
     else {
         undef @diff;
@@ -1520,9 +1450,7 @@ sub main::which {
       ($main::OS_win)
       ? split( ';',      $ENV{PATH} )
       : split( /[\:\;]/, $ENV{PATH} );
-    for
-      my $path ( $main::config_parms{bin_dir}, ".", "$main::Pgm_Path", @paths )
-    {
+    for my $path ( $main::config_parms{bin_dir}, ".", "$main::Pgm_Path", @paths ) {
         chop $path if $path =~ /\\$/;    # Drop trailing slash
         my $pgm_path = "$path/$pgm";
         if ($main::OS_win) {
@@ -1627,8 +1555,7 @@ sub main::get_idle_item_data {
                     my $name = $object->get_object_name;
                     $name =~ s/^\$//;    # strip the $
                     my $idleduration = $object->get_idle_time;
-                    my $idlehours =
-                      sprintf( "%d", $idleduration / ( 60 * 60 ) );
+                    my $idlehours = sprintf( "%d", $idleduration / ( 60 * 60 ) );
                     my $idleminutes =
                       sprintf( "%d", ( $idleduration % ( 60 * 60 ) ) / 60 );
                     my $idleseconds = ( $idleduration % ( 60 * 60 ) ) % 60;
diff --git a/lib/http_server.pl b/lib/http_server.pl
index 8bb6ef8ea..4f34f13b0 100644
--- a/lib/http_server.pl
+++ b/lib/http_server.pl
@@ -11,8 +11,7 @@
 
 #no warnings 'uninitialized';   # These seem to always show up.  Dang, will not work with 5.0
 
-use vars
-  qw(%Http %Cookies %Included_HTML %HTTP_ARGV $HTTP_REQUEST $HTTP_BODY $HTTP_REQ_TYPE);
+use vars qw(%Http %Cookies %Included_HTML %HTTP_ARGV $HTTP_REQUEST $HTTP_BODY $HTTP_REQ_TYPE);
 $Authorized = 0;
 
 my ( $leave_socket_open_passes, $leave_socket_open_action );
@@ -58,8 +57,7 @@
     'json'  => 'application/json',
 );
 
-my ( %http_dirs, %html_icons, $html_info_overlib, %password_protect_dirs,
-    %http_agent_formats, %http_agent_sizes );
+my ( %http_dirs, %html_icons, $html_info_overlib, %password_protect_dirs, %http_agent_formats, %http_agent_sizes );
 
 my ( $http_fork_mem, $http_fork_page, $http_fork_count );
 
@@ -107,16 +105,13 @@ sub http_read_parms {
       unless $main::config_parms{http_client_timeout};
 
     #html_user_agents    = Windows CE=>1,whatever=>2
-    &read_parm_hash( \%http_agent_formats,
-        $main::config_parms{html_browser_formats}, 1 );
-    &read_parm_hash( \%http_agent_sizes,
-        $main::config_parms{html_browser_sizes}, 1 );
+    &read_parm_hash( \%http_agent_formats, $main::config_parms{html_browser_formats}, 1 );
+    &read_parm_hash( \%http_agent_sizes,   $main::config_parms{html_browser_sizes},   1 );
 
     undef %html_icons;       # Refresh lib/http_server.pl icons
     undef %Included_HTML;    # These should get re-created on $Reload
 
-    %password_protect_dirs = map { $_, 1 } split ',',
-      $main::config_parms{password_protect_dirs};
+    %password_protect_dirs = map { $_, 1 } split ',', $main::config_parms{password_protect_dirs};
 
     # Set defaults for all html_ parms for alternate browser user-agent web_formats
 
@@ -151,9 +146,8 @@ sub http_process_request {
     my $client_ip_address = inet_ntoa($iaddr) if $iaddr;
     $Socket_Ports{http}{client_ip_address} = $client_ip_address;
 
-    $Authorized = &password_check( undef, 'http' );  # Returns authorized userid
-    print
-      "----------\nhttp: client_ip=$Socket_Ports{http}{client_ip_address} a=$Authorized.\n"
+    $Authorized = &password_check( undef, 'http' );    # Returns authorized userid
+    print "----------\nhttp: client_ip=$Socket_Ports{http}{client_ip_address} a=$Authorized.\n"
       if $main::Debug{http};
 
     # Read http header data
@@ -163,9 +157,8 @@ sub http_process_request {
     my $temp;
 
     # Must wait for the new socket to become active
-    my $nfound =
-      &socket_has_data( $socket, $main::config_parms{http_client_timeout} );
-    return unless $nfound > 0;    # nfound == -1 means an error
+    my $nfound = &socket_has_data( $socket, $main::config_parms{http_client_timeout} );
+    return unless $nfound > 0;                         # nfound == -1 means an error
     while (1) {
         $_ = <$socket>;
         last unless $_ and /\S/;
@@ -189,12 +182,11 @@ sub http_process_request {
 
     $Socket_Ports{http}{data_record} = $header;
 
-    $Http{loop} =
-      $Loop_Count;    # Track which pass we last processes a web request
+    $Http{loop}    = $Loop_Count;                 # Track which pass we last processes a web request
     $Http{request} = $header;
     $Http{Referer} = '' unless $Http{Referer};    # Avoid uninitilized var errors
     ( $Http{Host_address} ) = $Http{Host} =~ /([^\:]+)/
-      if $Http{Host};    # Drop the port, if present
+      if $Http{Host};                             # Drop the port, if present
     $Http{Client_address} = $Socket_Ports{http}{client_ip_address};
 
     if ( $Http{Cookie} ) {
@@ -300,22 +292,19 @@ sub http_process_request {
         $Authorized = &password_check( $Cookies{password}, 'http', 'crypted' );
     }
 
-    my ( $req_typ, $get_req, $get_arg ) =
-      $header =~ m|^(GET\|POST\|PUT) (\/[^ \?]*)\??(\S+)? HTTP|;
+    my ( $req_typ, $get_req, $get_arg ) = $header =~ m|^(GET\|POST\|PUT) (\/[^ \?]*)\??(\S+)? HTTP|;
     $get_arg = '' unless defined $get_arg;
     $HTTP_REQ_TYPE = $req_typ;
 
-    $get_arg =~ s/(.*)\&__async.*/$1/; # RaK: Fast hack to ensure async requests
+    $get_arg =~ s/(.*)\&__async.*/$1/;    # RaK: Fast hack to ensure async requests
 
-    logit "$config_parms{data_dir}/logs/server_header.$Year_Month_Now.log",
-      "$header data:$temp"
+    logit "$config_parms{data_dir}/logs/server_header.$Year_Month_Now.log", "$header data:$temp"
       if $main::Debug{http};
-    print "http: gr=$get_req ga=$get_arg "
-      . "A=$Authorized format=$Http{format} ua=$Http{'User-Agent'} h=$header"
+    print "http: gr=$get_req ga=$get_arg " . "A=$Authorized format=$Http{format} ua=$Http{'User-Agent'} h=$header"
       if $main::Debug{http};
     if ( $req_typ eq "POST" || $req_typ eq "PUT" ) {
         my $cl = $Http{'Content-Length'}
-          || $Http{'Content-length'};    # Netscape uses lower case l
+          || $Http{'Content-length'};     # Netscape uses lower case l
         print "http POST query has $cl bytes of args\n" if $main::Debug{http};
         my $buf;
         read $socket, $buf, $cl;
@@ -392,12 +381,10 @@ sub http_process_request {
         }
     }
 
-    $get_arg =~
-      tr/\+/ /;    # translate + back to spaces (e.g. code search tk widget)
-     # Real + will be in %## form (e.g. /SET;&html_list(X10_Item)?$test_house2?%2B15)
+    $get_arg =~ tr/\+/ /;              # translate + back to spaces (e.g. code search tk widget)
+                                       # Real + will be in %## form (e.g. /SET;&html_list(X10_Item)?$test_house2?%2B15)
 
-    $get_arg =~ s/\&/&&/g
-      ;    # translate & to &&, since we translate %##  to & before splitting
+    $get_arg =~ s/\&/&&/g;             # translate & to &&, since we translate %##  to & before splitting
 
     # translate from %## back to real characters
     # Ascii table: http://www.bbsinc.com/symbol.html
@@ -405,8 +392,7 @@ sub http_process_request {
     $get_req =~ s/%([0-9a-fA-F]{2})/pack("C",hex($1))/ge;
     $get_req =~ s!//!/!g;    # remove double slashes in request
 
-    $HTTP_REQUEST =
-      $get_req; # copy get_req to globally (i.e. in scripts) accessible variable
+    $HTTP_REQUEST = $get_req;    # copy get_req to globally (i.e. in scripts) accessible variable
 
     $get_arg =~ s/%([0-9a-fA-F]{2})/pack("C",hex($1))/ge;
 
@@ -425,8 +411,7 @@ sub http_process_request {
             my $html = &html_authorized;
             $html .= "<br>Refresh: <a target='_top' href='/'> Main Page</a>\n";
             $html .= &html_password('') . '<br>';
-            print $socket &html_page( undef, $html, undef, undef, undef,
-                undef );
+            print $socket &html_page( undef, $html, undef, undef, undef, undef );
         }
         else {
             my $html = &html_authorized;
@@ -435,9 +420,7 @@ sub http_process_request {
             #           $html .= &html_reload_link('/', 'Refresh Main Page');   # Does not force reload?
             my ( $name, $name_short ) = &net_domain_name('http');
             if ( $Authorized and $get_req =~ /\/SET_PASSWORD$/ ) {
-                &print_log(
-                    "Password was just accepted for User [$Authorized] browser $name"
-                );
+                &print_log( "Password was just accepted for User [$Authorized] browser $name" );
 
                 # Speak calls cause problems with speak hooks, like in the audrey code
                 #               &speak("app=admin $Authorized password accepted for $name_short");
@@ -448,9 +431,7 @@ sub http_process_request {
                 # No good way to un-Authorized here, so just re-do the pop-up window till it gives up?
                 #               print "dbx requestor=$name, get_req=$get_req, Authorized=$Authorized\n";
                 print $socket &html_password('');
-                print $socket &html_page( undef,
-                    "requestor=$name, get_req=$get_req, Authorized=$Authorized"
-                );
+                print $socket &html_page( undef, "requestor=$name, get_req=$get_req, Authorized=$Authorized" );
             }
         }
         return;
@@ -477,8 +458,7 @@ sub http_process_request {
 
             #           $html = $Http{Referer}; # &html_page will use referer if only a url is given
             $html =~ s/\/SET_PASSWORD.*//;
-            &print_log(
-                "Password was just accepted for User [$user] browser $name");
+            &print_log("Password was just accepted for User [$user] browser $name");
 
             #           &speak("app=admin $user password accepted for $name_short");
         }
@@ -486,10 +466,9 @@ sub http_process_request {
             $Authorized = 0;
             $html   .= "<b>Password was incorrect</b>\n";
             $Cookie .= "Set-Cookie: password=xyz ; ; path=/;\n";
-            $Cookies{password_was_not_valid}++
-              ;    # So we can monitor from user code
+            $Cookies{password_was_not_valid}++;    # So we can monitor from user code
             &print_log("Password was just NOT set; $name");
-            &play( file => 'unauthorized' );    # Defined in event_sounds.pl
+            &play( file => 'unauthorized' );       # Defined in event_sounds.pl
 
             #           &speak("app=admin Password NOT set by $name_short");
         }
@@ -497,15 +476,12 @@ sub http_process_request {
         return;
     }
 
-    elsif ( !$Authorized and lc $main::config_parms{password_protect} eq 'all' )
-    {
+    elsif ( !$Authorized and lc $main::config_parms{password_protect} eq 'all' ) {
         if ( $get_req =~ /wml/ ) {
-            print $socket &html_password('browser')
-              ;    # wml requires browser login ... no form/cookies for now
+            print $socket &html_password('browser');    # wml requires browser login ... no form/cookies for now
         }
         else {
-            $h_response =
-              "<center><h3>MisterHouse password_protect set to all.  Password required for all functions</h3>\n";
+            $h_response = "<center><h3>MisterHouse password_protect set to all.  Password required for all functions</h3>\n";
             $h_response .= "<h3><a href=/SET_PASSWORD>Login</a></h3></center>";
             print $socket &html_page( "", $h_response );
         }
@@ -526,12 +502,11 @@ sub http_process_request {
         $h_response = $1;
 
         if ($get_arg) {
-            $get_arg =~
-              s/select_cmd=//;    # Drop the cmd=  prefix from form lists.
-            $get_arg =~ tr/\_/ /; # Put blanks back
-            $get_arg =~ tr/\~/_/; # Put _ back
-             # Drop the &&x=n&&y=n that is tacked on (before or after) when doing image form submits
-             # Do the same in SET below
+            $get_arg =~ s/select_cmd=//;    # Drop the cmd=  prefix from form lists.
+            $get_arg =~ tr/\_/ /;           # Put blanks back
+            $get_arg =~ tr/\~/_/;           # Put _ back
+                                            # Drop the &&x=n&&y=n that is tacked on (before or after) when doing image form submits
+                                            # Do the same in SET below
             $get_arg =~ s/&&x=\d+&&y=\d+//;
             $get_arg =~ s/x=\d+&&y=\d+&&//;
 
@@ -544,8 +519,7 @@ sub http_process_request {
         my $authority = $ref->get_authority if $ref;
         $authority = $Password_Allow{$get_arg} unless $authority;
 
-        print
-          "http: RUN a=$Authorized,$authority get_arg=$get_arg response=$h_response\n"
+        print "http: RUN a=$Authorized,$authority get_arg=$get_arg response=$h_response\n"
           if $main::Debug{http};
 
         if ( $Authorized or ( $authority and $authority eq 'anyone' ) ) {
@@ -554,9 +528,7 @@ sub http_process_request {
             if ( !$get_arg ) {
                 &html_response( $socket, $h_response );
             }
-            elsif (
-                &run_voice_cmd( $get_arg, undef, "web [$client_ip_address]" ) )
-            {
+            elsif ( &run_voice_cmd( $get_arg, undef, "web [$client_ip_address]" ) ) {
                 &html_response( $socket, $h_response );
             }
             else {
@@ -570,8 +542,7 @@ sub http_process_request {
             }
         }
         else {
-            print $socket &html_page( "",
-                &html_unauthorized( $get_arg, $h_response ) );
+            print $socket &html_page( "", &html_unauthorized( $get_arg, $h_response ) );
         }
     }
 
@@ -598,8 +569,7 @@ sub http_process_request {
                 }
                 else {
                     $leave_socket_open_action = $action;
-                    $leave_socket_open_passes = 3
-                      ; # Wait a few passes, so multi-pass events can settle (e.g. barcode_web.pl)
+                    $leave_socket_open_passes = 3;        # Wait a few passes, so multi-pass events can settle (e.g. barcode_web.pl)
                 }
             }
             elsif ($response) {
@@ -641,16 +611,15 @@ sub http_process_request {
             for my $temp ( split( '&&', $get_arg ) ) {
                 next unless ( $item, $state ) = $temp =~ /(\S+)[\?\=](.*)/;
 
-                if ( $item =~ /^\d+$/ )
-                {   # Can't do html_pointer yet ... need to switch to Tk objects
+                if ( $item =~ /^\d+$/ ) {    # Can't do html_pointer yet ... need to switch to Tk objects
                     $authority = 0;
                     next;
                 }
 
                 # WAP pages don't allow for $ in url, so make it optional
                 $item = "\$" . $item unless substr( $item, 0, 1 ) eq "\$";
-                my $set_authority = eval
-                  qq[$item->get_authority if $item and ref($item) and UNIVERSAL::isa($item, 'Generic_Item');];
+                my $set_authority =
+                  eval qq[$item->get_authority if $item and ref($item) and UNIVERSAL::isa($item, 'Generic_Item');];
                 print "SET authority eval error: $@\n" if $@;
                 unless ( $set_authority eq 'anyone'
                     or $Password_Allow{$item} eq 'anyone' )
@@ -661,8 +630,7 @@ sub http_process_request {
             }
         }
 
-        print
-          "SET a=$Authorized,$authority hr=$h_response get_req=$get_req  get_arg=$get_arg\n"
+        print "SET a=$Authorized,$authority hr=$h_response get_req=$get_req  get_arg=$get_arg\n"
           if $main::Debug{http};
 
         if ( $Authorized or $authority ) {
@@ -681,8 +649,7 @@ sub http_process_request {
                     my $pvar = $html_pointers{$item};
 
                     # Allow for state objects
-                    if ( $pvar and ref $pvar ne 'SCALAR' and $pvar->can('set') )
-                    {
+                    if ( $pvar and ref $pvar ne 'SCALAR' and $pvar->can('set') ) {
                         $pvar->set( $state, "web [$client_ip_address]" );
                     }
                     else {
@@ -704,8 +671,7 @@ sub http_process_request {
                     $state =~ tr/\"/\'/;    # So we can use "" to quote it
 
                     #                   my $eval_cmd = qq[($item and ref($item) and UNIVERSAL::isa($item, 'Generic_Item')) ?
-                    my $eval_cmd =
-                      qq[($item and ref($item) ne '' and ref($item) ne 'SCALAR' and $item->can('set')) ?
+                    my $eval_cmd = qq[($item and ref($item) ne '' and ref($item) ne 'SCALAR' and $item->can('set')) ?
                                       ($item->set("$state", "web [$client_ip_address]")) : ($item = "$state")];
                     print "SET eval: $eval_cmd\n" if $main::Debug{http};
                     eval $eval_cmd;
@@ -716,8 +682,7 @@ sub http_process_request {
         }
         else {
             if ( $h_response =~ /^last_/ ) {
-                print $socket &html_page( "",
-                    &html_unauthorized( $get_arg, $h_response ) );
+                print $socket &html_page( "", &html_unauthorized( $get_arg, $h_response ) );
             }
             else {
                 # Just refresh the screen, don't give a bad boy msg
@@ -736,24 +701,21 @@ sub http_process_request {
     }
 
     # See if request was for an auto-generated page
-    elsif ( my ( $html, $style ) = &html_mh_generated( $get_req, $get_arg, 1 ) )
-    {
+    elsif ( my ( $html, $style ) = &html_mh_generated( $get_req, $get_arg, 1 ) ) {
         my $time_check2 = time;
         &print_socket_fork( $socket, &html_page( "", $html, $style ) );
 
         #        print $socket &html_page("", $html, $style);
         $time_check2 = time - $time_check2;
         if ( $time_check2 > 2 ) {
-            my $msg =
-              "http_server write time exceeded: time=$time_check2, req=$get_req,$get_arg";
+            my $msg = "http_server write time exceeded: time=$time_check2, req=$get_req,$get_arg";
 
             #           print "\n$Time_Date: $msg";
             &print_log($msg);
         }
     }
     else {
-        print
-          "Unrecognized html request: get_req=$get_req get_arg=$get_arg  header=$header\n";
+        print "Unrecognized html request: get_req=$get_req get_arg=$get_arg  header=$header\n";
 
         $get_req .= "?$get_arg" if $get_arg;
         $Misc{missing_url} = $get_req;
@@ -764,7 +726,7 @@ sub http_process_request {
     $time_check = time - $time_check;
     if ( $time_check > $config_parms{http_pause_time} ) {
         my $msg =
-          "http_server time exceeded $config_parms{http_pause_time} seconds: time=$time_check, lso=$leave_socket_open_passes, "
+            "http_server time exceeded $config_parms{http_pause_time} seconds: time=$time_check, lso=$leave_socket_open_passes, "
           . "l=$socket_fork_data{length}, ip=$Socket_Ports{http}{client_ip_address}, header=$header";
         logit "$config_parms{data_dir}/logs/mh_pause.$Year_Month_Now.log", $msg;
         print "\n$Time_Date: $msg\n";
@@ -784,16 +746,14 @@ sub html_password {
 
     my $html;
     if ( $menu eq 'html' ) {
-        $html =
-          qq[<BODY onLoad="self.focus();document.pw.password.focus(); top.frames[0].location.reload()">\n];
+        $html = qq[<BODY onLoad="self.focus();document.pw.password.focus(); top.frames[0].location.reload()">\n];
 
         #       $html .= qq[<BASE TARGET='_top'>\n];
         $html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="post">\n];
 
         #       $html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="get">\n]; ... get not secure from browser history list!!
         #       $html .= qq[<h3>Password:<INPUT size=10 name='password' type='password'></h3>\n</FORM>\n];
-        $html .=
-          qq[<b>Password:</b><INPUT size=10 name='password' type='password'>\n];
+        $html .= qq[<b>Password:</b><INPUT size=10 name='password' type='password'>\n];
         $html .= qq[<INPUT type=submit value='Submit Password'>\n</FORM>\n];
         $html .=
           qq[<P> This form is used for logging into MisterHouse.<br> For administration please see the documentation of <a href="http://misterhouse.net/mh.html"> set_password </a></P>\n];
@@ -809,8 +769,7 @@ sub html_password {
 
 sub html_authorized {
     if ($Authorized) {
-        return
-          "Status: <b><a href=UNSET_PASSWORD>Logged In as $Authorized</a></b><br>";
+        return "Status: <b><a href=UNSET_PASSWORD>Logged In as $Authorized</a></b><br>";
     }
     else {
         return "Status: <b><a href=SET_PASSWORD>Not Logged In</a></b><br>";
@@ -820,19 +779,13 @@ sub html_authorized {
 sub html_unauthorized {
     my ( $action, $h_response ) = @_;
     if ( $h_response =~ /vxml/ ) {
-        return &vxml_page(
-            audio => 'Sorry, you are not authorized for that command' );
+        return &vxml_page( audio => 'Sorry, you are not authorized for that command' );
     }
     else {
         #       my $msg = "<a href=speech>Refresh Recently Spoken Text</a><br>\n";
-        my $msg .= &html_header(
-            "<b>Unauthorized Mode</b>&nbsp;&nbsp;&nbsp;&nbsp;"
-              . &html_authorized,
-            $action
-        );
-        $msg .= "<li>" . $action . "</li>";
-        $msg .=
-          "<br>Status: <b><a href=SET_PASSWORD yet>Not Logged In</a></b></body></html>";
+        my $msg .= &html_header( "<b>Unauthorized Mode</b>&nbsp;&nbsp;&nbsp;&nbsp;" . &html_authorized, $action );
+        $msg    .= "<li>" . $action . "</li>";
+        $msg    .= "<br>Status: <b><a href=SET_PASSWORD yet>Not Logged In</a></b></body></html>";
         return $msg;
     }
 }
@@ -860,9 +813,7 @@ sub http_get_local_file {
                   unless $get_req =~ m|/$|;    # Force redirect in test_for_file
                 if ($get_alias_index) {
                     my $dir = $file;
-                    for my $default ( split ',',
-                        $main::config_parms{ 'html_default' . $Http{format} } )
-                    {
+                    for my $default ( split ',', $main::config_parms{ 'html_default' . $Http{format} } ) {
                         $file = "$dir/$default";
                         last ALIAS_CHECK if -e $file;
                     }
@@ -913,15 +864,12 @@ sub test_for_file {
         }
 
         my $dir = $file;
-        for my $default ( split ',',
-            $main::config_parms{ 'html_default' . $Http{format} } )
-        {
+        for my $default ( split ',', $main::config_parms{ 'html_default' . $Http{format} } ) {
             $file = "$dir/$default";
             last if -e $file;
         }
         unless ( -e $file ) {
-            print $socket &html_page( "Error",
-                "No index found for directory $get_req" );
+            print $socket &html_page( "Error", "No index found for directory $get_req" );
             return 1;
         }
     }
@@ -950,7 +898,7 @@ sub test_file_req {
     $get_req =~ s#/\./#/#g;    # /./ -> /
     $get_req =~ s#//+#/#g;     # // -> /
     1 while ( $get_req =~ s#/(?!\.\.)[^/]+/\.\.(/|$)#$1# );    # /foo/../ -> /
-      # if there is a .. at this point, it's a bad thing. Also stop if path contains exploitable characters
+         # if there is a .. at this point, it's a bad thing. Also stop if path contains exploitable characters
 
     #   if ($get_req =~ m#/\.\.|[\|\`;><\000]# ) {
     if ( $get_req =~ m#\.\.|[\|\`;><\000]# ) {
@@ -960,8 +908,7 @@ sub test_file_req {
 
     # Verify the directory is not password protected
     if ( $http_dir and $password_protect_dirs{$http_dir} and !$Authorized ) {
-        my $html =
-          "<h4>Directory $http_dir requires Login password access</h4>\n";
+        my $html = "<h4>Directory $http_dir requires Login password access</h4>\n";
         $html .= "<h4><a href=SET_PASSWORD>Login</a></h4>";
 
         #       print $socket &html_page('error', $html);
@@ -976,8 +923,7 @@ sub test_file_req {
 sub html_mh_generated {
     my ( $get_req, $get_arg, $auto_refresh ) = @_;
     my $html = '';
-    $html =
-      qq[<META HTTP-EQUIV="REFRESH" CONTENT="$main::config_parms{'html_refresh_rate' . $Http{format}}; url=$get_req">\n]
+    $html = qq[<META HTTP-EQUIV="REFRESH" CONTENT="$main::config_parms{'html_refresh_rate' . $Http{format}}; url=$get_req">\n]
       if $auto_refresh
       and $main::config_parms{ 'html_refresh_rate' . $Http{format} };
 
@@ -988,39 +934,31 @@ sub html_mh_generated {
     $get_req =~ s/^.*?([^\/]+)$/$1/;
 
     if ( $get_req =~ /^widgets$/ ) {
-        return ( $html . &widgets('all'),
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &widgets('all'), $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^widgets_type?$/ ) {
         $html .= &widgets('checkbutton');
         $html .= &widgets('radiobutton');
         $html .= &widgets('entry');
-        return ( $html . $html,
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . $html, $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^widgets_label$/ ) {
-        return ( $html . &widgets('label'),
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &widgets('label'), $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^widgets_entry$/ ) {
-        return ( $html . &widgets('entry'),
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &widgets('entry'), $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^widgets_radiobutton$/ ) {
-        return ( $html . &widgets('radiobutton'),
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &widgets('radiobutton'), $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^widgets_checkbox$/ ) {
-        return ( $html . &widgets('checkbutton'),
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &widgets('checkbutton'), $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^vars_save$/ ) {
-        return ( $html . &vars_save,
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &vars_save, $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
     elsif ( $get_req =~ /^vars_global$/ ) {
-        return ( $html . &vars_global,
-            $main::config_parms{ 'html_style_tk' . $Http{format} } );
+        return ( $html . &vars_global, $main::config_parms{ 'html_style_tk' . $Http{format} } );
     }
 
     # .html suffix is grandfathered in
@@ -1034,16 +972,13 @@ sub html_mh_generated {
         return (&html_error_log);
     }
     elsif ( $get_req =~ /^category$/ ) {
-        return ( &html_category,
-            $main::config_parms{ 'html_style_category' . $Http{format} } );
+        return ( &html_category, $main::config_parms{ 'html_style_category' . $Http{format} } );
     }
     elsif ( $get_req =~ /^groups$/ ) {
-        return ( &html_groups,
-            $main::config_parms{ 'html_style_category' . $Http{format} } );
+        return ( &html_groups, $main::config_parms{ 'html_style_category' . $Http{format} } );
     }
     elsif ( $get_req =~ /^items$/ ) {
-        return ( &html_items,
-            $main::config_parms{ 'html_style_category' . $Http{format} } );
+        return ( &html_items, $main::config_parms{ 'html_style_category' . $Http{format} } );
     }
     elsif ( $get_req =~ /^list[\:\;]?(\S*)$/ ) {
         $H_Response = $1 if $1;
@@ -1055,8 +990,7 @@ sub html_mh_generated {
                 $html .= shtml_include($_) . "\n";
             }
         }
-        return ( $html,
-            $main::config_parms{ 'html_style_list' . $Http{format} } );
+        return ( $html, $main::config_parms{ 'html_style_list' . $Http{format} } );
     }
     elsif ( $get_req =~ /^results$/ ) {
         return ("<h2>Click on any item\n");
@@ -1074,7 +1008,7 @@ sub html_sub {
     $data = '&' . $data
       if $data
       and $data !~ /^&/;    # Avoid & character in the url ... messes up Tellme
-    $data =~ s/\=\&+$//; # Goofy wapalizer (http://www.gelon.net) appends this??
+    $data =~ s/\=\&+$//;    # Goofy wapalizer (http://www.gelon.net) appends this??
 
     # Save ISMAP data: xyz(a,b)?1,2 -> xyz(a,b,1,2)
     if ( $data =~ /^(.+)\)\?(\d+),(\d+)$/ ) {
@@ -1092,28 +1026,19 @@ sub html_sub {
 
         # The %main:: array will have a glob for all subs (and vars)
         if ( $main::{$sub_name} ) {
-            print
-              "html_sub: a=$Authorized pa=$Password_Allow{'&$sub_name'} data=$data sn=$sub_name sa=$sub_arg sr=$sub_ref\n"
+            print "html_sub: a=$Authorized pa=$Password_Allow{'&$sub_name'} data=$data sn=$sub_name sa=$sub_arg sr=$sub_ref\n"
               if $main::Debug{http};
 
             # Check for authorization
-            if (
-                (
-                       $Authorized
-                    or $Password_Allow{"&$sub_name"}
-                    and $Password_Allow{"&$sub_name"} eq 'anyone'
-                )
-              )
-            {
+            if ( ( $Authorized or $Password_Allow{"&$sub_name"} and $Password_Allow{"&$sub_name"} eq 'anyone' ) ) {
+
                 # If not quoted, split to multiple argument according to ,
                 my @args = parse_line( ',', 0, $sub_arg );
                 $sub_arg = join ',', map { "'$_'" } @args;
                 return ( undef, "&$sub_name($sub_arg)" );
             }
             else {
-                return (
-                    "Web response function not authorized: &$sub_name $sub_arg"
-                );
+                return ( "Web response function not authorized: &$sub_name $sub_arg" );
             }
         }
         else {
@@ -1140,8 +1065,7 @@ sub html_response {
             # we way too many passes for the 'no response message'
             # from many commands that do not respond
             $leave_socket_open_passes = 3;
-            $leave_socket_open_action =
-              qq|&html_last_response('$Http{"User-Agent"}', $1)|;
+            $leave_socket_open_action = qq|&html_last_response('$Http{"User-Agent"}', $1)|;
         }
         elsif ( $h_response eq 'last_displayed' ) {
             $leave_socket_open_passes = 200;
@@ -1149,14 +1073,13 @@ sub html_response {
         }
         elsif ( $h_response eq 'last_spoken' ) {
             $leave_socket_open_passes = 3;
-            $leave_socket_open_action =
-              "&html_last_spoken";    # Only show the last spoken text
+            $leave_socket_open_action = "&html_last_spoken";    # Only show the last spoken text
 
             #           $leave_socket_open_action = "&speak_log_last(1)"; # Only show the last spoken text
             #           $leave_socket_open_action = "&Voice_Text::last_spoken(1)"; # Only show the last spoken text
         }
-        elsif ( $h_response =~ /^https?:\S+$/i or $h_response =~ /^reff?erer/i )
-        {
+        elsif ( $h_response =~ /^https?:\S+$/i or $h_response =~ /^reff?erer/i ) {
+
             # Allow to use just the base part of the referer
             #  - some browsers (audrey) do not return full referer url :(
             #    so allow for referer(url)...
@@ -1170,8 +1093,7 @@ sub html_response {
 
             # Wait a few passes before refreshing page, in case mh states changed
             #           $leave_socket_open_action = "&http_redirect('$h_response')"; # mh uses &html_page, so this does not work
-            $leave_socket_open_action = "'$h_response'"
-              ;    # &html_page will use referer if only a url is given
+            $leave_socket_open_action = "'$h_response'";    # &html_page will use referer if only a url is given
             $leave_socket_open_passes = 3;
         }
         elsif ( my ( $msg, $action ) = &html_sub($h_response) ) {
@@ -1180,8 +1102,7 @@ sub html_response {
             }
             else {
                 $leave_socket_open_action = $action;
-                $leave_socket_open_passes = 3
-                  ; # Wait a few passes, so multi-pass events can settle (e.g. barcode_web.pl)
+                $leave_socket_open_passes = 3;         # Wait a few passes, so multi-pass events can settle (e.g. barcode_web.pl)
             }
         }
         elsif ( &test_for_file( $socket, $h_response ) ) {
@@ -1227,8 +1148,7 @@ sub html_last_response {
             and $Cookies{msagent}
             and $main::config_parms{ 'html_msagent_script' . $Http{format} } )
         {
-            $script = file_read
-              "$config_parms{'html_dir' . $Http{format}}/$config_parms{'html_msagent_script' . $Http{format}}";
+            $script = file_read "$config_parms{'html_dir' . $Http{format}}/$config_parms{'html_msagent_script' . $Http{format}}";
             $script =~ s/<!-- *speak_text *-->/$last_response/;
         }
     }
@@ -1236,8 +1156,7 @@ sub html_last_response {
         ( $last_response, $style ) = &html_print_log;
     }
     elsif ( !$last_response ) {
-        $last_response =
-          "<br><b>No response resulted from the last command</b>";
+        $last_response = "<br><b>No response resulted from the last command</b>";
     }
 
     #   elsif ($Last_Response eq 'display') {
@@ -1442,8 +1361,7 @@ sub http_speak_to_wav_finish {
             $html .= "\n<br><BGSOUND SRC='$wav_file' VOLUME=20>\n";
         }
         else {
-            $html .=
-              "\n<br><EMBED SRC='$wav_file' VOLUME=20 WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n";
+            $html .= "\n<br><EMBED SRC='$wav_file' VOLUME=20 WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n";
 
             #           $html .= "\n<br><EMBED SRC='$wav_file'  VOLUME=20 WIDTH=144 HEIGHT=60 AUTOSTART='true'>\n" .
             #             "<NOEMBED><BGSOUND SRC='$wav_file'></NOEMBED>\n";
@@ -1463,8 +1381,7 @@ sub html_last_displayed {
     $last_displayed =~ s/\n/\n<br>/g;
 
     #   return "<h3>Last Displayed Text</h3>$last_displayed";
-    return "<h3>Last Displayed Text</h3>$last_displayed",
-      $main::config_parms{ 'html_style_speak' . $Http{format} };
+    return "<h3>Last Displayed Text</h3>$last_displayed", $main::config_parms{ 'html_style_speak' . $Http{format} };
 
 }
 
@@ -1478,8 +1395,7 @@ sub html_last_spoken {
         $h_response .= "<a href=speech>Refresh Recently Spoken Text</a>\n";
 
         #       $h_response .= &html_file($socket, '../web/bin/set_cookie.pl', 'webmute&&<b>Webmute</b>', 1);
-        my @last_spoken =
-          &speak_log_last( $main::config_parms{max_log_entries} );
+        my @last_spoken = &speak_log_last( $main::config_parms{max_log_entries} );
         for my $text (@last_spoken) {
             $h_response .= "<li>$text\n";
         }
@@ -1488,8 +1404,7 @@ sub html_last_spoken {
         $h_response = "<h4>Not Logged In</h4>";
     }
 
-    return "$h_response\n",
-      $main::config_parms{ 'html_style_speak' . $Http{format} };
+    return "$h_response\n", $main::config_parms{ 'html_style_speak' . $Http{format} };
 }
 
 sub html_print_log {
@@ -1500,8 +1415,7 @@ sub html_print_log {
           qq[<META HTTP-EQUIV="REFRESH" CONTENT="$main::config_parms{'html_refresh_rate' . $Http{format}}; url=print_log">\n]
           if $main::config_parms{ 'html_refresh_rate' . $Http{format} };
         $h_response .= "<a href=print_log>Refresh Print Log</a>\n";
-        my @last_printed =
-          &main::print_log_last( $main::config_parms{max_log_entries} );
+        my @last_printed = &main::print_log_last( $main::config_parms{max_log_entries} );
         for my $text (@last_printed) {
 
             #This formatting is a little bizarre, but sub html_page blindly
@@ -1515,8 +1429,7 @@ sub html_print_log {
     else {
         $h_response = "<h4>Not Logged In</h4>";
     }
-    return "$h_response\n",
-      $main::config_parms{ 'html_style_print' . $Http{format} };
+    return "$h_response\n", $main::config_parms{ 'html_style_print' . $Http{format} };
 }
 
 sub html_encode {
@@ -1536,8 +1449,7 @@ sub html_error_log {
           qq[<META HTTP-EQUIV="REFRESH" CONTENT="$main::config_parms{'html_refresh_rate' . $Http{format}}; url=error_log">\n]
           if $main::config_parms{ 'html_refresh_rate' . $Http{format} };
         $h_response .= "<a href=error_log>Refresh Error Log</a>\n";
-        my @last_printed =
-          &main::error_log_last( $main::config_parms{max_log_entries} );
+        my @last_printed = &main::error_log_last( $main::config_parms{max_log_entries} );
         for my $text (@last_printed) {
             $text =~ s/\n/\n<br>/g;
             $h_response .= "<li>$text\n";
@@ -1546,8 +1458,7 @@ sub html_error_log {
     else {
         $h_response = "<h4>Not Logged In</h4>";
     }
-    return "$h_response\n",
-      $main::config_parms{ 'html_style_error' . $Http{format} };
+    return "$h_response\n", $main::config_parms{ 'html_style_error' . $Http{format} };
 }
 
 # These html_form functions are used by mh/web/bin/*.pl scrips
@@ -1616,8 +1527,7 @@ sub html_form_select_set_var {
     my $html = "<form action=/bin/set_var.pl method=post><td>\n";
     $html .= qq|<input type='hidden' name='var'  value="$var">\n|;
     $html .= qq|<input type='hidden' name='resp' value='/bin/triggers.pl'>\n|;
-    $html .=
-      &html_form_select( 'value', 1, $default, @values ) . "</td></form>\n";
+    $html .= &html_form_select( 'value', 1, $default, @values ) . "</td></form>\n";
     return $html;
 }
 
@@ -1684,11 +1594,10 @@ sub html_file {
             &print_log("$whoisit made an unauthorized request for $file");
 
             #           return &html_page("", &html_unauthorized("Not authorized to run perl .pl file: $file"));
-            return &html_unauthorized(
-                "Not authorized to run perl .pl file: $file");
+            return &html_unauthorized("Not authorized to run perl .pl file: $file");
         }
 
-        @ARGV = '';    # Have to clear previous args
+        @ARGV = '';                                    # Have to clear previous args
         @ARGV = split( /&&/, $arg ) if defined $arg;
 
         # Allow for regular STDOUT cgi scripts
@@ -1736,9 +1645,7 @@ sub shtml_include {
 
     # Example:  <li>Version: <!--#include var="$Version"--> ...
     #   if (my ($prefix, $directive, $data, $suffix) = $r =~ /(.*)\<\!--+ *\#include +(\S+)=[\"\']([^\"\']+)[\"\'] *--\>(.*)/) {
-    while ( my ( $prefix, $directive, $data, $suffix ) =
-        $r =~ /(.*?)\<\!--+ *\#include +(\S+)=\"([^\"]+)\" *--\>(.*)/ )
-    {
+    while ( my ( $prefix, $directive, $data, $suffix ) = $r =~ /(.*?)\<\!--+ *\#include +(\S+)=\"([^\"]+)\" *--\>(.*)/ ) {
         print "Http include: $directive=$data\n" if $main::Debug{http};
         $html .= $prefix;
 
@@ -1747,28 +1654,21 @@ sub shtml_include {
         #   e.g.: " <td <!--#include file="motion.pl?timer_motion_main"--> >
         #       $html .= "\n<\!-- The following is from include $directive = $data -->\n" unless $file =~ /\.vxml$/;
         if ( $directive eq 'file' ) {
-            eval "\$data = qq[$data]"
-              ;    # Resolve $vars in file specs (e.g. config_parm{web_href...}
+            eval "\$data = qq[$data]";    # Resolve $vars in file specs (e.g. config_parm{web_href...}
             my ( $get_req, $get_arg ) = $data =~ m|(\/?[^ \?]+)\??(\S+)?|;
-            $get_arg = '' unless defined $get_arg;  # Avoid uninitalized var msg
-            $get_arg =~ s/\&/&&/g
-              ; # translate & to &&, since we translate %##  to & before splitting
+            $get_arg = '' unless defined $get_arg;    # Avoid uninitalized var msg
+            $get_arg =~ s/\&/&&/g;                    # translate & to &&, since we translate %##  to & before splitting
             if ( !$get_req ) {
             }
-            elsif ( my $html_file =
-                &test_for_file( $socket, $get_req, $get_arg, 1, 1 ) )
-            {
+            elsif ( my $html_file = &test_for_file( $socket, $get_req, $get_arg, 1, 1 ) ) {
                 $html .= $html_file;
             }
-            elsif ( my ( $html2, $style ) =
-                &html_mh_generated( $get_req, $get_arg, 0 ) )
-            {
-                $style = '' unless $style;    # Avoid uninitalized var msg
+            elsif ( my ( $html2, $style ) = &html_mh_generated( $get_req, $get_arg, 0 ) ) {
+                $style = '' unless $style;            # Avoid uninitalized var msg
                 $html .= $style . $html2;
             }
             else {
-                print
-                  "Error, shtml file directive not recognized: data=$data req=$get_req arg=$get_arg\n";
+                print "Error, shtml file directive not recognized: data=$data req=$get_req arg=$get_arg\n";
             }
         }
         elsif ( $directive eq 'ajax' ) {
@@ -1777,31 +1677,23 @@ sub shtml_include {
                 print "Correcting AJAX URL\n" if $main::Debug{http};
                 $url = "/" . $url;
             }
-            my $ajax_start =
-              qq[<span class="ajax_update"><input type="hidden" value="$url"><span class="content">];
-            my $ajax_end = qq[</span></span>];
-            eval "\$data = qq[$data]"
-              ;    # Resolve $vars in file specs (e.g. config_parm{web_href...}
+            my $ajax_start = qq[<span class="ajax_update"><input type="hidden" value="$url"><span class="content">];
+            my $ajax_end   = qq[</span></span>];
+            eval "\$data = qq[$data]";    # Resolve $vars in file specs (e.g. config_parm{web_href...}
             my ( $get_req, $get_arg ) = $data =~ m|(\/?[^ \?]+)\??(\S+)?|;
-            $get_arg = '' unless defined $get_arg;  # Avoid uninitalized var msg
-            $get_arg =~ s/\&/&&/g
-              ; # translate & to &&, since we translate %##  to & before splitting
+            $get_arg = '' unless defined $get_arg;    # Avoid uninitalized var msg
+            $get_arg =~ s/\&/&&/g;                    # translate & to &&, since we translate %##  to & before splitting
             if ( !$get_req ) {
             }
-            elsif ( my $html_file =
-                &test_for_file( $socket, $get_req, $get_arg, 1, 1 ) )
-            {
+            elsif ( my $html_file = &test_for_file( $socket, $get_req, $get_arg, 1, 1 ) ) {
                 $html .= $ajax_start . $html_file . $ajax_end;
             }
-            elsif ( my ( $html2, $style ) =
-                &html_mh_generated( $get_req, $get_arg, 0 ) )
-            {
-                $style = '' unless $style;    # Avoid uninitalized var msg
+            elsif ( my ( $html2, $style ) = &html_mh_generated( $get_req, $get_arg, 0 ) ) {
+                $style = '' unless $style;            # Avoid uninitalized var msg
                 $html .= $ajax_start . $style . $html2 . $ajax_end;
             }
             else {
-                print
-                  "Error, shtml ajax directive not recognized: data=$data req=$get_req arg=$get_arg\n";
+                print "Error, shtml ajax directive not recognized: data=$data req=$get_req arg=$get_arg\n";
             }
         }
         elsif ( $directive =~ /^s?var$/ or $directive eq 'code' ) {
@@ -1818,8 +1710,7 @@ sub shtml_include {
             print "Error in eval: $@" if $@;
         }
         else {
-            print
-              "http include directive not recognized:  $directive = $data\n";
+            print "http include directive not recognized:  $directive = $data\n";
         }
         $r = $suffix;
     }
@@ -1844,8 +1735,7 @@ sub html_cgi {
 
             # This is the step that fails on win98 :(
             open STDOUT, ">&$fileno"
-              or warn
-              "http .pl error: Can not redirect STDOUT to $fileno: $!\n";
+              or warn "http .pl error: Can not redirect STDOUT to $fileno: $!\n";
         }
     }
 
@@ -1874,9 +1764,8 @@ sub html_cgi {
     $ENV{REQUEST_METHOD} = 'GET';
 
     #   $ENV{REMOTE_ADDR}       = $Http{Client_address};
-    eval '&CGI::initialize_globals'
-      ;    # Need this or else CGI.pm global vars are not reset
-    local $^W = 0;    # Avoid redefined sub msgs
+    eval '&CGI::initialize_globals';    # Need this or else CGI.pm global vars are not reset
+    local $^W = 0;                      # Avoid redefined sub msgs
     eval $code;
     print "Error in http cgi eval: $@" if $@;
 
@@ -1956,11 +1845,9 @@ sub html_page {
 
     # Allow for fully formated html
     if ( $body =~ /^\s*<(!doctype\s*)?(html|\?xml)/i ) {
-        $body =~ s/\n/\n\r/g
-          ;    # Bill S. says this is required to be standards compiliant
+        $body =~ s/\n/\n\r/g;    # Bill S. says this is required to be standards compiliant
 
-        my $contenttype =
-          "text/html";    # Default value if no other information is found
+        my $contenttype = "text/html";    # Default value if no other information is found
 
         if ( $body =~ /^\s*<(\?xml)/i ) {
             $contenttype = "text/xml";
@@ -2027,8 +1914,7 @@ sub html_page {
     $extraheaders .= "\n\r"           if $extraheaders;
 
     # Not sure how important length is, but pretty cheap and easy to do
-    $html =~
-      s/\n/\n\r/g;    # Bill S. says this is required to be standards compiliant
+    $html =~ s/\n/\n\r/g;    # Bill S. says this is required to be standards compiliant
     return <<eof;
 HTTP/1.0 200 OK
 Server: MisterHouse
@@ -2064,7 +1950,7 @@ sub html_category {
     my $h_index;
 
     $h_index =
-      qq[<DIV ID="overDiv" STYLE="position:absolute; visibility:hide; z-index:1;"></DIV>\n]
+        qq[<DIV ID="overDiv" STYLE="position:absolute; visibility:hide; z-index:1;"></DIV>\n]
       . qq[<SCRIPT LANGUAGE="JavaScript" SRC="/lib/overlib.js"></SCRIPT>\n]
       if $html_info_overlib;
 
@@ -2079,8 +1965,7 @@ sub html_category {
             }
 
             #           $info = qq[onMouseOver="overlib('$info', FIXX, 5, OFFSETY, 50 )" onMouseOut="nd();"];
-            $info =
-              qq[onMouseOver="overlib('$info', RIGHT, OFFSETY, 50 )" onMouseOut="nd();"];
+            $info = qq[onMouseOver="overlib('$info', RIGHT, OFFSETY, 50 )" onMouseOut="nd();"];
         }
 
         # Create buttons with GD module if available
@@ -2089,8 +1974,7 @@ sub html_category {
               qq[<a href=list?$category $info accesskey=$accesskey><img src="/bin/button.pl?$category" alt='$category' border="0"></a>\n];
         }
         else {
-            $h_index .= "<li>"
-              . qq[<a href=list?$category $info accesskey=$accesskey>$category</a>\n];
+            $h_index .= "<li>" . qq[<a href=list?$category $info accesskey=$accesskey>$category</a>\n];
         }
     }
     return $h_index;
@@ -2109,14 +1993,10 @@ sub html_groups {
         # Create buttons with GD module if available
         if ( $Info{module_GD} ) {
             my $name = &pretty_object_name($group);
-            $h_index .=
-              qq[<a href=list?group=$group><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
+            $h_index .= qq[<a href=list?group=$group><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
         }
         else {
-            $h_index .= "<li>"
-              . &html_active_href( "list?group=$group",
-                &pretty_object_name($group) )
-              . "\n";
+            $h_index .= "<li>" . &html_active_href( "list?group=$group", &pretty_object_name($group) ) . "\n";
         }
     }
     return $h_index;
@@ -2128,14 +2008,12 @@ sub html_items {
     #   for my $object_type ('X10_Item', 'X10_Appliance', 'Group', 'iButton', 'Serial_Item') {
     for my $object_type (@Object_Types) {
         next if $object_type eq 'Voice_Cmd';    # Already covered under Category
-             # Create buttons with GD module if available
+                                                # Create buttons with GD module if available
         if ( $Info{module_GD} ) {
-            $h_index .=
-              qq[<a href=list?$object_type><img src="/bin/button.pl?$object_type" alt='$object_type' border="0"></a>\n];
+            $h_index .= qq[<a href=list?$object_type><img src="/bin/button.pl?$object_type" alt='$object_type' border="0"></a>\n];
         }
         else {
-            $h_index .= "<li>"
-              . &html_active_href( "list?$object_type", $object_type ) . "\n";
+            $h_index .= "<li>" . &html_active_href( "list?$object_type", $object_type ) . "\n";
         }
     }
     return $h_index;
@@ -2268,9 +2146,7 @@ sub button_action {
 
     # Do not dim the dishwasher :)
     unless ( eval qq|UNIVERSAL::isa($object_name, 'X10_Appliance')|
-        or eval
-        qq|ref($object_name) && $object_name->can('is_dimmable') && !($object_name->is_dimmable)|
-      )
+        or eval qq|ref($object_name) && $object_name->can('is_dimmable') && !($object_name->is_dimmable)| )
     {
         $state = 'dim'      if $x < 30;    # Left  side of image
         $state = 'brighten' if $x > 70;    # Right side of image
@@ -2353,9 +2229,7 @@ sub html_list {
     my ( $webname_or_object_type, $auto_refresh ) = @_;
     my ( $object, @object_list, $num, $h_list );
 
-    $h_list .= &html_header(
-        "<b>Browse $webname_or_object_type</b>&nbsp;&nbsp;&nbsp;&nbsp;"
-          . &html_authorized );
+    $h_list .= &html_header( "<b>Browse $webname_or_object_type</b>&nbsp;&nbsp;&nbsp;&nbsp;" . &html_authorized );
     $h_list =~ s/group=\$//;    # Drop the group=$ prefix on group lists
 
     $h_list .= qq[<!-- html_list -->\n];
@@ -2371,8 +2245,7 @@ sub html_list {
 
             # Now find object name
             my ( $file, $cmd2 ) = $cmd =~ /(.+)\:(.+)/;
-            my ( $object, $said, $vocab_cmd ) =
-              &Voice_Cmd::voice_item_by_text( lc $cmd2 );
+            my ( $object, $said, $vocab_cmd ) = &Voice_Cmd::voice_item_by_text( lc $cmd2 );
             my $object_name = $object->{object_name};
             next if $seen{$object_name}++;
             push @object_list, $object_name;
@@ -2416,9 +2289,7 @@ sub html_list {
 
         my @table_items =
           map { &html_item_state( $_, $webname_or_object_type ) } @objects;
-        $h_list .=
-          &table_it( $config_parms{ 'html_table_size' . $Http{format} },
-            0, 0, @table_items );
+        $h_list .= &table_it( $config_parms{ 'html_table_size' . $Http{format} }, 0, 0, @table_items );
         return $h_list;
     }
 
@@ -2428,8 +2299,7 @@ sub html_list {
           qq[<META HTTP-EQUIV="REFRESH" CONTENT="$main::config_parms{'html_refresh_rate' . $Http{format}}; url=list?$webname_or_object_type">\n]
           if $auto_refresh
           and $main::config_parms{ 'html_refresh_rate' . $Http{format} };
-        $h_list .=
-          "<!-- html_list list_objects_by_type = $webname_or_object_type -->\n";
+        $h_list .= "<!-- html_list list_objects_by_type = $webname_or_object_type -->\n";
         my @objects = map { &get_object_by_name($_) } @object_list;
 
         # Ignore objects marked as hidden
@@ -2437,9 +2307,7 @@ sub html_list {
 
         my @table_items =
           map { &html_item_state( $_, $webname_or_object_type ) } @objects;
-        $h_list .=
-          &table_it( $main::config_parms{ 'html_table_size' . $Http{format} },
-            0, 0, @table_items );
+        $h_list .= &table_it( $main::config_parms{ 'html_table_size' . $Http{format} }, 0, 0, @table_items );
         return $h_list;
     }
 
@@ -2456,8 +2324,7 @@ sub html_list {
 sub table_it {
     my ( $cols, $border, $space, @items ) = @_;
 
-    my $h_list .=
-      qq[<table border='$border' width="100%" cellspacing="$space" cellpadding="0">\n];
+    my $h_list .= qq[<table border='$border' width="100%" cellspacing="$space" cellpadding="0">\n];
 
     my $num = 0;
     for my $item (@items) {
@@ -2520,16 +2387,14 @@ sub html_command_table {
         #  - pick the first {a,b,c} phrase enumeration
         $text =~ s/\{(.+?),.+?\}/$1/g;
 
-        my ( $prefix, $states, $suffix, $h_text, $text_cmd, $ol_info,
-            $state_log, $ol_state_log );
+        my ( $prefix, $states, $suffix, $h_text, $text_cmd, $ol_info, $state_log, $ol_state_log );
         ( $prefix, $states, $suffix ) = $text =~ /^(.*)\[(.+?)\](.*)$/;
         $states = '' unless $states;    # Avoid -w uninitialized values error
         $suffix = '' unless $states;
         my @states = split ',', $states;
 
         #       my $states_with_select = @states > $config_parms{'html_category_select' . $Http{format}};
-        my $states_with_select = length("@states") >
-          $config_parms{ 'html_select_length' . $Http{format} };
+        my $states_with_select = length("@states") > $config_parms{ 'html_select_length' . $Http{format} };
 
         # Do the filename entry
         push @htmls, qq[<td align='left' valign='center'>$filename</td>\n]
@@ -2554,31 +2419,24 @@ sub html_command_table {
             }
             my $row = $list_count;
             $row /= 2
-              if $main::config_parms{ 'html_category_cols' . $Http{format} } ==
-              2;
+              if $main::config_parms{ 'html_category_cols' . $Http{format} } == 2;
             $height = $row * 25 if $row * 25 < $height;
 
             #           my $ol_pos = ($list_count > 5) ? 'ABOVE, HEIGHT, $height' : 'RIGHT';
             #           my $ol_pos = "ABOVE, HEIGHT, $height";
             my $ol_pos = "BELOW, HEIGHT, $height";
-            $ol_info =
-              qq[onMouseOver="overlib('$ol_info', $ol_pos)" onMouseOut="nd();"];
+            $ol_info = qq[onMouseOver="overlib('$ol_info', $ol_pos)" onMouseOut="nd();"];
 
             # Summarize state log entries
-            unless (
-                $main::config_parms{ 'html_category_states' . $Http{format} } )
-            {
+            unless ( $main::config_parms{ 'html_category_states' . $Http{format} } ) {
                 my @states_log = state_log $object;
                 while ( my $state = shift @states_log ) {
-                    if ( my ( $date, $time, $state ) =
-                        $state =~ /(\S+) (\S+ *[APM]{0,2}) *(.*)/ )
-                    {
+                    if ( my ( $date, $time, $state ) = $state =~ /(\S+) (\S+ *[APM]{0,2}) *(.*)/ ) {
                         $ol_state_log .= "<li>$date $time <b>$state</b> ";
                     }
                 }
                 $ol_state_log = "unknown" unless $ol_state_log;
-                $ol_state_log =
-                  qq[onMouseOver="overlib('$ol_state_log', RIGHT, WIDTH, 250 )" onMouseOut="nd();"];
+                $ol_state_log = qq[onMouseOver="overlib('$ol_state_log', RIGHT, WIDTH, 250 )" onMouseOut="nd();"];
             }
         }
 
@@ -2586,10 +2444,8 @@ sub html_command_table {
         if ( $config_parms{ 'html_info' . $Http{format} } eq 'overlib_link' ) {
 
             #           $html  = qq[<a href="javascript:void(0);" $ol_info>info</a><br> ];
-            $html =
-              qq[<a href='SET;&html_info($object_name)'$ol_info>info</a><br> ];
-            $html .=
-              qq[<a href='SET;&html_state_log($object_name)'$ol_state_log>log</a> ];
+            $html = qq[<a href='SET;&html_info($object_name)'$ol_info>info</a><br> ];
+            $html .= qq[<a href='SET;&html_state_log($object_name)'$ol_state_log>log</a> ];
             push @htmls, qq[<td align='left' valign='center'>$html</td>\n];
         }
 
@@ -2600,8 +2456,7 @@ sub html_command_table {
             #           my $alt = $object->{info} . " ($h_icon)";
             my $alt = $h_icon;
             $alt =~ s/.*?([^\/]+)\..*/$1/;    # Use just the base file name
-            $html =
-              qq[<input type='image' src="$h_icon" alt="$alt" border="0">\n];
+            $html = qq[<input type='image' src="$h_icon" alt="$alt" border="0">\n];
 
             #           $html = qq[<img src="$h_icon" alt="$h_icon" border="0">];
         }
@@ -2618,8 +2473,7 @@ sub html_command_table {
           . qq[">\n];
 
         # Icon button
-        push @htmls,
-          qq[$form  <td align='left' valign='center' width='0%' $ol_state_log>$html</td>\n];
+        push @htmls, qq[$form  <td align='left' valign='center' width='0%' $ol_state_log>$html</td>\n];
 
         # Now do the main text entry
         my $width =
@@ -2648,13 +2502,11 @@ sub html_command_table {
             #           $html .= qq[<option value="pick_a_state_msg" SELECTED> \n]; # Default is blank
             $msagent_cmd1 = "$prefix (";
             for my $state (@states) {
-                my $selected =
-                  $currState && $state eq $currState ? "selected" : "";
+                my $selected = $currState && $state eq $currState ? "selected" : "";
                 my $text_cmd = "$prefix$state$suffix";
                 $text_cmd =~ tr/\_/\~/;    # Blanks are not allowed in urls
                 $text_cmd =~ tr/ /\_/;
-                $html .=
-                  qq[<option $selected value="$text_cmd">$state</option>\n];
+                $html .= qq[<option $selected value="$text_cmd">$state</option>\n];
                 $state =~ s/\+(\d+)/$1/;    # Msagent doesn't like +20, +30, etc
                 $msagent_cmd1 .= "$state|" if $state;
             }
@@ -2666,13 +2518,11 @@ sub html_command_table {
             #           $html .= qq[<option value="pick_a_state_msg" SELECTED> \n]; # Default is blank
             $msagent_cmd1 = "$prefix (";
             for my $state (@states) {
-                my $selected =
-                  $currState && $state eq $currState ? "checked" : "";
+                my $selected = $currState && $state eq $currState ? "checked" : "";
                 my $text_cmd = "$prefix$state$suffix";
                 $text_cmd =~ tr/\_/\~/;    # Blanks are not allowed in urls
                 $text_cmd =~ tr/ /\_/;
-                $html .=
-                  qq[<INPUT type="radio" name="select_cmd" $selected onChange="form.submit()" value="$text_cmd"/>$state\n];
+                $html .= qq[<INPUT type="radio" name="select_cmd" $selected onChange="form.submit()" value="$text_cmd"/>$state\n];
                 $state =~ s/\+(\d+)/$1/;    # Msagent doesn't like +20, +30, etc
                 $msagent_cmd1 .= "$state|" if $state;
             }
@@ -2686,8 +2536,7 @@ sub html_command_table {
             $msagent_cmd1 = "$prefix (";
             for my $state (@states) {
                 my $text_cmd = "$prefix$state$suffix";
-                $text_cmd =~ s/\+/\%2B/g
-                  ;    # Use hex 2B = +, as + will be translated to blanks
+                $text_cmd =~ s/\+/\%2B/g;    # Use hex 2B = +, as + will be translated to blanks
                 $text_cmd =~ s/\'/\%27/g;    # Use hex 27 = '
                 $text_cmd =~ tr/\_/\~/;      # Blanks are not allowed in urls
                 $text_cmd =~ tr/ /\_/;
@@ -2697,8 +2546,7 @@ sub html_command_table {
                     $hrefs .= qq[, ] if $hrefs;
                 }
                 else {
-                    $html .=
-                      qq[<input type="hidden" name="select_cmd" value='$text_cmd'>\n];
+                    $html .= qq[<input type="hidden" name="select_cmd" value='$text_cmd'>\n];
                 }
 
                 # We could add ol_info here, so netscape kind of works, but this
@@ -2719,14 +2567,12 @@ sub html_command_table {
         # Just display the text, when no states
         else {
             my $text_cmd = $text;
-            $text_cmd =~
-              s/\+/\%2B/g;   # Use hex 2B = +, as + will be translated to blanks
-            $text_cmd =~ s/\'/\%27/g;    # Use hex 27 = '
-            $text_cmd =~ tr/\_/\~/;      # Blanks are not allowed in urls
+            $text_cmd =~ s/\+/\%2B/g;       # Use hex 2B = +, as + will be translated to blanks
+            $text_cmd =~ s/\'/\%27/g;       # Use hex 27 = '
+            $text_cmd =~ tr/\_/\~/;         # Blanks are not allowed in urls
             $text_cmd =~ tr/ /\_/;
             $html .= qq[<b>$text</b>];
-            $html .=
-              qq[<input type="hidden" name="select_cmd" value='$text_cmd'>\n];
+            $html .= qq[<input type="hidden" name="select_cmd" value='$text_cmd'>\n];
             $msagent_cmd1 = $text;
         }
 
@@ -2737,17 +2583,13 @@ sub html_command_table {
 
         # Do the states_log entry
         if ( $main::config_parms{ 'html_category_states' . $Http{format} } ) {
-            if ( my ( $date, $time, $state ) =
-                ( state_log $object)[0] =~ /(\S+) (\S+) *(.*)/ )
-            {
-                $state_log =
-                  "<NOBR><a href='SET;&html_state_log($object_name)'>$date $time</a></NOBR> <b>$state</b>";
+            if ( my ( $date, $time, $state ) = ( state_log $object)[0] =~ /(\S+) (\S+) *(.*)/ ) {
+                $state_log = "<NOBR><a href='SET;&html_state_log($object_name)'>$date $time</a></NOBR> <b>$state</b>";
             }
             else {
                 $state_log = "unknown";
             }
-            push @htmls,
-              qq[<td align='left' valign='center'>$state_log</td>\n\n];
+            push @htmls, qq[<td align='left' valign='center'>$state_log</td>\n\n];
         }
 
         # Include MsAgent VR commands
@@ -2760,17 +2602,15 @@ sub html_command_table {
         $msagent_cmd1 =~ s/\[\]//;    # Drop [] on stateless commands
         my $msagent_cmd2 = $msagent_cmd1;
         $msagent_cmd2 =~ s/\|/,/g;
-        $msagent_script1 .=
-          qq[minijeff.Commands.Add "$msagent_id", "$msagent_cmd2", "$msagent_cmd1", True, True\n];
-        $msagent_script2 .=
-          qq[Case "$msagent_id"\n   Run_Command(UserInput.voice)\n];
+        $msagent_script1 .= qq[minijeff.Commands.Add "$msagent_id", "$msagent_cmd2", "$msagent_cmd1", True, True\n];
+        $msagent_script2 .= qq[Case "$msagent_id"\n   Run_Command(UserInput.voice)\n];
     }
 
     # Create final html
     # moved the target option down to form and a tags to be compatible with IE7, dn
     #   $html = "<BASE TARGET='" . $config_parms{'html_target_speech' . $Http{format}}. "'>\n";
     $html =
-      qq[<DIV ID="overDiv" STYLE="position:absolute; visibility:hide; z-index:1;"></DIV>\n]
+        qq[<DIV ID="overDiv" STYLE="position:absolute; visibility:hide; z-index:1;"></DIV>\n]
       . qq[<SCRIPT LANGUAGE="JavaScript" SRC="/lib/overlib.js"></SCRIPT>\n]
       . $html
       if $html_info_overlib;
@@ -2779,8 +2619,8 @@ sub html_command_table {
         and $Cookies{msagent}
         and $main::config_parms{ 'html_msagent_script_vr' . $Http{format} } )
     {
-        my $msagent_file = file_read
-          "$config_parms{'html_dir' . $Http{format}}/$config_parms{'html_msagent_script_vr' . $Http{format}}";
+        my $msagent_file =
+          file_read "$config_parms{'html_dir' . $Http{format}}/$config_parms{'html_msagent_script_vr' . $Http{format}}";
         $msagent_file =~ s/<!-- *vr_cmds *-->/$msagent_script1/;
         $msagent_file =~ s/<!-- *vr_select *-->/$msagent_script2/;
         $html = $msagent_file . $html;
@@ -2799,8 +2639,7 @@ sub html_command_table {
       . &table_it(
         $cols,
         $main::config_parms{ 'html_category_border' . $Http{format} },
-        $main::config_parms{ 'html_category_cellsp' . $Http{format} },
-        @htmls
+        $main::config_parms{ 'html_category_cellsp' . $Http{format} }, @htmls
       );
 }
 
@@ -2849,8 +2688,7 @@ sub html_item_state {
 
     my $use_select = 1
       if @states > 2
-      and length("@states") >
-      $config_parms{ 'html_select_length' . $Http{format} };
+      and length("@states") > $config_parms{ 'html_select_length' . $Http{format} };
 
     if ($use_select) {
 
@@ -2860,9 +2698,7 @@ sub html_item_state {
           ? 'referer'
           : "&html_list($object_type)";
         $html .= qq[<FORM action="/SET;$referer?" method="get">\n];
-        $html .=
-          qq[<INPUT type="hidden" name="select_item" value="$object_name">\n]
-          ;    # So we can uncheck buttons
+        $html .= qq[<INPUT type="hidden" name="select_item" value="$object_name">\n];    # So we can uncheck buttons
     }
 
     # Find icon to show state, if not found show state_now in text.
@@ -2880,8 +2716,7 @@ sub html_item_state {
         $html .= $temp . '</a>&nbsp';
     }
     else {
-        $html .=
-          qq[<img src="/graphics/nostat.gif" alt="no_state" border="0"></a>];
+        $html .= qq[<img src="/graphics/nostat.gif" alt="no_state" border="0"></a>];
     }
     $html .= qq[</td>\n];
 
@@ -2898,17 +2733,14 @@ sub html_item_state {
           : "&html_list($object_type)";
 
         # Note:  Use hex 2B = +, as + means spaces in most urls
-        $html .=
-          qq[<a href='SET;$referer?$object_name?%2B15'><img src='/graphics/a1+.gif' alt='+' border='0'></a> ];
-        $html .=
-          qq[<a href='SET;$referer?$object_name?-15'>  <img src='/graphics/a1-.gif' alt='-' border='0'></a> ];
+        $html .= qq[<a href='SET;$referer?$object_name?%2B15'><img src='/graphics/a1+.gif' alt='+' border='0'></a> ];
+        $html .= qq[<a href='SET;$referer?$object_name?-15'>  <img src='/graphics/a1-.gif' alt='-' border='0'></a> ];
     }
 
     # Add Select states
     if ($use_select) {
         $html .= qq[<SELECT name="select_state" onChange="form.submit()">\n];
-        $html .=
-          qq[<option value="pick_a_state_msg" SELECTED> \n];  # Default is blank
+        $html .= qq[<option value="pick_a_state_msg" SELECTED> \n];             # Default is blank
         for my $state (@states) {
 
             #           my $state_url = &escape($state);
@@ -2942,8 +2774,7 @@ sub html_item_state {
               ( $Http{Referer} =~ /html$/ )
               ? 'referer'
               : "&html_list($object_type)";
-            $html .=
-              qq[<a href='SET;$referer?$object_name=$state_toggle'>$object_name2</a>];
+            $html .= qq[<a href='SET;$referer?$object_name=$state_toggle'>$object_name2</a>];
         }
         else {
             $html .= $object_name2;
@@ -2965,8 +2796,7 @@ sub html_item_state {
               ( $Http{Referer} =~ /html$/ )
               ? 'referer'
               : "&html_list($object_type)";
-            $html .=
-              qq[ <a href='SET;$referer?$object_name=$state_url'>$state_short</a>];
+            $html .= qq[ <a href='SET;$referer?$object_name=$state_url'>$state_short</a>];
         }
     }
 
@@ -3065,25 +2895,20 @@ sub print_socket_fork {
           if $main::Debug{http};
         if ($OS_win) {
             if ( $main::config_parms{http_fork} eq 'memmap' ) {
-                $http_fork_count =
-                  ( $http_fork_count % 65535 ) + 1;    # more than enough :^)
+                $http_fork_count = ( $http_fork_count % 65535 ) + 1;    # more than enough :^)
                 my $mapname = "//MemMap/HttpFork" . "$http_fork_count";
 
                 # seems we need to map this on a virtual memory page boundry
-                my $mapsize =
-                  $length + $http_fork_page - ( $length % $http_fork_page );
+                my $mapsize = $length + $http_fork_page - ( $length % $http_fork_page );
                 my $mem = $http_fork_mem->OpenMem( $mapname, $mapsize );
                 $mem->Write( \$html, 0 );
 
                 # This ugly fork can only do one at a time :(
                 if ( $socket_fork_data{process} ) {
-                    print
-                      "http: deferring socket_fork s=$socket mapname=$mapname\n"
+                    print "http: deferring socket_fork s=$socket mapname=$mapname\n"
                       if $main::Debug{http};
-                    push @{ $socket_fork_data{next} },
-                      [ $socket, $mem, $http_fork_count ];
-                    $leave_socket_open_passes =
-                      -1;    # This will not close the socket
+                    push @{ $socket_fork_data{next} }, [ $socket, $mem, $http_fork_count ];
+                    $leave_socket_open_passes = -1;    # This will not close the socket
                 }
                 else {
                     &print_socket_fork_win( $socket, $mem, $http_fork_count );
@@ -3095,8 +2920,7 @@ sub print_socket_fork {
                     print "http: defering socket_fork s=$socket\n"
                       if $main::Debug{http};
                     push @{ $socket_fork_data{next} }, [ $socket, \$html ];
-                    $leave_socket_open_passes =
-                      -1;    # This will not close the socket
+                    $leave_socket_open_passes = -1;    # This will not close the socket
                 }
                 else {
                     &print_socket_fork_win( $socket, \$html );
@@ -3140,8 +2964,7 @@ sub print_socket_fork_win {
         open OLD_HANDLE, ">&STDOUT"
           or print "\nsocket_fork error: can not backup STDOUT: $!\n";
         if ( my $fileno = $socket->fileno() ) {
-            print
-              "http: redirecting socket fn=$fileno s=$socket fork=$fork_count\n"
+            print "http: redirecting socket fn=$fileno s=$socket fork=$fork_count\n"
               if $main::Debug{http};
             unless ( open STDOUT, ">&$fileno" ) {
                 print "http error: Can not redirect STDOUT: $!\n";
@@ -3152,15 +2975,14 @@ sub print_socket_fork_win {
               or print "Warning, run error: pgm_path=$perl $cmd\n error=",
               Win32::FormatMessage( Win32::GetLastError() ), "\n";
             open STDOUT, ">&OLD_HANDLE"
-              or print
-              "\nsocket_fork error: can not redir STDIN to orig value: $!\n";
+              or print "\nsocket_fork error: can not redir STDIN to orig value: $!\n";
             close OLD_HANDLE;
 
             # Need to close the socket only after the process is done :(
             $socket_fork_data{forkmem} = $ptr if $fork_count;
             $socket_fork_data{process} = $process;
             $socket_fork_data{socket}  = $socket;
-            $leave_socket_open_passes = -1;    # This will not close the socket
+            $leave_socket_open_passes  = -1;                    # This will not close the socket
 
             #           shutdown($socket, 0);   # "how":  0=no more receives, 1=sends, 2=both
             #           $socket->close();
@@ -3309,8 +3131,7 @@ sub vars_save {
         my $value = ( $Save{$key} ) ? $Save{$key} : '';
         push @table_items, "<td align='left'><b>$key:</b> $value</td>";
     }
-    return &html_header("List Save Variables")
-      . &table_it( 2, 1, 1, @table_items );
+    return &html_header("List Save Variables") . &table_it( 2, 1, 1, @table_items );
 }
 
 sub vars_global {
@@ -3322,29 +3143,27 @@ sub vars_global {
 
         # Assume all the global vars we care about are $Ab...
         next if $key !~ /^[A-Z][a-z]/ or $key =~ /\:/;
-        next if $key eq 'Save' or $key eq 'Tk_objects';    # Covered elsewhere
+        next if $key eq 'Save'        or $key eq 'Tk_objects';    # Covered elsewhere
         next if $key eq 'Socket_Ports';
         next if $key eq 'User_Code';
 
         my $glob = $main::{$key};
         if ( ${$glob} ) {
             my $value = ${$glob};
-            next if $value =~ /HASH/;     # Skip object pointers
+            next if $value =~ /HASH/;                             # Skip object pointers
             next if $key eq 'Password';
             push @table_items, "<td align='left'><b>\$$key:</b> $value</td>";
         }
         elsif ( %{$glob} ) {
             for my $key2 ( sort keys %{$glob} ) {
                 my $value = ${$glob}{$key2} . "\n";
-                $value = '' unless $value;    # Avoid -w uninitialized value msg
-                next if $value =~ /HASH/;     # Skip object pointers
-                push @table_items,
-                  "<td align='left'><b>\$$key\{$key2\}:</b> $value</td>";
+                $value = '' unless $value;                        # Avoid -w uninitialized value msg
+                next if $value =~ /HASH/;                         # Skip object pointers
+                push @table_items, "<td align='left'><b>\$$key\{$key2\}:</b> $value</td>";
             }
         }
     }
-    return &html_header("List Global Variables")
-      . &table_it( 2, 1, 1, @table_items );
+    return &html_header("List Global Variables") . &table_it( 2, 1, 1, @table_items );
 }
 
 sub vxml_page {
@@ -3429,9 +3248,9 @@ sub vxml_form {
         else {
             $grammar .= qq|[$cmd] {<option "$i">}\n|;
             $filled  .= qq|  <if cond='$i'>\n|;
-            $filled .= qq|   <audio>$text</audio>\n| unless $text eq 'previous';
-            $filled .= qq|   $action[$i-1]\n| if $action[ $i - 1 ];
-            $filled .= qq|   <goto expr="'$goto[$i-1]'"/>\n  </if>\n|;
+            $filled  .= qq|   <audio>$text</audio>\n| unless $text eq 'previous';
+            $filled  .= qq|   $action[$i-1]\n| if $action[ $i - 1 ];
+            $filled  .= qq|   <goto expr="'$goto[$i-1]'"/>\n  </if>\n|;
         }
         $i++;
     }
@@ -3513,8 +3332,7 @@ sub widgets {
     }
 
     # List a header unless we are listing for a category, which already has a header
-    my $header =
-      ($request_category) ? ' ' : &html_header("List $request_type widgets");
+    my $header = ($request_category) ? ' ' : &html_header("List $request_type widgets");
     return $header . &table_it( $cols, 0, 0, @table_items );
 }
 
@@ -3537,8 +3355,7 @@ sub widget_label {
         next if $search and $label !~ /$search/i;
         my ( $key, $value ) = $label =~ /(.+?\:)(.*)/;
         $value = '' unless $value;
-        push @table_items, qq[<tr><td align='left' colspan=1><b>$key</b></td>]
-          . qq[<td align='left' colspan=5>$value</td></tr>];
+        push @table_items, qq[<tr><td align='left' colspan=1><b>$key</b></td>] . qq[<td align='left' colspan=5>$value</td></tr>];
 
         #       push @table_items, qq[<td align='left' colspan=4>$value</td>];
         #       $label =~ s/(.+?\:)/<b>$1<\/b>/; # Bold the label part
@@ -3598,7 +3415,7 @@ sub widget_radiobutton {
     $html .= qq[<td align='left'><b>$label</b></td>];
     push @table_items, $html;
     $html_pointers{ ++$html_pointer_cnt } = $pvar;
-    my @text = @$ptext if $ptext;  # Copy, so do not destroy original with shift
+    my @text = @$ptext if $ptext;    # Copy, so do not destroy original with shift
 
     for my $value (@$pvalue) {
         my $text = shift @text;
@@ -3612,8 +3429,7 @@ sub widget_radiobutton {
         else {
             $checked = 'CHECKED' if $$pvar and $$pvar eq $value;
         }
-        $html =
-          qq[<td align='left'><INPUT type="radio" NAME="$html_pointer_cnt" value="$value" $checked ];
+        $html = qq[<td align='left'><INPUT type="radio" NAME="$html_pointer_cnt" value="$value" $checked ];
         $html .= qq[$checked onClick="form.submit()">$text</td>];
         push @table_items, $html;
     }
@@ -3642,8 +3458,7 @@ sub widget_checkbutton {
         my $html =
           qq[<FORM name="widgets_radiobutton" ACTION="SET;$H_Response"  target=\']
           . $config_parms{ 'html_target_speech' . $Http{format} } . "'>\n";
-        $html .= qq[<INPUT type="hidden" name="$html_pointer_cnt" value='0'>\n]
-          ;    # So we can uncheck buttons
+        $html .= qq[<INPUT type="hidden" name="$html_pointer_cnt" value='0'>\n];    # So we can uncheck buttons
         $html .=
           qq[<td align='left'><INPUT type="checkbox" NAME="$html_pointer_cnt" value="1" $checked onClick="form.submit()">$text</td></FORM>\n];
         push @table_items, $html;
@@ -3675,24 +3490,18 @@ sub dir_index {
     $dir_tr =~ s/\//\%2F/g;
 
     opendir DIR, $dir
-      or print
-      "http_server: Could not open dir_index for $dir_html dir=$dir: $!\n";
+      or print "http_server: Could not open dir_index for $dir_html dir=$dir: $!\n";
     my @files = sort readdir DIR;
     close DIR;
 
     @files = grep /$filter/, @files if $filter;    # Drop out files if requested
 
     $filter =~ s/\\/\%5C/g;
-    my $html =
-      qq[<table width=80% border=0 cellspacing=0 cellpadding=0>\n<tr height=50>];
-    $html .=
-      qq[<td><a href="SET;&dir_index('$dir_tr','name',$reverse2,'$filter')">$sort_order Sort by Name</a></td>\n];
-    $html .=
-      qq[<td><a href="SET;&dir_index('$dir_tr','type',$reverse2,'$filter')">$sort_order Sort by Type</a></td>\n];
-    $html .=
-      qq[<td><a href="SET;&dir_index('$dir_tr','size',$reverse2,'$filter')">$sort_order Sort by Size</a></td>\n];
-    $html .=
-      qq[<td><a href="SET;&dir_index('$dir_tr','date',$reverse2,'$filter')">$sort_order Sort by Date</a></td></tr>\n];
+    my $html = qq[<table width=80% border=0 cellspacing=0 cellpadding=0>\n<tr height=50>];
+    $html .= qq[<td><a href="SET;&dir_index('$dir_tr','name',$reverse2,'$filter')">$sort_order Sort by Name</a></td>\n];
+    $html .= qq[<td><a href="SET;&dir_index('$dir_tr','type',$reverse2,'$filter')">$sort_order Sort by Type</a></td>\n];
+    $html .= qq[<td><a href="SET;&dir_index('$dir_tr','size',$reverse2,'$filter')">$sort_order Sort by Size</a></td>\n];
+    $html .= qq[<td><a href="SET;&dir_index('$dir_tr','date',$reverse2,'$filter')">$sort_order Sort by Date</a></td></tr>\n];
 
     my %file_data;
     for my $file (@files) {
@@ -3713,16 +3522,12 @@ sub dir_index {
 
     }
     if ( $sortby eq 'date' or $sortby eq 'size' ) {
-        @files = sort {
-                 $file_data{$a}{$sortby} <=> $file_data{$b}{$sortby}
-              or $a cmp $b
-        } @files;
+        @files =
+          sort { $file_data{$a}{$sortby} <=> $file_data{$b}{$sortby} or $a cmp $b } @files;
     }
     elsif ( $sortby eq 'type' ) {
-        @files = sort {
-                 $file_data{$a}{$sortby} cmp $file_data{$b}{$sortby}
-              or $a cmp $b
-        } @files;
+        @files =
+          sort { $file_data{$a}{$sortby} cmp $file_data{$b}{$sortby} or $a cmp $b } @files;
     }
     @files = reverse @files if $reverse;
     my $i = 0;
diff --git a/lib/http_utils.pl b/lib/http_utils.pl
index 9b7e79caf..f4613b1cd 100644
--- a/lib/http_utils.pl
+++ b/lib/http_utils.pl
@@ -88,8 +88,7 @@ sub insert_keyboard {
     }
 
     #	my @rows=qw/`1234567890-= qwertyuiop[]\ asdfghjkl;' zxcvbnm,.\//;  # This gives warnings with use diagnostics
-    my @rows =
-      ( "`1234567890-=", "qwertyuiop[]\\", "asdfghjkl;'", "zxcvbnm,.\/" );
+    my @rows = ( "`1234567890-=", "qwertyuiop[]\\", "asdfghjkl;'", "zxcvbnm,.\/" );
 
     my $result = qq[<div class="keyboard">
 <br/>
@@ -110,38 +109,31 @@ sub insert_keyboard {
             $value = '&amp;'  if $value eq '&';
 
             if ( $row == 1 && $column == 0 ) {
-                $result .=
-                  qq[<input class="special" type="button" onclick="keyboard_next_control()" value="Tab">];
+                $result .= qq[<input class="special" type="button" onclick="keyboard_next_control()" value="Tab">];
             }
 
             if ( $row == 2 && $column == 0 ) {
-                $result .=
-                  qq[<input class="special" type="button" value="Caps" onclick="keyboard_caps_pressed(this)">];
+                $result .= qq[<input class="special" type="button" value="Caps" onclick="keyboard_caps_pressed(this)">];
             }
 
             if ( $row == 3 && $column == 0 ) {
-                $result .=
-                  qq[<input class="special" type="button" value="Shift" onclick="keyboard_shift_pressed(this)">];
+                $result .= qq[<input class="special" type="button" value="Shift" onclick="keyboard_shift_pressed(this)">];
             }
 
-            $result .=
-              qq[<input type="button" onclick="keyboard_insert_char(this.value)" class="small" value="$value">];
+            $result .= qq[<input type="button" onclick="keyboard_insert_char(this.value)" class="small" value="$value">];
             $column++;
         }
 
         if ( $row == 0 ) {
-            $result .=
-              qq[<input class="special" type="button" onclick="keyboard_delete_char()" value="Backspace">];
+            $result .= qq[<input class="special" type="button" onclick="keyboard_delete_char()" value="Backspace">];
         }
 
         if ( $row == 2 ) {
-            $result .=
-              qq[<input class="special" type="button" onclick="keyboard_form.submit()" value="Enter">];
+            $result .= qq[<input class="special" type="button" onclick="keyboard_form.submit()" value="Enter">];
         }
 
         if ( $row == 3 ) {
-            $result .=
-              qq[<input class="special" type="button" value="Shift" onclick="keyboard_shift_pressed(this)">];
+            $result .= qq[<input class="special" type="button" value="Shift" onclick="keyboard_shift_pressed(this)">];
         }
         $row++;
         $result .= "</td></tr>";
@@ -152,8 +144,7 @@ sub insert_keyboard {
 <input class="spacebar special" type="button" onclick="keyboard_insert_char(' ')" value="Space">];
 
     if ($hide_button) {
-        $result .=
-          qq[<input name="hide" value="Hide" type="button" onclick="hideKeyboard()">];
+        $result .= qq[<input name="hide" value="Hide" type="button" onclick="hideKeyboard()">];
     }
 
     $result .= '</td></tr></table></td>';
@@ -171,13 +162,11 @@ sub insert_keyboard {
             my @chars = split( //, $_ );
             for (@chars) {
                 my $value = $_;
-                $result .=
-                  qq[<input type="button" onclick="keyboard_insert_char(this.value)" class="small" value="$value">];
+                $result .= qq[<input type="button" onclick="keyboard_insert_char(this.value)" class="small" value="$value">];
                 $column++;
             }
             if ( $row == 3 ) {
-                $result .=
-                  qq[<input class="keyboard" type="button" onclick="keyboard_delete_all()" value="Clear">];
+                $result .= qq[<input class="keyboard" type="button" onclick="keyboard_delete_all()" value="Clear">];
             }
 
             $result .= '</td></tr>';
diff --git a/lib/iButton.pm b/lib/iButton.pm
index 80070b16f..7d475d128 100644
--- a/lib/iButton.pm
+++ b/lib/iButton.pm
@@ -245,8 +245,7 @@ sub new {
 
     # If the crc was not given, lets calculate it
     if ( length $id == 14 ) {
-        $crc = Hardware::iButton::Connection::crc( 0,
-            split( //, pack( "b*", $raw_id ) ) );
+        $crc = Hardware::iButton::Connection::crc( 0, split( //, pack( "b*", $raw_id ) ) );
         $crc = pack 'C', $crc;
     }
     $raw_id .= unpack( 'b8', $crc );
@@ -262,7 +261,7 @@ sub new {
     $id = $self->id();             # Get the full id
     $objects_by_id{$id} = $self;
 
-    $$self{state} = '';    # Will only be listed on web page if state is defined
+    $$self{state} = '';            # Will only be listed on web page if state is defined
 
     if ( $self->model() eq 'DS2406' ) {
         push( @{ $$self{states} }, 'on', 'off' );
@@ -402,8 +401,7 @@ sub toggle_switch_2405 {
         $connection->mode("\xe3");         # COMMAND_MODE (is this correct?)
         $connection->send("\x55");         # This should toggle the switch
         $connection->read(3);              # How many bytes should I read here?
-        my $byte = unpack( "b", $connection->read(1) )
-          ;                                # This reads one more byte, I think.
+        my $byte = unpack( "b", $connection->read(1) );    # This reads one more byte, I think.
         print unpack( "b", $byte );
         $connection->reset;
 
@@ -423,10 +421,8 @@ sub read_temp {
     return unless $connections{ $self->{port} };
 
     if ( $connections{ $self->{port} } eq 'proxy' ) {
-        &main::proxy_send( $self->{port}, 'ibutton', 'read_temp',
-            $$self{object_name} );
-        return $self->{state}
-          ;    # This is the previous  temp, but better than nothing.
+        &main::proxy_send( $self->{port}, 'ibutton', 'read_temp', $$self{object_name} );
+        return $self->{state};    # This is the previous  temp, but better than nothing.
     }
 
     my $temp = $self->read_temperature_hires();
@@ -434,8 +430,7 @@ sub read_temp {
 
     my $temp_c = sprintf( "%3.2f", $temp );
     my $temp_f = sprintf( "%3.2f", &::convert_c2f($temp) );
-    my $temp_def =
-      ( $main::config_parms{weather_uom_temp} eq 'C' ) ? $temp_c : $temp_f;
+    my $temp_def = ( $main::config_parms{weather_uom_temp} eq 'C' ) ? $temp_c : $temp_f;
 
     set_receive $self $temp_def;
 
@@ -470,13 +465,7 @@ sub scan_report {
     my @ib_list = &iButton::scan( $family, $port );
     my $report;
     for my $ib (@ib_list) {
-        $report .=
-            "Device type:"
-          . $ib->family() . "  ID:"
-          . $ib->serial
-          . "  CRC:"
-          . $ib->crc . ": "
-          . $ib->model() . "\n";
+        $report .= "Device type:" . $ib->family() . "  ID:" . $ib->serial . "  CRC:" . $ib->crc . ": " . $ib->model() . "\n";
     }
     return $report;
 }
@@ -585,8 +574,7 @@ sub read_temp {
 
     my $temp_c = sprintf( "%3.2f", $temp );
     my $temp_f = sprintf( "%3.2f", &::convert_c2f($temp) );
-    my $temp_def =
-      ( $main::config_parms{weather_uom_temp} eq 'C' ) ? $temp_c : $temp_f;
+    my $temp_def = ( $main::config_parms{weather_uom_temp} eq 'C' ) ? $temp_c : $temp_f;
 
     $this->set_receive($temp_def);
 
diff --git a/lib/imap_utils.pl b/lib/imap_utils.pl
index 23f24c00a..c625e9270 100644
--- a/lib/imap_utils.pl
+++ b/lib/imap_utils.pl
@@ -105,8 +105,7 @@ sub main::get_imap {
     my $local_offset;
 
     if ($tz_offset) {
-        my ( $tz_sign, $tz_hour, $tz_minute ) =
-          $tz_offset =~ /(\S)(\d+)(\d\d)$/;
+        my ( $tz_sign, $tz_hour, $tz_minute ) = $tz_offset =~ /(\S)(\d+)(\d\d)$/;
         $local_offset = ( $tz_hour * 60 * 60 ) + ( $tz_minute * 60 );
         $local_offset = -1 * $local_offset if ( $tz_sign eq "-" );
     }
@@ -215,23 +214,20 @@ sub main::get_imap {
             if ( $from =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/ ) {
                 my $enc_check = find_encoding($1);
                 if ($enc_check) {
-                    print
-                      "Unicode $1 detected. Decoding MIME-Header 'from' from $from to "
+                    print "Unicode $1 detected. Decoding MIME-Header 'from' from $from to "
                       if $debug;
                     $from = decode( "MIME-Header", $from );
                     print "$from.\n" if $debug;
                 }
                 else {
-                    print
-                      "WARNING: Unknown unicode detected $1 for 'from' $from\n";
+                    print "WARNING: Unknown unicode detected $1 for 'from' $from\n";
                 }
             }
 
             if ( $to =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/ ) {
                 my $enc_check = find_encoding($1);
                 if ($enc_check) {
-                    print
-                      "Unicode $1 detected. Decoding MIME-Header 'to' from $to to "
+                    print "Unicode $1 detected. Decoding MIME-Header 'to' from $to to "
                       if $debug;
                     $to = decode( "MIME-Header", $to );
                     print "$to.\n" if $debug;
@@ -244,8 +240,7 @@ sub main::get_imap {
             if ( $cc =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/ ) {
                 my $enc_check = find_encoding($1);
                 if ($enc_check) {
-                    print
-                      "Unicode $1 detected. Decoding MIME-Header 'cc' from $cc to "
+                    print "Unicode $1 detected. Decoding MIME-Header 'cc' from $cc to "
                       if $debug;
                     $cc = decode( "MIME-Header", $cc );
                     print "$cc.\n" if $debug;
@@ -258,15 +253,13 @@ sub main::get_imap {
             if ( $subject =~ m/\=\?([0-9A-Za-z\-_]+)\?.\?.*\?\=/ ) {
                 my $enc_check = find_encoding($1);
                 if ($enc_check) {
-                    print
-                      "Unicode $1 detected. Decoding MIME-Header 'subject' from $subject to "
+                    print "Unicode $1 detected. Decoding MIME-Header 'subject' from $subject to "
                       if $debug;
                     $subject = decode( "MIME-Header", $subject );
                     print "$subject.\n" if $debug;
                 }
                 else {
-                    print
-                      "WARNING: Unknown unicode detected $1 for 'subject' $subject\n";
+                    print "WARNING: Unknown unicode detected $1 for 'subject' $subject\n";
                 }
             }
 
@@ -428,8 +421,7 @@ sub _check_age {
     #rfc format
     #my ($day, $mon, $year, $hour, $min, $sec,$tz) = $rfc2060_date =~ /(\d+)\s+(\S+)\s+(\d\d\d\d)\s+(\d+):(\d+):(\d+)\s+(\S+)/;
     #int format
-    my ( $day, $mon, $year, $hour, $min, $sec, $tz ) =
-      $internaldate =~ /^(\d+)-(\S+)-(\d\d\d\d)\s+(\d+):(\d+):(\d+)\s+(\S+)/;
+    my ( $day, $mon, $year, $hour, $min, $sec, $tz ) = $internaldate =~ /^(\d+)-(\S+)-(\d\d\d\d)\s+(\d+):(\d+):(\d+)\s+(\S+)/;
 
     my $monnum = $month{ lc $mon } - 1;
     $year = $year - 1900;
diff --git a/lib/json_server.pl b/lib/json_server.pl
index 1d5965fbd..c7926f391 100644
--- a/lib/json_server.pl
+++ b/lib/json_server.pl
@@ -170,15 +170,11 @@ sub json_get {
 
         eval {
             my $json_collections = file_read($collection_file);
-            $json_data{'collections'} = decode_json($json_collections)
-              ;    #HP, wrap this in eval to prevent MH crashes
+            $json_data{'collections'} = decode_json($json_collections);    #HP, wrap this in eval to prevent MH crashes
         };
         if ($@) {
-            print_log
-              "Json_Server.pl: WARNING: decode_json failed for collection.json. Please check this file!";
-            $json_data{'collections'} =
-              decode_json('{ "0" : { "name" : "error" } }')
-              ;    #write a blank collection
+            print_log "Json_Server.pl: WARNING: decode_json failed for collection.json. Please check this file!";
+            $json_data{'collections'} = decode_json('{ "0" : { "name" : "error" } }');    #write a blank collection
 
         }
     }
@@ -193,15 +189,11 @@ sub json_get {
 
         eval {
             my $prefs = file_read($prefs_file);
-            $json_data{'ia7_config'} =
-              decode_json($prefs);  #HP, wrap this in eval to prevent MH crashes
+            $json_data{'ia7_config'} = decode_json($prefs);    #HP, wrap this in eval to prevent MH crashes
         };
         if ($@) {
-            print_log
-              "Json_Server.pl: WARNING: decode_json failed for ia7_config.json. Please check this file!";
-            $json_data{'ia7_config'} =
-              decode_json('{ "prefs" : { "status" : "error" } }')
-              ;                     #write a blank collection
+            print_log "Json_Server.pl: WARNING: decode_json failed for ia7_config.json. Please check this file!";
+            $json_data{'ia7_config'} = decode_json('{ "prefs" : { "status" : "error" } }');    #write a blank collection
 
         }
     }
@@ -216,12 +208,10 @@ sub json_get {
 
         eval {
             my $prefs = file_read($prefs_file);
-            $json_data{'rrd_config'} =
-              decode_json($prefs);  #HP, wrap this in eval to prevent MH crashes
+            $json_data{'rrd_config'} = decode_json($prefs);    #HP, wrap this in eval to prevent MH crashes
         };
         if ($@) {
-            print_log
-              "Json_Server.pl: WARNING: decode_json failed for ia7_rrd_config.json. Please check this file!";
+            print_log "Json_Server.pl: WARNING: decode_json failed for ia7_rrd_config.json. Please check this file!";
         }
     }
 
@@ -247,8 +237,8 @@ sub json_get {
         my $celsius  = 0;
         my $arg_time = 0;
         $arg_time = int( $args{time}[0] ) if ( defined int( $args{time}[0] ) );
-        $celsius = 1 if ( $config_parms{weather_uom_temp} eq 'C' );
-        $celsius = 1
+        $celsius  = 1                     if ( $config_parms{weather_uom_temp} eq 'C' );
+        $celsius  = 1
           if ( lc $json_data{'rrd_config'}->{'prefs'}->{'uom'} eq "celsius" );
         my %data;
         my $end = "now";
@@ -263,14 +253,8 @@ sub json_get {
             if ( defined $args{group}[0] ) {
                 @{ $args{ds} } = ();    #override any DSs specified in the URL
                 for my $dsg ( keys %{ $json_data{'rrd_config'}->{'ds'} } ) {
-                    if (
-                        defined $json_data{'rrd_config'}->{'ds'}->{$dsg}
-                        ->{'group'} )
-                    {
-                        foreach my $group ( split /,/,
-                            $json_data{'rrd_config'}->{'ds'}->{$dsg}->{'group'}
-                          )
-                        {
+                    if ( defined $json_data{'rrd_config'}->{'ds'}->{$dsg}->{'group'} ) {
+                        foreach my $group ( split /,/, $json_data{'rrd_config'}->{'ds'}->{$dsg}->{'group'} ) {
                             push @{ $args{ds} }, $dsg
                               if ( lc $group ) eq ( lc $args{group}[0] );
                         }
@@ -284,48 +268,31 @@ sub json_get {
                 #if it doesn't exist as a ds then skip
                 my $cf = $default_cf;
                 $cf = $json_data{'rrd_config'}->{'ds'}->{$ds}->{'cf'}
-                  if (
-                    defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'cf'} );
+                  if ( defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'cf'} );
                 push @defs,   "DEF:$ds=$path/$rrd_file:$ds:$cf";
                 push @xports, "XPORT:$ds";
-                $dataset[$index]->{'label'} =
-                  $json_data{'rrd_config'}->{'ds'}->{$ds}->{'label'}
-                  if (
-                    defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'label'}
-                  );
-                $dataset[$index]->{'color'} =
-                  $json_data{'rrd_config'}->{'ds'}->{$ds}->{'color'}
-                  if (
-                    defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'color'}
-                  );
-                if (
-                    lc $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'} eq
-                    "bar" )
-                {
+                $dataset[$index]->{'label'} = $json_data{'rrd_config'}->{'ds'}->{$ds}->{'label'}
+                  if ( defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'label'} );
+                $dataset[$index]->{'color'} = $json_data{'rrd_config'}->{'ds'}->{$ds}->{'color'}
+                  if ( defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'color'} );
+                if ( lc $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'} eq "bar" ) {
                     $dataset[$index]->{'bars'}->{'show'}      = "true";
                     $dataset[$index]->{'bars'}->{'fill'}      = "0";
                     $dataset[$index]->{'bars'}->{'lineWidth'} = 0;
 
                     #$dataset[$index]->{'bars'}->{'barWidth'} = 8 * 60 * 60 * 1000;  #calculate barwidth based on data range
                     #TODO - bar width on data range
-                    $dataset[$index]->{'bars'}->{'fillColor'}->{'colors'}[0]
-                      ->{'opacity'} = 0.3;
-                    $dataset[$index]->{'bars'}->{'fillColor'}->{'colors'}[1]
-                      ->{'opacity'} = 0.3;
-                    $dataset[$index]->{'yaxis'} = 2;
+                    $dataset[$index]->{'bars'}->{'fillColor'}->{'colors'}[0]->{'opacity'} = 0.3;
+                    $dataset[$index]->{'bars'}->{'fillColor'}->{'colors'}[1]->{'opacity'} = 0.3;
+                    $dataset[$index]->{'yaxis'}                                           = 2;
                 }
                 else {
                     $dataset[$index]->{'lines'}->{'show'} = "true";
                 }
-                $round[$index] =
-                  $json_data{'rrd_config'}->{'ds'}->{$ds}->{'round'}
-                  if (
-                    defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'round'}
-                  );
-                $type[$index] =
-                  $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'}
-                  if (
-                    defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'} );
+                $round[$index] = $json_data{'rrd_config'}->{'ds'}->{$ds}->{'round'}
+                  if ( defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'round'} );
+                $type[$index] = $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'}
+                  if ( defined $json_data{'rrd_config'}->{'ds'}->{$ds}->{'type'} );
                 $index++;
             }
 
@@ -342,20 +309,18 @@ sub json_get {
             foreach my $line (@lines) {
 
                 #print "line=$line\n";
-                my ($step) = $line =~ /\<step\>(\d+)\<\/step\>/
-                  ;    #this is the width for any bar charts
+                my ($step) = $line =~ /\<step\>(\d+)\<\/step\>/;    #this is the width for any bar charts
                 if ($step) {
                     for my $i ( 0 .. $#dataset ) {
-                        $dataset[$i]->{'bars'}->{'barWidth'} =
-                          int($step) * 1000
+                        $dataset[$i]->{'bars'}->{'barWidth'} = int($step) * 1000
                           if ( defined $dataset[$i]->{'bars'} );
                     }
                 }
                 my ($time) = $line =~ /\<row\>\<t\>(\d*)\<\/t\>/;
-                $time = $time * 1000;    #javascript is in milliseconds
+                $time = $time * 1000;                               #javascript is in milliseconds
 
                 #print "time=$time, $arg_time\n";
-                next if ( $arg_time > int($time) );    #only return new items
+                next if ( $arg_time > int($time) );                 #only return new items
                 my (@values) = $line =~ /\<v\>(-?[e.+-\d]*|NaN)\<\/v\>/g;
                 if ($time) {
 
@@ -369,14 +334,12 @@ sub json_get {
                         $value1 = ( $value1 - 32 ) * ( 5 / 9 )
                           if (  ($celsius)
                             and ( lc $type[$index] eq "temperature" ) );
-                        $value1 =
-                          sprintf( "%." . $round[$index] . "f", $value1 )
+                        $value1 = sprintf( "%." . $round[$index] . "f", $value1 )
                           if ( defined $round[$index] );
 
                         #print "value1=$value1";
                         $value1 =~ s/\.0*$//
-                          unless ( $value1 == 0 )
-                          ;    #remove unneccessary trailing decimals
+                          unless ( $value1 == 0 );    #remove unneccessary trailing decimals
                         $value1 = "null" if ( lc $value1 eq "nan" );
 
                         #print "value1=$value1\n";
@@ -422,9 +385,7 @@ sub json_get {
                 my $o = &get_object_by_name($name);
                 print_log "json: object name=$name ref=" . ref $o
                   if $Debug{json};
-                if ( my $data =
-                    &json_object_detail( $o, \%args, \%fields, $parent_table ) )
-                {
+                if ( my $data = &json_object_detail( $o, \%args, \%fields, $parent_table ) ) {
                     $json_data{objects}{$name} = $data;
                 }
             }
@@ -449,9 +410,7 @@ sub json_get {
                 $name =~ s/\$|\%|\&|\@//g;
                 print_log "json: object name=$name ref=" . ref $o
                   if $Debug{json};
-                if ( my $data =
-                    &json_object_detail( $o, \%args, \%fields, $parent_table ) )
-                {
+                if ( my $data = &json_object_detail( $o, \%args, \%fields, $parent_table ) ) {
                     $json_data{objects}{$name} = $data;
                 }
             }
@@ -501,8 +460,7 @@ sub json_get {
             next unless $key =~ /.+::$/;
             next if $key eq 'main::';
             my $iref = ${$ref}{$key};
-            my ( $k, $r ) =
-              &json_walk_var( $iref, $key, qw( SCALAR ARRAY HASH CODE ) );
+            my ( $k, $r ) = &json_walk_var( $iref, $key, qw( SCALAR ARRAY HASH CODE ) );
             $json_data{packages}{$k} = $r if $k ne "";
         }
 
@@ -627,9 +585,8 @@ sub json_get {
         {
             #Only return messages since time
             @log = ::print_speaklog_since( $args{time}[0] );
-            push @log, ''
-              ; #TODO HP - Kludge, the javascript seems to want an extra line in the array for some reason
-                #print "db/json: " . join(", ",@log) . "\n";
+            push @log, '';    #TODO HP - Kludge, the javascript seems to want an extra line in the array for some reason
+                              #print "db/json: " . join(", ",@log) . "\n";
         }
         elsif ( !$args{time} ) {
             @log = ::print_speaklog_since();
@@ -675,7 +632,7 @@ sub json_get {
     my $json_raw = JSON->new->allow_nonref;
 
     # Translate special characters
-    $json_raw->canonical(1); #Order the data so that objects show alphabetically
+    $json_raw->canonical(1);    #Order the data so that objects show alphabetically
     $json_raw = $json_raw->pretty->encode( \%json );
     return &json_page($json_raw);
 
@@ -689,8 +646,7 @@ sub json_get_sub_element {
     $error_path .= $path . "/";
     if ( ref $json_ref eq 'HASH' && exists $json_ref->{$path} ) {
         if ( scalar( @{$element_ref} ) > 0 ) {
-            return json_get_sub_element( $element_ref, $json_ref->{$path},
-                $error_path );
+            return json_get_sub_element( $element_ref, $json_ref->{$path}, $error_path );
         }
         else {
             #This is the end of the line
@@ -811,8 +767,7 @@ sub build_parent_table {
         my $group = &get_object_by_name($group_name);
         $group_name =~ s/\$|\%|\&|\@//g;
         unless ( defined $group ) {
-            print_log
-              "json: build_parent_table, group_name $group_name doesn't have an object?"
+            print_log "json: build_parent_table, group_name $group_name doesn't have an object?"
               if $Debug{json};
             next;
         }
@@ -846,8 +801,8 @@ sub json_object_detail {
     if ( $args{time} && $args{time}[0] > 0 ) {
 
         # Idle times are only reported in seconds
-        my $request_time = int( $args{time}[0] / 1000 );    # Convert to seconds
-        my $current_time = int( ::get_tickcount() / 1000 ); # Convert to seconds
+        my $request_time = int( $args{time}[0] / 1000 );       # Convert to seconds
+        my $current_time = int( ::get_tickcount() / 1000 );    # Convert to seconds
 
         if ( !( $object->can('get_idle_time') ) ) {
 
@@ -928,11 +883,8 @@ sub json_object_detail {
             ## can add linked items too.
             if ( ref($object) eq 'Group' ) {
                 $value = [];
-                my @tmp
-                  ; ## pull all the members into a temp array that can be sorted
-                for my $obj_name (
-                    &list_objects_by_group( $object->get_object_name, 1 ) )
-                {
+                my @tmp;    ## pull all the members into a temp array that can be sorted
+                for my $obj_name ( &list_objects_by_group( $object->get_object_name, 1 ) ) {
                     $obj_name =~ s/\$|\%|\&|\@//g;
 
                     #push (@{$value}, $obj_name);
@@ -953,8 +905,7 @@ sub json_object_detail {
             print_log "json: object_dets f $f ev $value" if $Debug{json};
         }
         elsif ( $f eq 'html' and $object->can('get_type') ) {
-            $value = "<!\[CDATA\["
-              . &html_item_state( $object, $object->get_type ) . "\]\]>";
+            $value = "<!\[CDATA\[" . &html_item_state( $object, $object->get_type ) . "\]\]>";
             print_log "json: object_dets f $f" if $Debug{json};
         }
         else {
@@ -987,7 +938,7 @@ sub filter_object {
         next if ( lc($f) eq 'fields' );
         next if ( lc($f) eq 'long_poll' );
         next
-          if ( lc($f) eq 'items' ); #HP, we should already have parsed the items
+          if ( lc($f) eq 'items' );    #HP, we should already have parsed the items
         next if ( $f eq '' );
         if ( $$object{$f} ) {
             for my $test_val ( @{ $args{$f} } ) {
@@ -1066,9 +1017,7 @@ sub json_usage {
         my $url = "/sub?json($r)";
         $html .= "<h2>$r</h2>\n<p><a href='$url'>$url</a></p>\n<ul>\n";
         foreach my $opt ( sort keys %args ) {
-            if ( $args{$opt}{applyto} eq 'all' or grep /^$r$/,
-                split /\|/, $args{$opt}{applyto} )
-            {
+            if ( $args{$opt}{applyto} eq 'all' or grep /^$r$/, split /\|/, $args{$opt}{applyto} ) {
                 $url = "/sub?json($r,$opt";
                 if ( defined $args{$opt}{example} ) {
                     foreach ( split /\|/, $args{$opt}{example} ) {
@@ -1230,9 +1179,7 @@ sub json_table_fetch_data {
     my @data;
     eval( @data = &{ $json_table{$key}{hook} }( $posx, $records ) );
     if ($@) {
-        print_log "Json_Server.pl: WARNING: fetch data failed for "
-          . $key . " "
-          . $json_table{$key}{hook} . "!";
+        print_log "Json_Server.pl: WARNING: fetch data failed for " . $key . " " . $json_table{$key}{hook} . "!";
         return 0;
     }
     my $l = &json_get_table_length($key) + 1;
diff --git a/lib/menu_code.pl b/lib/menu_code.pl
index cfb655667..9336463dd 100644
--- a/lib/menu_code.pl
+++ b/lib/menu_code.pl
@@ -37,9 +37,8 @@ sub menu_parse {
     $Menus{$menu_group} = \%menus;
 
     # Find all the valid Voice_Cmd text
-    for my $object ( map { &get_object_by_name($_) }
-        &list_objects_by_type('Voice_Cmd') )
-    {
+    for my $object ( map { &get_object_by_name($_) } &list_objects_by_type('Voice_Cmd') ) {
+
         # Pick first of {a,b} enumerations (e.g. {tell me,what is} )
         my $text = $$object{text};
         $text =~ s/\{([^,]+).+?\}/$1/g;
@@ -56,9 +55,8 @@ sub menu_parse {
         # Pull out 'start menu' records:  M: Lights
         if ( $type eq 'M' ) {
             $menu = $data;
-            $menu =~
-              s/ /_/g;    # Blanks will mess up wml (and vxml and html?) menus
-                # Reset index.  Allow for menus in different sections/files
+            $menu =~ s/ /_/g;                     # Blanks will mess up wml (and vxml and html?) menus
+                                                  # Reset index.  Allow for menus in different sections/files
             $index = -1;
             $index = @{ $menus{$menu}{items} } - 1
               if $menus{$menu} and $menus{$menu}{items};
@@ -97,8 +95,7 @@ sub menu_parse {
         if ($states) {
             $menus{$menu}{items}[$index]{ $type . 'prefix' } = $prefix;
             $menus{$menu}{items}[$index]{ $type . 'suffix' } = $suffix;
-            @{ $menus{$menu}{items}[$index]{ $type . 'states' } } = split ',',
-              $states;
+            @{ $menus{$menu}{items}[$index]{ $type . 'states' } } = split ',', $states;
 
             # Create a states menu for each unique set of states
             if ( $type eq 'D' ) {
@@ -108,8 +105,8 @@ sub menu_parse {
                     push @{ $menus{_menu_list} }, $menu_states_cnt;
                     my $i = 0;
                     for my $state ( split ',', $states ) {
-                        $menus{$menu_states_cnt}{items}[$i]{D} = $state;
-                        $menus{$menu_states_cnt}{items}[$i]{A} = 'state_select';
+                        $menus{$menu_states_cnt}{items}[$i]{D}    = $state;
+                        $menus{$menu_states_cnt}{items}[$i]{A}    = 'state_select';
                         $menus{$menu_states_cnt}{items}[$i]{goto} = 'prev';
                         $i++;
                     }
@@ -136,8 +133,7 @@ sub menu_parse {
             my $i = 0;
             if ( $$ptr{Astates} ) {
                 for my $state ( @{ $$ptr{Astates} } ) {
-                    $$ptr{actions}[ $i++ ] =
-                      "$$ptr{Aprefix}'$state'$$ptr{Asuffix}";
+                    $$ptr{actions}[ $i++ ] = "$$ptr{Aprefix}'$state'$$ptr{Asuffix}";
                 }
             }
 
@@ -179,8 +175,7 @@ sub menu_parse {
                 delete $unused_menus{ $$ptr{goto} };
             }
             else {
-                print
-                  "\nWarning, goto menu not found: menu=$menu goto=$$ptr{goto} text=$$ptr{D}\n\n"
+                print "\nWarning, goto menu not found: menu=$menu goto=$$ptr{goto} text=$$ptr{D}\n\n"
                   unless $$ptr{goto} eq 'prev';
             }
         }
@@ -285,8 +280,7 @@ sub menu_submenus {
 
 sub menu_create {
     my ($file) = @_;
-    my $menu_top =
-      "# This is an auto-generated file.  Rename it before you edit it, then update menu.pl to point to it\nM: mh\n";
+    my $menu_top = "# This is an auto-generated file.  Rename it before you edit it, then update menu.pl to point to it\nM: mh\n";
     my $menu;
     for my $category ( sort &list_code_webnames('Voice_Cmd') ) {
         $menu_top .= "  D: $category\n";
@@ -303,8 +297,7 @@ sub menu_create {
             my $text = $$object{text};
             $text =~ s/\{([^,]+).+?\}/$1/g;
 
-            $menu .= sprintf "  D: %-50s  # %-25s %10s\n", $text, $object_name,
-              $authority;
+            $menu .= sprintf "  D: %-50s  # %-25s %10s\n", $text, $object_name, $authority;
         }
     }
     &file_write( $file, $menu_top . $menu );
@@ -349,14 +342,14 @@ sub menu_run {
     # Allow anyone to run set_authority('anyone') commands
     my $ref;
     if ( $cmd = $action ) {
-        $cmd =~ s/\'//g;    # Drop the '' quotes around state if a voice cmd
+        $cmd =~ s/\'//g;                         # Drop the '' quotes around state if a voice cmd
         ($ref) = &Voice_Cmd::voice_item_by_text( lc($cmd) );
     }
-    $authority = $ref->get_authority       unless $authority or !$ref;
-    $authority = $Password_Allow{$display} unless $authority;
-    $authority = $Password_Allow{$cmd}     unless $authority;
+    $authority = $ref->get_authority                     unless $authority or !$ref;
+    $authority = $Password_Allow{$display}               unless $authority;
+    $authority = $Password_Allow{$cmd}                   unless $authority;
     $authority = $Menus{$menu_group}{$menu}{'default:P'} unless $authority;
-    $authority = '' unless $authority;
+    $authority = ''                                      unless $authority;
 
     $Socket_Ports{http}{client_ip_address} = ''
       unless $Socket_Ports{http}{client_ip_address};
@@ -375,27 +368,21 @@ sub menu_run {
 
         # If wap cell phone id is not in the list, prompt for the password
         elsif ( $format eq 'w' ) {
-            unless (
-                $Http{'x-up-subno'} and grep $Http{'x-up-subno'} eq $_,
-                split( /[, ]/, $config_parms{password_allow_phones} )
-              )
+            unless ( $Http{'x-up-subno'} and grep $Http{'x-up-subno'} eq $_, split( /[, ]/, $config_parms{password_allow_phones} ) )
             {
-                return &html_password('browser')
-                  ;    # wml requires browser login ... no form/cookies for now
+                return &html_password('browser');    # wml requires browser login ... no form/cookies for now
             }
         }
         elsif ( $format eq 'l' ) {
             return 'Not authorized';
         }
         else {
-            return &html_password('')
-              ; # Html can take cookies or browser ... default to mh.ini password_menu
+            return &html_password('');               # Html can take cookies or browser ... default to mh.ini password_menu
         }
     }
 
     if ($action) {
-        my $msg =
-          "menu_run: g=$menu_group m=$menu i=$item s=$state => action: $action";
+        my $msg = "menu_run: g=$menu_group m=$menu i=$item s=$state => action: $action";
         print_log $msg;
         my $setby = ( lc $format =~ /^h/i ) ? 'web' : 'notweb';
         $setby .= " [$Socket_Ports{http}{client_ip_address}]"
@@ -408,8 +395,7 @@ sub menu_run {
         {
             #           package main;   # Need this if we had this code in a package
             eval $action;
-            print
-              "Error in menu_run: m=$menu i=$item s=$state action=$action error=$@\n"
+            print "Error in menu_run: m=$menu i=$item s=$state action=$action error=$@\n"
               if $@;
         }
     }
@@ -426,8 +412,7 @@ sub menu_run {
         #  Default to referer.  Also make sure we have a full path, starting with http
         $Http{Referer} =~ m|(http://\S+?)/|;
         $referer = $1 . $referer unless $referer =~ /^http/;
-        $referer =~ s/&&/&/
-          ; # These got doubled up in http_server ... need them as single (e.g. /bin/menu.pl?main&Top|Main|Rooms)
+        $referer =~ s/&&/&/;   # These got doubled up in http_server ... need them as single (e.g. /bin/menu.pl?main&Top|Main|Rooms)
         $referer =~ s/ /%20/g;
         return &http_redirect($referer);
     }
@@ -448,8 +433,7 @@ sub menu_run {
         $response = eval $1;
     }
     elsif ($response) {
-        eval
-          "\$response = qq[$response]";   # Allow for var substitution of $state
+        eval "\$response = qq[$response]";    # Allow for var substitution of $state
     }
 
     if ( !$response or $response eq 'last_response' ) {
@@ -475,10 +459,8 @@ sub menu_run_response {
     $response = 'all done' unless $response;
     if ( $format and $format eq 'w' ) {
         $response =~ s/& /&amp; /g;
-        my $wml =
-          qq|<head><meta forua="true" http-equiv="Cache-Control" content="max-age=0"/></head>\n|;
-        $wml .=
-          qq|<template><do type="accept" label="Prev."><prev/></do></template>\n|;
+        my $wml = qq|<head><meta forua="true" http-equiv="Cache-Control" content="max-age=0"/></head>\n|;
+        $wml .= qq|<template><do type="accept" label="Prev."><prev/></do></template>\n|;
         $wml .= qq|<card><p>$response</p></card>|;
         return &wml_page($wml);
     }
@@ -486,12 +468,10 @@ sub menu_run_response {
 
         #       my $http_root = "http://$config_parms{http_server}:$config_parms{http_port}";
         my $http_root = '';    # Full url is no longer required :)
-        my $goto =
-          "${http_root}sub?menu_vxml($Menus{menu_data}{last_response_menu_group})#$Menus{menu_data}{last_response_menu}";
+        my $goto = "${http_root}sub?menu_vxml($Menus{menu_data}{last_response_menu_group})#$Menus{menu_data}{last_response_menu}";
 
         #       print "db1 gt=$goto\n";
-        my $vxml =
-          qq|<form><block><audio>$response</audio><goto next='$goto'/></block></form>|;
+        my $vxml = qq|<form><block><audio>$response</audio><goto next='$goto'/></block></form>|;
 
         #       my $vxml = qq|<form><block><audio>$response</audio><goto expr="'$goto'"/></block></form>|;
         return &vxml_page($vxml);
@@ -535,8 +515,7 @@ sub menu_html {
                 $html .= "    <li> $$ptr2{Dprefix}\n";
                 my $state = 0;
                 for my $state_name ( @{ $$ptr2{Dstates} } ) {
-                    $html .=
-                      "      <a href='/sub?menu_run($menu_group,$menu,$item,$state,h)'>$state_name</a>, \n";
+                    $html .= "      <a href='/sub?menu_run($menu_group,$menu,$item,$state,h)'>$state_name</a>, \n";
                     $state++;
                 }
                 $html .= "    $$ptr2{Dsuffix}\n";
@@ -544,19 +523,16 @@ sub menu_html {
 
             # One state
             else {
-                $html .=
-                  "    <li><a href='/sub?menu_run($menu_group,$menu,$item,,h)'>$$ptr2{D}</a>\n";
+                $html .= "    <li><a href='/sub?menu_run($menu_group,$menu,$item,,h)'>$$ptr2{D}</a>\n";
             }
         }
         elsif ( $$ptr2{R} ) {
-            $html .=
-              "    <li><a href='/sub?menu_run($menu_group,$menu,$item,,h)'>$$ptr2{D}</a>\n";
+            $html .= "    <li><a href='/sub?menu_run($menu_group,$menu,$item,,h)'>$$ptr2{D}</a>\n";
         }
 
         # Menu item
         else {
-            $html .=
-              "    <li><a href='/sub?menu_html($menu_group,$goto)'>$goto</a>\n";
+            $html .= "    <li><a href='/sub?menu_html($menu_group,$goto)'>$goto</a>\n";
         }
         $item++;
     }
@@ -576,8 +552,7 @@ sub menu_wml {
 
     ($menu_group) = &get_menu_default('default') unless $menu_group;
     $menu_start = $Menus{$menu_group}{_menu_list}[0] unless $menu_start;
-    logit "$config_parms{data_dir}/logs/menu_wml.log",
-      "ip=$Socket_Ports{http}{client_ip_address} mg=$menu_group m=$menu_start";
+    logit "$config_parms{data_dir}/logs/menu_wml.log", "ip=$Socket_Ports{http}{client_ip_address} mg=$menu_group m=$menu_start";
 
     my ( @menus, @cards );
 
@@ -611,8 +586,7 @@ sub menu_wml_cards {
     %menus = map { $_, 1 } @menus;
 
     # Dang, can not get a prev button when using select??
-    my $template =
-      qq|<template><do type="prev" label="Prev1"><prev/></do></template>\n|;
+    my $template = qq|<template><do type="prev" label="Prev1"><prev/></do></template>\n|;
 
     #                            qq|<do type="accept" label="Prev2"><prev/></do></template>\n|;
     push @cards, $template;
@@ -651,29 +625,24 @@ sub menu_wml_cards {
                       ( $menus{$goto} )
                       ? "#$goto"
                       : "/sub?menu_wml($menu_group,$goto)";
-                    $wml .=
-                      "    <option value='$item' onpick='$goto'>$$ptr{Dprefix}..$$ptr{Dsuffix}</option>\n";
+                    $wml .= "    <option value='$item' onpick='$goto'>$$ptr{Dprefix}..$$ptr{Dsuffix}</option>\n";
                 }
 
                 # States menu
                 elsif ( $$ptr{A} eq 'state_select' ) {
-                    $wml .=
-                      "    <option onpick='/sub?menu_run($menu_group,\$prev_menu,\$prev_value,$item,w)'>$$ptr{D}</option>\n";
+                    $wml .= "    <option onpick='/sub?menu_run($menu_group,\$prev_menu,\$prev_value,$item,w)'>$$ptr{D}</option>\n";
                 }
 
                 # One state
                 elsif ( $$ptr{A} eq 'set_password' ) {
-                    $wml .=
-                      "    <option onpick='/SET_PASSWORD'>Set Password</option>\n";
+                    $wml .= "    <option onpick='/SET_PASSWORD'>Set Password</option>\n";
                 }
                 else {
-                    $wml .=
-                      "    <option onpick='/sub?menu_run($menu_group,$menu,$item,,w)'>$$ptr{D}</option>\n";
+                    $wml .= "    <option onpick='/sub?menu_run($menu_group,$menu,$item,,w)'>$$ptr{D}</option>\n";
                 }
             }
             elsif ( $$ptr{R} ) {
-                $wml .=
-                  "    <option onpick='/sub?menu_run($menu_group,$menu,$item,,w)'>$$ptr{D}</option>\n";
+                $wml .= "    <option onpick='/sub?menu_run($menu_group,$menu,$item,,w)'>$$ptr{D}</option>\n";
             }
 
             # Menu item
@@ -683,8 +652,7 @@ sub menu_wml_cards {
                   ( $menus{$goto} )
                   ? "#$goto"
                   : "/sub?menu_wml($menu_group,$goto)";
-                $wml .=
-                  "    <option value='$item' onpick='$goto'>$$ptr{D}</option>\n";
+                $wml .= "    <option value='$item' onpick='$goto'>$$ptr{D}</option>\n";
             }
             $item++;
         }
@@ -707,16 +675,12 @@ sub menu_vxml {
 
     ($menu_group) = &get_menu_default('default') unless $menu_group;
     $menu_start = $Menus{$menu_group}{_menu_list}[0] unless $menu_start;
-    logit "$config_parms{data_dir}/logs/menu_vxml.log",
-      "ip=$Socket_Ports{http}{client_ip_address} mg=$menu_group m=$menu_start";
+    logit "$config_parms{data_dir}/logs/menu_vxml.log", "ip=$Socket_Ports{http}{client_ip_address} mg=$menu_group m=$menu_start";
 
     # Get a list of all menus, then build vxml forms
     my @menus = &menu_submenus( $menu_group, $menu_start, 99 );
     my @forms = &menu_vxml_forms( $menu_group, @menus );
-    my $greeting = &vxml_audio(
-        'greeting',                 'Welcome to Mister House',
-        '/misc/tellme_welcome.wav', "#$menu_start"
-    );
+    my $greeting = &vxml_audio( 'greeting', 'Welcome to Mister House', '/misc/tellme_welcome.wav', "#$menu_start" );
     my $vxml_vars = "<var name='prev_menu'/>\n<var name='prev_item'/>\n";
     return &vxml_page( $vxml_vars . $greeting . "@forms" );
 }
@@ -762,14 +726,12 @@ sub menu_vxml_forms {
 
                     #                   $goto = "${http_root}sub?menu_run($menu_group,{prev_menu},{prev_item},$item,v)";
                     # db1x
-                    $goto =
-                      "${http_root}sub?menu_run($menu_group,' + prev_menu + ',' + prev_item + ',$item,v)";
+                    $goto = "${http_root}sub?menu_run($menu_group,' + prev_menu + ',' + prev_item + ',$item,v)";
                 }
 
                 # One state
                 else {
-                    $goto =
-                      "${http_root}sub?menu_run($menu_group,$menu,$item,,v)";
+                    $goto = "${http_root}sub?menu_run($menu_group,$menu,$item,,v)";
                 }
             }
             elsif ( $$ptr{R} ) {
@@ -889,16 +851,14 @@ sub menu_lcd_navigate {
         if ( $$lcd{cy} < $$lcd{dy} ) {
             $$lcd{dy} = $$lcd{cy};
         }
-        &menu_lcd_curser_state( $lcd, $$lcd{menu_ptr}{items}[ $$lcd{cy} ] )
-          ;    # Move cursor to the same state
+        &menu_lcd_curser_state( $lcd, $$lcd{menu_ptr}{items}[ $$lcd{cy} ] );    # Move cursor to the same state
     }
     elsif ( $key eq 'down' ) {
         $$lcd{cy}++ unless $$lcd{cy} == $$lcd{menu_cnt};
         if ( $$lcd{cy} > ( $$lcd{dy} + $$lcd{dy_max} ) ) {
             $$lcd{dy} = $$lcd{cy} - $$lcd{dy_max};
         }
-        &menu_lcd_curser_state( $lcd, $$lcd{menu_ptr}{items}[ $$lcd{cy} ] )
-          ;    # Move cursor to the same state
+        &menu_lcd_curser_state( $lcd, $$lcd{menu_ptr}{items}[ $$lcd{cy} ] );    # Move cursor to the same state
     }
     elsif ( $key eq 'left' ) {
 
@@ -933,9 +893,7 @@ sub menu_lcd_navigate {
         if ( $ptr and $$ptr{A} ) {
 
             #           my $response = &menu_run("$$lcd{menu_group},$menu,$$lcd{cy},$$lcd{menu_state},l");
-            my $response =
-              &menu_run( $$lcd{menu_group}, $menu, $$lcd{cy},
-                $$lcd{menu_state}, 'l' );
+            my $response = &menu_run( $$lcd{menu_group}, $menu, $$lcd{cy}, $$lcd{menu_state}, 'l' );
             if ($response) {
                 &menu_lcd_display( $lcd, $response, $menu );
             }
@@ -943,9 +901,7 @@ sub menu_lcd_navigate {
 
         # Display a response
         elsif ( $ptr and $$ptr{R} ) {
-            my $response =
-              &menu_run( $$lcd{menu_group}, $menu, $$lcd{cy},
-                $$lcd{menu_state}, 'l' );
+            my $response = &menu_run( $$lcd{menu_group}, $menu, $$lcd{cy}, $$lcd{menu_state}, 'l' );
             if ($response) {
                 &menu_lcd_display( $lcd, $response, $menu );
             }
@@ -954,8 +910,7 @@ sub menu_lcd_navigate {
         # Load next menu
         elsif ($ptr) {
             push @{ $$lcd{menu_history} }, $menu;
-            push @{ $$lcd{menu_states} }, join $;, $$lcd{cx}, $$lcd{cy},
-              $$lcd{dy}, $$lcd{menu_state};
+            push @{ $$lcd{menu_states} }, join $;, $$lcd{cx}, $$lcd{cy}, $$lcd{dy}, $$lcd{menu_state};
             &menu_lcd_load( $lcd, $$ptr{D} );
         }
 
@@ -980,8 +935,7 @@ sub menu_lcd_navigate {
 sub menu_lcd_display {
     my ( $lcd, $response, $menu ) = @_;
     push @{ $$lcd{menu_history} }, $menu if $menu;
-    push @{ $$lcd{menu_states} }, join $;, $$lcd{cx}, $$lcd{cy}, $$lcd{dy},
-      $$lcd{menu_state};
+    push @{ $$lcd{menu_states} }, join $;, $$lcd{cx}, $$lcd{cy}, $$lcd{dy}, $$lcd{menu_state};
     $Text::Wrap::columns = 20;
 
     #   @{$$lcd{display}} = split "\n", wrap('', '', $response);
@@ -1023,10 +977,7 @@ sub menu_format_list {
     my ( $format, @list ) = @_;
 
     if ( $format eq 'w' ) {
-        return
-            '<select><option>'
-          . join( "</option>\n<option>", @list )
-          . '</option></select>';
+        return '<select><option>' . join( "</option>\n<option>", @list ) . '</option></select>';
     }
     elsif ( $format eq 'h' ) {
         return join( "<br>\n", @list );
@@ -1049,8 +1000,7 @@ sub set_menu_default {
 
 sub get_menu_default {
     my ($address) = @_;
-    my ( $menu_group, $menus ) = split $;,
-      $Menus{menu_data}{defaults}{$address};
+    my ( $menu_group, $menus ) = split $;, $Menus{menu_data}{defaults}{$address};
 
     # Safeguard, in case the default was mis-specified.
     # Auto-generated mh.menu  group will always be there.
diff --git a/lib/mh_perl2exe_list.pl b/lib/mh_perl2exe_list.pl
index 0fe5972a6..0d29270aa 100644
--- a/lib/mh_perl2exe_list.pl
+++ b/lib/mh_perl2exe_list.pl
@@ -58,8 +58,7 @@
 #se Win32::OLE::lite;
 use Win32::Process;
 use Win32::PerfLib;
-use Win32::Setupsup
-  qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText);
+use Win32::Setupsup qw(WaitForAnyWindow SendKeys EnumChildWindows SetFocus SetWindowText GetWindowText);
 
 #use Win32::Setupsup;    # For sending keystrokes
 use Win32::Sound;        # So we can play wave files
diff --git a/lib/mqtt.pm b/lib/mqtt.pm
index a6f580728..8518eb136 100644
--- a/lib/mqtt.pm
+++ b/lib/mqtt.pm
@@ -201,8 +201,7 @@ $main::Debug{mqtt} = 1;
 
 # ------------------------------------------------------------------------------
 sub dump() {
-    &main::print_log(
-        "*** mqtt Dumper (MQTT_Data):\n" . Dumper( \%MQTT_Data ) . "***" );
+    &main::print_log( "*** mqtt Dumper (MQTT_Data):\n" . Dumper( \%MQTT_Data ) . "***" );
 }
 
 # ------------------------------------------------------------------------------
@@ -224,9 +223,8 @@ sub mqtt_reconnect() {
     ###
     $$self{socket}->close();
 
-    &main::print_log(
-        "*** mqtt $$self{instance} mqtt_connect Socket ($$self{host}:$$self{port},$$self{keep_alive_timer}) "
-    ) if ( $main::Debug{mqtt} || 1 );
+    &main::print_log( "*** mqtt $$self{instance} mqtt_connect Socket ($$self{host}:$$self{port},$$self{keep_alive_timer}) " )
+      if ( $main::Debug{mqtt} || 1 );
 
     ### 1) open a socket (host, port and keepalive
     my $socket = IO::Socket::INET->new(
@@ -237,8 +235,7 @@ sub mqtt_reconnect() {
     # Can't use this at this time
     # $socket = new main::Socket_Item(undef, undef, "$host:$port", $instance);
 
-    &main::print_log(
-        "*** mqtt $$self{instance} Socket check #1 ($$self{keep_alive_timer}) [ $! ]: "
+    &main::print_log( "*** mqtt $$self{instance} Socket check #1 ($$self{keep_alive_timer}) [ $! ]: "
           . ( $self->isConnected() ? "Connected" : "Failed" ) )
       if ( $main::Debug{mqtt} );
     return if ( !defined($socket) );
@@ -257,8 +254,7 @@ sub mqtt_reconnect() {
     );
 
     ### 3) Check for ACK or fail
-    &main::print_log(
-        "*** mqtt $$self{instance} Socket check #2 ($$self{keep_alive_timer}) [ $! ]: "
+    &main::print_log( "*** mqtt $$self{instance} Socket check #2 ($$self{keep_alive_timer}) [ $! ]: "
           . ( $self->isConnected() ? "Connected" : "Failed" ) )
       if ( $main::Debug{mqtt} );
 
@@ -286,23 +282,20 @@ sub mqtt_reconnect() {
     $self->send_mqtt_msg(
         message_type => MQTT_SUBSCRIBE,
         message_id   => $msg_id++,
-        topics => [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $self->{topic} ]
+        topics       => [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $self->{topic} ]
     );
 
     ### 5) Check for ACK or fail
     ###    we really should check for a SubAck and that it's the correct SubAck
     $msg = $self->read_mqtt_msg_timeout($buf)
-      or
-      &main::print_log( "*** mqtt $$self{instance} Received: " . "No SubAck" );
-    &main::print_log(
-        "*** mqtt $$self{instance} Sub 1 Received: " . "$$msg{string}" )
+      or &main::print_log( "*** mqtt $$self{instance} Received: " . "No SubAck" );
+    &main::print_log( "*** mqtt $$self{instance} Sub 1 Received: " . "$$msg{string}" )
       if ( $main::Debug{mqtt} );
 
     ### ------------------------------------------------------------------------
 
     ### 6) check for data
-    &main::print_log(
-        "*** mqtt $$self{instance} Initializing MQTT re_connection ...")
+    &main::print_log("*** mqtt $$self{instance} Initializing MQTT re_connection ...")
       if ( $main::Debug{mqtt} );
 }
 
@@ -314,9 +307,8 @@ sub mqtt_reconnect() {
 sub mqtt_connect() {
     my ($self) = @_;
 
-    &main::print_log(
-        "*** mqtt mqtt_connect Socket ($$self{host}:$$self{port},$$self{keep_alive_timer}) "
-    ) if ( $main::Debug{mqtt} || 1 );
+    &main::print_log( "*** mqtt mqtt_connect Socket ($$self{host}:$$self{port},$$self{keep_alive_timer}) " )
+      if ( $main::Debug{mqtt} || 1 );
 
     ### 1) open a socket (host, port and keepalive
     my $socket = IO::Socket::INET->new(
@@ -345,8 +337,7 @@ sub mqtt_connect() {
 
     ### 3) Check for ACK or fail
     &main::print_log(
-        "*** mqtt Socket check ($$self{keep_alive_timer}) [ $! ]: "
-          . ( $self->isConnected() ? "Connected" : "Failed" ) )
+        "*** mqtt Socket check ($$self{keep_alive_timer}) [ $! ]: " . ( $self->isConnected() ? "Connected" : "Failed" ) )
       if ( $main::Debug{mqtt} );
 
     my $msg = read_mqtt_msg_timeout( $self, $buf );
@@ -366,13 +357,12 @@ sub mqtt_connect() {
     $self->send_mqtt_msg(
         message_type => MQTT_SUBSCRIBE,
         message_id   => $msg_id++,
-        topics => [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $self->{topic} ]
+        topics       => [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $self->{topic} ]
     );
 
     ### 5) Check for ACK or fail
     $msg = $self->read_mqtt_msg_timeout($buf)
-      or
-      &main::print_log( "*** mqtt $$self{instance} Received: " . "No SubAck" );
+      or &main::print_log( "*** mqtt $$self{instance} Received: " . "No SubAck" );
     if ( $main::Debug{mqtt} ) {
         my $s =
           defined( $$msg{string} )
@@ -381,13 +371,11 @@ sub mqtt_connect() {
         ###
         ### IF we're not getting $$msg{string} then what are we getting ?
         ###
-        &main::print_log( "*** mqtt $$self{instance} Sub 1 Received: " . "$s" )
-          ;    # @FIXME: Use of uninitialized value
+        &main::print_log( "*** mqtt $$self{instance} Sub 1 Received: " . "$s" );    # @FIXME: Use of uninitialized value
     }
 
     ### 6) check for data
-    &main::print_log(
-        "*** mqtt $$self{instance} Initializing MQTT connection ...")
+    &main::print_log("*** mqtt $$self{instance} Initializing MQTT connection ...")
       if ( $main::Debug{mqtt} );
 }
 
@@ -422,9 +410,7 @@ sub isNotConnected {
 =cut
 
 sub new {
-    my ( $class, $instance, $host, $port, $topic, $user, $password,
-        $keep_alive_timer )
-      = @_;
+    my ( $class, $instance, $host, $port, $topic, $user, $password, $keep_alive_timer ) = @_;
 
     my $self = {};
 
@@ -448,24 +434,19 @@ sub new {
                         $self,
                         message_type => MQTT_SUBSCRIBE,
                         message_id   => $msg_id++,
-                        topics =>
-                          [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $topic ]
+                        topics       => [ map { [ $_ => MQTT_QOS_AT_MOST_ONCE ] } $topic ]
                     );
 
                     ### 5) Check for ACK or fail
                     $buf = '';
                     my $msg = read_mqtt_msg( $self, $buf )
-                      or &main::print_log(
-                        "*** mqtt $$self{instance} Received: " . "No SubAck" );
-                    &main::print_log(
-                        "*** mqtt $inst Sub 2 Received: " . $msg->string )
+                      or &main::print_log( "*** mqtt $$self{instance} Received: " . "No SubAck" );
+                    &main::print_log( "*** mqtt $inst Sub 2 Received: " . $msg->string )
                       if ( $main::Debug{mqtt} );
                 }
 
                 # This is the little messages that appear when MH starts
-                &main::print_log(
-                    "*** Reusing $inst (instead of $instance) on $host:$port $topic"
-                );
+                &main::print_log( "*** Reusing $inst (instead of $instance) on $host:$port $topic" );
 
                 ###
                 ### Ran into an issue doing it this way, it renames the object to the last
@@ -513,9 +494,7 @@ sub new {
     $MQTT_Data{$instance}{self} = $self;
 
     if ( $main::Debug{mqtt} ) {
-        &main::print_log(
-            "*** Opening MQTT ($instance) connection to $$self{host}/$$self{port}/$$self{topic}"
-        );
+        &main::print_log( "*** Opening MQTT ($instance) connection to $$self{host}/$$self{port}/$$self{topic}" );
         &main::print_log("*** Host       = $$self{host}");
         &main::print_log("*** Port       = $$self{port}");
         &main::print_log("*** Topic      = $$self{topic}");
@@ -526,8 +505,7 @@ sub new {
     ### ------------------------------------------------------------------------
     $self->mqtt_connect();
 
-    &main::print_log(
-        "\n***\n*** Hmm, this is not good!, can't find myself\n***\n")
+    &main::print_log("\n***\n*** Hmm, this is not good!, can't find myself\n***\n")
       unless $self;
     return unless $self;
 
@@ -574,9 +552,7 @@ sub check_for_data {
             if ( 'off' ne $self->{state} ) {
 
                 # First say something
-                &main::print_log(
-                    "*** mqtt $inst failed ($$self{host}/$$self{port}/$$self{topic})"
-                );
+                &main::print_log( "*** mqtt $inst failed ($$self{host}/$$self{port}/$$self{topic})" );
 
                 # Then do something (reconnect)
 
@@ -616,14 +592,8 @@ sub check_for_data {
                 ### Someone published something, deal with it
                 ###
                 if ( $main::Debug{mqtt} ) {
-                    &main::print_log(
-                        "*** mqtt $inst check_for_data rcv'd: T:" . $msg->topic,
-                        ", M:",
-                        $msg->message
-                    );
-                    &main::print_log( "*** mqtt $inst check_for_data rcv'd: S:"
-                          . $msg->string
-                          . "," );
+                    &main::print_log( "*** mqtt $inst check_for_data rcv'd: T:" . $msg->topic, ", M:", $msg->message );
+                    &main::print_log( "*** mqtt $inst check_for_data rcv'd: S:" . $msg->string . "," );
                 }
 
                 ###
@@ -638,15 +608,13 @@ sub check_for_data {
             }
             elsif ( $msg->message_type == MQTT_PINGRESP ) {
                 $$self{got_ping_response} = 1;
-                &main::print_log(
-                    "*** mqtt $inst check_for_data Ping rcvd: " . $msg->string )
+                &main::print_log( "*** mqtt $inst check_for_data Ping rcvd: " . $msg->string )
                   if ( $main::Debug{mqtt} );
             }
             else {
                 # "$msg->string"
                 # Net::MQTT::Message::SubAck=HASH(0x2da94e0)->string
-                &main::print_log(
-                    "*** mqtt $inst check_for_data Received: " . $msg->string )
+                &main::print_log( "*** mqtt $inst check_for_data Received: " . $msg->string )
                   if ( $main::Debug{mqtt} );
             }
         }
@@ -678,8 +646,7 @@ sub check_for_data {
             ###
             ### We've exceeded the ping time
             ###
-            &main::print_log(
-                "*** mqtt $inst read_mqtt_msg Ping Response timeout.")
+            &main::print_log("*** mqtt $inst read_mqtt_msg Ping Response timeout.")
               unless ( $$self{got_ping_response} );
             ###
             ### This has confused me, I'm not certain if I should put it back in or not
@@ -747,13 +714,11 @@ sub read_mqtt_msg {
 
         # We get no bytes if there is an error or the socket has closed
         unless ($bytes) {
-            &main::print_log(
-                "*** mqtt $$self{instance}: read_mqtt_msg Socket closed "
+            &main::print_log( "*** mqtt $$self{instance}: read_mqtt_msg Socket closed "
                   . ( defined $bytes ? 'gracefully ' : "with error [ $! ]" ) );
 
             # Not a permanent solution just a way to keep debugging
-            &main::print_log(
-                "*** mqtt deleting $$self{instance}\n" . Dumper( \$self ) )
+            &main::print_log( "*** mqtt deleting $$self{instance}\n" . Dumper( \$self ) )
               if ( $main::Debug{mqtt} );
             delete( $MQTT_Data{ $$self{instance} } );
 
@@ -791,13 +756,11 @@ sub read_mqtt_msg_timeout {
 
         # We get no bytes if there is an error or the socket has closed
         unless ($bytes) {
-            &main::print_log(
-                "*** mqtt $$self{instance}: read_mqtt_msg Socket closed "
+            &main::print_log( "*** mqtt $$self{instance}: read_mqtt_msg Socket closed "
                   . ( defined $bytes ? 'gracefully ' : "with error [ $! ]" ) );
 
             # Not a permanent solution just a way to keep debugging
-            &main::print_log(
-                "*** mqtt deleting $$self{instance}\n" . Dumper( \$self ) )
+            &main::print_log( "*** mqtt deleting $$self{instance}\n" . Dumper( \$self ) )
               if ( $main::Debug{mqtt} );
             delete( $MQTT_Data{ $$self{instance} } );
 
@@ -872,9 +835,7 @@ sub pub_msg {
     if ( $self->isNotConnected() ) {
 
         # First say something
-        &main::print_log(
-            "*** mqtt $$self{instance} failed ($$self{host}/$$self{port}/$$self{topic})"
-        );
+        &main::print_log( "*** mqtt $$self{instance} failed ($$self{host}/$$self{port}/$$self{topic})" );
 
         # Then do something (reconnect)
 
@@ -1114,9 +1075,7 @@ sub set {
         ###
         ### Incoming (MQTT to MH)
         ###
-        &::print_log( "*** mqtt mqtt_Item nom to MQTT to MH "
-              . $self->get_object_name()
-              . "::set($msg, $p_setby)" )
+        &::print_log( "*** mqtt mqtt_Item nom to MQTT to MH " . $self->get_object_name() . "::set($msg, $p_setby)" )
           if $main::Debug{mqtt};
     }
     else {
@@ -1125,14 +1084,11 @@ sub set {
         ###
         if ( $main::Debug{mqtt} ) {
             if ( defined( $self->get_object_name() ) ) {
-                &::print_log( "*** mqtt mqtt_Item nom to MH to MQTT ("
-                      . $self->get_object_name()
-                      . ') no p_setby ::set($msg, $p_setby)' );
+                &::print_log(
+                    "*** mqtt mqtt_Item nom to MH to MQTT (" . $self->get_object_name() . ') no p_setby ::set($msg, $p_setby)' );
             }
             else {
-                &::print_log(
-                    '*** mqtt mqtt_Item nom to MH to MQTT () no p_setby ::set($msg, $p_setby)'
-                );
+                &::print_log( '*** mqtt mqtt_Item nom to MH to MQTT () no p_setby ::set($msg, $p_setby)' );
             }
         }
         ###
diff --git a/lib/ncpuxa.pm b/lib/ncpuxa.pm
index 08bec75fa..9d01d3a97 100644
--- a/lib/ncpuxa.pm
+++ b/lib/ncpuxa.pm
@@ -63,13 +63,9 @@ my @keys = ( @units, @actions );
 
 my @states = ( "Off", "On", );    # module/point states
 
-my @dow = (
-    "Sunday",   "Monday", "Tuesday", "Wednesday",
-    "Thursday", "Friday", "Saturday"
-);
+my @dow = ( "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" );
 
-my @unittype =
-  ( "SECU-16", "SECU-16I", "RLY08-XA", "Speak Easy", "CPU-XA", "Unknown" );
+my @unittype = ( "SECU-16", "SECU-16I", "RLY08-XA", "Speak Easy", "CPU-XA", "Unknown" );
 
 my $quiet = 1;
 
@@ -191,8 +187,7 @@ sub send_x10_leviton_level {
     my $result;
 
     if ( !$quiet ) {
-        printf( "send X-10 leviton level %s/%s %d\n",
-            $houses[$house], $keys[$key], $level );
+        printf( "send X-10 leviton level %s/%s %d\n", $houses[$house], $keys[$key], $level );
     }
 
     $ret = write_int( $s, XA_X10_LEVEL() );
@@ -221,8 +216,7 @@ sub set_relay {
     my $result;
 
     if ( !$quiet ) {
-        printf( "set relay module#%d point#%d to %d\n",
-            $module, $point, $state );
+        printf( "set relay module#%d point#%d to %d\n", $module, $point, $state );
     }
 
     $ret = write_int( $s, XA_SET_RELAY() );
@@ -308,8 +302,7 @@ sub remote_ir {
     my $result;
 
     if ( !$quiet ) {
-        printf( "send remote IR module:%d zone:%d irnum:%d\n",
-            $module, $zone, $irnum );
+        printf( "send remote IR module:%d zone:%d irnum:%d\n", $module, $zone, $irnum );
     }
 
     $ret = write_int( $s, XA_REMOTE_IR() );
diff --git a/lib/ncpuxa_mh.pm b/lib/ncpuxa_mh.pm
index da62f880f..71e5709c8 100644
--- a/lib/ncpuxa_mh.pm
+++ b/lib/ncpuxa_mh.pm
@@ -83,8 +83,7 @@ sub send {
     if ( my ( $house, $level ) = $data =~ /^X([A-P])&P(\d+)$/ ) {
         $house = unpack( 'C', $house ) - 65;    #Get code from ASCII
         $level = int($level) - 1;
-        ncpuxa::send_x10_leviton_level( $controlsock{$hostport},
-            $house, $save_unit, $level );
+        ncpuxa::send_x10_leviton_level( $controlsock{$hostport}, $house, $save_unit, $level );
         return;
     }
 
@@ -123,9 +122,7 @@ sub send {
     }
 
     #Send remote IR
-    if ( my ( $irnum, $module, $zone ) =
-        $data =~ /^IRSlot([0-9]+)@([0-9]+):([0-9]+)$/ )
-    {
+    if ( my ( $irnum, $module, $zone ) = $data =~ /^IRSlot([0-9]+)@([0-9]+):([0-9]+)$/ ) {
         $irnum  = int($irnum);
         $module = int($module);
         $zone   = int($zone);
@@ -134,9 +131,7 @@ sub send {
     }
 
     #Set Relay
-    if ( my ( $relay, $state, undef, $module ) =
-        $data =~ /^OUTPUT([0-9]+)(high|low)(@([0-9]+))?$/i )
-    {
+    if ( my ( $relay, $state, undef, $module ) = $data =~ /^OUTPUT([0-9]+)(high|low)(@([0-9]+))?$/i ) {
         $module = 1 unless defined $module;
         $relay  = int($relay);
         $state  = ( $state =~ /high/i ? "1" : "0" );
@@ -155,22 +150,17 @@ my $code;
 
 # 11/27/05, changed "All Lights Off" to report as O to be consistent with other modules
 my %funcs = (
-    '1',              '1',             '2',             '2',
-    '3',              '3',             '4',             '4',
-    '5',              '5',             '6',             '6',
-    '7',              '7',             '8',             '8',
-    '9',              '9',             '10',            'A',
-    '11',             'B',             '12',            'C',
-    '13',             'D',             '14',            'E',
-    '15',             'F',             '16',            'G',
-    'All Lights On',  'O',             'All Units Off', 'P',
-    'On',             'J',             'Off',           'K',
-    'Bright',         'L',             'Dim',           'M',
-    'Preset Dim 0',   'PRESET_DIM1',   'Preset Dim 1',  'PRESET_DIM2',
-    'All Lights Off', 'P',             'Extended Code', 'EXTENDED_CODE',
-    'Hail Request',   'HAIL_REQUEST',  'Hail Ack',      'HAIL_ACK',
-    'Extended Data',  'EXTENDED_DATA', 'Status On',     'STATUS_ON',
-    'Status Off',     'STATUS_OFF',    'Status',        'STATUS'
+    '1',              '1',          '2',             '2',             '3',             '3',
+    '4',              '4',          '5',             '5',             '6',             '6',
+    '7',              '7',          '8',             '8',             '9',             '9',
+    '10',             'A',          '11',            'B',             '12',            'C',
+    '13',             'D',          '14',            'E',             '15',            'F',
+    '16',             'G',          'All Lights On', 'O',             'All Units Off', 'P',
+    'On',             'J',          'Off',           'K',             'Bright',        'L',
+    'Dim',            'M',          'Preset Dim 0',  'PRESET_DIM1',   'Preset Dim 1',  'PRESET_DIM2',
+    'All Lights Off', 'P',          'Extended Code', 'EXTENDED_CODE', 'Hail Request',  'HAIL_REQUEST',
+    'Hail Ack',       'HAIL_ACK',   'Extended Data', 'EXTENDED_DATA', 'Status On',     'STATUS_ON',
+    'Status Off',     'STATUS_OFF', 'Status',        'STATUS'
 );
 
 sub read {
diff --git a/lib/net_gmail_utils.pl b/lib/net_gmail_utils.pl
index 4ba172ee3..dd6d0caf1 100644
--- a/lib/net_gmail_utils.pl
+++ b/lib/net_gmail_utils.pl
@@ -55,10 +55,7 @@ package net_gmail_utils;
 sub send_gmail {
 
     my %parms = @_;
-    my (
-        $from,    $to,   $subject, $text, $port,
-        $account, $mime, $baseref, $file, $filename
-    );
+    my ( $from, $to, $subject, $text, $port, $account, $mime, $baseref, $file, $filename );
     my ( $smtpusername, $smtppassword, $smtpencrypt );
 
     $port         = $parms{port};
@@ -89,8 +86,7 @@ sub send_gmail {
     $to = $main::config_parms{"net_mail_${account}_address"}
       unless ( defined $to );
 
-    my $timeout =
-      $main::config_parms{"net_mail_${account}_server_send_timeout"};
+    my $timeout = $main::config_parms{"net_mail_${account}_server_send_timeout"};
     $timeout = 20 unless $timeout;
 
     $smtpusername = $main::config_parms{"net_mail_${account}_user"}
diff --git a/lib/raZberry.pm b/lib/raZberry.pm
index da017a413..2e127354d 100755
--- a/lib/raZberry.pm
+++ b/lib/raZberry.pm
@@ -158,32 +158,23 @@ sub poll {
     &main::print_log("[raZberry] cmd=$cmd") if ( $self->{debug} > 1 );
 
     for my $dev ( keys %{ $self->{data}->{force_update} } ) {
-        &main::print_log(
-            "[raZberry] Forcing update to device $dev to account for local changes"
-        ) if ( $self->{debug} );
+        &main::print_log( "[raZberry] Forcing update to device $dev to account for local changes" ) if ( $self->{debug} );
         $self->update_dev($dev);
     }
 
     for my $dev ( keys %{ $self->{data}->{ping} } ) {
-        &main::print_log("[raZberry] Keep_alive: Pinging device $dev...")
-          ;    # if ($self->{debug});
-        &main::print_log("ping_dev $dev");    # if ($self->{debug});
-                                              #$self->ping_dev($dev);
+        &main::print_log("[raZberry] Keep_alive: Pinging device $dev...");    # if ($self->{debug});
+        &main::print_log("ping_dev $dev");                                    # if ($self->{debug});
+                                                                              #$self->ping_dev($dev);
     }
 
-    my ( $isSuccessResponse1, $devices ) =
-      _get_JSON_data( $self, 'devices', $cmd );
+    my ( $isSuccessResponse1, $devices ) = _get_JSON_data( $self, 'devices', $cmd );
     print Dumper $devices if ( $self->{debug} > 1 );
     if ($isSuccessResponse1) {
         $self->{lastupdate} = $devices->{data}->{updateTime};
         foreach my $item ( @{ $devices->{data}->{devices} } ) {
-            &main::print_log( "Found:"
-                  . $item->{id}
-                  . " with level "
-                  . $item->{metrics}->{level}
-                  . " and updated "
-                  . $item->{updateTime}
-                  . "." )
+            &main::print_log(
+                "Found:" . $item->{id} . " with level " . $item->{metrics}->{level} . " and updated " . $item->{updateTime} . "." )
               if ( $self->{debug} );
             my ($id) = ( split /_/, $item->{id} )[2];
 
@@ -199,24 +190,20 @@ sub poll {
             $self->{status} = "online";
 
             if ( defined $self->{child_object}->{$id} ) {
-                &main::print_log(
-                        "[raZberry] Child object detected: Controller Level:["
+                &main::print_log( "[raZberry] Child object detected: Controller Level:["
                       . $item->{metrics}->{level}
                       . "] Child Level:["
                       . $self->{child_object}->{$id}->level()
                       . "]" )
                   if ( $self->{debug} > 1 );
-                $self->{child_object}->{$id}
-                  ->set( $item->{metrics}->{level}, 'poll' )
-                  if ( $self->{child_object}->{$id}->level() ne
-                    $item->{metrics}->{level} );
+                $self->{child_object}->{$id}->set( $item->{metrics}->{level}, 'poll' )
+                  if ( $self->{child_object}->{$id}->level() ne $item->{metrics}->{level} );
             }
 
         }
     }
     else {
-        &main::print_log(
-            "[raZberry] Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
@@ -236,11 +223,9 @@ sub set_dev {
         $cmd .= "$lvl" if $lvl;
         &main::print_log("[raZberry] sending command $cmd")
           if ( $self->{debug} > 1 );
-        my ( $isSuccessResponse1, $status ) =
-          _get_JSON_data( $self, 'devices', $cmd );
+        my ( $isSuccessResponse1, $status ) = _get_JSON_data( $self, 'devices', $cmd );
         unless ($isSuccessResponse1) {
-            &main::print_log(
-                "[raZberry] Problem retrieving data from " . $self->{host} );
+            &main::print_log( "[raZberry] Problem retrieving data from " . $self->{host} );
             return ('0');
         }
 
@@ -261,8 +246,7 @@ sub ping_dev {
     &main::print_log("ping cmd=$cmd");    # if ($self->{debug} > 1);
     my ( $isSuccessResponse0, $status ) = _get_JSON_data( $self, 'ping', $cmd );
     unless ($isSuccessResponse0) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
@@ -279,12 +263,10 @@ sub isfailed_dev {
     my $cmd;
     $cmd = "%5B" . $devid . "%5D.data.isFailed.value";
     &main::print_log("isFailed cmd=$cmd");    # if ($self->{debug} > 1);
-    my ( $isSuccessResponse0, $status ) =
-      _get_JSON_data( $self, 'isfailed', $cmd );
+    my ( $isSuccessResponse0, $status ) = _get_JSON_data( $self, 'isfailed', $cmd );
 
     unless ($isSuccessResponse0) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('error');
     }
@@ -295,21 +277,13 @@ sub update_dev {
     my ( $self, $device ) = @_;
     my $cmd;
     my ( $devid, $instance, $class ) = ( split /-/, $device )[ 0, 1, 2 ];
-    $cmd = "%5B"
-      . $devid
-      . "%5D.instances%5B"
-      . $instance
-      . "%5D.commandClasses%5B"
-      . $class
-      . "%5D.Get()";
+    $cmd = "%5B" . $devid . "%5D.instances%5B" . $instance . "%5D.commandClasses%5B" . $class . "%5D.Get()";
     &main::print_log("[raZberry] Getting local state from $device ($devid)...")
       if ( $self->{debug} );
     &main::print_log("cmd=$cmd") if ( $self->{debug} > 1 );
-    my ( $isSuccessResponse0, $status ) =
-      _get_JSON_data( $self, 'force_update', $cmd );
+    my ( $isSuccessResponse0, $status ) = _get_JSON_data( $self, 'force_update', $cmd );
     unless ($isSuccessResponse0) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
@@ -337,13 +311,9 @@ sub _get_JSON_data {
             or ( $mode eq "isfailed" )
             or ( $mode eq "usercode" )
             or ( $mode eq "usercode_data" ) );
-        &main::print_log(
-            "[raZberry] contacting http://$host:$port/$method/$rest{$mode}$params"
-        ) if ( $self->{debug} );
+        &main::print_log( "[raZberry] contacting http://$host:$port/$method/$rest{$mode}$params" ) if ( $self->{debug} );
 
-        my $request =
-          HTTP::Request->new(
-            GET => "http://$host:$port/$method/$rest{$mode}$params" );
+        my $request = HTTP::Request->new( GET => "http://$host:$port/$method/$rest{$mode}$params" );
         $request->content_type("application/x-www-form-urlencoded");
 
         my $responseObj = $ua->request($request);
@@ -356,14 +326,11 @@ sub _get_JSON_data {
         my $isSuccessResponse = $responseCode < 400;
         $self->{updating} = 0;
         if ( !$isSuccessResponse ) {
-            &main::print_log(
-                "[raZberry] Warning, failed to get data. Response code $responseCode"
-            );
+            &main::print_log( "[raZberry] Warning, failed to get data. Response code $responseCode" );
             if ( defined $self->{child_object}->{comm} ) {
                 if ( $self->{status} eq "online" ) {
                     $self->{status} = "offline";
-                    main::print_log
-                      "Communication Tracking object found. Updating from "
+                    main::print_log "Communication Tracking object found. Updating from "
                       . $self->{child_object}->{comm}->state()
                       . " to offline..."
                       if ( $self->{loglevel} );
@@ -375,8 +342,7 @@ sub _get_JSON_data {
         if ( defined $self->{child_object}->{comm} ) {
             if ( $self->{status} eq "offline" ) {
                 $self->{status} = "online";
-                main::print_log
-                  "Communication Tracking object found. Updating from "
+                main::print_log "Communication Tracking object found. Updating from "
                   . $self->{child_object}->{comm}->state()
                   . " to online..."
                   if ( $self->{loglevel} );
@@ -386,17 +352,14 @@ sub _get_JSON_data {
         return ('1')
           if ( ( $mode eq "force_update" )
             or ( $mode eq "ping" )
-            or ( $mode eq "usercode" ) )
-          ;   #these come backs as nulls which crashes JSON::XS, so just return.
+            or ( $mode eq "usercode" ) );    #these come backs as nulls which crashes JSON::XS, so just return.
         return ( $responseObj->content ) if ( $mode eq "isfailed" );
         my $response = JSON::XS->new->decode( $responseObj->content );
         return ( $isSuccessResponse, $response )
 
     }
     else {
-        &main::print_log(
-            "[raZberry] Warning, not fetching data due to operation in progress"
-        );
+        &main::print_log( "[raZberry] Warning, not fetching data due to operation in progress" );
         return ('0');
     }
 }
@@ -410,8 +373,7 @@ sub stop_timer {
 sub start_timer {
     my ($self) = @_;
 
-    $self->{timer}->set( $self->{config}->{poll_seconds},
-        sub { &raZberry::poll($self) }, -1 );
+    $self->{timer}->set( $self->{config}->{poll_seconds}, sub { &raZberry::poll($self) }, -1 );
 }
 
 sub display_all_devices {
@@ -421,10 +383,8 @@ sub display_all_devices {
 
         print "RaZberry Device $id\n";
         print "\t level:\t\t $self->{data}->{devices}->{$id}->{level}\n";
-        print "\t updateTime:\t "
-          . localtime( $self->{data}->{devices}->{$id}->{updateTime} ) . "\n";
-        print
-          "\t deviceType:\t $self->{data}->{devices}->{$id}->{devicetype}\n";
+        print "\t updateTime:\t " . localtime( $self->{data}->{devices}->{$id}->{updateTime} ) . "\n";
+        print "\t deviceType:\t $self->{data}->{devices}->{$id}->{devicetype}\n";
         print "\t location:\t $self->{data}->{devices}->{$id}->{location}\n";
         print "\t title:\t\t $self->{data}->{devices}->{$id}->{title}\n";
         print "\t icon:\t\t $self->{data}->{devices}->{$id}->{icon}\n\n";
@@ -441,8 +401,7 @@ sub get_dev_status {
     }
     else {
 
-        &main::print_log(
-            "[raZberry] Warning, unable to get status of device $id");
+        &main::print_log("[raZberry] Warning, unable to get status of device $id");
         return 0;
     }
 
@@ -451,8 +410,7 @@ sub get_dev_status {
 sub register {
     my ( $self, $object, $dev, $options ) = @_;
     if ( lc $dev eq 'comm' ) {
-        &main::print_log(
-            "[raZberry] Registering Communication object to controller");
+        &main::print_log("[raZberry] Registering Communication object to controller");
         $self->{child_object}->{'comm'} = $object;
     }
     else {
@@ -461,15 +419,11 @@ sub register {
         if ( defined $options ) {
             if ( $options =~ m/force_update/ ) {
                 $self->{data}->{force_update}->{$dev} = 1;
-                &main::print_log(
-                    "[raZberry] Forcing Controller to contact Device $dev at each poll"
-                );
+                &main::print_log( "[raZberry] Forcing Controller to contact Device $dev at each poll" );
             }
             if ( $options =~ m/keep_alive/ ) {
                 $self->{data}->{ping}->{$dev} = 1;
-                &main::print_log(
-                    "[raZberry] Forcing Controller to ping Device $dev at each poll"
-                );
+                &main::print_log( "[raZberry] Forcing Controller to ping Device $dev at each poll" );
             }
         }
     }
@@ -484,11 +438,7 @@ sub new {
 
     my $self = {};
     bless $self, $class;
-    push(
-        @{ $$self{states} },
-        'off', 'low', 'med', 'high', 'on',  '10%', '20%',
-        '30%', '40%', '50%', '60%',  '70%', '80%', '90%'
-    );
+    push( @{ $$self{states} }, 'off', 'low', 'med', 'high', 'on', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%' );
 
     $$self{master_object} = $object;
     $devid = $devid . $zway_suffix unless ( $devid =~ m/-\d+-\d+$/ );
@@ -526,9 +476,7 @@ sub set {
         else {
             $n_state .= "$p_state%";
         }
-        main::print_log(
-            "[raZberry_dimmer] Setting value to $n_state. Level is "
-              . $self->{level} )
+        main::print_log( "[raZberry_dimmer] Setting value to $n_state. Level is " . $self->{level} )
           if ( $self->{debug} );
 
         $self->SUPER::set($n_state);
@@ -551,8 +499,7 @@ sub set {
             $$self{master_object}->set_dev( $$self{devid}, "level=$n_state" );
         }
         else {
-            main::print_log(
-                "[raZberry_dimmer] Error. Unknown set state $p_state");
+            main::print_log("[raZberry_dimmer] Error. Unknown set state $p_state");
         }
     }
 }
@@ -615,8 +562,7 @@ sub set {
         }
 
         # stop level?
-        main::print_log( "[raZberry_blind] Setting value to $n_state. Level is "
-              . $self->{level} )
+        main::print_log( "[raZberry_blind] Setting value to $n_state. Level is " . $self->{level} )
           if ( $self->{debug} );
 
         $self->SUPER::set($n_state);
@@ -633,8 +579,7 @@ sub set {
             #	$$self{master_object}->set_dev($$self{devid},"level=$n_state");
         }
         else {
-            main::print_log(
-                "[raZberry_blind] Error. Unknown set state $p_state");
+            main::print_log("[raZberry_blind] Error. Unknown set state $p_state");
         }
     }
 }
@@ -703,10 +648,7 @@ sub set {
     $map_states{unlocked} = "open";
 
     if ( $p_setby eq 'poll' ) {
-        main::print_log( "[raZberry_lock] Setting value to $p_state: "
-              . $map_states{$p_state}
-              . ". Level is "
-              . $self->{level} )
+        main::print_log( "[raZberry_lock] Setting value to $p_state: " . $map_states{$p_state} . ". Level is " . $self->{level} )
           if ( $self->{debug} );
         if ( ( $p_state eq "open" ) or ( $p_state eq "close" ) ) {
             $self->SUPER::set( $map_states{$p_state} );
@@ -715,19 +657,16 @@ sub set {
             $self->{level} = $p_state;
         }
         else {
-            main::print_log(
-                "[raZberry_lock] Unknown value $p_state in poll set");
+            main::print_log("[raZberry_lock] Unknown value $p_state in poll set");
         }
 
     }
     else {
         if ( ( lc $p_state eq "locked" ) or ( lc $p_state eq "unlocked" ) ) {
-            $$self{master_object}
-              ->set_dev( $$self{devid}, $map_states{$p_state} );
+            $$self{master_object}->set_dev( $$self{devid}, $map_states{$p_state} );
         }
         else {
-            main::print_log( "[raZberry_lock] Error. Unknown set state "
-                  . $map_states{$p_state} );
+            main::print_log( "[raZberry_lock] Error. Unknown set state " . $map_states{$p_state} );
         }
     }
 }
@@ -753,12 +692,10 @@ sub isfailed {
 sub battery_check {
     my ($self) = @_;
     if ( $self->{level} eq "" ) {
-        main::print_log(
-            "[raZberry_lock] INFO Battery level currently undefined");
+        main::print_log("[raZberry_lock] INFO Battery level currently undefined");
         return;
     }
-    main::print_log(
-        "[raZberry_lock] INFO Battery currently at " . $self->{level} . "%" );
+    main::print_log( "[raZberry_lock] INFO Battery currently at " . $self->{level} . "%" );
     if ( ( $self->{level} < 30 ) and ( $self->{battery_alert} == 0 ) ) {
         $self->{battery_alert} = 1;
         main::speak("Warning, Zwave lock battery has less than 30% charge");
@@ -775,8 +712,7 @@ sub enable_user {
     $status = $self->_control_user( $userid, $code, "1" );
 
     #delay for the lock to process the code and then read in the users
-    main::eval_with_timer( sub { &raZberry_lock::_update_users($self) },
-        $self->{user_data_delay} );
+    main::eval_with_timer( sub { &raZberry_lock::_update_users($self) }, $self->{user_data_delay} );
     return ($status);
 }
 
@@ -789,8 +725,7 @@ sub disable_user {
     $status = $self->_control_user( $userid, $code, "0" );
 
     #delay for the lock to process the code and then read in the users
-    main::eval_with_timer( sub { &raZberry_lock::_update_users($self) },
-        $self->{user_data_delay} );
+    main::eval_with_timer( sub { &raZberry_lock::_update_users($self) }, $self->{user_data_delay} );
     return ($status);
 }
 
@@ -817,8 +752,7 @@ sub print_users {
 sub _battery_timer {
     my ($self) = @_;
 
-    $self->{battery_timer}->set( $self->{battery_poll_seconds},
-        sub { &raZberry_lock::battery_check($self) }, -1 );
+    $self->{battery_timer}->set( $self->{battery_poll_seconds}, sub { &raZberry_lock::battery_check($self) }, -1 );
 }
 
 sub _control_user {
@@ -828,20 +762,14 @@ sub _control_user {
 
     my $cmd;
     my ( $devid, $instance, $class ) = ( split /-/, $self->{devid} )[ 0, 1, 2 ];
-    $cmd = "%5B"
-      . $devid
-      . "%5D.UserCode.Set("
-      . $userid . ","
-      . $code . ","
-      . $control . ")";
+    $cmd = "%5B" . $devid . "%5D.UserCode.Set(" . $userid . "," . $code . "," . $control . ")";
     &main::print_log("[raZberry] Enabling usercodes $userid ($devid)...")
       if ( $self->{debug} );
     &main::print_log("cmd=$cmd") if ( $self->{debug} > 1 );
     my ( $isSuccessResponse0, $status ) =
       &raZberry::_get_JSON_data( $self->{master_object}, 'usercode', $cmd );
     unless ($isSuccessResponse0) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
@@ -860,8 +788,7 @@ sub _update_users {
     my ( $isSuccessResponse0, $status ) =
       &raZberry::_get_JSON_data( $self->{master_object}, 'usercode', $cmd );
     unless ($isSuccessResponse0) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
@@ -869,12 +796,9 @@ sub _update_users {
     &main::print_log("[raZberry] Downloading local usercodes from $devid...")
       if ( $self->{debug} );
     &main::print_log("cmd=$cmd") if ( $self->{debug} > 1 );
-    my ( $isSuccessResponse1, $response ) =
-      &raZberry::_get_JSON_data( $self->{master_object}, 'usercode_data',
-        $cmd );
+    my ( $isSuccessResponse1, $response ) = &raZberry::_get_JSON_data( $self->{master_object}, 'usercode_data', $cmd );
     unless ($isSuccessResponse1) {
-        &main::print_log(
-            "[raZberry] Error: Problem retrieving data from " . $self->{host} );
+        &main::print_log( "[raZberry] Error: Problem retrieving data from " . $self->{host} );
         $self->{data}->{retry}++;
         return ('0');
     }
diff --git a/lib/read_table_A.pl b/lib/read_table_A.pl
index c99bb8f2b..30c3f51c0 100644
--- a/lib/read_table_A.pl
+++ b/lib/read_table_A.pl
@@ -15,8 +15,7 @@
 
 #print_log "Using read_table_A.pl";
 
-my ( %groups, %objects, %packages, %addresses, %scene_build_controllers,
-    %scene_build_responders );
+my ( %groups, %objects, %packages, %addresses, %scene_build_controllers, %scene_build_responders );
 
 sub read_table_init_A {
 
@@ -40,10 +39,9 @@ sub read_table_A {
     $record =~ s/\s*#.*$//;
 
     my (
-        $code,      $address,    $name,      $object,
-        $grouplist, $comparison, $limit,     @other,
-        $other,     $vcommand,   $occupancy, $network,
-        $password,  $interface,  $additional_code
+        $code,       $address, $name,     $object,    $grouplist,
+        $comparison, $limit,   @other,    $other,     $vcommand,
+        $occupancy,  $network, $password, $interface, $additional_code
     );
     my (@item_info) = split( ',\s*', $record );
     my $type = uc shift @item_info;
@@ -67,33 +65,32 @@ sub read_table_A {
     # -[ UPB ]----------------------------------------------------------
     elsif ( $type eq "UPBPIM" ) {
         require 'UPBPIM.pm';
-        ( $name, $network, $password, $address, $grouplist, @other ) =
-          @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        ( $name, $network, $password, $address, $grouplist, @other ) = @item_info;
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "UPBPIM('UPBPIM', $network,$password,$address)";
     }
     elsif ( $type eq "UPBD" ) {
         require 'UPB_Device.pm';
         ( $name, $object, $network, $address, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "UPB_Device(\$$object, $network,$address)";
     }
     elsif ( $type eq "UPBL" ) {
         require 'UPB_Link.pm';
         ( $name, $object, $network, $address, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "UPB_Link(\$$object, $network,$address)";
     }
     elsif ( $type eq "UPBRAIN8" ) {
         require 'UPB_Rain8.pm';
         ( $name, $object, $network, $address, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "UPB_Rain8(\$$object, $network,$address)";
     }
     elsif ( $type eq "UPBT" ) {
         require 'UPB_Thermostat.pm';
         ( $name, $object, $network, $address, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "UPB_Thermostat(\$$object, $network,$address)";
     }
 
@@ -101,71 +98,46 @@ sub read_table_A {
     elsif ( $type eq "INSTEON_PLM" ) {
         require Insteon_PLM;
         ( $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );               # Quote data
         $object = "Insteon_PLM('Insteon_PLM',$other)";
     }
     elsif ( $type eq "INSTEON_LAMPLINC" ) {
         require Insteon::Lighting;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );           # Quote data
             $object = "Insteon::LampLinc(\'$address\',$other)";
         }
     }
     elsif ( $type eq "INSTEON_BULBLINC" ) {
         require Insteon::Lighting;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );        # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );           # Quote data
             $object = "Insteon::BulbLinc(\'$address\',$other)";
         }
     }
     elsif ( $type eq "INSTEON_APPLIANCELINC" ) {
         require Insteon::Lighting;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );             # Quote data
             $object = "Insteon::ApplianceLinc(\'$address\',$other)";
         }
     }
     elsif ( $type eq "INSTEON_SWITCHLINC" ) {
         require Insteon::Lighting;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );             # Quote data
             $object = "Insteon::SwitchLinc(\'$address\',$other)";
         }
     }
     elsif ( $type eq "INSTEON_SWITCHLINCRELAY" ) {
         require Insteon::Lighting;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );    # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );               # Quote data
             $object = "Insteon::SwitchLincRelay(\'$address\',$other)";
         }
     }
@@ -173,17 +145,13 @@ sub read_table_A {
         require Insteon::Lighting;
         if (
             validate_def(
-                $type, 2,
-                [
-                    qr/^[[:xdigit:]]{2}\.[[:xdigit:]]{2}\.[[:xdigit:]]{2}:[[:xdigit:]]{2}$/,
-                    'name'
-                ],
+                $type, 2, [ qr/^[[:xdigit:]]{2}\.[[:xdigit:]]{2}\.[[:xdigit:]]{2}:[[:xdigit:]]{2}$/, 'name' ],
                 \@item_info
             )
           )
         {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );           # Quote data
             $object = "Insteon::KeyPadLinc(\'$address\', $other)";
         }
     }
@@ -191,105 +159,94 @@ sub read_table_A {
         require Insteon::Lighting;
         if (
             validate_def(
-                $type, 2,
-                [
-                    qr/^[[:xdigit:]]{2}\.[[:xdigit:]]{2}\.[[:xdigit:]]{2}:[[:xdigit:]]{2}$/,
-                    'name'
-                ],
+                $type, 2, [ qr/^[[:xdigit:]]{2}\.[[:xdigit:]]{2}\.[[:xdigit:]]{2}:[[:xdigit:]]{2}$/, 'name' ],
                 \@item_info
             )
           )
         {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );    # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );                # Quote data
             $object = "Insteon::KeyPadLincRelay(\'$address\', $other)";
         }
     }
     elsif ( $type eq "INSTEON_REMOTELINC" ) {
         require Insteon::Controller;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );           # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::RemoteLinc(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_MOTIONSENSOR" ) {
         require Insteon::Security;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );             # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::MotionSensor(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_TRIGGERLINC" ) {
         require Insteon::Security;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );             # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::TriggerLinc(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_IOLINC" ) {
         require Insteon::IOLinc;
-        if (
-            validate_def(
-                $type, 2, [ 'insteon_address', 'name' ], \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'insteon_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );         # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );                # Quote data
             $object = "Insteon::IOLinc(\'$address\', $other)";
         }
     }
     elsif ( $type eq "INSTEON_FANLINC" ) {
         require Insteon::Lighting;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );             # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::FanLinc(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_ICONTROLLER" ) {
         require Insteon::BaseInsteon;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );             # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         my ( $deviceid, $groupid ) = $address =~ /(\S+):(\S+)/;
         if ($groupid) {
-            $object =
-              "Insteon::InterfaceController(\'00.00.00:$groupid\', $other)";
+            $object = "Insteon::InterfaceController(\'00.00.00:$groupid\', $other)";
         }
         else {
-            $object =
-              "Insteon::InterfaceController(\'00.00.00:$address\', $other)";
+            $object = "Insteon::InterfaceController(\'00.00.00:$address\', $other)";
         }
     }
     elsif ( $type eq 'IPLT' or $type eq 'INSTEON_THERMOSTAT' ) {
         require Insteon::Thermostat;
         ( $address, $name, $grouplist, $object, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );           # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::Thermostat(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_IRRIGATION" ) {
         require Insteon::Irrigation;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );           # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::Irrigation(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_SYNCHROLINC" ) {
         require Insteon::Energy;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );            # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::SynchroLinc(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_IMETER" ) {
         require Insteon::Energy;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );            # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::iMeter(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_MICROSWITCH" ) {
         require Insteon::Lighting;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );            # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::MicroSwitch(\'$address\', $other)";
     }
     elsif ( $type eq "INSTEON_MICROSWITCHRELAY" ) {
         require Insteon::Lighting;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "Insteon::MicroSwitchRelay(\'$address\', $other)";
     }
 
@@ -297,46 +254,42 @@ sub read_table_A {
     elsif ( $type eq 'FROG' ) {
         require 'FroggyRita.pm';
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "FroggyRita('$address', $other)";
     }
     elsif ( $type eq "X10A" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );                # Quote data
             $object = "X10_Appliance('$address', $other)";
         }
     }
     elsif ( $type eq "X10I" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
-            $other = join ', ', ( map { "'$_'" } @other );          # Quote data
+            $other = join ', ', ( map { "'$_'" } @other );                # Quote data
             $object = "X10_Item('$address', $other)";
         }
     }
     elsif ( $type eq "X10TR" ) {
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "X10_Transmitter('$address', $other)";
     }
     elsif ( $type eq "X10O" ) {
         ( $address, $name, $grouplist, @other ) = @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );              # Quote data
+        $other = join ', ', ( map { "'$_'" } @other );                    # Quote data
         $object = "X10_Ote('$address', $other)";
     }
     elsif ( $type eq "X10SL" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );
             $object = "X10_Switchlinc('$address', $other)";
         }
     }
     elsif ( $type eq "X10AL" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );
             $object = "X10_Appliancelinc('$address', $other)";
@@ -348,8 +301,7 @@ sub read_table_A {
         $object = "X10_Keypadlinc('$address', $other)";
     }
     elsif ( $type eq "X10LL" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );
             $object = "X10_Lamplinc('$address', $other)";
@@ -381,8 +333,7 @@ sub read_table_A {
         $object = "RCS_Item('$address', $other)";
     }
     elsif ( $type eq "X10MS" ) {
-        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) )
-        {
+        if ( validate_def( $type, 2, [ 'x10_address', 'name' ], \@item_info ) ) {
             ( $address, $name, $grouplist, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );          # Quote data
             $object = "X10_Sensor('$address', '$name', $other)";
@@ -394,9 +345,8 @@ sub read_table_A {
         $object = "RF_Item('$address', '$name', $other)";
     }
     elsif ( $type eq "COMPOOL" ) {
-        ( $address, $name, $grouplist ) = @item_info;
-        ( $address, $comparison, $limit ) =
-          $address =~ /\s*(\w+)\s*(\<|\>|\=)*\s*(\d*)/;
+        ( $address, $name,       $grouplist ) = @item_info;
+        ( $address, $comparison, $limit )     = $address =~ /\s*(\w+)\s*(\<|\>|\=)*\s*(\d*)/;
         $object = "Compool_Item('$address', '$comparison', '$limit')"
           if $comparison ne undef;
         $object = "Compool_Item('$address')" if $comparison eq undef;
@@ -597,12 +547,11 @@ sub read_table_A {
         if ( !( $vcommand =~ /.*\[.*/ ) ) {
             $vcommand .= " [ON,OFF]";
         }
-        $code .= sprintf "\nmy \$v_%s_state;\n", $name;
-        $code .= sprintf "\$v_%s = new Voice_Cmd(\"%s\");\n", $name, $vcommand;
-        $code .= sprintf "if (\$v_%s_state = said \$v_%s) {\n", $name, $name;
-        $code .= sprintf "  set \$%s \$v_%s_state;\n", $name, $name;
-        $code .= sprintf "  respond \"Turning %s \$v_%s_state\";\n",
-          $fixedname, $name;
+        $code .= sprintf "\nmy \$v_%s_state;\n",                     $name;
+        $code .= sprintf "\$v_%s = new Voice_Cmd(\"%s\");\n",        $name, $vcommand;
+        $code .= sprintf "if (\$v_%s_state = said \$v_%s) {\n",      $name, $name;
+        $code .= sprintf "  set \$%s \$v_%s_state;\n",               $name, $name;
+        $code .= sprintf "  respond \"Turning %s \$v_%s_state\";\n", $fixedname, $name;
         $code .= sprintf "}\n";
         return $code;
     }
@@ -646,7 +595,7 @@ sub read_table_A {
         else {
             $object = "Sensor_Zone('$address')";
         }
-        if ( !$packages{caddx}++ ) {    # first time for this object type?
+        if ( !$packages{caddx}++ ) {                      # first time for this object type?
             $code .= "use caddx;\n";
         }
     }
@@ -668,9 +617,8 @@ sub read_table_A {
         ( $address, $name, $grouplist, $serial, $pa_type, @other ) = @item_info;
         $pa_type = 'wdio' unless $pa_type;
 
-        if ( !$packages{PAobj}++ ) {    # first time for this object type?
-            $code .=
-              "my (%pa_weeder_max_port,%pa_zone_types,%pa_zone_type_by_zone);\n";
+        if ( !$packages{PAobj}++ ) {                      # first time for this object type?
+            $code .= "my (%pa_weeder_max_port,%pa_zone_types,%pa_zone_type_by_zone);\n";
         }
 
         $code .=
@@ -689,64 +637,47 @@ sub read_table_A {
             # AHB / ALB  or DBH / DBL
             $address =~ s/^(\S)(\S)$/$1H$2/;    # if $pa_type eq 'wdio';
             $address = "D$address" if $pa_type eq 'wdio_old';
-            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n",
-              $name . '_obj', $address, $serial;
+            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n", $name . '_obj', $address, $serial;
 
             $address =~ s/^(\S{1,2})H(\S)$/$1L$2/;
-            $code .= sprintf "\$%-35s -> add ('%s','off');\n", $name . '_obj',
-              $address;
+            $code .= sprintf "\$%-35s -> add ('%s','off');\n", $name . '_obj', $address;
 
             $object = '';
         }
         elsif ( lc $pa_type eq 'object' ) {
             if ( $name =~ /^pa_pa_/i ) {
-                print
-                  "\nObject name \"$name\" starts with \"pa_\". This will cause conflicts. Ignoring entry";
+                print "\nObject name \"$name\" starts with \"pa_\". This will cause conflicts. Ignoring entry";
             }
             else {
-                $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n",
-                  $name, $address;
-                $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",
-                  $name, $address;
+                $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n", $name, $address;
+                $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",   $name, $address;
             }
         }
         elsif ( lc $pa_type eq 'audrey' ) {
             require 'Audrey_Play.pm';
-            $code .= sprintf "\$%-35s = new Audrey_Play('%s');\n",
-              $name . '_obj', $address;
+            $code .= sprintf "\$%-35s = new Audrey_Play('%s');\n", $name . '_obj', $address;
             $code .= sprintf "\$%-35s -> hidden(1);\n", $name . '_obj';
         }
         elsif ( lc $pa_type eq 'x10' ) {
             $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-            $code .= sprintf "\$%-35s = new X10_Appliance('%s','%s');\n",
-              $name . '_obj', $address, $serial;
+            $code .= sprintf "\$%-35s = new X10_Appliance('%s','%s');\n", $name . '_obj', $address, $serial;
             $code .= sprintf "\$%-35s -> hidden(1);\n", $name . '_obj';
-            $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n",
-              $name, $name . '_obj';
-            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n", $name,
-              $name . '_obj';
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'off','off');\n", $name, $name . '_obj';
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n",   $name, $name . '_obj';
         }
         elsif ( lc $pa_type eq 'xap' ) {
-            $code .= sprintf "\$%-35s = new xAP_Item('%s');\n", $name . '_obj',
-              $address;
-            $code .= sprintf "\$%-35s -> hidden(1);\n", $name . '_obj';
-            $code .= sprintf "\$%-35s -> target_address('%s');\n",
-              $name . '_obj', $address;
-            $code .= sprintf "\$%-35s -> class_name('%s');\n", $name . '_obj',
-              $serial;
-            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n", $name,
-              $name . '_obj';
+            $code .= sprintf "\$%-35s = new xAP_Item('%s');\n",    $name . '_obj', $address;
+            $code .= sprintf "\$%-35s -> hidden(1);\n",            $name . '_obj';
+            $code .= sprintf "\$%-35s -> target_address('%s');\n", $name . '_obj', $address;
+            $code .= sprintf "\$%-35s -> class_name('%s');\n",     $name . '_obj', $serial;
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n", $name, $name . '_obj';
         }
         elsif ( lc $pa_type eq 'xpl' ) {
-            $code .= sprintf "\$%-35s = new xPL_Item('%s');\n", $name . '_obj',
-              $address;
-            $code .= sprintf "\$%-35s -> hidden(1);\n", $name . '_obj';
-            $code .= sprintf "\$%-35s -> target_address('%s');\n",
-              $name . '_obj', $address;
-            $code .= sprintf "\$%-35s -> class_name('%s');\n", $name . '_obj',
-              $serial;
-            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n", $name,
-              $name . '_obj';
+            $code .= sprintf "\$%-35s = new xPL_Item('%s');\n",    $name . '_obj', $address;
+            $code .= sprintf "\$%-35s -> hidden(1);\n",            $name . '_obj';
+            $code .= sprintf "\$%-35s -> target_address('%s');\n", $name . '_obj', $address;
+            $code .= sprintf "\$%-35s -> class_name('%s');\n",     $name . '_obj', $serial;
+            $code .= sprintf "\$%-35s -> tie_items(\$%s,'on','on');\n", $name, $name . '_obj';
         }
         elsif ( lc $pa_type eq 'aviosys' ) {
             my $aviosysref = {
@@ -771,10 +702,8 @@ sub read_table_A {
                     '8' => ']'
                 }
             };
-            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n",
-              $name . '_obj', $aviosysref->{'on'}{$address}, $serial;
-            $code .= sprintf "\$%-35s -> add ('%s','off');\n", $name . '_obj',
-              $aviosysref->{'off'}{$address};
+            $code .= sprintf "\$%-35s = new Serial_Item('%s','on','%s');\n", $name . '_obj', $aviosysref->{'on'}{$address}, $serial;
+            $code .= sprintf "\$%-35s -> add ('%s','off');\n", $name . '_obj', $aviosysref->{'off'}{$address};
         }
         elsif ( lc $pa_type eq 'amixer' ) {
 
@@ -795,11 +724,10 @@ sub read_table_A {
         my $monitor_name;
         ( $address, $name, $monitor_name, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-        if ( !$packages{ZoneMinder_xAP}++ ) { # first time for this object type?
+        if ( !$packages{ZoneMinder_xAP}++ ) {             # first time for this object type?
             $code .= "use ZoneMinder_xAP;\n";
         }
-        $code .= sprintf "\n\$%-35s = new ZM_ZoneItem('%s');\n", $name,
-          $address;
+        $code .= sprintf "\n\$%-35s = new ZM_ZoneItem('%s');\n", $name, $address;
         if ( $objects{$monitor_name} ) {
             $code .= sprintf "\$%-35s -> add(\$%s);\n", $monitor_name, $name;
         }
@@ -814,17 +742,16 @@ sub read_table_A {
         else {
             $object = "ZM_MonitorItem('$address')";
         }
-        if ( !$packages{ZoneMinder_xAP}++ ) { # first time for this object type?
+        if ( !$packages{ZoneMinder_xAP}++ ) {             # first time for this object type?
             $code .= "use ZoneMinder_xAP;\n";
         }
     }
     elsif ( $type eq "ANALOG_SENSOR" ) {
-        my $xc_name;                          #xap conduit
+        my $xc_name;                                      #xap conduit
         my $sensor_type;
 
         #ANALOG_SENSOR, xap source, object name, xap conduit name, groups, xap sensor type, tokens...
-        if ( !$packages{AnalogSensor_Item}++ )
-        {                                     # first time for this object type?
+        if ( !$packages{AnalogSensor_Item}++ ) {          # first time for this object type?
             $code .= "use AnalogSensor_Item;\n";
         }
         $address = shift @item_info;
@@ -834,15 +761,14 @@ sub read_table_A {
             $xc_name = $address;
             ( $name, $grouplist, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-            $code .= sprintf "\n\$%-35s = new AnalogSensor_Item(\$%s, %s);\n",
-              $name, $xc_name, $other;
+            $code .= sprintf "\n\$%-35s = new AnalogSensor_Item(\$%s, %s);\n", $name, $xc_name, $other;
         }
         else {
             ( $name, $xc_name, $grouplist, $sensor_type, @other ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );    # Quote data
             if ( lc $name eq 'auto' ) {                       #new
                 $name = $xc_name . "_" . $sensor_type . "_" . $address;
-                $name =~ s/\./_/g;    #strip out all the periods from xap names
+                $name =~ s/\./_/g;                            #strip out all the periods from xap names
             }
             $code .=
               sprintf "\n\$%-35s = new AnalogSensor_Item('%s', '%s', %s);\n",
@@ -854,12 +780,11 @@ sub read_table_A {
         $object = '';
     }
     elsif ( $type eq "ANALOG_SENSOR_R" ) {
-        my $xc_name;                  #xap conduit
+        my $xc_name;                                          #xap conduit
         my $sensor_type;
 
         #ANALOG_SENSOR_R, xap source, object name, xap conduit name, groups, xap sensor type, tokens...
-        if ( !$packages{AnalogSensor_Item}++ )
-        {                             # first time for this object type?
+        if ( !$packages{AnalogSensor_Item}++ ) {              # first time for this object type?
             $code .= "use AnalogSensor_Item;\n";
         }
         $address = shift @item_info;
@@ -878,12 +803,9 @@ sub read_table_A {
             $other = join ', ', ( map { "'$_'" } @other );    # Quote data
             if ( lc $name eq 'auto' ) {                       #new
                 $name = $xc_name . "_" . $sensor_type . "_" . $address;
-                $name =~ s/\./_/g;    #strip out all the periods from xap names
+                $name =~ s/\./_/g;                            #strip out all the periods from xap names
             }
-            $code .=
-              sprintf
-              "\n\$%-35s = new AnalogRangeSensor_Item('%s', '%s', %s);\n",
-              $name, $address, $sensor_type, $other;
+            $code .= sprintf "\n\$%-35s = new AnalogRangeSensor_Item('%s', '%s', %s);\n", $name, $address, $sensor_type, $other;
             if ( $objects{$xc_name} ) {
                 $code .= sprintf "\$%-35s -> add(\$%s);\n", $xc_name, $name;
             }
@@ -896,8 +818,7 @@ sub read_table_A {
         #ANALOG_SENSOR, xap source, object name, xap conduit name, groups, xap sensor type, tokens...
         ( $sensor_name, $name, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-        if ( !$packages{AnalogSensor_Item}++ )
-        {    # first time for this object type?
+        if ( !$packages{AnalogSensor_Item}++ ) {          # first time for this object type?
             $code .= "use AnalogSensor_Item;\n";
         }
 
@@ -920,7 +841,7 @@ sub read_table_A {
         else {
             $object = "OneWire_xAP('$address')";
         }
-        if ( !$packages{OneWire_xAP}++ ) {    # first time for this object type?
+        if ( !$packages{OneWire_xAP}++ ) {                # first time for this object type?
             $code .= "use OneWire_xAP;\n";
         }
     }
@@ -930,7 +851,7 @@ sub read_table_A {
         #SDX, xap instance, object name, psixc server name
         ( $address, $name, $server, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-        if ( !$packages{SysDiag_xAP}++ ) {    # first time for this object type?
+        if ( !$packages{SysDiag_xAP}++ ) {                # first time for this object type?
             $code .= "use SysDiag_xAP;\n";
         }
         if ($other) {
@@ -949,7 +870,7 @@ sub read_table_A {
         else {
             $object = "BSC_Item('$address')";
         }
-        if ( !$packages{BSC}++ ) {    # first time for this object type?
+        if ( !$packages{BSC}++ ) {                        # first time for this object type?
             $code .= "use BSC;\n";
         }
     }
@@ -962,7 +883,7 @@ sub read_table_A {
         else {
             $object = "xPL_Sensor('$address')";
         }
-        if ( !$packages{xPL_Items}++ ) {    # first time for this object type?
+        if ( !$packages{xPL_Items}++ ) {                  # first time for this object type?
             $code .= "use xPL_Items;\n";
         }
     }
@@ -975,7 +896,7 @@ sub read_table_A {
         else {
             $object = "xPL_UPS('$address')";
         }
-        if ( !$packages{xPL_Items}++ ) {    # first time for this object type?
+        if ( !$packages{xPL_Items}++ ) {                  # first time for this object type?
             $code .= "use xPL_Items;\n";
         }
     }
@@ -988,7 +909,7 @@ sub read_table_A {
         else {
             $object = "xPL_X10Security('$address')";
         }
-        if ( !$packages{xPL_Items}++ ) {    # first time for this object type?
+        if ( !$packages{xPL_Items}++ ) {                  # first time for this object type?
             $code .= "use xPL_Items;\n";
         }
     }
@@ -1001,7 +922,7 @@ sub read_table_A {
         else {
             $object = "xPL_X10Basic('$address')";
         }
-        if ( !$packages{xPL_X10Basic}++ ) {    # first time for this objecttype?
+        if ( !$packages{xPL_X10Basic}++ ) {               # first time for this objecttype?
             $code .= "use xPL_X10Basic;\n";
         }
     }
@@ -1014,7 +935,7 @@ sub read_table_A {
         else {
             $object = "xPL_IrrigationGateway('$address')";
         }
-        if ( !$packages{xPL_Irrigation}++ ) { # first time for this object type?
+        if ( !$packages{xPL_Irrigation}++ ) {             # first time for this object type?
             $code .= "use xPL_Irrigation;\n";
         }
     }
@@ -1027,7 +948,7 @@ sub read_table_A {
         else {
             $object = "xPL_IrrigationValve('$address',\$$object)";
         }
-        if ( !$packages{xPL_Irrigation}++ ) { # first time for this object type?
+        if ( !$packages{xPL_Irrigation}++ ) {             # first time for this object type?
             $code .= "use xPL_Irrigation;\n";
         }
     }
@@ -1040,7 +961,7 @@ sub read_table_A {
         else {
             $object = "xPL_IrrigationQueue('$address',\$$object)";
         }
-        if ( !$packages{xPL_Irrigation}++ ) { # first time for this object type?
+        if ( !$packages{xPL_Irrigation}++ ) {             # first time for this object type?
             $code .= "use xPL_Irrigation;\n";
         }
     }
@@ -1053,7 +974,7 @@ sub read_table_A {
         else {
             $object = "xPL_LightGateway('$address')";
         }
-        if ( !$packages{xPL_Lighting}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Lighting}++ ) {               # first time for this object type?
             $code .= "use xPL_Lighting;\n";
         }
     }
@@ -1066,7 +987,7 @@ sub read_table_A {
         else {
             $object = "xPL_Light('$address',\$$object)";
         }
-        if ( !$packages{xPL_Lighting}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Lighting}++ ) {               # first time for this object type?
             $code .= "use xPL_Lighting;\n";
         }
     }
@@ -1079,7 +1000,7 @@ sub read_table_A {
         else {
             $object = "xPL_PlugwiseGateway('$address')";
         }
-        if ( !$packages{xPL_Plugwise}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Plugwise}++ ) {               # first time for this object type?
             $code .= "use xPL_Plugwise;\n";
         }
     }
@@ -1092,7 +1013,7 @@ sub read_table_A {
         else {
             $object = "xPL_Plugwise('$address',\$$object)";
         }
-        if ( !$packages{xPL_Plugwise}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Plugwise}++ ) {               # first time for this object type?
             $code .= "use xPL_Plugwise;\n";
         }
     }
@@ -1105,7 +1026,7 @@ sub read_table_A {
         else {
             $object = "xPL_Squeezebox('$address')";
         }
-        if ( !$packages{xPL_Squeezebox}++ ) { # first time for this object type?
+        if ( !$packages{xPL_Squeezebox}++ ) {             # first time for this object type?
             $code .= "use xPL_Squeezebox;\n";
         }
     }
@@ -1118,7 +1039,7 @@ sub read_table_A {
         else {
             $object = "xPL_SecurityGateway('$address')";
         }
-        if ( !$packages{xPL_Security}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Security}++ ) {               # first time for this object type?
             $code .= "use xPL_Security;\n";
         }
     }
@@ -1131,7 +1052,7 @@ sub read_table_A {
         else {
             $object = "xPL_Zone('$address',\$$object)";
         }
-        if ( !$packages{xPL_Security}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Security}++ ) {               # first time for this object type?
             $code .= "use xPL_Security;\n";
         }
     }
@@ -1144,7 +1065,7 @@ sub read_table_A {
         else {
             $object = "xPL_Area('$address',\$$object)";
         }
-        if ( !$packages{xPL_Security}++ ) {   # first time for this object type?
+        if ( !$packages{xPL_Security}++ ) {               # first time for this object type?
             $code .= "use xPL_Security;\n";
         }
     }
@@ -1157,7 +1078,7 @@ sub read_table_A {
         else {
             $object = "X10SL_Scene('$address')";
         }
-        if ( !$packages{X10_Scene}++ ) {    # first time for this object type?
+        if ( !$packages{X10_Scene}++ ) {                  # first time for this object type?
             $code .= "use X10_Scene;\n";
         }
     }
@@ -1170,7 +1091,7 @@ sub read_table_A {
         else {
             $object = "Scene()";
         }
-        if ( !$packages{Scene}++ ) {    # first time for this object type?
+        if ( !$packages{Scene}++ ) {                      # first time for this object type?
             $code .= "use Scene;\n";
         }
     }
@@ -1178,18 +1099,16 @@ sub read_table_A {
         my ( $scene_name, $on_level, $ramp_rate );
         ( $name, $scene_name, $on_level, $ramp_rate ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
-        if ( !$packages{X10_Scene}++ ) {    # first time for this object type?
+        if ( !$packages{X10_Scene}++ ) {                  # first time for this object type?
             $code .= "use X10_Scene;\n";
         }
         if ( ( $objects{$scene_name} ) and ( $objects{$name} ) ) {
             if ($on_level) {
                 if ($ramp_rate) {
-                    $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
-                      $scene_name, $name, $on_level, $ramp_rate;
+                    $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n", $scene_name, $name, $on_level, $ramp_rate;
                 }
                 else {
-                    $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n",
-                      $scene_name, $name, $on_level;
+                    $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", $scene_name, $name, $on_level;
                 }
             }
             else {
@@ -1200,42 +1119,30 @@ sub read_table_A {
     }
     elsif ( $type eq "SCENE_MEMBER" ) {
         my ( $scene_name, $on_level, $ramp_rate );
-        if (
-            validate_def(
-                $type, 2,
-                [ 'name', 'name', 'insteon_on_level', 'insteon_ramp_rate' ],
-                \@item_info
-            )
-          )
-        {
+        if ( validate_def( $type, 2, [ 'name', 'name', 'insteon_on_level', 'insteon_ramp_rate' ], \@item_info ) ) {
             ( $name, $scene_name, $on_level, $ramp_rate ) = @item_info;
             $other = join ', ', ( map { "'$_'" } @other );    # Quote data
 
-            if ( !$packages{Scene}++ ) {    # first time for this object type?
+            if ( !$packages{Scene}++ ) {                      # first time for this object type?
                 $code .= "use Scene;\n";
             }
             if ( ( $objects{$scene_name} ) and ( $objects{$name} ) ) {
                 if ($on_level) {
                     if ($ramp_rate) {
-                        $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
-                          $scene_name, $name, $on_level, $ramp_rate;
+                        $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n", $scene_name, $name, $on_level, $ramp_rate;
                     }
                     else {
-                        $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n",
-                          $scene_name, $name, $on_level;
+                        $code .= sprintf "\$%-35s -> add(\$%s,'%s');\n", $scene_name, $name, $on_level;
                     }
                 }
                 else {
-                    $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_name,
-                      $name;
+                    $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_name, $name;
                 }
             }
             else {
-                print
-                  "\nThere is no object called $scene_name defined.  Ignoring SCENE_MEMBER entry.\n"
+                print "\nThere is no object called $scene_name defined.  Ignoring SCENE_MEMBER entry.\n"
                   unless $objects{$scene_name};
-                print
-                  "\nThere is no object called $name defined.  Ignoring SCENE_MEMBER entry.\n"
+                print "\nThere is no object called $name defined.  Ignoring SCENE_MEMBER entry.\n"
                   unless $objects{$name};
             }
             $object = '';
@@ -1244,25 +1151,15 @@ sub read_table_A {
     elsif ( $type eq "SCENE_BUILD" ) {
 
         #SCENE_BUILD, scene_name, scene_member, is_controller?, is_responder?, onlevel, ramprate
-        my ( $scene_member, $is_scene_controller, $is_scene_responder,
-            $on_level, $ramp_rate );
+        my ( $scene_member, $is_scene_controller, $is_scene_responder, $on_level, $ramp_rate );
         if (
             validate_def(
-                $type, 2,
-                [
-                    'name',             'name',
-                    'boolean',          'boolean',
-                    'insteon_on_level', 'insteon_ramp_rate'
-                ],
-                \@item_info
+                $type, 2, [ 'name', 'name', 'boolean', 'boolean', 'insteon_on_level', 'insteon_ramp_rate' ], \@item_info
             )
           )
         {
 
-            (
-                $name, $scene_member, $is_scene_controller,
-                $is_scene_responder, $on_level, $ramp_rate
-            ) = @item_info;
+            ( $name, $scene_member, $is_scene_controller, $is_scene_responder, $on_level, $ramp_rate ) = @item_info;
 
             if ( !$packages{Scene}++ ) {    # first time for this object type?
                 $code .= "use Scene;\n";
@@ -1271,8 +1168,7 @@ sub read_table_A {
                 $scene_build_controllers{$name}{$scene_member} = "1";
             }
             if ($is_scene_responder) {
-                $scene_build_responders{$name}{$scene_member} =
-                  "$on_level,$ramp_rate";
+                $scene_build_responders{$name}{$scene_member} = "$on_level,$ramp_rate";
             }
             $object = '';
         }
@@ -1286,7 +1182,7 @@ sub read_table_A {
         else {
             $object = "Philips_Hue('$address')";
         }
-        if ( !$packages{Philips_Hue}++ ) {    # first time for this object type?
+        if ( !$packages{Philips_Hue}++ ) {                # first time for this object type?
             $code .= "use Philips_Hue;\n";
         }
     }
@@ -1299,7 +1195,7 @@ sub read_table_A {
         else {
             $object = "Philips_Lux('$address')";
         }
-        if ( !$packages{Philips_Hue}++ ) {    # first time for this object type?
+        if ( !$packages{Philips_Hue}++ ) {                # first time for this object type?
             $code .= "use Philips_Hue;\n";
         }
     }
@@ -1315,63 +1211,56 @@ sub read_table_A {
     elsif ( $type eq "AD2_DOOR_ITEM" ) {
         require AD2;
         my ( $instance, $expander, $relay, $wireless, $zone, $partition );
-        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) =
-          @item_info;
+        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
         my ( $map, $address ) = split( '=', $address );
         $expander = $address if ( uc($map) eq "EXP" );
         $relay    = $address if ( uc($map) eq "REL" );
         $wireless = $address if ( uc($map) eq "RFX" );
-        $object =
-          "AD2_Item('door','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
+        $object = "AD2_Item('door','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
     }
     elsif ( $type eq "AD2_MOTION_ITEM" ) {
         require AD2;
         my ( $instance, $expander, $relay, $wireless, $zone, $partition );
-        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) =
-          @item_info;
+        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
         my ( $map, $address ) = split( '=', $address );
         $expander = $address if ( uc($map) eq "EXP" );
         $relay    = $address if ( uc($map) eq "REL" );
         $wireless = $address if ( uc($map) eq "RFX" );
-        $object =
-          "AD2_Item('motion','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
+        $object = "AD2_Item('motion','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
     }
     elsif ( $type eq "AD2_GENERIC_ITEM" ) {
         require AD2;
         my ( $instance, $expander, $relay, $wireless, $zone, $partition );
-        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) =
-          @item_info;
+        ( $name, $instance, $zone, $partition, $address, $grouplist, @other ) = @item_info;
         $other = join ', ', ( map { "'$_'" } @other );    # Quote data
         my ( $map, $address ) = split( '=', $address );
         $expander = $address if ( uc($map) eq "EXP" );
         $relay    = $address if ( uc($map) eq "REL" );
         $wireless = $address if ( uc($map) eq "RFX" );
-        $object =
-          "AD2_Item('','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
+        $object = "AD2_Item('','$instance','$zone','$partition','$expander','$relay','$wireless','$other')";
     }
     elsif ( $type eq "AD2_PARTITION" ) {
         require AD2;
         my ( $instance, $number );
-        ( $name, $instance, $number, $address, $grouplist, @other ) =
-          @item_info;
-        $other = join ', ', ( map { "'$_'" } @other );    # Quote data
+        ( $name, $instance, $number, $address, $grouplist, @other ) = @item_info;
+        $other = join ', ', ( map { "'$_'" } @other );                          # Quote data
         $object = "AD2_Partition('$instance','$number','$address','$other')";
     }
-   elsif($type eq "AD2_OUTPUT") {
+    elsif ( $type eq "AD2_OUTPUT" ) {
         require AD2;
-        my ($instance,$output);
-        ($name, $instance, $output, $grouplist, @other) = @item_info;
-        $other = join ', ', (map {"'$_'"} @other); # Quote data
+        my ( $instance, $output );
+        ( $name, $instance, $output, $grouplist, @other ) = @item_info;
+        $other = join ', ', ( map { "'$_'" } @other );                          # Quote data
         $object = "AD2_Output('$instance','$output','$other')";
     }
+
     #-------------- End AD2 Objects -------------
     elsif ( $type =~ /PLCBUS_.*/ ) {
         require PLCBUS;
         ( $address, $name, $grouplist, @other ) = @item_info;
-        ( $object, $grouplist, $additional_code ) =
-          PLCBUS->generate_code( $type, @item_info );
+        ( $object, $grouplist, $additional_code ) = PLCBUS->generate_code( $type, @item_info );
     }
     else {
         print "\nUnrecognized .mht entry: $record\n";
@@ -1395,8 +1284,7 @@ sub read_table_A {
         }
 
         if ( $name eq $group ) {
-            &::print_log(
-                "mht object and group name are the same: $name  Bad idea!");
+            &::print_log("mht object and group name are the same: $name  Bad idea!");
         }
         else {
             # Allow for floorplan data:  Bedroom(5,15)|Lights
@@ -1439,15 +1327,11 @@ sub read_table_finish_A {
 
         #Loop through the controller hash
         if ( exists $scene_build_controllers{$scene} ) {
-            foreach my $scene_controller (
-                keys %{ $scene_build_controllers{$scene} } )
-            {
+            foreach my $scene_controller ( keys %{ $scene_build_controllers{$scene} } ) {
                 if ( $objects{$scene_controller} ) {
 
                     #Make a link to each responder in the responder hash
-                    while ( my ( $scene_responder, $responder_data ) =
-                        each( %{ $scene_build_responders{$scene} } ) )
-                    {
+                    while ( my ( $scene_responder, $responder_data ) = each( %{ $scene_build_responders{$scene} } ) ) {
                         my ( $on_level, $ramp_rate ) =
                           split( ',', $responder_data );
 
@@ -1456,9 +1340,7 @@ sub read_table_finish_A {
                         {
                             if ($on_level) {
                                 if ($ramp_rate) {
-                                    $code .=
-                                      sprintf
-                                      "\$%-35s -> add(\$%s,'%s','%s');\n",
+                                    $code .= sprintf "\$%-35s -> add(\$%s,'%s','%s');\n",
                                       $scene_controller, $scene_responder,
                                       $on_level,         $ramp_rate;
                                 }
@@ -1470,8 +1352,7 @@ sub read_table_finish_A {
                                 }
                             }
                             else {
-                                $code .= sprintf "\$%-35s -> add(\$%s);\n",
-                                  $scene_controller, $scene_responder;
+                                $code .= sprintf "\$%-35s -> add(\$%s);\n", $scene_controller, $scene_responder;
                             }
                         }
                     }
@@ -1479,14 +1360,12 @@ sub read_table_finish_A {
                 }
                 else {
                     ::print_log( "[Read_Table_A] ERROR: There is no object "
-                          . "called $scene_controller defined.  Ignoring SCENE_BUILD entry."
-                    );
+                          . "called $scene_controller defined.  Ignoring SCENE_BUILD entry." );
                 }
             }
         }
         else {
-            ::print_log( "[Read_Table_A] ERROR: There is no controller "
-                  . "defined for $scene.  Ignoring SCENE_BUILD entry." );
+            ::print_log( "[Read_Table_A] ERROR: There is no controller " . "defined for $scene.  Ignoring SCENE_BUILD entry." );
         }
     }
     return $code;
@@ -1504,9 +1383,8 @@ sub read_table_finish_A {
 # #Global validation routine:
 sub validate_def {
     my ( $type, $req_count, $req_array, $passed_values ) = @_;
-    my $paramNum = 0;
-    my $paramCount =
-      scalar @{$passed_values};    # Number of parameters passed on the item
+    my $paramNum   = 0;
+    my $paramCount = scalar @{$passed_values};    # Number of parameters passed on the item
     foreach my $param_type ( @{$req_array} ) {
 
         if ( defined $$passed_values[$paramNum]
@@ -1517,14 +1395,12 @@ sub validate_def {
                     ::print_log(
                         "[Read_Table_A] ERROR: $_[0]: $$passed_values[0], failed to match $param_type:  Found \"$$passed_values[$paramNum]\", Definition skipped."
                     );
-                    ::print_log( "[Read_table-A]        $_[0], "
-                          . join( ', ', @$passed_values ) );
+                    ::print_log( "[Read_table-A]        $_[0], " . join( ', ', @$passed_values ) );
                     return 0;
                 }
             }
             elsif ( $param_type eq 'boolean' ) {
-                ::print_log(
-                    "Error item $paramNum in definition, should be 0 or 1")
+                ::print_log("Error item $paramNum in definition, should be 0 or 1")
                   unless ( $$passed_values[$paramNum] =~ /^(0|1)$/ );
             }
             elsif ( $param_type eq 'name' ) {
@@ -1532,8 +1408,7 @@ sub validate_def {
                     ::print_log(
                         "[Read_Table_A] ERROR: $_[0]: $$passed_values[0], can only use characters A-z and _  Found \"$$passed_values[$paramNum]\", Definition skipped."
                     );
-                    ::print_log( "[Read_table-A]        $_[0], "
-                          . join( ', ', @$passed_values ) );
+                    ::print_log( "[Read_table-A]        $_[0], " . join( ', ', @$passed_values ) );
                     return 0;
                 }
             }
@@ -1554,33 +1429,27 @@ sub validate_def {
                     && $1 >= 0 );
             }
             elsif ( $param_type eq 'insteon_address' ) {
-                my ( $x1, $x2, $x3 ) = $$passed_values[$paramNum] =~
-                  m/^([A-F0-9]{2})\.([A-F0-9]{2})\.([A-F0-9]{2})$/i;
+                my ( $x1, $x2, $x3 ) = $$passed_values[$paramNum] =~ m/^([A-F0-9]{2})\.([A-F0-9]{2})\.([A-F0-9]{2})$/i;
                 unless ( $x1 && $x2 && $x3 ) {
                     ::print_log(
                         "[Read_Table_A] ERROR: $_[0]: $$passed_values[0] Insteon Address should be xx.xx.xx, got \"$$passed_values[$paramNum]\" "
                     );
-                    ::print_log( "[Read_table-A]        $_[0], "
-                          . join( ', ', @$passed_values ) );
+                    ::print_log( "[Read_table-A]        $_[0], " . join( ', ', @$passed_values ) );
                     return 0;
                 }
             }
             elsif ( $param_type eq 'x10_address' ) {
-                my ( $ha, $da ) =
-                  $$passed_values[$paramNum] =~ m/^([A-P])([0-9]{1,2})$/i;
+                my ( $ha, $da ) = $$passed_values[$paramNum] =~ m/^([A-P])([0-9]{1,2})$/i;
                 unless ( $ha && $da && $da < 17 ) {
                     ::print_log(
                         "[Read_Table_A] ERROR: $_[0]: $$passed_values[0] X10 Address should be 2-3 characters,  House code A-P, Device 1-16, got \"$$passed_values[$paramNum]\", Definition skipped."
                     );
-                    ::print_log( "[Read_table-A]        $_[0], "
-                          . join( ', ', @$passed_values ) );
+                    ::print_log( "[Read_table-A]        $_[0], " . join( ', ', @$passed_values ) );
                     return 0;
                 }
             }
             else {
-                ::print_log(
-                    "[Read_Table_A] WARNING: Unknown validation type: $param_type"
-                );
+                ::print_log( "[Read_Table_A] WARNING: Unknown validation type: $param_type" );
             }
         }
         else {
@@ -1589,8 +1458,7 @@ sub validate_def {
                 ::print_log(
                     "[Read_table-A] ERROR: $_[0]  $req_count parameters are required in the definition, $pc parameters found: definition skipped."
                 );
-                ::print_log( "[Read_table-A]        $_[0], "
-                      . join( ', ', @$passed_values ) );
+                ::print_log( "[Read_table-A]        $_[0], " . join( ', ', @$passed_values ) );
                 return 0;
             }
         }
diff --git a/lib/read_table_xml.pl b/lib/read_table_xml.pl
index 1def46df0..8ec5c7662 100644
--- a/lib/read_table_xml.pl
+++ b/lib/read_table_xml.pl
@@ -68,7 +68,7 @@
 my $createunknown = 1;
 
 #set to 1 to create groups even when they have the same name as items by suffixing _group
-my $smartgroupfix = 0;   ###11/2003 cwitte dflt to zero. (table_A compatability)
+my $smartgroupfix = 0;    ###11/2003 cwitte dflt to zero. (table_A compatability)
 my $twig_code_accum;
 
 #set up the item types
@@ -114,8 +114,7 @@
 };
 $itemtype{"AUDIOTRON"} = { object => "AudiotronPlayer", use_other => 0 };
 $itemtype{"WEATHER"}   = { object => "Weather_Item",    use_other => 0 };
-$itemtype{"GENERIC"} =
-  { object => "Generic_Item", use_addr => 0, use_other => 0 };
+$itemtype{"GENERIC"}   = { object => "Generic_Item",    use_addr  => 0, use_other => 0 };
 $itemtype{"WAKEONLAN"} = {
     object => "WakeOnLan",
     "init" => "require 'WakeOnLan.pm';\n"
@@ -248,7 +247,7 @@ sub read_table_init_xml {
 #############################
 sub read_table_xml {
     print "read_table_xml: begin \n";
-    my $data = $_[0]; #perl complains about trying to fiddle directly with @_[0]
+    my $data = $_[0];    #perl complains about trying to fiddle directly with @_[0]
     if ( !$data ) { print "No data in sub read_table_xml"; next; }
 
     #do some mying
@@ -259,8 +258,7 @@ sub read_table_xml {
     my $start_time = Time::HiRes::time();
     print "establishing twig exit: \n";
     $twig_code_accum = "";
-    my $twig =
-      XML::Twig->new( twig_handlers => { item => \&construct_object } );
+    my $twig = XML::Twig->new( twig_handlers => { item => \&construct_object } );
     $twig->parse($data);
     print "twig parsed: $twig $data\n";
     my $twig_end = Time::HiRes::time();
@@ -269,8 +267,7 @@ sub read_table_xml {
     my $twig_time  = $twig_end - $start_time;
     my $path_time  = $t3_time - $twig_end;
     my $total_time = $t3_time - $start_time;
-    printf "TIME: twig: %6.2f path: %6.2f total: %6.2f\n", $twig_time,
-      $path_time, $total_time;
+    printf "TIME: twig: %6.2f path: %6.2f total: %6.2f\n", $twig_time, $path_time, $total_time;
 
     &summarize_usage();    ## code to display conversion test effectiveness
 
@@ -310,9 +307,9 @@ sub construct_object {
 
     my $debug = 0;
 
-    my $x_address = $item->first_child_text("address");   # get the address text
-    my $x_name    = $item->first_child_text("name");      # get the name text
-    my $x_type    = $item->first_child_text("type");      # get the type text
+    my $x_address   = $item->first_child_text("address");     # get the address text
+    my $x_name      = $item->first_child_text("name");        # get the name text
+    my $x_type      = $item->first_child_text("type");        # get the type text
     my $x_occupancy = $item->first_child_text("occupancy");
     my $x_object    = $item->first_child_text("object");
     $debug && print "construct_object: $item has address: $x_address\n";
@@ -356,7 +353,7 @@ sub construct_object {
             $object_hash->{"use_addr"}    ## if address allowed for objecttype
             && $q_address
           )
-        {    ## if "address" data exists, tack it on.
+        {                                 ## if "address" data exists, tack it on.
             if ( $object_hash->{"use_addr"} eq "obj_ref" ) {
                 $object .= '$' . $x_address;    ## non-quoted
             }
@@ -365,27 +362,27 @@ sub construct_object {
             }
         }
         if (
-            $object_hash->{"use_name"}    ## rf,x10ms have address:name:other
+            $object_hash->{"use_name"}          ## rf,x10ms have address:name:other
             && $x_name
           )
-        {                                 ## tack on the name, and quote it.
+        {                                       ## tack on the name, and quote it.
             $object .= ", '" . $x_name . "'";
         }
         if (
-            $object_hash->{"use_occupancy"}    ## Presence monitor
+            $object_hash->{"use_occupancy"}     ## Presence monitor
             && $x_occupancy
           )
-        {    ## tack on the name, and quote it.
+        {                                       ## tack on the name, and quote it.
             if ( $object_hash->{"use_occupancy"} eq "obj_ref" ) {
                 $object .= ', $' . $x_occupancy;
             }
         }
 
         if (
-            $object_hash->{"use_other"}    ## if other allowed for objecttype
+            $object_hash->{"use_other"}         ## if other allowed for objecttype
             && $q_other_string
           )
-        {    ## if "other" data exists, tack it on.
+        {                                       ## if "other" data exists, tack it on.
             $object .= ", " . $q_other_string;
         }
 
@@ -419,18 +416,17 @@ sub construct_object {
 
     elsif ( $x_type eq "GROUP" ) {    ### cjw port
         $object = "Group" unless $groups{$x_name};    ## once per group
-              # print "Adding empty tag for group: [$x_name]\n";
+                                                      # print "Adding empty tag for group: [$x_name]\n";
         $groups{$x_name}{empty}++;
     }
-    elsif ( $x_type eq "PA" ) {    ### hard-coded groups
+    elsif ( $x_type eq "PA" ) {                       ### hard-coded groups
         if ( !$packages{$x_type}++ ) {
             $code .= "require 'PAobj.pm';\n";
         }
 
         my $pa_type = $item->first_child_text("pa_type");
         if ( $config_parms{pa_type} ne $pa_type ) {
-            print
-              "ERROR! INI parm 'pa_type' = $config_parms{pa_type}, but PA item $x_name is of $pa_type.  Skipping.\n";
+            print "ERROR! INI parm 'pa_type' = $config_parms{pa_type}, but PA item $x_name is of $pa_type.  Skipping.\n";
             return;
         }
 
@@ -451,11 +447,9 @@ sub construct_object {
         if ( $pa_type =~ /^wdio/ ) {
             $x_address =~ s/^(\S)(\S)$/$1H$2/;
             $x_address = "D$x_address" if $pa_type eq 'wdio_old';
-            $code .= sprintf "\n\$%-35s = new Serial_Item('%s','on',%s);\n",
-              $x_name, $x_address, $q_other_string;
+            $code .= sprintf "\n\$%-35s = new Serial_Item('%s','on',%s);\n", $x_name, $x_address, $q_other_string;
             $x_address =~ s/^(\S)H(\S)$/$1L$2/;
-            $code .= sprintf "\n\$%-35s -> add ('%s','off');\n", $x_name,
-              $x_address;
+            $code .= sprintf "\n\$%-35s -> add ('%s','off');\n", $x_name, $x_address;
             $object = '';
         }
         elsif ( lc $pa_type eq 'x10' ) {
@@ -470,29 +464,25 @@ sub construct_object {
 
     elsif ( $x_type =~ /^VOICE/ ) {
         my $vcommand = $q_other_string;
-        $vcommand =~ s/^'(.*)'$/$1/; ## no single quotes, voice cmds are doubleq
+        $vcommand =~ s/^'(.*)'$/$1/;    ## no single quotes, voice cmds are doubleq
 
         my $fixedname = $x_name;
         $fixedname =~ s/_/ /g;
         if ( !( $vcommand =~ /.*\[.*/ ) ) {
             $vcommand .= " [ON,OFF]";
         }
-        $code .= sprintf "\nmy \$v_%s_state;\n", $x_name;
-        $code .= sprintf "\$v_%s = new Voice_Cmd(\"%s\");\n", $x_name,
-          $vcommand;
-        $code .= sprintf "if (\$v_%s_state = said \$v_%s) {\n", $x_name,
-          $x_name;
-        $code .= sprintf "  set \$%s \$v_%s_state;\n", $x_name, $x_name;
-        $code .= sprintf "  respond \"Turning %s \$v_%s_state\";\n",
-          $fixedname, $x_name;
+        $code .= sprintf "\nmy \$v_%s_state;\n",                     $x_name;
+        $code .= sprintf "\$v_%s = new Voice_Cmd(\"%s\");\n",        $x_name, $vcommand;
+        $code .= sprintf "if (\$v_%s_state = said \$v_%s) {\n",      $x_name, $x_name;
+        $code .= sprintf "  set \$%s \$v_%s_state;\n",               $x_name, $x_name;
+        $code .= sprintf "  respond \"Turning %s \$v_%s_state\";\n", $fixedname, $x_name;
         $code .= sprintf "}\n";
 
         ##undef $object;   ## we don't want any default code, need to proceed
     }
     else {
         if ( $createunknown == 1 ) {
-            print "\nUnrecognized .mht item: type:", $x_type, " name:",
-              $x_name, "\n";
+            print "\nUnrecognized .mht item: type:", $x_type, " name:", $x_name, "\n";
             print "Creating as generic object\n";
             $object = $itemtype{"GENERIC"}{object};
         }
@@ -521,8 +511,7 @@ sub construct_object {
                 $group .= "_group";
             }
             else {
-                print_log
-                  "mht object and group name are the same: $x_name  Bad idea!";
+                print_log "mht object and group name are the same: $x_name  Bad idea!";
                 next;
 
             }
diff --git a/lib/table_A2XML.pm b/lib/table_A2XML.pm
index 7684c66f8..fbd2a2bb2 100644
--- a/lib/table_A2XML.pm
+++ b/lib/table_A2XML.pm
@@ -55,8 +55,7 @@ sub convert {
     my $in_file = new FileHandle $tgt;
     confess "can't read [$tgt]\n" unless $in_file;
     while (<$in_file>) {
-        if ( /Format\s*=\s*(\S+)/i && $1 eq "A" )
-        {    ## we're hard-wired for tbl A
+        if ( /Format\s*=\s*(\S+)/i && $1 eq "A" ) {    ## we're hard-wired for tbl A
             $format  = $1;
             $xml_out = new FileHandle ">$dest";
             confess "can't write [$dest]\n" unless $xml_out;
@@ -66,11 +65,7 @@ sub convert {
         }
         next unless ($format);
 
-        my (
-            $code,      $address,    $name,      $object,
-            $grouplist, $comparison, $limit,     @other,
-            $other,     $vcommand,   $occupancy, $pa_type
-        );
+        my ( $code, $address, $name, $object, $grouplist, $comparison, $limit, @other, $other, $vcommand, $occupancy, $pa_type );
         my ($type);
         my ($comment);
         my (@item_info);
diff --git a/lib/tk_widgets.pl b/lib/tk_widgets.pl
index 2ac05c8b0..b6ad9fd3d 100644
--- a/lib/tk_widgets.pl
+++ b/lib/tk_widgets.pl
@@ -19,9 +19,8 @@
     &tk_mbutton( 'Help', \&help );
 
     &tk_button(
-        'Reload (F1)', \&read_code,   'Pause (F2)', \&pause,
-        ' Exit (F3) ', \&sig_handler, 'Debug (F4)', \&toggle_debug,
-        'Log (F5)',    \&toggle_log
+        'Reload (F1)', \&read_code,    'Pause (F2)', \&pause, ' Exit (F3) ', \&sig_handler,
+        'Debug (F4)',  \&toggle_debug, 'Log (F5)',   \&toggle_log
     );
 
     &tk_label( \$Tk_objects{label_time} );
@@ -32,19 +31,12 @@
 
     &tk_entry( "Sleep time", \$Loop_Sleep_Time, "Tk passes", \$Loop_Tk_Passes );
 
-    &tk_radiobutton(
-        'Mode', \$Save{mode},
-        [ 'normal', 'mute', 'offline' ],
-        [ 'Normal', 'Mute', 'Offline' ]
-    );
+    &tk_radiobutton( 'Mode', \$Save{mode}, [ 'normal', 'mute', 'offline' ], [ 'Normal', 'Mute', 'Offline' ] );
 
     #   &tk_radiobutton('Debug', \$config_parms{debug}, [1, 0], ['On', 'Off']);
     #   &tk_checkbutton('Debug on', \$config_parms{debug});
     &tk_entry( 'Debug flag', \$config_parms{debug} );
 
-    &tk_checkbutton(
-        'Sleeping Parents', \$Save{sleeping_parents},
-        'Sleeping Kids',    \$Save{sleeping_kids}
-    );
+    &tk_checkbutton( 'Sleeping Parents', \$Save{sleeping_parents}, 'Sleeping Kids', \$Save{sleeping_kids} );
 
 }
diff --git a/lib/trigger_code.pl b/lib/trigger_code.pl
index a3db84b2d..d318d18e2 100644
--- a/lib/trigger_code.pl
+++ b/lib/trigger_code.pl
@@ -151,8 +151,7 @@ sub _trigger_write_code {
     $trigger_write_code_flag = 0;
     my $script;
     foreach my $name ( trigger_list() ) {
-        my ( $trigger, $code, $type, $triggered, $trigger_error, $code_error )
-          = trigger_get($name);
+        my ( $trigger, $code, $type, $triggered, $trigger_error, $code_error ) = trigger_get($name);
         next unless $trigger;
         next if $trigger_error;
 
@@ -172,23 +171,20 @@ sub _trigger_write_code {
 # when Misterhouse is next started.
 #
 " . $script;
-        print_log "trigger_write_code: this sub was called, but triggers"
-          . " not changed", return
+        print_log "trigger_write_code: this sub was called, but triggers" . " not changed", return
           if $script eq $prev_script;
         $prev_script = $script;
         &file_write( $script_file, $script );
 
         # Replace (faster) or reload (if there was no file previously)
         if ( $main::Run_Members{'triggers_table'} ) {
-            print_log "trigger_write_code: trigger script $script_file"
-              . " written, running do_user_file"
+            print_log "trigger_write_code: trigger script $script_file" . " written, running do_user_file"
               if $Debug{'trigger'};
             &do_user_file("$::Code_Dirs[0]/triggers.mhp");
         }
         else {
             # Must be done before the user code eval
-            print_log "trigger_write_code: trigger script $script_file"
-              . " written, running read_code"
+            print_log "trigger_write_code: trigger script $script_file" . " written, running read_code"
               if $Debug{'trigger'};
             push @Nextpass_Actions, \&read_code;
         }
@@ -199,7 +195,7 @@ sub _trigger_write_code {
 
             # reload on next pass if we remove trigger script
             push @Nextpass_Actions, \&read_code;
-            unlink $script_file if -e $script_file;   # don't write empty script
+            unlink $script_file if -e $script_file;    # don't write empty script
         }
         $prev_script = "";
         return;
@@ -254,8 +250,8 @@ sub trigger_set {
     my ( $trigger, $code, $type, $name, $replace, $triggered, $new_name ) = @_;
 
     return unless $trigger and $code;
-    $trigger =~ s/[;\s\r\n]*$//g;   # in case trigger file was edited on windows
-    $code =~ s/[;\s\r\n]*$//g;      # So we can consistenly add ;\n when used
+    $trigger =~ s/[;\s\r\n]*$//g;    # in case trigger file was edited on windows
+    $code =~ s/[;\s\r\n]*$//g;       # So we can consistenly add ;\n when used
     $triggered = 0         unless $triggered;
     $type      = 'OneShot' unless $type;
 
@@ -361,8 +357,7 @@ sub trigger_rename {
     my $type      = $triggers{$name}{type};
     my $replace   = 1;
     my $triggered = $triggers{$name}{triggerd};
-    trigger_set( $trigger, $code, $type, $name, $replace, $triggered,
-        $new_name );
+    trigger_set( $trigger, $code, $type, $name, $replace, $triggered, $new_name );
     return;
 }
 
diff --git a/lib/vsDB.pm b/lib/vsDB.pm
index 216b0cad7..5dccfd6fb 100644
--- a/lib/vsDB.pm
+++ b/lib/vsDB.pm
@@ -170,8 +170,7 @@ sub EOF {
 sub FieldValue {
     my ($this) = shift;
     return "EOF" if ( $this->{'EOF'} );
-    my ($fieldName) =
-      shift || return "ERROR: FieldValue(): Field Name Required";
+    my ($fieldName)      = shift || return "ERROR: FieldValue(): Field Name Required";
     my ($newValue)       = shift;
     my ($fieldNumber)    = $this->{'fieldNames'}{$fieldName};
     my ($lineFeed)       = chr(10);
@@ -503,13 +502,8 @@ sub Filter {
         {
             $filterSetting = 1;
         }
-        elsif (
-            $operator eq "like"
-            && !(
-                index( lc( $this->FieldValue($fieldName) ), lc($criteria), 0 )
-                + 1
-            )
-          )
+        elsif ( $operator eq "like"
+            && !( index( lc( $this->FieldValue($fieldName) ), lc($criteria), 0 ) + 1 ) )
         {
             $filterSetting = 1;
         }
@@ -559,26 +553,19 @@ sub Commit {
         # if only new records were added, just append to the file
         my ($nCount);
         if ( !open( OUTPUTFILE, ">>$fileName" ) ) {
-            $this->{'lastError'} =
-              "Commit: Couldn't Open DataFile '$fileName' For Appending";
+            $this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Appending";
             return 0;
         }
         flock( OUTPUTFILE, 2 ) if ($useFlock);
         my ($tempArray) = $this->{'fileArray'};
-        for (
-            $nCount = $this->{'originalCount'} + 1;
-            $nCount <= $this->{'recordCount'};
-            $nCount++
-          )
-        {
+        for ( $nCount = $this->{'originalCount'} + 1; $nCount <= $this->{'recordCount'}; $nCount++ ) {
             print OUTPUTFILE @$tempArray[$nCount];
         }
     }
     else {
         # if records were changed or deleted, we have to replace them all
         if ( !open( OUTPUTFILE, ">$fileName" ) ) {
-            $this->{'lastError'} =
-              "Commit: Couldn't Open DataFile '$fileName' For Writing";
+            $this->{'lastError'} = "Commit: Couldn't Open DataFile '$fileName' For Writing";
             return 0;
         }
         flock( OUTPUTFILE, 2 ) if ($useFlock);
@@ -664,8 +651,7 @@ sub Open {
         return 0;
     }
     elsif ( !( -r $fileName ) ) {
-        $this->{'lastError'} =
-          "Open: Couldn't Open DataFile '$fileName' For Reading";
+        $this->{'lastError'} = "Open: Couldn't Open DataFile '$fileName' For Reading";
         return 0;
     }
 
diff --git a/lib/vsEmail.pm b/lib/vsEmail.pm
index 535d1c3dd..e81d978cf 100644
--- a/lib/vsEmail.pm
+++ b/lib/vsEmail.pm
@@ -317,8 +317,7 @@ sub Send {
             return 0;
         }
         else {
-            $this->{'Log'} =
-              "Sendmail was not found at '" . $sendmailPath . "'.\n";
+            $this->{'Log'} = "Sendmail was not found at '" . $sendmailPath . "'.\n";
             return 0;
         }
     }
@@ -350,11 +349,8 @@ sub ValidAddress {
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     my $this    = shift;
     my $address = shift;
-    if (
-        ( $address =~ /(@.*@)|(\.\.)|(@\.)|(\.@)|(^\.)/ )
-        || ( $address !~
-            /^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,3}|[0-9]{1,3})(\]?)$/ )
-      )
+    if (   ( $address =~ /(@.*@)|(\.\.)|(@\.)|(\.@)|(^\.)/ )
+        || ( $address !~ /^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,3}|[0-9]{1,3})(\]?)$/ ) )
     {
         return 0;
     }
@@ -466,25 +462,24 @@ $mailcfg{'mime'} &&= ( !$@ );
 
 my $word_rx = '[\x21\x23-\x27\x2A-\x2B\x2D\w\x3D\x3F]+';
 my $user_rx = $word_rx                                     # valid chars
-  . '(?:\.' . $word_rx . ')*'    # possibly more words preceded by a dot
+  . '(?:\.' . $word_rx . ')*'                              # possibly more words preceded by a dot
   ;
-my $dom_rx = '\w[-\w]+(?:\.\w[-\w]+)*';       # less valid chars in domain names
+my $dom_rx = '\w[-\w]+(?:\.\w[-\w]+)*';                    # less valid chars in domain names
 my $ip_rx  = '\[\d{1,3}(?:\.\d{1,3}){3}\]';
 
 $address_rx = '\b((' . $user_rx . ')\@(' . $dom_rx . '\b|' . $ip_rx . '))';
-;                                             # v. 0.4
+;                                                          # v. 0.4
 
 sub time_to_date {
 
     # convert a time() value to a date-time string according to RFC 822
 
-    my $time = $_[0] || time();               # default to now if no argument
+    my $time = $_[0] || time();                            # default to now if no argument
 
     my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
     my @wdays  = qw(Sun Mon Tue Wed Thu Fri Sat);
 
-    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
-      localtime($time);
+    my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime($time);
 
     $TZ ||= $mailcfg{'tz'};
 
@@ -513,11 +508,7 @@ sub sendmail {
     local $_;
     local $/ = "\015\012";
 
-    my (
-        %mail,       $k,         $smtp,    $server,   $port,
-        $connected,  $localhost, $message, $fromaddr, $recip,
-        @recipients, $to,        $header,
-    );
+    my ( %mail, $k, $smtp, $server, $port, $connected, $localhost, $message, $fromaddr, $recip, @recipients, $to, $header, );
 
     sub fail {
 
@@ -542,12 +533,10 @@ sub sendmail {
         $k = ucfirst lc( shift @_ );
 
         if ( !$k and $^W ) {
-            warn
-              "Received false mail hash key: \'$k\'. Did you forget to put it in quotes?\n";
+            warn "Received false mail hash key: \'$k\'. Did you forget to put it in quotes?\n";
         }
 
-        $k =~ s/\s*:\s*$//o
-          ;    # kill colon (and possible spaces) at end, we add it later.
+        $k =~ s/\s*:\s*$//o;    # kill colon (and possible spaces) at end, we add it later.
         $mail{$k} = shift @_;
     }
 
@@ -595,8 +584,7 @@ sub sendmail {
 
     # cleanup message, and encode if needed
     $message =~ s/^\./\.\./gom;    # handle . as first character
-    $message =~ s/\r\n/\n/go
-      ;    # normalize line endings, step 1 of 2 (next step after MIME encoding)
+    $message =~ s/\r\n/\n/go;      # normalize line endings, step 1 of 2 (next step after MIME encoding)
 
     $mail{'Mime-version'} ||= '1.0';
     $mail{'Content-type'} ||= 'text/plain; charset="iso-8859-1"';
@@ -611,10 +599,8 @@ sub sendmail {
         else {
             $mail{'Content-transfer-encoding'} = '8bit';
             if ( $message =~ /[\x80-\xFF]/o ) {
-                $error .=
-                  "MIME::QuotedPrint not present!\nSending 8bit characters, hoping it will come across OK.\n";
-                warn "MIME::QuotedPrint not present!\n",
-                  "Sending 8bit characters, hoping it will come across OK.\n"
+                $error .= "MIME::QuotedPrint not present!\nSending 8bit characters, hoping it will come across OK.\n";
+                warn "MIME::QuotedPrint not present!\n", "Sending 8bit characters, hoping it will come across OK.\n"
                   if $^W;
             }
         }
@@ -654,23 +640,19 @@ sub sendmail {
         #print "<b>" . $server. "</b><p>";
 
         $server =~ s/\s+//go;    # remove spaces just in case of a typo
-            # extract port if server name like "mail.domain.com:2525"
+                                 # extract port if server name like "mail.domain.com:2525"
         ( $server =~ s/:(.+)$//o ) ? $port = $1 : $port = $mailcfg{'port'};
-        $smtp = $server;    # save $server for use outside foreach loop
+        $smtp = $server;         # save $server for use outside foreach loop
 
         my $smtpaddr = inet_aton $server;
         unless ($smtpaddr) {
             $error .= "$server not found\n";
-            next;           # next server
+            next;                # next server
         }
 
-        my $retried = 0;    # reset retries for each server
-        while (
-            (
-                not $connected = connect S, pack_sockaddr_in( $port, $smtpaddr )
-            )
-            and ( $retried < $mailcfg{'retries'} )
-          )
+        my $retried = 0;         # reset retries for each server
+        while ( ( not $connected = connect S, pack_sockaddr_in( $port, $smtpaddr ) )
+            and ( $retried < $mailcfg{'retries'} ) )
         {
             $retried++;
             $error .= "connect to $server failed ($!)\n";
@@ -698,10 +680,7 @@ sub sendmail {
     {
         local $^W = 0;    # don't warn on undefined variables
                           # Add info to log variable
-        $log .=
-            "Server: $smtp Port: $port\n"
-          . "From: $fromaddr\n"
-          . "Subject: $mail{Subject}\n" . "To: ";
+        $log .= "Server: $smtp Port: $port\n" . "From: $fromaddr\n" . "Subject: $mail{Subject}\n" . "To: ";
     }
 
     my ($oldfh) = select(S);
diff --git a/lib/vsLock.pm b/lib/vsLock.pm
index 7a18142c5..9d8c3f7a9 100644
--- a/lib/vsLock.pm
+++ b/lib/vsLock.pm
@@ -190,14 +190,14 @@ sub lockfile {
     my $self = shift;
     my ( $file, $format ) = @_;
     local $_ = defined($format) ? $format : $self->format;
-    s/%%/\01/g;               # Protect double percent signs
-    s/%/\02/g;                # Protect against substitutions adding their own %
-    s/\02f/$file/g;           # %f is the full path name
-    s/\02D/&dir($file)/ge;    # %D is the dir name
-    s/\02F/&base($file)/ge;   # %F is the base name
-    s/\02p/$$/g;              # %p is the process's pid
-    s/\02/%/g;                # All other % kept as-is
-    s/\01/%/g;                # Restore escaped % signs
+    s/%%/\01/g;                # Protect double percent signs
+    s/%/\02/g;                 # Protect against substitutions adding their own %
+    s/\02f/$file/g;            # %f is the full path name
+    s/\02D/&dir($file)/ge;     # %D is the dir name
+    s/\02F/&base($file)/ge;    # %F is the base name
+    s/\02p/$$/g;               # %p is the process's pid
+    s/\02/%/g;                 # All other % kept as-is
+    s/\01/%/g;                 # Restore escaped % signs
     $_;
 }
 
@@ -359,8 +359,7 @@ sub _acs_check {
         if ( $self->warn ) {
             $file =~ s|.*/(.*)|$1|;    # Keep only basename
             my $s = $hold == 1 ? '' : 's';
-            &{ $self->wfunc }
-              ("UNLOCKED $file (lock older than $hold second$s)");
+            &{ $self->wfunc }("UNLOCKED $file (lock older than $hold second$s)");
         }
     }
 }
diff --git a/lib/xAP_Items.pm b/lib/xAP_Items.pm
index 4d4b6805b..9744b195b 100644
--- a/lib/xAP_Items.pm
+++ b/lib/xAP_Items.pm
@@ -30,11 +30,9 @@ package xAP;
 #se IO::Socket::INET;           # Gives us the INADDR constants, but not in perl 5.0 :(
 
 my (
-    @xap_item_names,    $started,             $xap_listen,
-    $xap_hub_listen,    $xap_send,            %hub_ports,
-    %xap_uids,          %xap_virtual_devices, $xap_hbeat_interval,
-    $xap_hbeat_counter, @send_queue,          %timeouts,
-    $send_queue_timeout
+    @xap_item_names, $started,  $xap_listen,          $xap_hub_listen,     $xap_send,
+    %hub_ports,      %xap_uids, %xap_virtual_devices, $xap_hbeat_interval, $xap_hbeat_counter,
+    @send_queue,     %timeouts, $send_queue_timeout
 );
 use vars '$xap_data';
 
@@ -45,8 +43,7 @@ use constant XAP_REAL_DEVICE_NAME => 'core';
 sub startup {
 
     return
-      if $started++
-      ;    # Allows us to call with $Reload or with xap_module mh.ini parm
+      if $started++;    # Allows us to call with $Reload or with xap_module mh.ini parm
 
     @xap_item_names = ();
     @send_queue     = ();
@@ -84,8 +81,7 @@ sub startup {
         }
         else {
             if ( &open_port( $port, 'listen', 'xap_hub_listen', 0, 1 ) ) {
-                $xap_hub_listen =
-                  new Socket_Item( undef, undef, 'xap_hub_listen' );
+                $xap_hub_listen = new Socket_Item( undef, undef, 'xap_hub_listen' );
                 print " - mh in xAP Hub mode\n";
             }
             else {
@@ -115,8 +111,7 @@ sub reload_hook {
 sub exit_hook {
     return if $main::Save{mh_exit} eq 'restart';
     for my $virtual_device_name ( keys %{xap_virtual_devices} ) {
-        &send_xap_heartbeat( $xap_virtual_devices{$virtual_device_name}{port},
-            $virtual_device_name, 'stopped' );
+        &send_xap_heartbeat( $xap_virtual_devices{$virtual_device_name}{port}, $virtual_device_name, 'stopped' );
     }
 }
 
@@ -133,11 +128,9 @@ sub init_xap_virtual_device {
         for my $p ( 49152 .. 65535 ) {
             $port = $p;
             last
-              if &open_port( $port, 'listen', "xap_listen_$virtual_device_name",
-                1, 1 );
+              if &open_port( $port, 'listen', "xap_listen_$virtual_device_name", 1, 1 );
         }
-        my $xap_socket =
-          new Socket_Item( undef, undef, "xap_listen_$virtual_device_name" );
+        my $xap_socket = new Socket_Item( undef, undef, "xap_listen_$virtual_device_name" );
         $xap_virtual_devices{$virtual_device_name}{socket} = $xap_socket;
         $xap_virtual_devices{$virtual_device_name}{port}   = $port;
 
@@ -145,8 +138,7 @@ sub init_xap_virtual_device {
         if ( !( $::config_parms{xap_nohub} ) ) {
 
             # now set up the hub port that will send to mh
-            $hub_ports{$port} =
-              &xAP::get_xap_mh_source_info($virtual_device_name);
+            $hub_ports{$port} = &xAP::get_xap_mh_source_info($virtual_device_name);
             my $port_name = "xap_send_$port";
             &open_port( $port, 'send', $port_name, 1, 1 );
         }
@@ -167,8 +159,7 @@ sub main::display_xap {
         &main::display_xap_message_display(%args);
     }
     else {
-        &main::print_log(
-            "Display support for the schema, $schema, does not yet exist");
+        &main::print_log("Display support for the schema, $schema, does not yet exist");
     }
 
 }
@@ -332,8 +323,7 @@ sub open_port {
         return 0;
     }
 
-    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port,
-      $send_listen
+    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port, $send_listen
       if $verbose;
 
     print "db xAP_Items open_port: p=$port pn=$port_name l=$local s=$sock\n"
@@ -343,7 +333,7 @@ sub open_port {
     $::Socket_Ports{$port_name}{datatype} = 'raw';
     $::Socket_Ports{$port_name}{port}     = $port;
     $::Socket_Ports{$port_name}{sock}     = $sock;
-    $::Socket_Ports{$port_name}{socka} = $sock;  # UDP ports are always "active"
+    $::Socket_Ports{$port_name}{socka}    = $sock;    # UDP ports are always "active"
 
     return $sock;
 }
@@ -367,9 +357,7 @@ sub check_for_data {
         if ($xap_send) {
             if ( $xap_hbeat_counter == 1 ) {
                 for my $virtual_device_name ( keys %{xap_virtual_devices} ) {
-                    &send_xap_heartbeat(
-                        $xap_virtual_devices{$virtual_device_name}{port},
-                        $virtual_device_name, 'alive' );
+                    &send_xap_heartbeat( $xap_virtual_devices{$virtual_device_name}{port}, $virtual_device_name, 'alive' );
                 }
                 $xap_hbeat_counter = $xap_hbeat_interval;
             }
@@ -460,8 +448,7 @@ sub _process_incoming_xap_hub_data {
             or $main::Debug{xap} )
         {
             my $sock = $::Socket_Ports{"xap_send_$port"}{sock};
-            print
-              "db2 xap hub: sending $protocol data to p=$port s=$sock d=\n$data.\n"
+            print "db2 xap hub: sending $protocol data to p=$port s=$sock d=\n$data.\n"
               if $main::Debug{xap} and $main::Debug{xap} == 2;
             print $sock $data if defined($sock);
         }
@@ -488,8 +475,7 @@ sub _process_incoming_xap_hub_data {
                   if $main::Debug{xap};
 
                 # xAP apps want local
-                &open_port( $port, 'send', $port_name, 1,
-                    $msg eq 'registering' );
+                &open_port( $port, 'send', $port_name, 1, $msg eq 'registering' );
             }
         }
     }
@@ -535,17 +521,15 @@ sub _process_incoming_xap_data {
     if ( !( $source eq &xAP::get_xap_mh_source_info() ) ) {
 
         # Set states in matching xAP objects
-        for my $name (@xap_item_names) { #&::list_objects_by_type('xAP_Item')) {
+        for my $name (@xap_item_names) {    #&::list_objects_by_type('xAP_Item')) {
             my $o = &main::get_object_by_name($name);
             $o = $name
-              unless $o
-              ;  # In case we stored object directly (e.g. lib/Telephony_xAP.pm)
+              unless $o;                    # In case we stored object directly (e.g. lib/Telephony_xAP.pm)
 
             # don't continue processing object if it's not bound to the device
             next unless $o->device_name() eq $device_name;
 
-            print
-              "db3 xap test  o=$name s=$source os=$$o{source} c=$class oc=$$o{class} \n"
+            print "db3 xap test  o=$name s=$source os=$$o{source} c=$class oc=$$o{class} \n"
               if $main::Debug{xap} and $main::Debug{xap} == 3;
             my $regex_source = &wildcard_2_regex( $$o{source} );
             next unless $source =~ /^$regex_source$/i;
@@ -608,16 +592,14 @@ sub _process_incoming_xap_data {
                     my $value_convertor = $$o{_value_convertors}{$key}
                       if defined( $$o{_value_convertors} );
                     if ($value_convertor) {
-                        print
-                          "db xap: located value convertor: $value_convertor\n"
+                        print "db xap: located value convertor: $value_convertor\n"
                           if $main::Debug{xap};
                         my $converted_value = eval $value_convertor;
                         if ($@) {
                             print $@;
                         }
                         else {
-                            print
-                              "db xap: converted value is: $converted_value\n"
+                            print "db xap: converted value is: $converted_value\n"
                               if $main::Debug{xap};
                         }
                         $value = $converted_value if $converted_value;
@@ -626,10 +608,8 @@ sub _process_incoming_xap_data {
 
                     # Monitor what changed (real data, not hbeat).
                     $$o{changed} .= "$section : $key = $value | "
-                      unless $section eq 'xap-header'
-                      ; # or ($section eq 'xap-hbeat' and !($$o{class} =~ /^xap-hbeat/i));
-                    print
-                      "db3 xap state check m=$$o{state_monitor} key=$section : $key  value=$value\n"
+                      unless $section eq 'xap-header';    # or ($section eq 'xap-hbeat' and !($$o{class} =~ /^xap-hbeat/i));
+                    print "db3 xap state check m=$$o{state_monitor} key=$section : $key  value=$value\n"
                       if $main::Debug{xap} and $main::Debug{xap} == 3;
                     if (    $$o{state_monitor}
                         and $$o{state_monitor} =~ /$section\s*[:=]\s*$key/i
@@ -653,8 +633,7 @@ sub _process_incoming_xap_data {
             # Can not use Generic_Item set method, as state_next_path only carries state, not all other $section data, to the next pass
             #              $o -> SUPER::set($state_value, 'xAP') if defined $state_value;
             my $set_by_name = 'xAP';
-            $set_by_name .= " [$source]"
-              ;   # no longer needed: if ($::config_parms{'xap_use_to_target'});
+            $set_by_name .= " [$source]";    # no longer needed: if ($::config_parms{'xap_use_to_target'});
             $o->SUPER::set_now( $state_value, $set_by_name )
               if $o->allow_empty_state()
               or ( defined $state_value and $state_value ne '' );
@@ -664,8 +643,7 @@ sub _process_incoming_xap_data {
 
 sub get_xap_uid {
     my ( $device_type, $subaddress_name ) = @_;
-    my $uid = &get_xap_base_uid($device_type)
-      . &get_xap_subaddress_uid( $device_type, $subaddress_name );
+    my $uid = &get_xap_base_uid($device_type) . &get_xap_subaddress_uid( $device_type, $subaddress_name );
     return $uid;
 }
 
@@ -673,45 +651,32 @@ sub get_xap_subaddress_uid {
     my ( $p_type_name, $subaddress_name, $requested_uid ) = @_;
     my $subaddress_uid = "00";
     if ($subaddress_name) {
-        if ( exists( $xap_uids{$p_type_name} )
-            && exists(
-                $xap_uids{$p_type_name}{'sub-fwd-map'}{$subaddress_name} ) )
+        if (   exists( $xap_uids{$p_type_name} )
+            && exists( $xap_uids{$p_type_name}{'sub-fwd-map'}{$subaddress_name} ) )
         {
             $subaddress_uid =
               $xap_uids{$p_type_name}{'sub-fwd-map'}{$subaddress_name};
         }
         else {
             # did we get a $requested_uid?
-            if ( $requested_uid && ( length($requested_uid) == 2 ) )
-            {    # not a very robust validation
-                    # try to honor the request
-                if (
-                    !(
-                        exists(
-                            $xap_uids{$p_type_name}{'sub-rvs-map'}
-                              {$requested_uid}
-                        )
-                    )
-                  )
-                {
+            if ( $requested_uid && ( length($requested_uid) == 2 ) ) {    # not a very robust validation
+                                                                          # try to honor the request
+                if ( !( exists( $xap_uids{$p_type_name}{'sub-rvs-map'}{$requested_uid} ) ) ) {
                     $subaddress_uid = $requested_uid;
                 }
             }
             if ( !($requested_uid) || $subaddress_uid eq '00' ) {
-                my $last_xap_subaddress_uid =
-                  $xap_uids{$p_type_name}{'last_sub_uid'};
+                my $last_xap_subaddress_uid = $xap_uids{$p_type_name}{'last_sub_uid'};
                 $last_xap_subaddress_uid = 0 unless $last_xap_subaddress_uid;
                 $last_xap_subaddress_uid++;
 
                 # store it
-                $xap_uids{$p_type_name}{'last_sub_uid'} =
-                  $last_xap_subaddress_uid;
+                $xap_uids{$p_type_name}{'last_sub_uid'} = $last_xap_subaddress_uid;
 
                 #convert to hex
                 $subaddress_uid = sprintf( "%X", $last_xap_subaddress_uid );
                 if ( length($subaddress_uid) % 2 ) {
-                    $subaddress_uid =
-                      "0$subaddress_uid"; # pad w/ a 0 if number of chars is odd
+                    $subaddress_uid = "0$subaddress_uid";    # pad w/ a 0 if number of chars is odd
                 }
             }
 
@@ -787,8 +752,7 @@ sub get_xap_base_uid {
         }
         else {
             # get the last base uid and convert hex string to number
-            my $uid = &get_xap_base_uid(XAP_REAL_DEVICE_NAME)
-              ;    # make sure it's initialized
+            my $uid = &get_xap_base_uid(XAP_REAL_DEVICE_NAME);    # make sure it's initialized
             $uid = $xap_uids{'last_base_uid'};
             my $uid_num = $uid;
 
@@ -797,7 +761,7 @@ sub get_xap_base_uid {
             $uid                       = sprintf( "%X", $uid_num );
             $xap_uids{'last_base_uid'} = $uid_num;
             if ( length($uid) % 2 ) {
-                $uid = "0$uid";    # pad w/ a 0 if an odd number of chars
+                $uid = "0$uid";                                   # pad w/ a 0 if an odd number of chars
             }
             $xap_uids{$p_type_name}{'base'} = $uid;
             return $uid;
@@ -821,11 +785,7 @@ sub get_xap_mh_source_info {
     $device = $::config_parms{title} unless $device;
     $device = ( $device =~ /misterhouse(.*)pid/i ) ? 'misterhouse' : $device;
     $device = &xAP::get_ok_name_part($device);
-    return
-        &get_mh_vendor_info() . '.'
-      . &get_mh_device_info() . '.'
-      . $device . '.'
-      . $instance;
+    return &get_mh_vendor_info() . '.' . &get_mh_device_info() . '.' . $device . '.' . $instance;
 }
 
 sub get_ok_name_part {
@@ -842,8 +802,7 @@ sub is_target {
         ( !( $source eq &xAP::get_xap_mh_source_info() ) ) && ( ( !($target) )
             || $target eq '*'
             || $target eq ( &get_mh_vendor_info() . '.*' )
-            || $target eq
-            ( &get_mh_vendor_info() . '.' & get_mh_device_info() . '.*' )
+            || $target eq ( &get_mh_vendor_info() . '.' & get_mh_device_info() . '.*' )
             || $target eq &xAP::get_xap_mh_source_info() )
     );
 
@@ -879,8 +838,7 @@ sub send {
     #    print "db5 $protocol send: ca=$class_address d=@data xap_send=$xap_send\n" if ($main::Debug{xap} and $main::Debug{xap} == 5) or ($main::Debug{xpl} and $main::Debug{xpl} == 5);
 
     my $target = '*';
-    my @data2
-      ;    # this will hold the "stripped" data after looking for a target arg
+    my @data2;    # this will hold the "stripped" data after looking for a target arg
     while (@data) {
         my $section = shift @data;
         if ( lc $section eq 'xap_target' ) {
@@ -908,8 +866,7 @@ sub sendXap {
         &sendXapWithHeaderVars(@data2);
     }
     else {
-        print
-          "WARNING! xAP is disabled and you are trying to send xAP data!! (xAP::sendXap())\n";
+        print "WARNING! xAP is disabled and you are trying to send xAP data!! (xAP::sendXap())\n";
     }
 }
 
@@ -968,8 +925,7 @@ sub sendXapWithHeaderVars {
 
     }
     else {
-        print
-          "WARNING! xAP is disabled and you are trying to send xAP data!! (xAP::sendXapWIthHeaderVars())\n";
+        print "WARNING! xAP is disabled and you are trying to send xAP data!! (xAP::sendXapWIthHeaderVars())\n";
     }
 }
 
@@ -981,7 +937,7 @@ sub send_xap_heartbeat {
 
         my $xap_hbeat_interval_in_secs = $xap_hbeat_interval * 60;
         my $xap_version                = '12';
-        my $msg = "xap-hbeat\n{\nv=$xap_version\nhop=1\n";
+        my $msg                        = "xap-hbeat\n{\nv=$xap_version\nhop=1\n";
         $msg .= "uid=" . &get_xap_base_uid($base_ref) . "00" . "\n";
         $msg .= "class=xap-hbeat.$hbeat_type\n";
         $msg .= "source=" . &xAP::get_xap_mh_source_info($base_ref) . "\n";
@@ -1029,19 +985,11 @@ sub _handleStaleXapSockets {
     # check main sending socket
     my $port_name = 'xap_send';
     if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-        if (
-            &xAP::open_port(
-                $::Socket_Ports{$port_name}{port},
-                'send', $port_name, 0, 1
-            )
-          )
-        {
-            print
-              "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
+        if ( &xAP::open_port( $::Socket_Ports{$port_name}{port}, 'send', $port_name, 0, 1 ) ) {
+            print "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
         }
         else {
-            print
-              "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
+            print "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
         }
     }
 
@@ -1049,19 +997,11 @@ sub _handleStaleXapSockets {
     for my $virtual_device_name ( keys %{xap_virtual_devices} ) {
         $port_name = "xap_listen_$virtual_device_name";
         if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-            if (
-                &xAP::open_port(
-                    $::Socket_Ports{$port_name}{port},
-                    'listen', $port_name, 0, 1
-                )
-              )
-            {
-                print
-                  "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
+            if ( &xAP::open_port( $::Socket_Ports{$port_name}{port}, 'listen', $port_name, 0, 1 ) ) {
+                print "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
             }
             else {
-                print
-                  "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
+                print "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
             }
         }
     }
@@ -1070,19 +1010,11 @@ sub _handleStaleXapSockets {
     if ( !( $::config_parms{xap_nohub} ) ) {
         $port_name = 'xap_hub_listen';
         if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-            if (
-                &xAP::open_port(
-                    $::Socket_Ports{$port_name}{port},
-                    'listen', $port_name, 0, 1
-                )
-              )
-            {
-                print
-                  "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
+            if ( &xAP::open_port( $::Socket_Ports{$port_name}{port}, 'listen', $port_name, 0, 1 ) ) {
+                print "Notice. xAP socket ($port_name) had been closed and has been reopened\n";
             }
             else {
-                print
-                  "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
+                print "WARNING! xAP socket ($port_name) had been closed and can not be reopened\n";
             }
         }
 
@@ -1157,20 +1089,19 @@ sub new {
 
     $xap_class  = '*' if !$xap_class;
     $xap_source = '*' if !$xap_source;
-    $$self{state}              = '';
-    $$self{class}              = $xap_class;
-    $$self{source}             = $xap_source;
-    $$self{protocol}           = 'xAP';
-    $$self{target_address}     = '*';
-    $$self{m_timeoutHeartBeat} = 0;             # don't monitor heart beats
-    $$self{m_appStatus}        = 'unknown';
-    $$self{m_timerHeartBeat}   = new Timer();
+    $$self{state}               = '';
+    $$self{class}               = $xap_class;
+    $$self{source}              = $xap_source;
+    $$self{protocol}            = 'xAP';
+    $$self{target_address}      = '*';
+    $$self{m_timeoutHeartBeat}  = 0;                           # don't monitor heart beats
+    $$self{m_appStatus}         = 'unknown';
+    $$self{m_timerHeartBeat}    = new Timer();
     $$self{m_device_name}       = xAP::XAP_REAL_DEVICE_NAME;
     $$self{m_allow_empty_state} = 0;
     &store_data( $self, @data );
 
-    $self->state_overload('off')
-      ;    # By default, do not process ~;: strings as substate/multistate
+    $self->state_overload('off');                              # By default, do not process ~;: strings as substate/multistate
 
     return $self;
 }
@@ -1235,11 +1166,7 @@ sub manage_heartbeat_timeout {
         $m_repeatAction = $p_repeatAction if $p_repeatAction;
         $$self{m_actionHeartBeat}  = $p_actionHeartBeat;
         $$self{m_timeoutHeartBeat} = $p_timeoutHeartBeat;
-        $$self{m_timerHeartBeat}->set(
-            $$self{m_timeoutHeartBeat},
-            $$self{m_actionHeartBeat},
-            $m_repeatAction
-        );
+        $$self{m_timerHeartBeat}->set( $$self{m_timeoutHeartBeat}, $$self{m_actionHeartBeat}, $m_repeatAction );
         $$self{m_timerHeartBeat}->start();
     }
 }
@@ -1318,8 +1245,7 @@ sub default_setstate {
     my @parms;
     for my $section ( sort keys %{ $$self{sections} } ) {
         next
-          unless $$self{sections}{$section} eq
-          'send';    # Do not echo received data
+          unless $$self{sections}{$section} eq 'send';    # Do not echo received data
         push @parms, $section, $$self{$section};
     }
 
@@ -1353,8 +1279,7 @@ sub state_now {
                 }
             }
         }
-        print
-          "db xAP_Item:state_now: section data for $section_name is: $section_state_now\n"
+        print "db xAP_Item:state_now: section data for $section_name is: $section_state_now\n"
           if $main::Debug{xap} and $section_state_now;
         $state_now = $section_state_now;
     }
diff --git a/lib/xPL_Irrigation.pm b/lib/xPL_Irrigation.pm
index 2929af9ec..ca51b93c8 100644
--- a/lib/xPL_Irrigation.pm
+++ b/lib/xPL_Irrigation.pm
@@ -30,7 +30,7 @@ sub new {
     $$self{'pump_is_running'} = 0;    # assume it is not running
     @{ $$self{'valve_id_list'} } = ();
     @{ $$self{'queue_id_list'} } = ();
-    $self->restore_data( 'pump_is_running', 'default_queue_id' );   # keep track
+    $self->restore_data( 'pump_is_running', 'default_queue_id' );    # keep track
 
     return $self;
 }
@@ -66,11 +66,7 @@ sub get_queue {
     my $new_queue = xPL_IrrigationQueue->new( $queue_id, $self );
 
     # persist the newly created item
-    &main::store_object_data(
-        $new_queue, 'xPL_IrrigationQueue',
-        'IrrigationQueue' . $queue_id,
-        'IrrigationQueue' . $queue_id
-    );
+    &main::store_object_data( $new_queue, 'xPL_IrrigationQueue', 'IrrigationQueue' . $queue_id, 'IrrigationQueue' . $queue_id );
     $self->add_item_if_not_present($new_queue);
     return $new_queue;
 }
@@ -78,18 +74,15 @@ sub get_queue {
 sub get_default_queue {
     my ($self) = @_;
     if ( !( defined $self->default_queue_id ) ) {
-        $$self{default_queue_id} = '0'; # invent one; this should never happen!!
-        &::print_log(
-            "[xPL_IrrigationGateway] WARN: automatically creating a new default queue id of "
-              . $self->default_queue_id );
+        $$self{default_queue_id} = '0';    # invent one; this should never happen!!
+        &::print_log( "[xPL_IrrigationGateway] WARN: automatically creating a new default queue id of " . $self->default_queue_id );
     }
     return $self->get_queue( $self->default_queue_id );
 }
 
 sub request_stat {
     my ( $self, $request_all ) = @_;
-    $self->SUPER::send_cmnd(
-        'sprinklr.request' => { 'request' => 'gateinfo' } );
+    $self->SUPER::send_cmnd( 'sprinklr.request' => { 'request' => 'gateinfo' } );
     if ($request_all) {
         for my $valve ( $self->find_members('xPL_IrrigationValve') ) {
             if ($valve) {
@@ -103,8 +96,7 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /sprinklr\.gateinfo/ ) {
-            &::print_log(
-                "[xPL_IrrigationGateway] Received sprinklr.gateinfo message."
+            &::print_log( "[xPL_IrrigationGateway] Received sprinklr.gateinfo message."
                   . " Default queue id= "
                   . $$self{'sprinklr.gateinfo'}{'default-queue-id'} )
               if $main::Debug{irrigation};
@@ -120,56 +112,47 @@ sub default_setstate {
                   split( /,/, $$self{'sprinklr.gateinfo'}{'queue-id-list'} );
                 @{ $$self{'queue_id_list'} } = @list;
             }
-            $self->SUPER::send_cmnd(
-                'sprinklr.request' => { 'request' => 'pumpinfo' } );
+            $self->SUPER::send_cmnd( 'sprinklr.request' => { 'request' => 'pumpinfo' } );
         }
         elsif ( $$self{changed} =~ /sprinklr\.pumpinfo/ ) {
             &::print_log(
-                "[xPL_IrrigationGateway] Received sprinkler.pumpinfo message: pump is "
-                  . $$self{'sprinklr.pumpinfo'}{state} )
+                "[xPL_IrrigationGateway] Received sprinkler.pumpinfo message: pump is " . $$self{'sprinklr.pumpinfo'}{state} )
               if $main::Debug{irrigation};
             $$self{pump_is_running} =
               ( $$self{'sprinklr.pumpinfo'}{state} =~ /^running/i ) ? 1 : 0;
         }
         elsif ( $$self{changed} =~ /sprinkler\.gateway/ ) {
-            &::print_log(
-                "[xPL_IrrigationGateway] Received sprinkler.gateway message")
+            &::print_log("[xPL_IrrigationGateway] Received sprinkler.gateway message")
               if $main::Debug{irrigation};
         }
         elsif ( $$self{changed} =~ /sprinklr\.pump/ ) {
-            &::print_log(
-                "[xPL_IrrigationGateway] Received sprinkler.pump message: pump is "
-                  . $$self{'sprinklr.pump'}{state} )
+            &::print_log( "[xPL_IrrigationGateway] Received sprinkler.pump message: pump is " . $$self{'sprinklr.pump'}{state} )
               if $main::Debug{irrigation};
             $$self{pump_is_running} =
               ( $$self{'sprinklr.pump'}{state} =~ /^running/i ) ? 1 : 0;
         }
         elsif ( $$self{changed} =~ /sprinklr\.vrequest/ ) {
-            my $queue_id      = $$self{'sprinklr.vrequest'}{'queue-id'};
-            my $request_index = $$self{'sprinklr.vrequest'}{'request-index'};
-            my $action        = $$self{'sprinklr.vrequest'}{'action'};
-            my $valve_id      = $$self{'sprinklr.vrequest'}{'valve-id'};
-            my $run_minutes   = $$self{'sprinklr.vrequest'}{'run-minutes'};
-            my $remaining_minutes =
-              $$self{'sprinklr.vrequest'}{'remaining-minutes'};
-
-            &::print_log(
-                "[xPL_IrrigationGateway] Received sprinklr.vrequest message."
+            my $queue_id          = $$self{'sprinklr.vrequest'}{'queue-id'};
+            my $request_index     = $$self{'sprinklr.vrequest'}{'request-index'};
+            my $action            = $$self{'sprinklr.vrequest'}{'action'};
+            my $valve_id          = $$self{'sprinklr.vrequest'}{'valve-id'};
+            my $run_minutes       = $$self{'sprinklr.vrequest'}{'run-minutes'};
+            my $remaining_minutes = $$self{'sprinklr.vrequest'}{'remaining-minutes'};
+
+            &::print_log( "[xPL_IrrigationGateway] Received sprinklr.vrequest message."
                   . " queue_id=$queue_id, request_index=$request_index, action=$action,"
-                  . " valve_id=$valve_id, run_minutes=$run_minutes, remaining_minutes=$remaining_minutes"
-            ) if $main::Debug{irrigation};
+                  . " valve_id=$valve_id, run_minutes=$run_minutes, remaining_minutes=$remaining_minutes" )
+              if $main::Debug{irrigation};
 
         }
         elsif ( $$self{changed} =~ /sprinklr\.rqstinfo/ ) {
-            &::print_log(
-                "[xPL_IrrigationGateway] Received sprinkler.rqstinfo message")
+            &::print_log("[xPL_IrrigationGateway] Received sprinkler.rqstinfo message")
               if $main::Debug{irrigation};
         }
     }
     else {
-        &::print_log(
-            "[xPL_IrrigationGateway] WARN: Gateway state may not be explicitely set.  Ignoring."
-        ) if $main::Debug{irrigation};
+        &::print_log( "[xPL_IrrigationGateway] WARN: Gateway state may not be explicitely set.  Ignoring." )
+          if $main::Debug{irrigation};
 
         # return a -1 if not changed by xpl so that state is not revised until receipt of gateinfo
         return -1;
@@ -342,12 +325,8 @@ sub new {
     $self->SUPER::device_monitor("valve-id=$id") if defined $id;
 
     # remap the state values to on and off
-    $self->tie_value_convertor( 'state',
-        '($section eq "sprinklr.valvinfo" and $value eq "closed") ? "off" : "on"'
-    );
-    $self->tie_value_convertor( 'action',
-        '($section eq "sprinklr.valve" and $value eq "closed") ? "off" : "on"'
-    );
+    $self->tie_value_convertor( 'state',  '($section eq "sprinklr.valvinfo" and $value eq "closed") ? "off" : "on"' );
+    $self->tie_value_convertor( 'action', '($section eq "sprinklr.valve" and $value eq "closed") ? "off" : "on"' );
 
     $self->state_overload('on');
 
@@ -356,8 +335,7 @@ sub new {
 
 sub request_stat {
     my ($self) = @_;
-    $self->SUPER::send_cmnd(
-        'sprinklr.request' => { 'request' => 'valvinfo' } );
+    $self->SUPER::send_cmnd( 'sprinklr.request' => { 'request' => 'valvinfo' } );
 }
 
 sub id {
@@ -376,10 +354,7 @@ sub ignore_message {
     my $ignore_message = 0;
     if (
         !(
-            (
-                defined( $$p_data{'sprinklr.valvinfo'} )
-                and $$p_data{'sprinklr.valvinfo'}{'valve-id'} eq $self->id
-            )
+            ( defined( $$p_data{'sprinklr.valvinfo'} ) and $$p_data{'sprinklr.valvinfo'}{'valve-id'} eq $self->id )
             or ( defined( $$p_data{'sprinklr.valve'} )
                 and $$p_data{'sprinklr.valve'}{'valve-id'} eq $self->id )
         )
@@ -394,22 +369,16 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /sprinklr\.valvinfo/ ) {
-            &::print_log( "[xPL_IrrigationValve] valve: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_IrrigationValve] valve: " . $self->get_object_name . " state is $state" )
               if $main::Debug{irrigation};
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
         elsif ( $$self{changed} =~ /sprinklr\.valve/ ) {
-            &::print_log( "[xPL_IrrigationValve] valve: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_IrrigationValve] valve: " . $self->get_object_name . " state is $state" )
               if $main::Debug{irrigation};
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
     else {
@@ -440,14 +409,13 @@ sub default_setstate {
                       . $self->default_run_time
                       . " minutes on default queue" )
                   if $main::Debug{irrigation};
-                $$self{gateway}
-                  ->queue_request( $self, $self->default_run_time );
+                $$self{gateway}->queue_request( $self, $self->default_run_time );
             }
             else {
                 &::print_log( "[xPL_IrrigationValve] Request valve: "
                       . $self->get_object_name
-                      . " queued for gateway default run time on default queue"
-                ) if $main::Debug{irrigation};
+                      . " queued for gateway default run time on default queue" )
+                  if $main::Debug{irrigation};
                 $$self{gateway}->queue_request($self);
             }
         }
@@ -455,9 +423,8 @@ sub default_setstate {
 
             # TO-DO;  this is a bit more difficult since it involves locating the active
             #    request and deleting it from it's queue
-            &::print_log(
-                "[xPL_IrrigationValve] WARN: Unable to support off state.  Request is ignored."
-            ) if $main::Debug{irrigation};
+            &::print_log( "[xPL_IrrigationValve] WARN: Unable to support off state.  Request is ignored." )
+              if $main::Debug{irrigation};
         }
 
         # return a -1 if not changed by xpl so that state is not revised until receipt of gateinfo
@@ -481,7 +448,7 @@ sub new {
 
     # default the default run time as 5 minutes; possibly this should be longer?
     $$self{default_run_time} = 5;
-    $$self{state_monitor} = "sprinklr.queinfo : state|sprinklr.queue : action";
+    $$self{state_monitor}    = "sprinklr.queinfo : state|sprinklr.queue : action";
     $self->SUPER::device_monitor("queue-id=$id") if defined $id;
 
     $self->state_overload('on');
@@ -515,10 +482,7 @@ sub ignore_message {
     my $ignore_message = 0;
     if (
         !(
-            (
-                defined( $$p_data{'sprinklr.queinfo'} )
-                and $$p_data{'sprinklr.queinfo'}{'queue-id'} eq $self->id
-            )
+            ( defined( $$p_data{'sprinklr.queinfo'} ) and $$p_data{'sprinklr.queinfo'}{'queue-id'} eq $self->id )
             or ( defined( $$p_data{'sprinklr.queue'} )
                 and $$p_data{'sprinklr.queue'}{'queue-id'} eq $self->id )
         )
@@ -572,8 +536,7 @@ sub clear {
     my $cmd_block = {};
     $$cmd_block{'command'}  = 'CLEAR-QUEUE';
     $$cmd_block{'queue-id'} = $self->id;
-    &::print_log(
-        "[xPL_IrrigationQueue] Received request to clear queue: " . $self->id )
+    &::print_log( "[xPL_IrrigationQueue] Received request to clear queue: " . $self->id )
       if $main::Debug{irrigation};
     $self->SUPER::send_cmnd( 'sprinklr.basic', $cmd_block );
 }
@@ -583,8 +546,7 @@ sub hold {
     my $cmd_block = {};
     $$cmd_block{'command'}  = 'HOLD-QUEUE';
     $$cmd_block{'queue-id'} = $self->id;
-    &::print_log(
-        "[xPL_IrrigationQueue] Received request to hold queue: " . $self->id )
+    &::print_log( "[xPL_IrrigationQueue] Received request to hold queue: " . $self->id )
       if $main::Debug{irrigation};
     $self->SUPER::send_cmnd( 'sprinklr.basic', $cmd_block );
 }
@@ -594,8 +556,7 @@ sub release {
     my $cmd_block = {};
     $$cmd_block{'command'}  = 'RELEASE-QUEUE';
     $$cmd_block{'queue-id'} = $self->id;
-    &::print_log( "[xPL_IrrigationQueue] Received request to release queue: "
-          . $self->id )
+    &::print_log( "[xPL_IrrigationQueue] Received request to release queue: " . $self->id )
       if $main::Debug{irrigation};
     $self->SUPER::send_cmnd( 'sprinklr.basic', $cmd_block );
 }
diff --git a/lib/xPL_Items.pm b/lib/xPL_Items.pm
index b35fe36fc..c42303ab9 100644
--- a/lib/xPL_Items.pm
+++ b/lib/xPL_Items.pm
@@ -74,16 +74,14 @@ package xPL;
 #@xPL::ISA = ('Generic_Item');
 
 my (
-    @xpl_item_names, $started,            %hub_ports,
-    $xpl_listen,     $xpl_hub_listen,     $xpl_send,
-    %xpl_hub_ports,  $xpl_hbeat_interval, $xpl_hbeat_counter
+    @xpl_item_names, $started,       %hub_ports,          $xpl_listen, $xpl_hub_listen,
+    $xpl_send,       %xpl_hub_ports, $xpl_hbeat_interval, $xpl_hbeat_counter
 );
 
 # Create sockets and add hook to check incoming data
 sub startup {
     return
-      if $started++
-      ;    # Allows us to call with $Reload or with xpl_module mh.ini parm
+      if $started++;    # Allows us to call with $Reload or with xpl_module mh.ini parm
 
     # In case you don't want xpl for some reason
     return if $::config_parms{xpl_disable};
@@ -125,8 +123,7 @@ sub startup {
         }
         else {
             if ( &open_port( $port, 'listen', 'xpl_hub_listen', 0, 1 ) ) {
-                $xpl_hub_listen =
-                  new Socket_Item( undef, undef, 'xpl_hub_listen' );
+                $xpl_hub_listen = new Socket_Item( undef, undef, 'xpl_hub_listen' );
                 print " - mh in xPL Hub mode\n";
 
                 # now set up the hub port that will send to mh
@@ -164,8 +161,7 @@ sub main::display_xpl {
         &main::display_xpl_osd_basic(%args);
     }
     else {
-        &main::print_log(
-            "Display support for the schema, $schema, does not yet exist");
+        &main::print_log("Display support for the schema, $schema, does not yet exist");
     }
 }
 
@@ -189,9 +185,7 @@ sub main::display_xpl_osd_basic {
     if ( $address =~ /^slimdev-slimserv/i ) {
         $text = "\\n$text" unless $text =~ /\\n\S+/i;
     }
-    &xPL::send( 'xPL', $address,
-        'osd.basic' =>
-          { command => 'write', delay => $duration, text => $text } );
+    &xPL::send( 'xPL', $address, 'osd.basic' => { command => 'write', delay => $duration, text => $text } );
 }
 
 sub open_port {
@@ -223,8 +217,7 @@ sub open_port {
             Broadcast => 1
         );
 
-        print "db xPL_Items open_port: pn=$port_name l=$local PeerPort=$port "
-          . "PeerAddr=$dest_address"
+        print "db xPL_Items open_port: pn=$port_name l=$local PeerPort=$port " . "PeerAddr=$dest_address"
           if $main::Debug{xpl};
     }
     else {
@@ -250,8 +243,7 @@ sub open_port {
         );
         $port = $sock->sockport() if ( $port == 0 );
 
-        print "db xPL_Items open_port: pn=$port_name l=$local LocalPort=$port "
-          . "LocalAddr=$listen_address"
+        print "db xPL_Items open_port: pn=$port_name l=$local LocalPort=$port " . "LocalAddr=$listen_address"
           if $main::Debug{xpl};
     }
     unless ($sock) {
@@ -262,15 +254,14 @@ sub open_port {
     }
     print "\n" if $main::Debug{xpl};
 
-    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port,
-      $send_listen
+    printf " - creating %-15s on %3s %5s %s\n", $port_name, 'udp', $port, $send_listen
       if $verbose;
 
     $::Socket_Ports{$port_name}{protocol} = 'udp';
     $::Socket_Ports{$port_name}{datatype} = 'raw';
     $::Socket_Ports{$port_name}{port}     = $port;
     $::Socket_Ports{$port_name}{sock}     = $sock;
-    $::Socket_Ports{$port_name}{socka} = $sock;  # UDP ports are always "active"
+    $::Socket_Ports{$port_name}{socka}    = $sock;    # UDP ports are always "active"
 
     return $sock;
 }
@@ -315,8 +306,7 @@ sub parse_data {
             $source = $value if $section =~ /^xpl/ and $key =~ /^source$/i;
             $target = $value if $section =~ /^xpl/ and $key =~ /^target$/i;
             if ( exists( $d{$section}{$key} ) ) {
-                $d{$section}{$key} .=
-                  "," . $value;             # xpl allows "continuation lines"
+                $d{$section}{$key} .= "," . $value;    # xpl allows "continuation lines"
             }
             else {
                 $d{$section}{$key} = $value;
@@ -372,8 +362,7 @@ sub _process_incoming_xpl_hub_data {
                   if $main::Debug{xpl};
 
                 # xPL apps want local
-                &open_port( $port, 'send', $port_name, 1,
-                    $msg eq 'registering' );
+                &open_port( $port, 'send', $port_name, 1, $msg eq 'registering' );
             }
         }
     }
@@ -381,8 +370,7 @@ sub _process_incoming_xpl_hub_data {
     # As a hub, echo data to other xpl listeners unless it's our transmission
     for $port ( keys %xpl_hub_ports ) {
         my $sock = $::Socket_Ports{"xpl_send_$port"}{sock};
-        print "db2 xpl hub: sending xpl data to p=$port destination="
-          . "$xpl_hub_ports{$port} s=$sock d=\n$data.\n"
+        print "db2 xpl hub: sending xpl data to p=$port destination=" . "$xpl_hub_ports{$port} s=$sock d=\n$data.\n"
           if $main::Debug{xpl} and $main::Debug{xpl} == 2;
         print $sock $data if defined($sock);
     }
@@ -415,10 +403,9 @@ sub _process_incoming_xpl_data {
     if ( !( $source eq &xPL::get_xpl_mh_source_info() ) ) {
 
         # Set states in matching xPL objects
-        for my $name (@xpl_item_names)
-        {    #(&::list_objects_by_type('xPL_Item')) {
+        for my $name (@xpl_item_names) {    #(&::list_objects_by_type('xPL_Item')) {
             my $o = &main::get_object_by_name($name);
-            $o = $name unless $o;    # In case we stored object directly
+            $o = $name unless $o;           # In case we stored object directly
             print "db3 xpl test  o=$name s=$source oa=$$o{source}\n"
               if $main::Debug{xpl} and $main::Debug{xpl} == 3;
 
@@ -476,16 +463,14 @@ sub _process_incoming_xpl_data {
                     my $value_convertor = $$o{_value_convertors}{$key}
                       if defined( $$o{_value_convertors} );
                     if ($value_convertor) {
-                        print
-                          "db xpl: located value convertor: $value_convertor\n"
+                        print "db xpl: located value convertor: $value_convertor\n"
                           if $main::Debug{xpl};
                         my $converted_value = eval $value_convertor;
                         if ($@) {
                             print $@;
                         }
                         else {
-                            print
-                              "db xpl: converted value is: $converted_value\n"
+                            print "db xpl: converted value is: $converted_value\n"
                               if $main::Debug{xpl};
                         }
                         $value = $converted_value if $converted_value;
@@ -499,13 +484,10 @@ sub _process_incoming_xpl_data {
                       or $section eq 'xpl-trig'
                       or $section eq 'xpl-cmnd'
                       or ( $section eq 'hbeat.app' and $key ne 'status' );
-                    print "db3 xpl state check m=$$o{state_monitor} key="
-                      . "$section : $key  value=$value\n"
+                    print "db3 xpl state check m=$$o{state_monitor} key=" . "$section : $key  value=$value\n"
                       if $main::Debug{xpl};    # and $main::Debug{xpl} == 3;
                     if ( $$o{state_monitor} ) {
-                        foreach my $state_monitor (
-                            split( /\|/, $$o{state_monitor} ) )
-                        {
+                        foreach my $state_monitor ( split( /\|/, $$o{state_monitor} ) ) {
                             if ( $state_monitor =~ /$section\s*[:=]\s*$key/i
                                 and defined $value )
                             {
@@ -553,13 +535,9 @@ sub get_mh_device_info {
 sub get_xpl_mh_source_info {
     my $instance = $::config_parms{xpl_title};
     $instance = $::config_parms{title} unless $instance;
-    $instance =
-      ( $instance =~ /misterhouse(.*)pid/i ) ? 'misterhouse' : $instance;
+    $instance = ( $instance =~ /misterhouse(.*)pid/i ) ? 'misterhouse' : $instance;
     $instance = &xPL::get_ok_name_part($instance);
-    return
-        &get_mh_vendor_info() . '-'
-      . &get_mh_device_info() . '.'
-      . $instance;
+    return &get_mh_vendor_info() . '-' . &get_mh_device_info() . '.' . $instance;
 }
 
 sub get_ok_name_part {
@@ -603,8 +581,7 @@ sub sendXpl {
     if ( defined($xpl_send) ) {
         my ( $target, $msg_type, @data ) = @_;
         my ( $parms, $msg );
-        $msg = "xpl-$msg_type\n{\nhop=1\nsource="
-          . &xPL::get_xpl_mh_source_info() . "\n";
+        $msg = "xpl-$msg_type\n{\nhop=1\nsource=" . &xPL::get_xpl_mh_source_info() . "\n";
         if ( defined($target) ) {
             $msg .= "target=$target\n";
         }
@@ -642,8 +619,7 @@ sub sendXpl {
         }
     }
     else {
-        print "WARNING! xPL is disabled and you are trying to send xPL "
-          . "data!! (xPL::sendXpl())\n";
+        print "WARNING! xPL is disabled and you are trying to send xPL " . "data!! (xPL::sendXpl())\n";
     }
 }
 
@@ -671,8 +647,7 @@ sub send_xpl_heartbeat {
               if $main::Debug{xpl} and $main::Debug{xpl} == 6;
         }
         else {
-            print
-              "Error in xPL_Item::send_heartbeat.  send socket not active\n";
+            print "Error in xPL_Item::send_heartbeat.  send socket not active\n";
         }
     }
     else {
@@ -688,38 +663,22 @@ sub _handleStaleXplSockets {
     # check main sending socket
     my $port_name = 'xpl_send';
     if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-        if (
-            &xPL::open_port(
-                $::Socket_Ports{$port_name}{port},
-                'send', $port_name, 0, 1
-            )
-          )
-        {
-            print "Notice. xPL socket ($port_name) had been closed and "
-              . "has been reopened\n";
+        if ( &xPL::open_port( $::Socket_Ports{$port_name}{port}, 'send', $port_name, 0, 1 ) ) {
+            print "Notice. xPL socket ($port_name) had been closed and " . "has been reopened\n";
         }
         else {
-            print "WARNING! xPL socket ($port_name) had been closed and "
-              . "can not be reopened\n";
+            print "WARNING! xPL socket ($port_name) had been closed and " . "can not be reopened\n";
         }
     }
 
     # check main listening socket
     $port_name = 'xpl_listen';
     if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-        if (
-            &xPL::open_port(
-                $::Socket_Ports{$port_name}{port},
-                'listen', $port_name, 0, 1
-            )
-          )
-        {
-            print "Notice. xPL socket ($port_name) had been closed and "
-              . "has been reopened\n";
+        if ( &xPL::open_port( $::Socket_Ports{$port_name}{port}, 'listen', $port_name, 0, 1 ) ) {
+            print "Notice. xPL socket ($port_name) had been closed and " . "has been reopened\n";
         }
         else {
-            print "WARNING! xPL socket ($port_name) had been closed and "
-              . "can not be reopened\n";
+            print "WARNING! xPL socket ($port_name) had been closed and " . "can not be reopened\n";
         }
     }
 
@@ -727,19 +686,11 @@ sub _handleStaleXplSockets {
     if ( !( $::config_parms{xpl_nohub} ) and defined($xpl_hub_listen) ) {
         $port_name = 'xpl_hub_listen';
         if ( !( $::Socket_Ports{$port_name}{socka} ) ) {
-            if (
-                &xPL::open_port(
-                    $::Socket_Ports{$port_name}{port},
-                    'listen', $port_name, 0, 1
-                )
-              )
-            {
-                print "Notice. xPL socket ($port_name) had been closed and "
-                  . "has been reopened\n";
+            if ( &xPL::open_port( $::Socket_Ports{$port_name}{port}, 'listen', $port_name, 0, 1 ) ) {
+                print "Notice. xPL socket ($port_name) had been closed and " . "has been reopened\n";
             }
             else {
-                print "WARNING! xPL socket ($port_name) had been closed and "
-                  . "can not be reopened\n";
+                print "WARNING! xPL socket ($port_name) had been closed and " . "can not be reopened\n";
             }
         }
 
@@ -835,10 +786,10 @@ sub new {
 
     $xpl_source = '*' if !$xpl_source or $xpl_source eq '*';
 
-    $$self{state}          = '';
-    $$self{address}        = $xpl_source;           # left in place for legacy
-    $$self{address}        = '*' if !$xpl_source;
-    $$self{target_address} = '*';
+    $$self{state}                = '';
+    $$self{address}              = $xpl_source;                     # left in place for legacy
+    $$self{address}              = '*' if !$xpl_source;
+    $$self{target_address}       = '*';
     $$self{class}                = $xpl_class unless !$xpl_class;
     $$self{m_timeoutHeartBeat}   = 0;
     $$self{m_appStatus}          = 'unknown';
@@ -848,8 +799,7 @@ sub new {
 
     &xPL_Item::store_data( $self, @data );
 
-    $self->state_overload('off')
-      ;    # By default, do not process ~;: strings as substate/multistate
+    $self->state_overload('off');                                   # By default, do not process ~;: strings as substate/multistate
 
     return $self;
 }
@@ -913,11 +863,7 @@ sub manage_heartbeat_timeout {
         $m_repeatAction = $p_repeatAction if $p_repeatAction;
         $$self{m_actionHeartBeat}  = $p_actionHeartBeat;
         $$self{m_timeoutHeartBeat} = $p_timeoutHeartBeat;
-        $$self{m_timerHeartBeat}->set(
-            $$self{m_timeoutHeartBeat},
-            $$self{m_actionHeartBeat},
-            $m_repeatAction
-        );
+        $$self{m_timerHeartBeat}->set( $$self{m_timeoutHeartBeat}, $$self{m_actionHeartBeat}, $m_repeatAction );
         $$self{m_timerHeartBeat}->start();
     }
 }
@@ -992,8 +938,7 @@ sub state_now {
                 }
             }
         }
-        print "db xPL_Item:state_now: section data for $section_name is: "
-          . "$section_state_now\n"
+        print "db xPL_Item:state_now: section data for $section_name is: " . "$section_state_now\n"
           if $main::Debug{xpl} and $section_state_now;
         $state_now = $section_state_now;
     }
@@ -1040,9 +985,7 @@ sub device_monitor {
         $$self{_device_id_key} = lc $key;
     }
     if ( defined $$self{_device_id} ) {
-        return (
-            ( $$self{_device_id_key} ) ? $$self{_device_id_key} : 'device' )
-          . $$self{_device_id};
+        return ( ( $$self{_device_id_key} ) ? $$self{_device_id_key} : 'device' ) . $$self{_device_id};
     }
     else {
         return;
@@ -1059,9 +1002,7 @@ sub default_setstate {
     if ( $$self{_on_set_message} ) {
         for my $class_name ( sort keys %{ $$self{_on_set_message} } ) {
             my $block;
-            for my $msg_key (
-                sort keys %{ $$self{_on_set_message}{$class_name} } )
-            {
+            for my $msg_key ( sort keys %{ $$self{_on_set_message}{$class_name} } ) {
                 my $field_value =
                   eval( $$self{_on_set_message}{$class_name}{$msg_key} );
                 $block->{$msg_key} = $field_value;
@@ -1072,15 +1013,13 @@ sub default_setstate {
     else {
         if ( $$self{state_monitor} ) {
             foreach my $state_monitor ( split( /\|/, $$self{state_monitor} ) ) {
-                my ( $section, $key ) =
-                  $$self{state_monitor} =~ /(\S+)\s*[:=]\s*(\S+)/;
+                my ( $section, $key ) = $$self{state_monitor} =~ /(\S+)\s*[:=]\s*(\S+)/;
                 $$self{$section}{$key} = $state;
             }
         }
         for my $section ( sort keys %{ $$self{sections} } ) {
             next
-              unless $$self{sections}{$section} eq
-              'send';    # Do not echo received data
+              unless $$self{sections}{$section} eq 'send';    # Do not echo received data
             push @parms, $section, $$self{$section};
         }
     }
@@ -1161,13 +1100,11 @@ sub ignore_message {
     my ( $self, $p_data ) = @_;
     my $ignore_message = 0;
     if ( $$self{_device_id_key} and $self->class_name ) {
-        print
-          "Device monitoring enabled: key=$$self{_device_id_key}, id=$$self{_device_id}, tested value="
+        print "Device monitoring enabled: key=$$self{_device_id_key}, id=$$self{_device_id}, tested value="
           . $$p_data{ $self->class_name }{ $$self{_device_id_key} } . "\n"
           if $main::Debug{xpl};
         $ignore_message =
-          ( $$self{_device_id} ne
-              lc $$p_data{ $self->class_name }{ $$self{_device_id_key} } )
+          ( $$self{_device_id} ne lc $$p_data{ $self->class_name }{ $$self{_device_id_key} } )
           ? 1
           : 0;
     }
@@ -1185,12 +1122,10 @@ sub new {
     my $self = $class->SUPER::new($source);
     if ($p_type) {
         $$self{sensor_type} = $p_type;
-        if ( $p_type eq 'output'
-          ) # define a default message to be sent out on a call to the "set" method
+        if ( $p_type eq 'output' )    # define a default message to be sent out on a call to the "set" method
         {
             # the following can always be overwritten
-            $self->on_set_message(
-                'control.basic' => { 'z##current' => '$state' } );
+            $self->on_set_message( 'control.basic' => { 'z##current' => '$state' } );
         }
     }
     else {
@@ -1233,15 +1168,13 @@ sub highest {
 sub ignore_message {
     my ( $self, $p_data ) = @_;
     return 1
-      if $self->SUPER::ignore_message($p_data)
-      ;    # user xPL_Item's filter against deviceid
+      if $self->SUPER::ignore_message($p_data);    # user xPL_Item's filter against deviceid
     return ( $$p_data{'sensor.basic'}{type} ne $$self{sensor_type} ) ? 1 : 0;
 }
 
 sub request_stat {
     my ($self) = @_;
-    $self->SUPER::send_cmnd( 'sensor.request' =>
-          { 'request' => 'current', 'type' => "'$$self{sensor_type}'" } );
+    $self->SUPER::send_cmnd( 'sensor.request' => { 'request' => 'current', 'type' => "'$$self{sensor_type}'" } );
 }
 
 package xPL_UPS;
@@ -1277,8 +1210,7 @@ sub event {
 sub ignore_message {
     my ( $self, $p_data ) = @_;
     return 1
-      if $self->SUPER::ignore_message($p_data)
-      ;    # user xPL_Item's filter against deviceid
+      if $self->SUPER::ignore_message($p_data);    # user xPL_Item's filter against deviceid
     return ( $$p_data{'ups.basic'} or $$p_data{'hbeat.app'} ) ? 0 : 1;
 }
 
@@ -1329,8 +1261,7 @@ sub delay {
 sub ignore_message {
     my ( $self, $p_data ) = @_;
     return 1
-      if $self->SUPER::ignore_message($p_data)
-      ;    # user xPL_Item's filter against deviceid
+      if $self->SUPER::ignore_message($p_data);    # user xPL_Item's filter against deviceid
     if ( $$self{type} ) {
         return ( $$p_data{'x10.security'}{type} ne $$self{type} ) ? 1 : 0;
     }
diff --git a/lib/xPL_Lighting.pm b/lib/xPL_Lighting.pm
index 0c36118f2..3ff24dc1e 100644
--- a/lib/xPL_Lighting.pm
+++ b/lib/xPL_Lighting.pm
@@ -46,8 +46,7 @@ sub device_id_list {
 
 sub request_stat {
     my ( $self, $request_all ) = @_;
-    $self->SUPER::send_cmnd(
-        'lighting.request' => { 'request' => 'gateinfo' } );
+    $self->SUPER::send_cmnd( 'lighting.request' => { 'request' => 'gateinfo' } );
     if ($request_all) {
         for my $light ( $self->find_members('xPL_Light') ) {
             if ($light) {
@@ -61,8 +60,7 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /lighting\.gateinfo/ ) {
-            &::print_log(
-                    "[xPL_LightGateway] Received lighting.gateinfo message."
+            &::print_log( "[xPL_LightGateway] Received lighting.gateinfo message."
                   . " Preferred network id= "
                   . $$self{'lighting.gateinfo'}{'preferred-net'} )
               if $main::Debug{xpl_light};
@@ -70,13 +68,10 @@ sub default_setstate {
               $$self{'lighting.gateinfo'}{'preferred-net'};
 
             # send out a request to get info about the supported device list
-            $self->SUPER::send_cmnd(
-                'lighting.request' => { 'request' => 'devlist' } );
+            $self->SUPER::send_cmnd( 'lighting.request' => { 'request' => 'devlist' } );
         }
         elsif ( $$self{changed} =~ /lighting\.devlist/ ) {
-            &::print_log(
-                "[xPL_LightGateway] Received lighting.devlist message: status "
-                  . $$self{'lighting.devlist'}{status} )
+            &::print_log( "[xPL_LightGateway] Received lighting.devlist message: status " . $$self{'lighting.devlist'}{status} )
               if $main::Debug{xpl_light};
             if ( $$self{'lighting.devlist'}{'device'} ) {
                 my @list = split( /,/, $$self{'lighting.devlist'}{'device'} );
@@ -98,9 +93,7 @@ sub default_setstate {
         }
     }
     else {
-        &::print_log(
-            "[xPL_LightGateway] WARN: Gateway state may not be explicitely set.  Ignoring."
-        ) if $main::Debug{xpl_light};
+        &::print_log( "[xPL_LightGateway] WARN: Gateway state may not be explicitely set.  Ignoring." ) if $main::Debug{xpl_light};
 
         # return a -1 if not changed by xpl so that state is not revised until receipt of gateinfo
         return -1;
@@ -231,8 +224,7 @@ sub new {
     $self->SUPER::device_monitor("device=$id") if $id;
 
     # remap the state values to on and off
-    $self->tie_value_convertor( 'level',
-        '($section =~ /^lighting\.dev/ and $value eq "0") ? "off" : "$value"' );
+    $self->tie_value_convertor( 'level', '($section =~ /^lighting\.dev/ and $value eq "0") ? "off" : "$value"' );
 
     $self->state_overload('on');
     $self->restore_data('ramp_rate');    # keep track
@@ -255,10 +247,7 @@ sub ignore_message {
     my $ignore_message = 0;
     if (
         !(
-            (
-                defined( $$p_data{'lighting.devinfo'} )
-                and $$p_data{'lighting.devinfo'}{'device'} eq $self->id
-            )
+            ( defined( $$p_data{'lighting.devinfo'} ) and $$p_data{'lighting.devinfo'}{'device'} eq $self->id )
             or ( defined( $$p_data{'lighting.device'} )
                 and $$p_data{'lighting.device'}{'device'} eq $self->id )
         )
@@ -279,26 +268,20 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /lighting\.devinfo/ ) {
-            &::print_log( "[xPL_Light] light: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Light] light: " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_light};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
         elsif ( $$self{changed} =~ /lighting\.device/ ) {
-            &::print_log( "[xPL_Light] light: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Light] light: " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_light};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
     else {
@@ -321,11 +304,10 @@ sub default_setstate {
               . ( ( $level eq '0' ) ? 'off' : "on at a level of $level" ) )
           if $main::Debug{xpl_light};
         my $cmd_block;
-        $$cmd_block{'command'} = 'goto';
-        $$cmd_block{'device'}  = $self->id;
-        $$cmd_block{'level'}   = $level;
-        $$cmd_block{'fade-rate'} =
-          ( $self->ramp_rate ) ? $self->ramp_rate : 'default';
+        $$cmd_block{'command'}   = 'goto';
+        $$cmd_block{'device'}    = $self->id;
+        $$cmd_block{'level'}     = $level;
+        $$cmd_block{'fade-rate'} = ( $self->ramp_rate ) ? $self->ramp_rate : 'default';
         $self->SUPER::send_cmnd( 'lighting.basic', $cmd_block );
         return;
     }
diff --git a/lib/xPL_Plugwise.pm b/lib/xPL_Plugwise.pm
index 278831204..d9d9e7fa0 100644
--- a/lib/xPL_Plugwise.pm
+++ b/lib/xPL_Plugwise.pm
@@ -93,8 +93,7 @@ sub request_stat {
     for my $circle ( $self->find_members('xPL_Plugwise') ) {
         if ($circle) {
             my $name = $circle->get_object_name();
-            &::print_log(
-                "[xPL_PlugwiseGateway] Requesting state for $name over xPL")
+            &::print_log("[xPL_PlugwiseGateway] Requesting state for $name over xPL")
               if $main::Debug{xpl_plugwise};
             $circle->request_stat();
 
@@ -109,9 +108,8 @@ sub default_setstate {
     if ( $set_by =~ /^xpl/i ) {
     }
     else {
-        &::print_log(
-            "[xPL_PlugwiseGateway] WARN: Gateway state may not be explicitely set.  Ignoring."
-        ) if $main::Debug{xpl_plugwise};
+        &::print_log( "[xPL_PlugwiseGateway] WARN: Gateway state may not be explicitely set.  Ignoring." )
+          if $main::Debug{xpl_plugwise};
 
         # return a -1 if not changed by xpl so that state is not revised until receipt of gateinfo
         return -1;
@@ -234,9 +232,7 @@ sub new {
     $self->SUPER::device_monitor("device=$id") if $id;
 
     # remap the state values to on and off
-    $self->tie_value_convertor( 'level',
-        '($section =~ /^plugwise.basic/ and $value eq "off") ? "off" : "$value"'
-    );
+    $self->tie_value_convertor( 'level', '($section =~ /^plugwise.basic/ and $value eq "off") ? "off" : "$value"' );
 
     $self->addStates( 'on', 'off' );
 
@@ -261,15 +257,7 @@ sub addStates {
 sub ignore_message {
     my ( $self, $p_data ) = @_;
     my $ignore_msg = 0;
-    if (
-        !(
-            (
-                defined( $$p_data{'plugwise.basic'} )
-                and $$p_data{'plugwise.basic'}{'device'} eq $self->id
-            )
-        )
-      )
-    {
+    if ( !( ( defined( $$p_data{'plugwise.basic'} ) and $$p_data{'plugwise.basic'}{'device'} eq $self->id ) ) ) {
         $ignore_msg = 1;
     }
     return $ignore_msg;
@@ -282,15 +270,12 @@ sub default_setstate {
 
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /plugwise\.basic/ ) {
-            &::print_log( "[xPL_Plugwise] "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Plugwise] " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_plugwise};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
     else {
@@ -298,12 +283,8 @@ sub default_setstate {
         my $cmnd = ( $state =~ /^off/i ) ? 'off' : 'on';
 
         return -1
-          if ( $self->state eq $state )
-          ;              # Don't propagate state unless it has changed.
-        &::print_log( "[xPL_Plugwise] Request "
-              . $self->get_object_name
-              . " turn "
-              . $cmnd )
+          if ( $self->state eq $state );    # Don't propagate state unless it has changed.
+        &::print_log( "[xPL_Plugwise] Request " . $self->get_object_name . " turn " . $cmnd )
           if $main::Debug{xpl_plugwise};
         my $cmd_block;
         $$cmd_block{'command'} = $cmnd;
diff --git a/lib/xPL_Security.pm b/lib/xPL_Security.pm
index dcb706f1a..5e6481f78 100644
--- a/lib/xPL_Security.pm
+++ b/lib/xPL_Security.pm
@@ -69,8 +69,7 @@ sub area_id_list {
 
 sub request_stat {
     my ( $self, $request_all ) = @_;
-    $self->SUPER::send_cmnd(
-        'security.request' => { 'request' => 'gateinfo' } );
+    $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'gateinfo' } );
     if ($request_all) {
         for my $zone ( $self->find_members('xPL_Zone') ) {
             if ($zone) {
@@ -97,8 +96,7 @@ sub default_setstate {
               $$self{'security.gateinfo'}{'zone-commands'};
             $$self{'area_commands'} =
               $$self{'security.gateinfo'}{'area-commands'};
-            &::print_log(
-                    "[xPL_SecurityGateway] Received security.gateinfo message."
+            &::print_log( "[xPL_SecurityGateway] Received security.gateinfo message."
                   . " Zone Count= "
                   . $$self{'zone_count'}
                   . " Area Count= "
@@ -107,42 +105,34 @@ sub default_setstate {
 
             # send out a request to get info about the supported zone list
             if ( $$self{'zone_count'} > 0 ) {
-                $self->SUPER::send_cmnd(
-                    'security.request' => { 'request' => 'zonelist' } );
+                $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'zonelist' } );
             }
             elsif ( $$self{'area_count'} > 0 ) {
-                $self->SUPER::send_cmnd(
-                    'security.request' => { 'request' => 'arealist' } );
+                $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'arealist' } );
             }
             else {
-                $self->SUPER::send_cmnd(
-                    'security.request' => { 'request' => 'gatestat' } );
+                $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'gatestat' } );
             }
         }
         elsif ( $$self{changed} =~ /security\.zonelist/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.zonelist message")
+            &::print_log("[xPL_SecurityGateway] Received security.zonelist message")
               if $main::Debug{xpl_security};
             if ( $$self{'security.zonelist'}{'zone-list'} ) {
                 my @list =
                   split( /,/, $$self{'security.zonelist'}{'zone-list'} );
                 @{ $$self{'zone_id_list'} } =
                   ( @{ $$self{'zone_id_list'} }, @list );
-                print "zone_id_list size is "
-                  . @{ $$self{'zone_id_list'} } . "\n";
+                print "zone_id_list size is " . @{ $$self{'zone_id_list'} } . "\n";
             }
             if ( $$self{'area_count'} > 0 ) {
-                $self->SUPER::send_cmnd(
-                    'security.request' => { 'request' => 'arealist' } );
+                $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'arealist' } );
             }
             else {
-                $self->SUPER::send_cmnd(
-                    'security.request' => { 'request' => 'gatestat' } );
+                $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'gatestat' } );
             }
         }
         elsif ( $$self{changed} =~ /security\.arealist/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.arealist message")
+            &::print_log("[xPL_SecurityGateway] Received security.arealist message")
               if $main::Debug{xpl_security};
             if ( $$self{'security.arealist'}{'area-list'} ) {
                 my @list =
@@ -150,12 +140,10 @@ sub default_setstate {
                 @{ $$self{'area_id_list'} } =
                   ( @{ $$self{'area_id_list'} }, @list );
             }
-            $self->SUPER::send_cmnd(
-                'security.request' => { 'request' => 'gatestat' } );
+            $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'gatestat' } );
         }
         elsif ( $$self{changed} =~ /security\.gatestat/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.gatestat message")
+            &::print_log("[xPL_SecurityGateway] Received security.gatestat message")
               if $main::Debug{xpl_security};
             $$self{'ac_status'} = $$self{'security.gatestat'}{'ac-fail'};
             $$self{'battery_status'} =
@@ -163,30 +151,25 @@ sub default_setstate {
             $$self{'alarm_status'} = $$self{'security.gatestat'}{'status'};
         }
         elsif ( $$self{changed} =~ /security\.zoneinfo/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.zoneinfo message")
+            &::print_log("[xPL_SecurityGateway] Received security.zoneinfo message")
               if $main::Debug{xpl_security};
         }
         elsif ( $$self{changed} =~ /security\.areainfo/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.areainfo message")
+            &::print_log("[xPL_SecurityGateway] Received security.areainfo message")
               if $main::Debug{xpl_security};
         }
         elsif ( $$self{changed} =~ /security\.zonestat/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.zonestat message")
+            &::print_log("[xPL_SecurityGateway] Received security.zonestat message")
               if $main::Debug{xpl_security};
         }
         elsif ( $$self{changed} =~ /security\.areastat/ ) {
-            &::print_log(
-                "[xPL_SecurityGateway] Received security.areastat message")
+            &::print_log("[xPL_SecurityGateway] Received security.areastat message")
               if $main::Debug{xpl_security};
         }
     }
     else {
-        &::print_log(
-            "[xPL_SecurityGateway] WARN: Gateway state may not be explicitely set.  Ignoring."
-        ) if $main::Debug{xpl_security};
+        &::print_log( "[xPL_SecurityGateway] WARN: Gateway state may not be explicitely set.  Ignoring." )
+          if $main::Debug{xpl_security};
 
         # return a -1 if not changed by xpl so that state is not revised until receipt of gateinfo
         return -1;
@@ -315,9 +298,8 @@ sub new {
     $$self{gateway} = $gateway;
     $gateway->add_item_if_not_present($self);
     $self->SUPER::class_name('security.zone*');
-    $$self{id} = $id;
-    $$self{state_monitor} =
-      "security.zonestat : armed|security.zonestat : alert|security.zonestat : alarm|security.zone : event";
+    $$self{id}            = $id;
+    $$self{state_monitor} = "security.zonestat : armed|security.zonestat : alert|security.zonestat : alarm|security.zone : event";
     $self->SUPER::device_monitor("zone=$id") if $id;
 
     $self->state_overload('off');
@@ -327,8 +309,7 @@ sub new {
 
 sub request_stat {
     my ($self) = @_;
-    $self->SUPER::send_cmnd(
-        'security.request' => { 'request' => 'zonestat' } );
+    $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'zonestat' } );
 }
 
 sub id {
@@ -341,10 +322,7 @@ sub ignore_message {
     my $ignore_message = 0;
     if (
         !(
-            (
-                defined( $$p_data{'security.zonestat'} )
-                and $$p_data{'security.zonestat'}{'zone'} eq $self->id
-            )
+            ( defined( $$p_data{'security.zonestat'} ) and $$p_data{'security.zonestat'}{'zone'} eq $self->id )
             or ( defined( $$p_data{'security.zone'} )
                 and $$p_data{'security.zone'}{'zone'} eq $self->id )
         )
@@ -359,26 +337,20 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /security\.zonestat/ ) {
-            &::print_log( "[xPL_Security] security zone status: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Security] security zone status: " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_security};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
         elsif ( $$self{changed} =~ /security\.zone/ ) {
-            &::print_log( "[xPL_Security] security zone : "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Security] security zone : " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_security};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
 }
@@ -393,9 +365,8 @@ sub new {
     $$self{gateway} = $gateway;
     $gateway->add_item_if_not_present($self);
     $self->SUPER::class_name('security.area*');
-    $$self{id} = $id;
-    $$self{state_monitor} =
-      "security.areastat : armed|security.areastat : alert|security.areastat : alarm|security.area : event";
+    $$self{id}            = $id;
+    $$self{state_monitor} = "security.areastat : armed|security.areastat : alert|security.areastat : alarm|security.area : event";
     $self->SUPER::device_monitor("area=$id") if $id;
 
     $self->state_overload('off');
@@ -405,8 +376,7 @@ sub new {
 
 sub request_stat {
     my ($self) = @_;
-    $self->SUPER::send_cmnd(
-        'security.request' => { 'request' => 'areastat' } );
+    $self->SUPER::send_cmnd( 'security.request' => { 'request' => 'areastat' } );
 }
 
 sub id {
@@ -419,10 +389,7 @@ sub ignore_message {
     my $ignore_message = 0;
     if (
         !(
-            (
-                defined( $$p_data{'security.areastat'} )
-                and $$p_data{'security.areastat'}{'area'} eq $self->id
-            )
+            ( defined( $$p_data{'security.areastat'} ) and $$p_data{'security.areastat'}{'area'} eq $self->id )
             or ( defined( $$p_data{'security.device'} )
                 and $$p_data{'security.area'}{'area'} eq $self->id )
         )
@@ -437,26 +404,20 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /security\.areastat/ ) {
-            &::print_log( "[xPL_Security] security area stat: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Security] security area stat: " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_security};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
         elsif ( $$self{changed} =~ /security\.area/ ) {
-            &::print_log( "[xPL_Security] security area: "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Security] security area: " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_security};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
 }
diff --git a/lib/xPL_Squeezebox.pm b/lib/xPL_Squeezebox.pm
index 754a0c7a8..041bbc4d4 100644
--- a/lib/xPL_Squeezebox.pm
+++ b/lib/xPL_Squeezebox.pm
@@ -159,36 +159,27 @@ sub default_setstate {
     my ( $self, $state, $substate, $set_by ) = @_;
     if ( $set_by =~ /^xpl/i ) {
         if ( $$self{changed} =~ /audio\.basic/ ) {
-            &::print_log( "[xPL_Squeezebox] "
-                  . $self->get_object_name
-                  . " state is $state" )
+            &::print_log( "[xPL_Squeezebox] " . $self->get_object_name . " state is $state" )
               if $main::Debug{xpl_squeezebox};
 
             # TO-DO: process all of the other pertinent attributes available
             return -1
-              if $self->state eq
-              $state;    # don't propagate state unless it has changed
+              if $self->state eq $state;    # don't propagate state unless it has changed
         }
     }
     else {
         my $cmnd = ( $state =~ /^off/i ) ? 'stop' : 'play';
 
         return -1
-          if ( $self->state eq $state )
-          ;              # Don't propagate state unless it has changed.
-        &::print_log( "[xPL_Squeezebox] Request "
-              . $self->get_object_name
-              . " turn "
-              . $cmnd )
+          if ( $self->state eq $state );    # Don't propagate state unless it has changed.
+        &::print_log( "[xPL_Squeezebox] Request " . $self->get_object_name . " turn " . $cmnd )
           if $main::Debug{xpl_squeezebox};
 
         if ( $cmnd eq 'stop' ) {
-            $self->SUPER::send_cmnd(
-                'audio.slimserv' => { 'extended' => 'power 0' } );
+            $self->SUPER::send_cmnd( 'audio.slimserv' => { 'extended' => 'power 0' } );
         }
         else {
-            $self->SUPER::send_cmnd(
-                'audio.slimserv' => { 'command' => $cmnd } );
+            $self->SUPER::send_cmnd( 'audio.slimserv' => { 'command' => $cmnd } );
         }
 
         return;
diff --git a/lib/xml_server.pl b/lib/xml_server.pl
index 436ee416b..458109be5 100644
--- a/lib/xml_server.pl
+++ b/lib/xml_server.pl
@@ -22,8 +22,7 @@
 
 sub xml {
     my ( $request, $options ) = @_;
-    my ( $xml, $xml_types, $xml_groups, $xml_categories, $xml_vars,
-        $xml_objects );
+    my ( $xml, $xml_types, $xml_groups, $xml_categories, $xml_vars, $xml_objects );
 
     return &xml_usage unless $request;
 
@@ -181,16 +180,14 @@ sub xml {
     # List packages
     if ( $request{packages} or $request{package} ) {
         $xml .= "  <packages>\n    <vars>\n";
-        if ( $request{packages}{members} and @{ $request{packages}{members} } )
-        {
+        if ( $request{packages}{members} and @{ $request{packages}{members} } ) {
             foreach my $member ( @{ $request{packages}{members} } ) {
                 no strict 'refs';
                 my ( $type, $base ) = $member =~ /^(.)(.*)/;
                 my $ref;
                 eval "\$ref = \\$member";
                 print_log "xml packages error: $@" if $@;
-                $xml .=
-                  &walk_var( $ref, $member, 3, qw( SCALAR ARRAY HASH CODE ) );
+                $xml .= &walk_var( $ref, $member, 3, qw( SCALAR ARRAY HASH CODE ) );
             }
         }
         else {
@@ -199,8 +196,7 @@ sub xml {
                 next unless $key =~ /.+::$/;
                 next if $key eq 'main::';
                 my $iref = ${$ref}{$key};
-                $xml .=
-                  &walk_var( $iref, $key, 3, qw( SCALAR ARRAY HASH CODE ) );
+                $xml .= &walk_var( $iref, $key, 3, qw( SCALAR ARRAY HASH CODE ) );
             }
         }
         $xml .= "    </vars>\n  </packages>\n";
@@ -212,9 +208,7 @@ sub xml {
         if (   ( $request{vars}{members} and @{ $request{vars}{members} } )
             or ( $request{var}{members} and @{ $request{var}{members} } ) )
         {
-            foreach my $member ( @{ $request{vars}{members} },
-                @{ $request{var}{members} } )
-            {
+            foreach my $member ( @{ $request{vars}{members} }, @{ $request{var}{members} } ) {
                 no strict 'refs';
                 my ( $type, $name ) = $member =~ /^([\$\@\%\&])?(.+)/;
                 my $ref;
@@ -232,8 +226,7 @@ sub xml {
                 }
                 elsif ( $member =~ /.+::$/ ) {
                     eval "\$ref = \\\%$member";
-                    $xml .=
-                      &walk_var( $ref, $name, 2, qw( SCALAR ARRAY HASH CODE ) )
+                    $xml .= &walk_var( $ref, $name, 2, qw( SCALAR ARRAY HASH CODE ) )
                       if $ref;
                 }
                 else {
@@ -473,8 +466,7 @@ sub object_detail {
             print_log "xml: object_dets f $f ev $value" if $Debug{xml};
         }
         elsif ( $f eq 'html' and $object->can('get_type') ) {
-            $value = "<!\[CDATA\["
-              . &html_item_state( $object, $object->get_type ) . "\]\]>";
+            $value = "<!\[CDATA\[" . &html_item_state( $object, $object->get_type ) . "\]\]>";
             print_log "xml: object_dets f $f" if $Debug{xml};
         }
         else {
@@ -570,9 +562,7 @@ sub xml_usage {
         my $url = "/sub?xml($r)";
         $html .= "<h2>$r</h2>\n<p><a href='$url'>$url</a></p>\n<ul>\n";
         foreach my $opt ( sort keys %options ) {
-            if ( $options{$opt}{applyto} eq 'all' or grep /^$r$/,
-                split /\|/, $options{$opt}{applyto} )
-            {
+            if ( $options{$opt}{applyto} eq 'all' or grep /^$r$/, split /\|/, $options{$opt}{applyto} ) {
                 $url = "/sub?xml($r,$opt";
                 if ( defined $options{$opt}{example} ) {
                     foreach ( split /\|/, $options{$opt}{example} ) {
diff --git a/web/bin/DSC5401_web_content.pl b/web/bin/DSC5401_web_content.pl
index 220f8a4c9..0c7e2ed4e 100644
--- a/web/bin/DSC5401_web_content.pl
+++ b/web/bin/DSC5401_web_content.pl
@@ -25,8 +25,7 @@
         $DSC->{TstatBroadcast} = $DSCarg;
         DSC5401->cmd( "TemperatureBroadcastControl", 1 ) if $DSCarg eq 'on';
         DSC5401->cmd( "TemperatureBroadcastControl", 0 ) if $DSCarg eq 'off';
-        &::print_log(
-            "DSC5401 WEB: The system temperature broadcast is now $DSCarg");
+        &::print_log("DSC5401 WEB: The system temperature broadcast is now $DSCarg");
         &::logit(
             "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
             "DSC5401 WEB: The system temperature broadcast is now $DSCarg"
@@ -47,24 +46,19 @@
     if ( $DSCcommand eq "PartitionArmControl" ) {
         DSC5401->cmd( "PartitionArmControl", 1 );
         &::print_log("DSC5401 WEB: Arming AWAY without access code");
-        &::logit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            "DSC5401 WEB: Arming AWAY without access code"
-        );
+        &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            "DSC5401 WEB: Arming AWAY without access code" );
     }
 
     if ( $DSCcommand eq "PartitionArmControlStayArm" ) {
         DSC5401->cmd( "PartitionArmControlStayArm", 1 );
         &::print_log("DSC5401 WEB: Arming STAY without access code");
-        &::logit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            "DSC5401 WEB: Arming STAY without access code"
-        );
+        &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            "DSC5401 WEB: Arming STAY without access code" );
     }
 
     if ( $DSCcommand eq "SetDateTime" ) {
-        my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) =
-          localtime(time);
+        my ( $sec, $m, $h, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
         $year = sprintf( "%02d", $year % 100 );
         $mon += 1;
         $m    = ( $m < 10 )    ? "0" . $m    : $m;
@@ -73,9 +67,7 @@
         $mon  = ( $mon < 10 )  ? "0" . $mon  : $mon;
         my $TimeStamp = "$h$m$mon$mday$year";
         $DSC->cmd( "SetDateTime", $TimeStamp );
-        &::print_log(
-            "DSC5401 WEB: Setting time on DSC panel to $TimeStamp (hhmmMMDDYY)"
-        );
+        &::print_log( "DSC5401 WEB: Setting time on DSC panel to $TimeStamp (hhmmMMDDYY)" );
         &::logit(
             "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
             "DSC5401 WEB: Setting time on DSC panel to $TimeStamp (hhmmMMDDYY)"
@@ -86,19 +78,15 @@
         $DSC->cmd( "PartitionArmControlWithCode", "1", "$DSCarg" )
           if $DSCarg ne '';
         &::print_log("DSC5401 WEB: Arming system with access code");
-        &::logit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            "DSC5401 WEB: Arming system with access code"
-        );
+        &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            "DSC5401 WEB: Arming system with access code" );
     }
 
     if ( $DSCcommand eq "PartitionDisarmControl" ) {
         $DSC->cmd( "PartitionDisarmControl", "1", "$DSCarg" ) if $DSCarg ne '';
         &::print_log("DSC5401 WEB: Disarming system with access code");
-        &::logit(
-            "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
-            "DSC5401 WEB: Disarming system with access code"
-        );
+        &::logit( "$main::config_parms{data_dir}/logs/DSC5401.$main::Year_Month_Now.log",
+            "DSC5401 WEB: Disarming system with access code" );
     }
 
     if ( $DSCcommand eq "PartitionEventMsg" ) {
@@ -120,8 +108,7 @@
 # html header  {{{
 use vars '$DSC';
 my $html;
-$html .=
-  qq[<html>\n<meta http-equiv='refresh' content='$DSCrefresh; URL=DSC5401_web_content.pl?refresh=$DSCrefresh'>\n];
+$html .= qq[<html>\n<meta http-equiv='refresh' content='$DSCrefresh; URL=DSC5401_web_content.pl?refresh=$DSCrefresh'>\n];
 $html .= qq[
 <body>
 ];
@@ -155,18 +142,15 @@
           if $status ne "restored";
 
         $html .= qq[    <td width=33% align='left'>];
-        $html .=
-          qq[ <img border=0 name="ZONE_${_}" src="/graphics/green_bullet.gif">&nbsp $Str</td>\n]
+        $html .= qq[ <img border=0 name="ZONE_${_}" src="/graphics/green_bullet.gif">&nbsp $Str</td>\n]
           if $status eq "restored";
-        $html .=
-          qq[ <img border=0 name="ZONE_${_}"src="/graphics/red_bullet.gif">&nbsp $Str</td>\n]
+        $html .= qq[ <img border=0 name="ZONE_${_}"src="/graphics/red_bullet.gif">&nbsp $Str</td>\n]
           if $status ne "restored";
     }
     else {
         $Str  .= "Not Used";
         $html .= qq[    <td width=33% align='left' BGCOLOR='#DDDDDD'>];
-        $html .=
-          qq[ <img border=0 src="/graphics/black_bullet.gif">&nbsp $Str</td>\n]
+        $html .= qq[ <img border=0 src="/graphics/black_bullet.gif">&nbsp $Str</td>\n]
           if $Str =~ /Not Used/;
     }
 
@@ -191,11 +175,9 @@
 
 #$html .= qq[    <td width=50%>Thermostat broadcast is $state , set to ];
 $html .= qq[    <td width=50%>Thermostat broadcast ];
-$html .=
-  qq[<input type="submit"  name="TstatBroadcast"  value="off" style="width: 30; border: 1px solid silver;">]
+$html .= qq[<input type="submit"  name="TstatBroadcast"  value="off" style="width: 30; border: 1px solid silver;">]
   if $state eq 'on';
-$html .=
-  qq[<input type="submit"  name="TstatBroadcast"  value="on" style="width: 40; border: 1px solid silver;">]
+$html .= qq[<input type="submit"  name="TstatBroadcast"  value="on" style="width: 40; border: 1px solid silver;">]
   if $state eq 'off';
 $html .= qq[</td>\n];
 
@@ -204,11 +186,9 @@
 
 #$html .= qq[    <td width=50%>Time broadcast is $state , set to ];
 $html .= qq[    <td width=50%>Time broadcast ];
-$html .=
-  qq[<input type="submit"  name="TimeBroadcast"  value="off"style="width: 30; border: 1px solid silver;">]
+$html .= qq[<input type="submit"  name="TimeBroadcast"  value="off"style="width: 30; border: 1px solid silver;">]
   if $state eq 'on';
-$html .=
-  qq[<input type="submit"  name="TimeBroadcast"  value="on" style="width: 40; border: 1px solid silver;">]
+$html .= qq[<input type="submit"  name="TimeBroadcast"  value="on" style="width: 40; border: 1px solid silver;">]
   if $state eq 'off';
 $html .= qq[</td>\n];
 $html .= qq[  </tr>\n\n];
@@ -219,20 +199,16 @@
 my $state = $DSC->{TstatBroadcast};
 my $log = $::config_parms{DSC_5401_part_log} ? "on" : "off";
 $html .= qq[    <td width=50%>Partition event msg &nbsp; ($log)&nbsp;];
-$html .=
-  qq[<input type="submit"  name="PartitionEventMsg"  value="On"  style="width: 50; border: 1px solid silver;">];
-$html .=
-  qq[<input type="submit"  name="PartitionEventMsg"  value="Off" style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="PartitionEventMsg"  value="On"  style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="PartitionEventMsg"  value="Off" style="width: 50; border: 1px solid silver;">];
 $html .= qq[</td>\n];
 
 # trigger zone event log message
 my $state = $DSC->{TimeBroadcast};
 my $log = $::config_parms{DSC_5401_zone_log} ? "on" : "off";
 $html .= qq[    <td width=50%>Enable zone event msg &nbsp; ($log)&nbsp;];
-$html .=
-  qq[<input type="submit"  name="ZoneEventMsg"  value="On"  style="width: 50; border: 1px solid silver;">];
-$html .=
-  qq[<input type="submit"  name="ZoneEventMsg"  value="Off" style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="ZoneEventMsg"  value="On"  style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="ZoneEventMsg"  value="Off" style="width: 50; border: 1px solid silver;">];
 $html .= qq[</td>\n];
 $html .= qq[  </tr>\n\n];
 
@@ -241,16 +217,13 @@
 # set alarm time and date from PC
 #$html .= qq[    <td width=50%>];
 $html .= qq[    <td width=50%>];
-$html .=
-  qq[<input type="submit"  name="SetDateTime"  value="Set time & date" style="width: 100; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="SetDateTime"  value="Set time & date" style="width: 100; border: 1px solid silver;">];
 $html .= qq[</td>\n];
 
 # enable verbose logging
 $html .= qq[    <td width=50%>Verbose arming control&nbsp;&nbsp;];
-$html .=
-  qq[<input type="submit"  name="VerboseArmingControl"  value="On"  style="width: 50; border: 1px solid silver;">];
-$html .=
-  qq[<input type="submit"  name="VerboseArmingControl"  value="Off" style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="VerboseArmingControl"  value="On"  style="width: 50; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="VerboseArmingControl"  value="Off" style="width: 50; border: 1px solid silver;">];
 
 $html .= qq[</td>\n];
 $html .= qq[  </tr>\n\n];
@@ -259,8 +232,7 @@
 
 # Arm system Away without access code
 $html .= qq[    <td width=50%>System ];
-$html .=
-  qq[<input type="submit"  name="PartitionArmControl"  value="Arm away" style="width: 60; border: 1px solid silver;">];
+$html .= qq[<input type="submit"  name="PartitionArmControl"  value="Arm away" style="width: 60; border: 1px solid silver;">];
 $html .= qq[</td>\n];
 $html .= qq[    <td width=50%>System ];
 $html .=
diff --git a/web/bin/ListManager.pl b/web/bin/ListManager.pl
index 5887b43c3..4459ce8fb 100644
--- a/web/bin/ListManager.pl
+++ b/web/bin/ListManager.pl
@@ -17,8 +17,8 @@
 my $DisplayCreateItem_Category   = "";
 my $DisplayCreateCategory_Status = "";
 my $DisplayKeyboard              = 1;     # do we display the keyboard
-my @Category;    # array containing category name, in file order
-                 # this allow to get printed list in store aisle.
+my @Category;                             # array containing category name, in file order
+                                          # this allow to get printed list in store aisle.
 my $AtShopStatus = "";
 my $NumColumns;
 my $ColumnsWidth;
@@ -94,7 +94,7 @@
 
 if ( exists $param{'DisplayManageList_ChangeList'} ) {
     $PrettyListName = $param{'DisplayManageList_ChangeList'};
-    $ListFile = "$config_parms{'data_dir'}/ListManager/${PrettyListName}.lst";
+    $ListFile       = "$config_parms{'data_dir'}/ListManager/${PrettyListName}.lst";
     system("touch $ListFile") if ( !-f $ListFile );
     $Config{'CurrentList'} = $ListFile;
     WriteConfig();
@@ -105,7 +105,7 @@
 
 if ( exists $param{'DisplayManageList_NewList'} ) {
     $PrettyListName = $param{'DisplayManageList_NewList'};
-    $ListFile = "$config_parms{'data_dir'}/ListManager/${PrettyListName}.lst";
+    $ListFile       = "$config_parms{'data_dir'}/ListManager/${PrettyListName}.lst";
     system("touch $ListFile") if ( !-f $ListFile );
     $Config{'CurrentList'} = $ListFile;
     WriteConfig();
@@ -116,10 +116,7 @@
 
 if ( exists $param{'DisplayCreateCategory_Action'} ) {
     $param{'DisplayCreateCategory_Name'} =~ s/(\w+)/\u\L$1/g;
-    if (
-        exists $CurrentItem{ $param{'DisplayCreateCategory_Name'} }{'DummyItem'}
-      )
-    {
+    if ( exists $CurrentItem{ $param{'DisplayCreateCategory_Name'} }{'DummyItem'} ) {
         $DisplayCreateCategory_Status =
           "<font color=red><h3>Category $param{'DisplayCreateCategory_Name'} already exists</h3></font>";
         $param{'HomePage_Action'} = 'Create Category';
@@ -134,8 +131,7 @@
               if ( $c eq $param{'DisplayCreateCategory_BeforeCategory'} );
             push @Category, $c;
         }
-        $DisplayCreateCategory_Status =
-          "<font color=red><h3>$param{'DisplayCreateCategory_Name'} created</h3></font>";
+        $DisplayCreateCategory_Status = "<font color=red><h3>$param{'DisplayCreateCategory_Name'} created</h3></font>";
         $CurrentItem{ $param{'DisplayCreateCategory_Name'} }{'DummyItem'} = 1;
     }
     WriteList();
@@ -159,21 +155,18 @@
 }
 
 if ( exists $param{'DisplayManageItem'} ) {
-    if ( exists $param{'DisplayManageItem_submit'} )
-    {    # we have change something
+    if ( exists $param{'DisplayManageItem_submit'} ) {    # we have change something
         my $Category = $param{'DisplayManageItem_Category'};
         foreach my $k (%param) {
             if ( $k =~ /DisplayManageItem_Ren/ ) {
-                my ( $Category, $Item ) =
-                  $k =~ /^DisplayManageItem_Ren_(.*)_(.*)$/;
+                my ( $Category, $Item ) = $k =~ /^DisplayManageItem_Ren_(.*)_(.*)$/;
                 next if ( $Item eq $param{$k} );
                 $CurrentItem{$Category}{ $param{$k} } =
                   $CurrentItem{$Category}{$Item};
                 delete $CurrentItem{$Category}{$Item};
             }
             elsif ( $k =~ /DisplayManageItem_Del/ ) {
-                my ( $Category, $Item ) =
-                  $k =~ /^DisplayManageItem_Del_(.*)_(.*)$/;
+                my ( $Category, $Item ) = $k =~ /^DisplayManageItem_Del_(.*)_(.*)$/;
                 delete $CurrentItem{$Category}{$Item};
             }
         }
@@ -185,8 +178,7 @@
 }
 
 if ( exists $param{'DisplayManageCategory'} ) {
-    if ( exists $param{'DisplayManageCategory_submit'} )
-    {    # we have change something
+    if ( exists $param{'DisplayManageCategory_submit'} ) {    # we have change something
         foreach my $k (%param) {
             if ( $k =~ /DisplayManageCategory_Ren/ ) {
                 my ($Cat) = $k =~ /^DisplayManageCategory_Ren_(.*)$/;
@@ -239,11 +231,10 @@
         foreach my $Item ( keys %{ $CurrentItem{$Cat} } ) {
             next if $Item eq "DummyItem";
             my $FormKey = "${Cat}";
-            $FormKey =~
-              s/ /XYZ/g;  # javascript workaround XYZ separate category and item
+            $FormKey =~ s/ /XYZ/g;    # javascript workaround XYZ separate category and item
             $FormKey .= "_$Item";
             next if !$param{$FormKey};
-            next if ( $param{$FormKey} == $CurrentItem{$Cat}{$Item} ); # already
+            next if ( $param{$FormKey} == $CurrentItem{$Cat}{$Item} );    # already
             if ( $CurrentItem{$Cat}{$Item} == 0 && $param{$FormKey} > 0 ) {
                 $AddedCount++;
                 $AddedItem = $Item;
@@ -300,12 +291,11 @@
         foreach my $Item ( keys %{ $CurrentItem{$Cat} } ) {
             next if $Item eq "DummyItem";
             my $FormKey = "${Cat}";
-            $FormKey =~
-              s/ /XYZ/g;  # javascript workaround XYZ separate category and item
+            $FormKey =~ s/ /XYZ/g;    # javascript workaround XYZ separate category and item
             $FormKey .= "_$Item";
             next if !$param{$FormKey};
             next
-              if ( $param{$FormKey} == $CurrentItem{$Cat}{$Item} ); # same value
+              if ( $param{$FormKey} == $CurrentItem{$Cat}{$Item} );    # same value
             if ( $CurrentItem{$Cat}{$Item} == 0 && $param{$FormKey} > 0 ) {
                 $AddedCount++;
                 $AddedItem = $Item;
@@ -380,22 +370,16 @@
     $param{'DisplayCreateItem_Item'} =~ s/(\w+)/\u\L$1/g;
 
     # duplicate entry
-    if (
-        exists $CurrentItem{ $param{'DisplayCreateItem_Category'} }
-        { $param{'DisplayCreateItem_Item'} } )
-    {
-        $DisplayCreateItem_Status =
-          $param{'DisplayCreateItem_Item'} . " exists";
+    if ( exists $CurrentItem{ $param{'DisplayCreateItem_Category'} }{ $param{'DisplayCreateItem_Item'} } ) {
+        $DisplayCreateItem_Status   = $param{'DisplayCreateItem_Item'} . " exists";
         $DisplayCreateItem_Item     = $param{'DisplayCreateItem_Item'};
         $DisplayCreateItem_Category = $param{'DisplayCreateItem_Category'};
         $param{'HomePage_Action'}   = 'Create Item';
     }
     else {
-        $CurrentItem{ $param{'DisplayCreateItem_Category'} }
-          { $param{'DisplayCreateItem_Item'} } =
+        $CurrentItem{ $param{'DisplayCreateItem_Category'} }{ $param{'DisplayCreateItem_Item'} } =
           ( $param{'DisplayCreateItem_CurrentList'} ) ? 1 : 0;
-        $Status =
-          "<i>$param{'DisplayCreateItem_Item'}</i> added in $param{'DisplayCreateItem_Category'}";
+        $Status = "<i>$param{'DisplayCreateItem_Item'}</i> added in $param{'DisplayCreateItem_Category'}";
         WriteList();
     }
     if ( exists $param{'DisplayCreateItem_AddMultiple'} ) {    # add more Item
@@ -470,8 +454,7 @@
 elsif ( $param{'HomePage_Action'} eq 'Create Item' ) {
     $DisplayCreateItem_Category = $param{'DisplayCategoryItem_Category'}
       if exists $param{'DisplayCategoryItem_Category'};
-    DisplayCreateItem( $DisplayCreateItem_Status, $DisplayCreateItem_Item,
-        $DisplayCreateItem_Category );
+    DisplayCreateItem( $DisplayCreateItem_Status, $DisplayCreateItem_Item, $DisplayCreateItem_Category );
 }
 elsif ( $param{'HomePage_Action'} eq 'Man Page' ) {
     DisplayManPage();
@@ -545,8 +528,7 @@ sub DisplayAbout {
 sub DisplayAtShop {
     my $Msg = shift;
     $html .= qq[<p><center>$Msg</center></p>\n] if $Msg;
-    foreach my $DisplayCategory (@Category)
-    {    # no sort, to display in aisles way (shopping)
+    foreach my $DisplayCategory (@Category) {    # no sort, to display in aisles way (shopping)
         my $HeaderPrint = 0;
         my $num         = 0;
         foreach my $Item ( sort keys %{ $CurrentItem{$DisplayCategory} } ) {
@@ -556,8 +538,7 @@ sub DisplayAtShop {
                 $html .= qq[</tr>\n<tr>\n] if $num % $NumColumns == 0;
                 my $Count = "($CurrentItem{$DisplayCategory}{$Item})"
                   if $CurrentItem{$DisplayCategory}{$Item} > 1;
-                $html .=
-                  qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
+                $html .= qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
                 $num++;
             }
         }
@@ -613,14 +594,11 @@ sub DisplayCategoryItem {
    </script>
    ];
 
-    $html .=
-      qq[<input type="hidden" name="DisplayCategoryItem_Category" value="$Category">\n];
+    $html .= qq[<input type="hidden" name="DisplayCategoryItem_Category" value="$Category">\n];
     $html .= qq[<table width="100%">];
     $html .= qq[<tr>\n];
-    $html .=
-      qq[<td align=left><input type="submit" name="DisplayCategoryItem_SelectAll" value="Select All"></td>\n];
-    $html .=
-      qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Item"></td>\n];
+    $html .= qq[<td align=left><input type="submit" name="DisplayCategoryItem_SelectAll" value="Select All"></td>\n];
+    $html .= qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Item"></td>\n];
     $html .= qq[</tr>\n];
     $html .= qq[</table>];
 
@@ -653,8 +631,7 @@ sub DisplayCategoryItem {
                      onClick="doPlus('${JavaCat}_${Item}_check','${JavaCat}_${Item}')">\n];
             $html .= qq[<input type="button" name="minus" value="-" 
                      onClick="doMinus('${JavaCat}_${Item}_check','${JavaCat}_${Item}')">\n];
-            $html .=
-              qq[<input type="checkbox" disabled name="${JavaCat}_${Item}_check" $Checked>\n];
+            $html .= qq[<input type="checkbox" disabled name="${JavaCat}_${Item}_check" $Checked>\n];
 
             $html .=
               qq[$Item <input type="text"  value="$value" name="${JavaCat}_${Item}" size="1" style="border:solid 0 #fff; color:#630; background:#fff none;"></td>\n];
@@ -662,8 +639,7 @@ sub DisplayCategoryItem {
         }
         $html .= qq[</tr>];
         $html .= qq[</table>\n];
-        $html .=
-          qq[<p><center>No Item defined in category $DisplayCategory</center></p>]
+        $html .= qq[<p><center>No Item defined in category $DisplayCategory</center></p>]
           if !$num;
         $SelectAll = '';
     }
@@ -704,8 +680,7 @@ sub DisplayCreateCategory {
     $html .= ( $Config{'DisplayMode'} eq 'normal' ) ? "<center>\n" : "<left>\n";
     $html .= qq[<p><font color=red size="2">$Status</font></p>]
       if ( $Status ne "" );
-    $html .=
-      qq[<p>Category:<input type="text" name="DisplayCreateCategory_Name" size="30"></p>\n];
+    $html .= qq[<p>Category:<input type="text" name="DisplayCreateCategory_Name" size="30"></p>\n];
 
     # display Category pull down if there is defined category{{{
     if ( $#Category >= 0 ) {
@@ -726,8 +701,7 @@ sub DisplayCreateCategory {
     # display keyboard
     InsertKeyboard('DisplayCreateCategory_Name') if $DisplayKeyboard;
 
-    my $AddMultiple =
-      ( exists $param{'DisplayCreateCategory_AddMultiple'} ) ? 'checked' : '';
+    my $AddMultiple = ( exists $param{'DisplayCreateCategory_AddMultiple'} ) ? 'checked' : '';
     $html .= qq[
    <p>Create multiple: <input type="checkbox" name="DisplayCreateCategory_AddMultiple" $AddMultiple></p>
    <p>
@@ -735,8 +709,7 @@ sub DisplayCreateCategory {
     <input type="submit" name="Cancel" value="Cancel">
    </p>
    ];
-    $html .=
-      ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
+    $html .= ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
     1;
 }
 
@@ -793,8 +766,7 @@ sub DisplayCreateItem {
 
         #}}}
 
-        $html .=
-          qq[<p>Item:<input type="text" name="DisplayCreateItem_Item" size=30 value="$SelectedItem"></p>\n];
+        $html .= qq[<p>Item:<input type="text" name="DisplayCreateItem_Item" size=30 value="$SelectedItem"></p>\n];
     }
     $html .= qq[<p><font color=red size="2">$Status</font></p>]
       if ( $Status ne "" );
@@ -803,10 +775,8 @@ sub DisplayCreateItem {
     InsertKeyboard('DisplayCreateItem_Item') if $DisplayKeyboard;
 
     # the submit button
-    my $AddMultiple =
-      ( exists $param{'DisplayCreateItem_AddMultiple'} ) ? 'checked' : '';
-    my $AddToListDefault =
-      ( $Config{'AddToListDefault'} == 1 ) ? 'checked' : '';
+    my $AddMultiple = ( exists $param{'DisplayCreateItem_AddMultiple'} ) ? 'checked' : '';
+    my $AddToListDefault = ( $Config{'AddToListDefault'} == 1 ) ? 'checked' : '';
     $html .= qq[
       <p>Add item to selected: <input type="checkbox" name="DisplayCreateItem_CurrentList" $AddToListDefault></p>
       <p>Add multiple: <input type="checkbox" name="DisplayCreateItem_AddMultiple" $AddMultiple></p>
@@ -815,8 +785,7 @@ sub DisplayCreateItem {
       <input type="submit" name="Cancel" value="Cancel">
       </p>
       ];
-    $html .=
-      ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
+    $html .= ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
 
     1;
 }
@@ -884,13 +853,11 @@ sub DisplayHomePage {
         $html .= qq[           <TD><center><H3>$Status<H3><center></TD>\n];
     }
 
-    $html .=
-      qq[  <TD align="right"> <input type = "submit" name = "HomePageRemove" value = "Remove" > </TD>\n];
+    $html .= qq[  <TD align="right"> <input type = "submit" name = "HomePageRemove" value = "Remove" > </TD>\n];
     $html .= qq[    </tr>\n];
 
     # pda status
-    $html .=
-      qq[     <tr><TD colspan="2"><center><H3>$Status<H3><center></TD></TR>\n]
+    $html .= qq[     <tr><TD colspan="2"><center><H3>$Status<H3><center></TD></TR>\n]
       if ( $Config{'DisplayMode'} eq 'pda' );
 
     $html .= qq[   </table>\n];
@@ -945,18 +912,14 @@ sub DisplayManageCategory {
 
     $html .= qq[<input type="hidden" name="DisplayManageCategory" value="1">\n];
     $html .= qq[<table width="100%">\n];
-    $html .=
-      qq[  <TD align="left"> <input type="submit" name="Cancel" value="Cancel" > </TD>\n];
-    $html .=
-      qq[  <TD align="right"> <input type="submit" name="DisplayManageCategory_submit" value="Submit" > </TD>\n];
+    $html .= qq[  <TD align="left"> <input type="submit" name="Cancel" value="Cancel" > </TD>\n];
+    $html .= qq[  <TD align="right"> <input type="submit" name="DisplayManageCategory_submit" value="Submit" > </TD>\n];
     $html .= qq[</table>\n];
     $html .= qq[<table width="100%">\n];
-    $html .=
-      qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Category"></td>\n];
+    $html .= qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Category"></td>\n];
     $html .= qq[</table>\n];
 
-    $html .=
-      qq[<table width="100%" cellspacing=0 ><colgroup span="$DisplayColumns" >\n];
+    $html .= qq[<table width="100%" cellspacing=0 ><colgroup span="$DisplayColumns" >\n];
 
     # display delete header
     my $i    = 0;
@@ -973,8 +936,7 @@ sub DisplayManageCategory {
     foreach my $Category ( keys %CurrentItem ) {
         next if $Category eq "Web_Functions";
         $html .= qq[ <tr>\n] if $num % $DisplayColumns == 0;
-        $html .=
-          qq[   <td><input type="checkbox" name="DisplayManageCategory_Del_${Category}" value="1">\n];
+        $html .= qq[   <td><input type="checkbox" name="DisplayManageCategory_Del_${Category}" value="1">\n];
         $html .=
           qq[    <input type="text" name="DisplayManageCategory_Ren_${Category}" value="$Category" onkeypress="return noenter()"></td>\n];
         $num++;
@@ -1019,12 +981,10 @@ sub DisplayManageItem {
    </script>
    ];
     $html .= qq[<input type="hidden" name="DisplayManageItem" value="1">\n];
-    $html .=
-      qq[<input type="hidden" name="DisplayCategoryItem_Category" value="$Category">\n];
+    $html .= qq[<input type="hidden" name="DisplayCategoryItem_Category" value="$Category">\n];
 
     $html .= qq[<table width="100%">\n];
-    $html .=
-      qq[  <TD align="left"> <input type="submit" name="Cancel" value="Cancel" > </TD>\n];
+    $html .= qq[  <TD align="left"> <input type="submit" name="Cancel" value="Cancel" > </TD>\n];
 
     # normal mode status
     $Status = '' if !$Config{'DisplayStatus'};
@@ -1032,30 +992,25 @@ sub DisplayManageItem {
         $html .= qq[ <TD align=center><H3>$Status<H3></TD>\n];
     }
 
-    $html .=
-      qq[  <TD align="right"> <input type="submit" name="DisplayManageItem_submit" value="Submit" > </TD>\n];
+    $html .= qq[  <TD align="right"> <input type="submit" name="DisplayManageItem_submit" value="Submit" > </TD>\n];
     $html .= qq[    </tr>\n];
 
     # pda status
-    $html .=
-      qq[     <tr><TD colspan="2"><center><H3>$Status<H3><center></TD></TR>\n]
+    $html .= qq[     <tr><TD colspan="2"><center><H3>$Status<H3><center></TD></TR>\n]
       if ( $Config{'DisplayMode'} eq 'pda' );
     $html .= qq[   </table>\n];
     $html .= qq[<table width="100%">\n];
-    $html .=
-      qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Item"></td>\n];
+    $html .= qq[<td align=right><input type="submit" name="HomePage_Action" value="Create Item"></td>\n];
     $html .= qq[</table>\n];
 
     if ( $Category eq '' ) {
-        $html .=
-          qq[<p><h3><center>Please select a category</center></h3></p>\n];
+        $html .= qq[<p><h3><center>Please select a category</center></h3></p>\n];
     }
     else {
         $html .= qq[<p><h3><center>$Category</center></h3></p>\n];
     }
 
-    $html .=
-      qq[<table width="100%" cellspacing=0 ><colgroup span="$DisplayColumns" >\n];
+    $html .= qq[<table width="100%" cellspacing=0 ><colgroup span="$DisplayColumns" >\n];
 
     # display delete/rename header
     my $i    = 0;
@@ -1072,8 +1027,7 @@ sub DisplayManageItem {
     foreach my $Item ( keys %{ $CurrentItem{$Category} } ) {
         next if ( $Item eq 'DummyItem' );
         $html .= qq[     <tr>\n] if $num % $DisplayColumns == 0;
-        $html .=
-          qq[       <td><input type="checkbox" name="DisplayManageItem_Del_${Category}_${Item}" value="1">\n];
+        $html .= qq[       <td><input type="checkbox" name="DisplayManageItem_Del_${Category}_${Item}" value="1">\n];
         $html .=
           qq[           <input type="text" name="DisplayManageItem_Ren_${Category}_${Item}" value="$Item" onkeypress="return noenter()"></td>\n];
         $num++;
@@ -1087,8 +1041,7 @@ sub DisplayManageItem {
     # we display all category
     foreach my $cat ( sort keys %CurrentItem ) {
         next if $cat eq '';
-        $html .=
-          qq[   <input type="submit" name="DisplayManageItem_Category" value="$cat">\n];
+        $html .= qq[   <input type="submit" name="DisplayManageItem_Category" value="$cat">\n];
     }
 
     1;
@@ -1116,22 +1069,19 @@ sub DisplayManageList {
 
     #}}}
     $html .= ( $Config{'DisplayMode'} eq 'normal' ) ? "<center>\n" : "<left>\n";
-    $html .=
-      qq[<p>Select from the following list, or enter a new list name</p>\n];
+    $html .= qq[<p>Select from the following list, or enter a new list name</p>\n];
     $html .= qq[<TABLE BORDER><TR>\n];
 
     my @Lists = <$config_parms{'data_dir'}/ListManager/*.lst>;
     foreach my $l (@Lists) {
         my ($PrettyName) = $l =~ /.*\/(.*).lst$/;
         $html .= qq[</tr>\n<TR>\n] if $num % $cols == 0;
-        $html .=
-          qq[<TD><center><input type="submit" name="DisplayManageList_ChangeList" value="$PrettyName"></center></TD>\n];
+        $html .= qq[<TD><center><input type="submit" name="DisplayManageList_ChangeList" value="$PrettyName"></center></TD>\n];
         $num++;
     }
 
     $html .= qq[</TR></TABLE>\n];
-    $html .=
-      qq[<p>New List:<input type="text" name="DisplayManageList_NewList" size=30></p>\n];
+    $html .= qq[<p>New List:<input type="text" name="DisplayManageList_NewList" size=30></p>\n];
 
     # display keyboard
     InsertKeyboard('DisplayManageList_NewList') if $DisplayKeyboard;
@@ -1144,8 +1094,7 @@ sub DisplayManageList {
    </p>
    ];
 
-    $html .=
-      ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
+    $html .= ( $Config{'DisplayMode'} eq 'normal' ) ? "</center>\n" : "</left>\n";
     1;
 }
 
@@ -1385,8 +1334,7 @@ =head1 Credits and contact information
 #  ======================== POD END ==================================
 ];
 
-    open DOC,
-      "echo \"$POD\" | pod2html --cachedir=$config_parms{html_alias_cache} --flush 2>/dev/null |";
+    open DOC, "echo \"$POD\" | pod2html --cachedir=$config_parms{html_alias_cache} --flush 2>/dev/null |";
     my $content = 0;
     while (<DOC>) {
         $content = 1 if /<body/;
@@ -1431,36 +1379,29 @@ sub DisplayNewUserInfo {
 #}}}
 #sub DisplayPreferences{{{
 sub DisplayPreferences {
-    my $CheckedPDA = ( $Config{'DisplayKeyboardPDA'} == 1 ) ? 'checked' : '';
-    my $CheckedNormal =
-      ( $Config{'DisplayKeyboardNormal'} == 1 ) ? 'checked' : '';
-    my $CheckedPipe   = ( $Config{'PrintPipe'} == 1 )     ? 'checked' : '';
-    my $StatusChecked = ( $Config{'DisplayStatus'} == 1 ) ? 'checked' : '';
-    my $CheckedAddToListDefault =
-      ( $Config{'AddToListDefault'} == 1 ) ? 'checked' : '';
+    my $CheckedPDA              = ( $Config{'DisplayKeyboardPDA'} == 1 )    ? 'checked' : '';
+    my $CheckedNormal           = ( $Config{'DisplayKeyboardNormal'} == 1 ) ? 'checked' : '';
+    my $CheckedPipe             = ( $Config{'PrintPipe'} == 1 )             ? 'checked' : '';
+    my $StatusChecked           = ( $Config{'DisplayStatus'} == 1 )         ? 'checked' : '';
+    my $CheckedAddToListDefault = ( $Config{'AddToListDefault'} == 1 )      ? 'checked' : '';
     $html .= qq[<left>\n];
     $html .= qq[<h3>Please select your preferences</h3>\n];
 
     $html .=
       qq[<p>Add to List when Creating Item Selected by default: <input type="checkbox" name="AddToListDefault" $CheckedAddToListDefault></p>\n];
-    $html .=
-      qq[<p>Display keyboard in PDA mode: <input type="checkbox" name="DisplayKeyboardPDA" $CheckedPDA></p>\n];
-    $html .=
-      qq[<p>Display keyboard in Normal mode: <input type="checkbox" name="DisplayKeyboardNormal" $CheckedNormal></p>\n];
+    $html .= qq[<p>Display keyboard in PDA mode: <input type="checkbox" name="DisplayKeyboardPDA" $CheckedPDA></p>\n];
+    $html .= qq[<p>Display keyboard in Normal mode: <input type="checkbox" name="DisplayKeyboardNormal" $CheckedNormal></p>\n];
     $html .=
       qq[<p>Columns in PDA mode:<input type="text" name="NumColumnsPDA" size=2 align="center" value="$Config{'NumColumnsPDA'}"></p>\n];
     $html .=
       qq[<p>Columns in normal mode: <input type="text" name="NumColumnsNormal" size=2 value="$Config{'NumColumnsNormal'}"></p>\n];
-    $html .=
-      qq[<p>Display status message: <input type="checkbox" name="DisplayStatus" $StatusChecked></p>\n];
-    $html .=
-      qq[<hr><p>Please consult the man page about the print preference</p>];
+    $html .= qq[<p>Display status message: <input type="checkbox" name="DisplayStatus" $StatusChecked></p>\n];
+    $html .= qq[<hr><p>Please consult the man page about the print preference</p>];
     $html .=
       qq[<p>Print text cmd:<input type="text" name="PrintTextCommand" size=20 align="center" value="$Config{'PrintTextCommand'}"></p>\n];
     $html .=
       qq[<p>Print html cmd:<input type="text" name="PrintHtmlCommand" size=20 align="center" value="$Config{'PrintHtmlCommand'}"></p>\n];
-    $html .=
-      qq[<p><input type="submit" name="DisplayPreferences" value="OK"></p>\n];
+    $html .= qq[<p><input type="submit" name="DisplayPreferences" value="OK"></p>\n];
 
     $html .= qq[</left>\n];
 
@@ -1504,16 +1445,14 @@ sub DisplaySearchItem {
     my $loc = ( $Config{'DisplayMode'} eq 'pda' ) ? 'left' : 'center';
     if ( $Item2Search eq "Search" ) {
 
-        $html .=
-          qq[<p><$loc>Search:<input type="text" name="DisplaySearchItem" size=30 value="">
+        $html .= qq[<p><$loc>Search:<input type="text" name="DisplaySearchItem" size=30 value="">
                  <input type="submit" align="right" name="SearchCategoryItem_Submit" value="Submit" >
                  </$loc></p>
                  ];
 
         # display keyboard
         InsertKeyboard('DisplaySearchItem') if $DisplayKeyboard;
-        $html .=
-          qq[<p><$loc><input type="submit" name="Cancel2" value="Cancel"></$loc></p>];
+        $html .= qq[<p><$loc><input type="submit" name="Cancel2" value="Cancel"></$loc></p>];
     }
     else {
 
@@ -1538,8 +1477,7 @@ sub DisplaySearchItem {
            </script>
            ];
 
-        $html .=
-          qq[<p><input type="submit" align="right" name="SearchCategoryItem_Submit" value="Submit" ></p>
+        $html .= qq[<p><input type="submit" align="right" name="SearchCategoryItem_Submit" value="Submit" ></p>
       <hr>
       <table width="100%" cellspacing=0 cellpadding=0>
       ];
@@ -1563,8 +1501,7 @@ sub DisplaySearchItem {
                   qq[<input type="button" name="plus" value="+" onClick="doPlus('${JavaCat}_${Item}_check','${JavaCat}_${Item}')">\n];
                 $html .=
                   qq[<input type="button" name="minus" value="-" onClick="doMinus('${JavaCat}_${Item}_check','${JavaCat}_${Item}')">\n];
-                $html .=
-                  qq[<input type="checkbox" disabled name="${JavaCat}_${Item}_check" $Checked>\n];
+                $html .= qq[<input type="checkbox" disabled name="${JavaCat}_${Item}_check" $Checked>\n];
                 $html .= qq[$DisplayCategory: $Item\n];
                 $html .=
                   qq[<input type="text"  value="$value" name="${JavaCat}_${Item}" size="1" style="border:solid 0 #fff; color:#630; background:#fff none;">];
@@ -1933,8 +1870,7 @@ sub PrintText {
     $html .= qq[<input type="hidden" name="action" value="Print">\n];
     $html .= qq[<p><input type="submit" name="action" value="Exit"><p>\n];
     if ( $Config{'PrintTextCommand'} ne '' ) {
-        foreach my $DisplayCategory (@Category)
-        {    # no sort, to display in aisles way (shopping)
+        foreach my $DisplayCategory (@Category) {    # no sort, to display in aisles way (shopping)
             my $HeaderPrint = 0;
             my $num         = 0;
             my @ITEM;
@@ -1966,12 +1902,10 @@ sub PrintText {
         $Config{'PrintTextCommand'} =~ s/ FILE/ $temp/;
         system("$Config{'PrintTextCommand'}");
         unlink $temp;
-        $html .=
-          qq[<pre>$txt</pre>\n<p>The following page has been print with "$Config{'PrintTextCommand'}" <p>\n];
+        $html .= qq[<pre>$txt</pre>\n<p>The following page has been print with "$Config{'PrintTextCommand'}" <p>\n];
     }
     else {
-        $html .=
-          "<p>The print command hasn't been defined yet, please consult the Man page and then set the print preference</p>";
+        $html .= "<p>The print command hasn't been defined yet, please consult the Man page and then set the print preference</p>";
     }
     1;
 
@@ -1985,8 +1919,7 @@ sub PrintHtml {
     $html .= qq[<p><input type="submit" name="action" value="Exit"><p>\n];
     if ( $Config{'PrintHtmlCommand'} ne '' ) {
         $html .= qq[<p><center><h2>$PrettyListName</h2></center></p>\n];
-        foreach my $DisplayCategory (@Category)
-        {    # no sort, to display in aisles way (shopping)
+        foreach my $DisplayCategory (@Category) {    # no sort, to display in aisles way (shopping)
             my $HeaderPrint = 0;
             my $num         = 0;
             foreach my $Item ( sort keys %{ $CurrentItem{$DisplayCategory} } ) {
@@ -1996,8 +1929,7 @@ sub PrintHtml {
                     $html .= qq[</tr>\n<tr>\n] if $num % $NumColumns == 0;
                     my $Count = "($CurrentItem{$DisplayCategory}{$Item})"
                       if $CurrentItem{$DisplayCategory}{$Item} > 1;
-                    $html .=
-                      qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
+                    $html .= qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
                     $num++;
                 }
             }
@@ -2021,12 +1953,10 @@ sub PrintHtml {
         $Config{'PrintHtmlCommand'} =~ s/ FILE/ $temp/;
         system("$Config{'PrintHtmlCommand'}");
         unlink $temp;
-        $html .=
-          qq[<p>The following page has been print with "$Config{'PrintHtmlCommand'}" <p>\n];
+        $html .= qq[<p>The following page has been print with "$Config{'PrintHtmlCommand'}" <p>\n];
     }
     else {
-        $html .=
-          "<p>The print command hasn't been defined yet, please consult the Man page and then set the print preference</p>";
+        $html .= "<p>The print command hasn't been defined yet, please consult the Man page and then set the print preference</p>";
     }
     1;
 }
@@ -2037,8 +1967,7 @@ sub PrintPreview {
     my $Msg = shift;
     $html .= qq[<input type="hidden" name="action" value="PrintPreview">\n];
     $html .= qq[<p><center><h2>$PrettyListName</h2></center></p>\n];
-    foreach my $DisplayCategory (@Category)
-    {    # no sort, to display in aisles way (shopping)
+    foreach my $DisplayCategory (@Category) {    # no sort, to display in aisles way (shopping)
         my $HeaderPrint = 0;
         my $num         = 0;
         foreach my $Item ( sort keys %{ $CurrentItem{$DisplayCategory} } ) {
@@ -2048,8 +1977,7 @@ sub PrintPreview {
                 $html .= qq[</tr>\n<tr>\n] if $num % $NumColumns == 0;
                 my $Count = "($CurrentItem{$DisplayCategory}{$Item})"
                   if $CurrentItem{$DisplayCategory}{$Item} > 1;
-                $html .=
-                  qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
+                $html .= qq[<td><input type="checkbox" name="${DisplayCategory}_$Item">$Item $Count</td>\n];
                 $num++;
             }
         }
@@ -2083,16 +2011,14 @@ sub ReadConfig {
         print_log "Directory ListManager doesn't exist";
         print_log "  Creating $DirPath";
         mkdir( "$DirPath", 0755 )
-          or return shoppingListError(
-            "ReadConfig: Can't create directory $DirPath: $!");
+          or return shoppingListError("ReadConfig: Can't create directory $DirPath: $!");
     }
 
     # validate is we have a configuration file
     if ( !-f $ConfigFile ) {
         print_log "Creating basic configuration file $ConfigFile";
         open CONFIG, ">$ConfigFile"
-          or return shoppingListError(
-            "ReadConfig: Can't open config file $ConfigFile: $!");
+          or return shoppingListError("ReadConfig: Can't open config file $ConfigFile: $!");
         print CONFIG ConfigFileHeader();
         print CONFIG ConfigDefault($DefaultList);
         close CONFIG;
@@ -2103,16 +2029,14 @@ sub ReadConfig {
 
     if ( $#List < 0 ) {
         open LIST, ">$DefaultList"
-          or return shoppingListError(
-            "ReadConfig: Can't open new list $DefaultList: $!");
+          or return shoppingListError("ReadConfig: Can't open new list $DefaultList: $!");
         print LIST DefaultList();
         close LIST;
     }
 
     # now we could read the configuration
     open CONFIG, "$ConfigFile"
-      or return shoppingListError(
-        "ReadConfig: Can't open config file $ConfigFile: $!");
+      or return shoppingListError("ReadConfig: Can't open config file $ConfigFile: $!");
     while (<CONFIG>) {
         chomp;
         s/^\s*(.*?)\s*$/$1/;
@@ -2296,13 +2220,11 @@ sub DisplayCurrentList {
               if $CurrentItem{$Category}{$Item} > 1;
         }
     }
-    $html .=
-      qq[<table width="100%"><colgroup span="$NumColumns" width="$ColumnsWidth">\n];
+    $html .= qq[<table width="100%"><colgroup span="$NumColumns" width="$ColumnsWidth">\n];
     my $num = 0;
     foreach my $Item ( sort keys %ItemOn ) {
         $html .= qq[     <tr>\n] if $num % $NumColumns == 0;
-        $html .=
-          qq[       <td><input type="checkbox" name="$ItemOn{$Item}_$Item" value="uncheck">$Item $ItemCount{"$Item"}</td>\n];
+        $html .= qq[       <td><input type="checkbox" name="$ItemOn{$Item}_$Item" value="uncheck">$Item $ItemCount{"$Item"}</td>\n];
         $num++;
         $html .= qq[     </tr>\n] if $num % $NumColumns == 0;
     }
@@ -2315,8 +2237,7 @@ sub DisplayCurrentList {
 #sub WriteConfig{{{
 sub WriteConfig {
     open CONFIG, ">$ConfigFile"
-      or return shoppingListError(
-        "WriteConfig: Can't open config file $ConfigFile: $!");
+      or return shoppingListError("WriteConfig: Can't open config file $ConfigFile: $!");
     print CONFIG ConfigFileHeader();
     foreach my $k ( sort keys %Config ) {
         $Config{$k} = lc( $Config{$k} ) if $k != 'CurrentList';
diff --git a/web/bin/button.pl b/web/bin/button.pl
index 2228f27f3..d214e26b3 100644
--- a/web/bin/button.pl
+++ b/web/bin/button.pl
@@ -177,8 +177,7 @@
     # calculate size of image and text for offset
 
     my $textsize = length $text;
-    my $font     = gdMediumBoldFont
-      ;    # Choices: gdTinyFont, gdLargeFont, gdSmallFont, gdMediumBoldFont
+    my $font     = gdMediumBoldFont;    # Choices: gdTinyFont, gdLargeFont, gdSmallFont, gdMediumBoldFont
     $font = gdTinyFont if $textsize > 14;
 
     my ( $imwidth, $imheight ) = $image->getBounds();
diff --git a/web/bin/button2.pl b/web/bin/button2.pl
index b002da19b..a5f46a7d2 100644
--- a/web/bin/button2.pl
+++ b/web/bin/button2.pl
@@ -87,8 +87,7 @@
 
 # We hit the cache, so we give back the image and exit
 if ( -f "$config_parms{html_alias_cache}/$ImageFile" ) {
-    print
-      "$ScriptName: Hit cached file $config_parms{html_alias_cache}/$ImageFile\n"
+    print "$ScriptName: Hit cached file $config_parms{html_alias_cache}/$ImageFile\n"
       if $Debug{$ScriptName};
     my $data = file_read("$config_parms{html_alias_cache}$ImageFile");
     return &mime_header( "/cache" . $ImageFile, 1, length $data ) . $data;
@@ -125,22 +124,18 @@
 
     my $WorkAreaMinX = $config_parms{button_min_x} || 3;
     my $WorkAreaMinY = $config_parms{button_min_y} || 3;
-    print
-      "$ScriptName: WorkAreaMinX=$WorkAreaMinX  WorkAreaMinY=$WorkAreaMinY\n"
+    print "$ScriptName: WorkAreaMinX=$WorkAreaMinX  WorkAreaMinY=$WorkAreaMinY\n"
       if $Debug{$ScriptName};
 
     my $WorkAreaMaxX = $config_parms{button_max_x} || $Twidth - 3;
     my $WorkAreaMaxY = $config_parms{button_max_y} || $THeight - 3;
-    print
-      "$ScriptName: WorkAreaMaxX=$WorkAreaMaxX  WorkAreaMaxY=$WorkAreaMaxY\n"
+    print "$ScriptName: WorkAreaMaxX=$WorkAreaMaxX  WorkAreaMaxY=$WorkAreaMaxY\n"
       if $Debug{$ScriptName};
 
     # copy icon over template, try to center in height
     my ( $IWidth, $IHeight ) = $GDIcon->getBounds();
-    my $IconY =
-      ( $WorkAreaMaxY - $WorkAreaMinY ) / 2 + $WorkAreaMinY - ( $IHeight / 2 );
-    $GDTemplate->copy( $GDIcon, $WorkAreaMinX, $IconY, 0, 0, $IWidth,
-        $IHeight );
+    my $IconY = ( $WorkAreaMaxY - $WorkAreaMinY ) / 2 + $WorkAreaMinY - ( $IHeight / 2 );
+    $GDTemplate->copy( $GDIcon, $WorkAreaMinX, $IconY, 0, 0, $IWidth, $IHeight );
     print "$ScriptName: Icon upper left [ $WorkAreaMinX, $IconY] \n"
       if $Debug{$ScriptName};
 
@@ -152,8 +147,7 @@
     # determine how many pixels available for text
     my $MaxTextPixelX = $WorkAreaMaxX - ( $IWidth + $WorkAreaMinX );
     my $MaxTextPixelY = $WorkAreaMaxY - $WorkAreaMinY;
-    print
-      "$ScriptName: Maximum Text pixels available X=$MaxTextPixelX Y=$MaxTextPixelY\n"
+    print "$ScriptName: Maximum Text pixels available X=$MaxTextPixelX Y=$MaxTextPixelY\n"
       if $Debug{$ScriptName};
 
     my @lines = split( '_', $Text );
@@ -179,12 +173,10 @@
     # validate ttf fonts
     if ( -f $config_parms{button_ttf} ) {
         $PTSize = $config_parms{button_ttf_ptsize} || 8.0;
-        my @Bounds = GD::Image->stringTTF( "0,0,0", $config_parms{button_ttf},
-            $PTSize, 0.0, 0, 0, "Nothing" );
+        my @Bounds = GD::Image->stringTTF( "0,0,0", $config_parms{button_ttf}, $PTSize, 0.0, 0, 0, "Nothing" );
         if ( scalar @Bounds == 0 ) {
             print "$ScriptName: Invalid TTF fonts $FontUse\n";
-            print
-              "$ScriptName:         maybe GD not configured for TTF, or invalid file\n";
+            print "$ScriptName:         maybe GD not configured for TTF, or invalid file\n";
             $ButtonOK = 0;
         }
         else {
@@ -200,12 +192,9 @@
         $PTSize = $config_parms{button_ttf_ptsize} || 8.0;
 
         my $AllChar = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-        @Bounds =
-          GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-            $AllChar );
+        @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $AllChar );
         my $FontHeight = $Bounds[7] - $Bounds[1];
-        print
-          "$ScriptName: text will be written with font $FontUse and PTSize $PTSize\n"
+        print "$ScriptName: text will be written with font $FontUse and PTSize $PTSize\n"
           if $Debug{$ScriptName};
         print "$ScriptName: Font height $FontHeight pixels\n"
           if $Debug{$ScriptName};
@@ -214,86 +203,62 @@
         if ( $NumLines == 1 ) {
 
             #determine text position
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[0] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[0] );
             print "$ScriptName:        Bounds for line \"$lines[0]\" @Bounds\n"
               if $Debug{$ScriptName};
-            $x = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
-            $y = $WorkAreaMaxY - 2;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[0] );
+            $x      = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
+            $y      = $WorkAreaMaxY - 2;
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[0] );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
         elsif ( $NumLines == 2 ) {
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[1] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[1] );
             print "$ScriptName:        Bounds for line \"$lines[1]\" @Bounds\n"
               if $Debug{$ScriptName};
             $x = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[1] );
             $y = $WorkAreaMaxY - 2;
             my $nexty = $y + $Bounds[7] - 2;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[1] );
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[1] );
             print "$ScriptName: Text location for line \"$lines[1]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[0] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[0] );
             print "$ScriptName:        Bounds for line \"$lines[0]\" @Bounds\n"
               if $Debug{$ScriptName};
-            $x = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
-            $y = $nexty;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[0] );
+            $x      = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
+            $y      = $nexty;
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[0] );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
         else {
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[2] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[2] );
             print "$ScriptName:        Bounds for line \"$lines[2]\" @Bounds\n"
               if $Debug{$ScriptName};
-            $x     = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
-            $y     = $WorkAreaMaxY - 2;
-            $nexty = $y + ( $Bounds[7] ) - 2;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[2] );
+            $x      = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
+            $y      = $WorkAreaMaxY - 2;
+            $nexty  = $y + ( $Bounds[7] ) - 2;
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[2] );
             print "$ScriptName: Text location for line \"$lines[2]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[1] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[1] );
             print "$ScriptName:        Bounds for line \"$lines[1]\" @Bounds\n"
               if $Debug{$ScriptName};
-            $x     = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
-            $y     = $nexty;
-            $nexty = $y + $Bounds[7] - 2;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[1] );
+            $x      = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
+            $y      = $nexty;
+            $nexty  = $y + $Bounds[7] - 2;
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[1] );
             print "$ScriptName: Text location for line \"$lines[1]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
-            @Bounds =
-              GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0,
-                $lines[0] );
+            @Bounds = GD::Image->stringTTF( $TextColor, $FontUse, $PTSize, 0.0, 0, 0, $lines[0] );
             print "$ScriptName:        Bounds for line \"$lines[0]\" @Bounds\n"
               if $Debug{$ScriptName};
-            $x = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
-            $y = $nexty;
-            @Bounds =
-              $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y,
-                $lines[0] );
+            $x      = $WorkAreaMaxX - ( $Bounds[2] + 2 - $Bounds[0] );
+            $y      = $nexty;
+            @Bounds = $GDTemplate->stringTTF( $TextColor, $FontUse, $PTSize, 0, $x, $y, $lines[0] );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
@@ -302,9 +267,7 @@
     else {
 
         if ( $config_parms{button_ttf} ) {
-            print(
-                "$ScriptName: Invalid ttf font $config_parms{button_ttf}, use default GD font\n"
-            );
+            print( "$ScriptName: Invalid ttf font $config_parms{button_ttf}, use default GD font\n" );
             $ButtonOK = 0;
         }
 
@@ -333,45 +296,39 @@
         if ( $NumLines == 1 ) {
             my $x = $WorkAreaMaxX - ( length( $lines[0] ) * $FontWidth );
             my $y = $WorkAreaMaxY - $FontHeight - 1;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0], $TextColor );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
         elsif ( $NumLines == 2 ) {
             my $x = $WorkAreaMaxX - ( length( $lines[1] ) * $FontWidth );
             my $y = $WorkAreaMaxY - $FontHeight - 1;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[1],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[1], $TextColor );
             print "$ScriptName: Text location for line \"$lines[1]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
             $x = $WorkAreaMaxX - ( length( $lines[0] ) * $FontWidth );
             $y -= $FontHeight;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0], $TextColor );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
         else {
             my $x = $WorkAreaMaxX - ( length( $lines[2] ) * $FontWidth );
             my $y = $WorkAreaMaxY - $FontHeight - 1;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[2],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[2], $TextColor );
             print "$ScriptName: Text location for line \"$lines[2]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
             $x = $WorkAreaMaxX - ( length( $lines[1] ) * $FontWidth );
             $y -= $FontHeight;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[1],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[1], $TextColor );
             print "$ScriptName: Text location for line \"$lines[1]\" [$x,$y]\n"
               if $Debug{$ScriptName};
 
             $x = $WorkAreaMaxX - ( length( $lines[0] ) * $FontWidth );
             $y -= $FontHeight;
-            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0],
-                $TextColor );
+            $GDTemplate->string( $FontUse, $x, $y, ucfirst $lines[0], $TextColor );
             print "$ScriptName: Text location for line \"$lines[0]\" [$x,$y]\n"
               if $Debug{$ScriptName};
         }
@@ -385,18 +342,15 @@
     }
     my $ButtonFile = $GDTemplate->$ButtonType();
     if ($ButtonOK) {
-        print
-          "$ScriptName: Writing button to cache: $config_parms{html_alias_cache}/$ImageFile\n"
+        print "$ScriptName: Writing button to cache: $config_parms{html_alias_cache}/$ImageFile\n"
           if $Debug{$ScriptName};
         file_write( "$config_parms{html_alias_cache}/$ImageFile", $ButtonFile );
     }
     else {
-        print
-          "$ScriptName: Button $config_parms{html_alias_cache}/$ImageFile not written to cache\n";
+        print "$ScriptName: Button $config_parms{html_alias_cache}/$ImageFile not written to cache\n";
     }
 
-    return &mime_header( "/cache" . $ImageFile, 1, length $ButtonFile )
-      . $ButtonFile;
+    return &mime_header( "/cache" . $ImageFile, 1, length $ButtonFile ) . $ButtonFile;
 }
 else {
     print "$ScriptName: Error generating image\n";
@@ -416,8 +370,7 @@ sub ValidIcon {
     # name could have 1 dot, to define type (icon.png)
     my $DotCount = $IconName =~ tr/././;
     if ( $DotCount > 1 ) {
-        print
-          "ValidIcon: Invalid icon name $IconName, no more than 1 dot (.) allow in name, using EmptyIcon.png\n";
+        print "ValidIcon: Invalid icon name $IconName, no more than 1 dot (.) allow in name, using EmptyIcon.png\n";
         return ( "NOICON", "NOICON", "" );
     }
 
@@ -432,8 +385,7 @@ sub ValidIcon {
 
     # is it a valid GD type
     if ( index( "JPG JPEG PNG XBM WMP XPM", uc($Type) ) < 0 ) {
-        print
-          "$ScriptName: ValidIcon: Invalid icon type [$Type], only JPG JPEG PNG XBM WMP XPM allowed\n";
+        print "$ScriptName: ValidIcon: Invalid icon type [$Type], only JPG JPEG PNG XBM WMP XPM allowed\n";
         return ( "NOICON", "NOICON", "" );
     }
 
@@ -510,24 +462,13 @@ sub OpenImage {
     elsif ( $FileName eq "NOTEMPLATE" ) {
 
         # we have no template
-        $TemplateObject =
-          GD::Image->new( $GenericTemplateX, $GenericTemplateY );
+        $TemplateObject = GD::Image->new( $GenericTemplateX, $GenericTemplateY );
         my $white = $TemplateObject->colorAllocate( 255, 255, 255 );
         my $black = $TemplateObject->colorAllocate( 0,   0,   0 );
-        $TemplateObject->rectangle( 0, 0, $GenericTemplateX, $GenericTemplateY,
-            $white );
-        $TemplateObject->rectangle(
-            1, 1,
-            $GenericTemplateX - 1,
-            $GenericTemplateY - 1, $black
-        );
-        $TemplateObject->rectangle(
-            3, 3,
-            $GenericTemplateX - 3,
-            $GenericTemplateY - 3, $white
-        );
-        print
-          "$ScriptName: Template file not defined in configuration file, will create a simple one\n";
+        $TemplateObject->rectangle( 0, 0, $GenericTemplateX,     $GenericTemplateY,     $white );
+        $TemplateObject->rectangle( 1, 1, $GenericTemplateX - 1, $GenericTemplateY - 1, $black );
+        $TemplateObject->rectangle( 3, 3, $GenericTemplateX - 3, $GenericTemplateY - 3, $white );
+        print "$ScriptName: Template file not defined in configuration file, will create a simple one\n";
         $ButtonOK = 0;
     }
     elsif ( $FileName eq "NOICON" ) {
@@ -569,8 +510,7 @@ sub FindFile {
             return "$Dirname/$FileName";
         }
     }
-    print
-      "$ScriptName: FindFile: $ImageType $FileName not found in any icons dir";
+    print "$ScriptName: FindFile: $ImageType $FileName not found in any icons dir";
     return "NO$ImageType";
 
 }
diff --git a/web/bin/callerid.pl b/web/bin/callerid.pl
index 6bb0ce1fc..07e4f396e 100644
--- a/web/bin/callerid.pl
+++ b/web/bin/callerid.pl
@@ -35,8 +35,7 @@ sub web_callerid_list {
 </script>
 </HEAD><BODY>\n<a name='Top'></a>$html
 Use this page to review or update your $::config_parms{caller_id_file} file.|;
-    $html .=
-      qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin|
+    $html .= qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin|
       unless ( ( $Authorized eq $authorized ) or ( $Authorized eq 'admin' ) );
     $html .= qq|or $authorized|
       if $authorized
@@ -64,7 +63,7 @@ sub web_callerid_list {
 
     $c_number = $request{cidnumber} if $request{cidnumber} ne '';
     $c_name   = $request{cidname}   if $request{cidname} ne '';
-    $c_wav = $Caller_ID::wav_by_number{$c_number}
+    $c_wav    = $Caller_ID::wav_by_number{$c_number}
       if $Caller_ID::wav_by_number{$c_number} ne '';
     $c_group = $Caller_ID::group_by_number{$c_number}
       if $Caller_ID::group_by_number{$c_number} ne '';
@@ -77,8 +76,7 @@ sub web_callerid_list {
     #display help on top, not pop-up to prevent audrey from dying
     if ($display_help) {
 
-        $html .=
-          "<br><br><font color=blue><b>HELP Information on $display_help field:</b><br><i>";
+        $html .= "<br><br><font color=blue><b>HELP Information on $display_help field:</b><br><i>";
         $html .= &web_callerid_help($display_help);
         $html .= "</i><br>\n";
 
@@ -88,8 +86,7 @@ sub web_callerid_list {
         $html .= "<table border>\n";
         $html .= "<tr><td></td>";
         for my $header ( '', @headers ) {
-            $html .=
-              qq[<td><a href="/bin/callerid.pl?help=$header&cidnumber=$c_number&cidname=$c_name];
+            $html .= qq[<td><a href="/bin/callerid.pl?help=$header&cidnumber=$c_number&cidname=$c_name];
             $html .= "&showlist=0" if $request{showlist} eq '0';
             $html .= qq[">$header</a></td>];
         }
@@ -145,13 +142,11 @@ sub web_callerid_list {
             my $headers = @headers;
 
             $html .= "<table border><tr><td colspan=$headers><B>$type</B>\n";
-            $html .=
-              "(<a name='$type' href='#Top'>back to top</a>)</td></tr>\n";
+            $html .= "(<a name='$type' href='#Top'>back to top</a>)</td></tr>\n";
 
             $html .= "<tr>";
             for my $header ( '', @headers ) {
-                $html .=
-                  qq[<td><a href="/bin/callerid.pl?help=$header">$header</a></td>];
+                $html .= qq[<td><a href="/bin/callerid.pl?help=$header">$header</a></td>];
             }
             $html .= "</tr>\n";
 
@@ -167,10 +162,8 @@ sub web_callerid_list {
                     or ( $Authorized eq 'admin' ) );
                 $html .= "</td> ";
                 for my $field ( 0 .. $headers - 1 ) {
-                    $html .= &html_form_input_set_func(
-                        'web_callerid_set_field', "/bin/callerid.pl",
-                        "$pos,$field",            $cid_info[$field]
-                    );
+                    $html .=
+                      &html_form_input_set_func( 'web_callerid_set_field', "/bin/callerid.pl", "$pos,$field", $cid_info[$field] );
                 }
                 $html .= "</tr>\n";
             }
@@ -251,15 +244,11 @@ sub web_callerid_help {
     my ($field) = @_;
 
     my %help = (
-        Number =>
-          'Telephone number, without formatting or spaces. Older format may use dashes.',
-        Name =>
-          'The caller ID name of the entry (what will be announced and logged)',
-        Group =>
-          'The caller ID group this entry belongs to. Add to the "rejected" group for some special processing. :)',
-        Wav =>
-          'Location and name of a wav file to play over the PA, rather than announcing the callers name.',
-        Data => 'Caller ID name or WAV file to play. (older format)'
+        Number => 'Telephone number, without formatting or spaces. Older format may use dashes.',
+        Name   => 'The caller ID name of the entry (what will be announced and logged)',
+        Group  => 'The caller ID group this entry belongs to. Add to the "rejected" group for some special processing. :)',
+        Wav    => 'Location and name of a wav file to play over the PA, rather than announcing the callers name.',
+        Data   => 'Caller ID name or WAV file to play. (older format)'
     );
 
     my $help = $help{$field};
diff --git a/web/bin/code_search.pl b/web/bin/code_search.pl
index 599d5b2f1..260729c6e 100644
--- a/web/bin/code_search.pl
+++ b/web/bin/code_search.pl
@@ -18,8 +18,7 @@
 
 my $font_size = ( &http_agent_size < 800 ) ? 1 : 3;
 
-$results =
-  qq[<font size=$font_size><pre>Searching for "$string" in code scripts:<BR> <BR>$results</pre></font>];
+$results = qq[<font size=$font_size><pre>Searching for "$string" in code scripts:<BR> <BR>$results</pre></font>];
 
 return &html_page( '', $results, ' ' );
 
diff --git a/web/bin/code_select.pl b/web/bin/code_select.pl
index de47f06fa..74fb87c10 100644
--- a/web/bin/code_select.pl
+++ b/web/bin/code_select.pl
@@ -41,8 +41,7 @@ sub select_code_form {
     $html .= qq| Simply check those that you'd like to run and
 they'll be automatically activated within MisterHouse.|
       if $Authorized eq 'admin';
-    $html .=
-      qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
+    $html .= qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
       unless $Authorized eq 'admin';
     $html .= qq|
 <CENTER><FORM ACTION="/bin/code_select.pl" method=post>
@@ -52,13 +51,10 @@ sub select_code_form {
     $html .= "&nbsp;Searching for: \"$search\"" if $search;
     $html .= "</td>";
 
-    my %files_selected = map { $_, 1 }
-      &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
-    my %standard_parms = map { $_, 1 }
-      qw(html_dir code_dir code_dir_common data_dir http_port debug);
+    my %files_selected = map { $_, 1 } &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
+    my %standard_parms = map { $_, 1 } qw(html_dir code_dir code_dir_common data_dir http_port debug);
     opendir( MYDIR, $config_parms{code_dir_common} )
-      or return
-      "Error, can not open directory $config_parms{code_dir_common}.\n";
+      or return "Error, can not open directory $config_parms{code_dir_common}.\n";
     my @files_read = readdir(MYDIR);
     close MYDIR;
     my ( %modules, %categories );
@@ -84,11 +80,7 @@ sub select_code_form {
         }
         next
           if $search
-          and !(
-               $category =~ /$search/i
-            or $file =~ /$search/i
-            or $description =~ /$search/i
-          );
+          and !( $category =~ /$search/i or $file =~ /$search/i or $description =~ /$search/i );
 
         if (%file_parms) {
             my $description_part;
@@ -97,20 +89,17 @@ sub select_code_form {
                     $description_part .= ", ";
                     $parms_list       .= ',';
                 }
-                $description_part .=
-                  "<a href='#' onclick=\"openparmhelp('$f_parm');return(false);\">";
+                $description_part .= "<a href='#' onclick=\"openparmhelp('$f_parm');return(false);\">";
                 if ( $config_parms{$f_parm} ) {
                     $description_part .= "<font color=black>$f_parm</font>";
                 }
                 else {
-                    $description_part .=
-                      "<font color=red><i>$f_parm</i></font>";
+                    $description_part .= "<font color=red><i>$f_parm</i></font>";
                 }
                 $description_part .= "</a>";
                 $parms_list .= $f_parm;
             }
-            $description .=
-              "<br><a href='#' onclick=\"edit_parms('$parms_list','$file');return(false);\">EDIT</a>"
+            $description .= "<br><a href='#' onclick=\"edit_parms('$parms_list','$file');return(false);\">EDIT</a>"
               if ( $Authorized eq 'admin' );
             $description .= "&nbsp;<b>Config parms</b>: $description_part";
         }
@@ -168,8 +157,7 @@ sub select_code_update {
     # Allow un-authorized users to browse, but only admin users to update
     return 'Not authorized to make updates' unless $Authorized eq 'admin';
 
-    my %modules_selected = map { $_, 1 }
-      &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
+    my %modules_selected = map { $_, 1 } &file_read( "$config_parms{data_dir}/$config_parms{code_select}", 2 );
 
     my ( %modules_added, %modules_dropped, %modules_deleted );
 
@@ -215,15 +203,11 @@ sub select_code_update {
     run_voice_cmd "reload code" if $modules_added or $modules_dropped;
 
     $html = "<H1>MisterHouse Code Activation Confirmation</H1>";
-    $html .=
-      "<b>The following code files are now      activated:</b><P><PRE>$modules_added</PRE>";
-    $html .=
-      "<b>The following code files are now   de-activated:</b><P><PRE>$modules_dropped</PRE>";
-    $html .=
-      "<b>The following code were deleted:  </b><P><PRE>$modules_deleted</PRE>"
+    $html .= "<b>The following code files are now      activated:</b><P><PRE>$modules_added</PRE>";
+    $html .= "<b>The following code files are now   de-activated:</b><P><PRE>$modules_dropped</PRE>";
+    $html .= "<b>The following code were deleted:  </b><P><PRE>$modules_deleted</PRE>"
       if $modules_deleted;
-    $html .=
-      "<b>Here are all your activated files:</b><P><PRE>$modules_selected</PRE>";
+    $html .= "<b>Here are all your activated files:</b><P><PRE>$modules_selected</PRE>";
 
     return &html_page( '', $html );
 }
diff --git a/web/bin/code_unselect.pl b/web/bin/code_unselect.pl
index 805ffa244..7efb6f99c 100644
--- a/web/bin/code_unselect.pl
+++ b/web/bin/code_unselect.pl
@@ -36,8 +36,7 @@ sub select_code_form {
 <a name='Top'></a>
 $html
 The following fils are all the code files in you code_dir list:  $config_parms{code_dir}.|;
-    $html .=
-      qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
+    $html .= qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
       unless $Authorized eq 'admin';
     $html .= qq|Simply uncheck files you want to disable or check to re-enable.|
       if $Authorized eq 'admin';
@@ -49,10 +48,8 @@ sub select_code_form {
     $html .= "&nbsp;Searching for: \"$search\"" if $search;
     $html .= "</td>";
 
-    my %files_deselected = map { $_, 1 }
-      &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 );
-    my %standard_parms = map { $_, 1 }
-      qw(html_dir code_dir code_dir_common data_dir http_port debug);
+    my %files_deselected = map { $_, 1 } &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 );
+    my %standard_parms = map { $_, 1 } qw(html_dir code_dir code_dir_common data_dir http_port debug);
 
     my @files_read;
     for my $file_dir (@Code_Dirs) {
@@ -62,8 +59,8 @@ sub select_code_form {
           unless $file_dir eq $config_parms{code_dir_common};
         close MYDIR;
     }
-    @files_read = grep( /^[a-z0-9].*\.(pl|mhp)$/i, @files_read )
-      ; # Must start with alphanumeric ... emacs edited checkpoints can start with #
+    @files_read =
+      grep( /^[a-z0-9].*\.(pl|mhp)$/i, @files_read );   # Must start with alphanumeric ... emacs edited checkpoints can start with #
 
     my ( %modules, %categories );
 
@@ -99,11 +96,7 @@ sub select_code_form {
         }
         next
           if $search
-          and !(
-               $category =~ /$search/i
-            or $file =~ /$search/i
-            or $description =~ /$search/i
-          );
+          and !( $category =~ /$search/i or $file =~ /$search/i or $description =~ /$search/i );
 
         if (%file_parms) {
             my $description_part;
@@ -112,14 +105,12 @@ sub select_code_form {
                     $description_part .= ", ";
                     $parms_list       .= ',';
                 }
-                $description_part .=
-                  "<a href='#' onclick=\"openparmhelp('$f_parm');return(false);\">";
+                $description_part .= "<a href='#' onclick=\"openparmhelp('$f_parm');return(false);\">";
                 if ( $config_parms{$f_parm} ) {
                     $description_part .= "<font color=black>$f_parm</font>";
                 }
                 else {
-                    $description_part .=
-                      "<font color=red><i>$f_parm</i></font>";
+                    $description_part .= "<font color=red><i>$f_parm</i></font>";
                 }
                 $description_part .= "</a>";
                 $parms_list .= $f_parm;
@@ -182,8 +173,7 @@ sub select_code_update {
     # Allow un-authorized users to browse only (if listed in password_allow)
     return 'Not authorized to make updates' unless $Authorized eq 'admin';
 
-    my %modules_deselected = map { $_, 1 }
-      &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 );
+    my %modules_deselected = map { $_, 1 } &file_read( "$config_parms{data_dir}/$config_parms{code_unselect}", 2 );
 
     my ( %modules_added, %modules_dropped, %modules_selected );
 
@@ -225,14 +215,10 @@ sub select_code_update {
     run_voice_cmd "reload code" if $modules_added or $modules_dropped;
 
     $html = "<H1>MisterHouse Code Activation Confirmation</H1>";
-    $html .=
-      "<b>The following code files are now      activated:</b><P><PRE>$modules_added</PRE>";
-    $html .=
-      "<b>The following code files are now   de-activated:</b><P><PRE>$modules_dropped</PRE>";
-    $html .=
-      "<b>Here are all your deactivated files:</b><P><PRE>$modules_deselected</PRE>";
-    $html .=
-      "<b>Here are all your   activated files:</b><P><PRE>$modules_selected</PRE>";
+    $html .= "<b>The following code files are now      activated:</b><P><PRE>$modules_added</PRE>";
+    $html .= "<b>The following code files are now   de-activated:</b><P><PRE>$modules_dropped</PRE>";
+    $html .= "<b>Here are all your deactivated files:</b><P><PRE>$modules_deselected</PRE>";
+    $html .= "<b>Here are all your   activated files:</b><P><PRE>$modules_selected</PRE>";
 
     return &html_page( '', $html );
 }
diff --git a/web/bin/command_search.pl b/web/bin/command_search.pl
index e7208b2c2..4a32d9973 100644
--- a/web/bin/command_search.pl
+++ b/web/bin/command_search.pl
@@ -14,12 +14,9 @@
 my ($string) = @ARGV;
 $string =~ s/search=//;    # Allow for ?string or ?search=string
 
-my $html = &html_header(
-    "<b>Search results for: <i>$string</i></b>&nbsp;&nbsp;&nbsp;&nbsp;"
-      . &html_authorized );
+my $html = &html_header( "<b>Search results for: <i>$string</i></b>&nbsp;&nbsp;&nbsp;&nbsp;" . &html_authorized );
 
-$html .= qq|<form action='/bin/command_search.pl'>Search String:|
-  . qq|<input align='left' size='25' name='search'></form>|;
+$html .= qq|<form action='/bin/command_search.pl'>Search String:| . qq|<input align='left' size='25' name='search'></form>|;
 
 $html .= &search_commands($string);
 
@@ -35,8 +32,7 @@ sub search_commands {
 
         # Now find object name
         my ( $file, $cmd2 ) = $cmd =~ /(.+)\:(.+)/;
-        my ( $object, $said, $vocab_cmd ) =
-          &Voice_Cmd::voice_item_by_text( lc $cmd2 );
+        my ( $object, $said, $vocab_cmd ) = &Voice_Cmd::voice_item_by_text( lc $cmd2 );
         my $object_name = $object->{object_name};
         next if $seen{$object_name}++;
         push @object_list, $object_name;
diff --git a/web/bin/counter.pl b/web/bin/counter.pl
index 2f0cb9d02..5e7805d50 100644
--- a/web/bin/counter.pl
+++ b/web/bin/counter.pl
@@ -11,11 +11,7 @@
 my @parms = @ARGV;
 for my $parm (@parms) {
     if ( $parm =~ /new/ ) {
-        return
-            "HTTP/1.0 200 OK\n\n"
-          . '<p><b>Page Views:</b> '
-          . ++$Save{"web_count_$page"}
-          . "</p>\n";
+        return "HTTP/1.0 200 OK\n\n" . '<p><b>Page Views:</b> ' . ++$Save{"web_count_$page"} . "</p>\n";
     }
 }
 return "HTTP/1.0 200 OK\n\n" . 'Page Views: ' . ++$Save{"web_count_$page"};
diff --git a/web/bin/dbmedit.cgi b/web/bin/dbmedit.cgi
index 20ee608bc..82c4593c3 100755
--- a/web/bin/dbmedit.cgi
+++ b/web/bin/dbmedit.cgi
@@ -241,8 +241,7 @@ elsif ( $in{'cmd'} eq 'delete' ) {
 
 }
 else {
-    &HTMLdie( "The command <b>$safein{'cmd'}</b> is not supported.",
-        "Command not supported" );
+    &HTMLdie( "The command <b>$safein{'cmd'}</b> is not supported.", "Command not supported" );
 
 }
 
@@ -406,10 +405,8 @@ sub calcglobals {
     @safein{ keys %in } = map { &HTMLescape($_) } values %in;
 
     # Save database definition to send to script again
-    $dbdefnget =
-      &urlencodelist( &subhash( *in, qw(file delim columns referer) ) );
-    $dbdefnpost =
-      &hiddenvars( &subhash( *in, qw(file delim columns referer) ) );
+    $dbdefnget = &urlencodelist( &subhash( *in, qw(file delim columns referer) ) );
+    $dbdefnpost = &hiddenvars( &subhash( *in, qw(file delim columns referer) ) );
 
     $delim =
       ( $in{'delim'} =~ /\d/ )
@@ -557,8 +554,7 @@ EOF
     }
 
     print "</table>\n\n";
-    print
-      "<p><b><i>* Backslashes indicate escaped characters, as in Perl.</i></b>\n\n"
+    print "<p><b><i>* Backslashes indicate escaped characters, as in Perl.</i></b>\n\n"
       if $has_backslashes;
 
     print <<EOF ;
@@ -597,8 +593,7 @@ EOF
             $width  = $width < 60        ? $width             : 60;
             $height = $maxheight[$_] > 1 ? $maxheight[$_] + 1 : 2;
             $height = $height < 10       ? $height            : 10;
-            print
-              qq(    <td><textarea name="$fieldname" rows=$height cols=$width></textarea></td></tr>\n);
+            print qq(    <td><textarea name="$fieldname" rows=$height cols=$width></textarea></td></tr>\n);
         }
         else {
             $width = $maxwidth[$_] ? $maxwidth[$_] + 1 : 20;
@@ -678,29 +673,25 @@ EOF
               &HTMLescape( &slashescapetextarea( $field[$_] ) );
             if ( $flags[$_]{'r'} ) {
                 $safefieldta =~ s/\n/<br>\n/g;
-                print
-                  qq(    <td><input type=hidden name="$fieldname" value="$safefield[$_]">$safefieldta</td></tr>\n);
+                print qq(    <td><input type=hidden name="$fieldname" value="$safefield[$_]">$safefieldta</td></tr>\n);
             }
             else {
                 $width  = $maxwidth[$_] > 20 ? $maxwidth[$_]      : 20;
                 $width  = $width < 60        ? $width             : 60;
                 $height = $maxheight[$_] > 1 ? $maxheight[$_] + 1 : 2;
                 $height = $height < 10       ? $height            : 10;
-                print
-                  qq(    <td><textarea name="$fieldname" rows=$height cols=$width>$safefieldta</textarea></td></tr>\n);
+                print qq(    <td><textarea name="$fieldname" rows=$height cols=$width>$safefieldta</textarea></td></tr>\n);
             }
 
             # ordinary text fields
         }
         else {
             if ( $flags[$_]{'r'} ) {
-                print
-                  qq(    <td><input type=hidden name="$fieldname" value="$safefield[$_]">$safefield[$_]</td></tr>\n);
+                print qq(    <td><input type=hidden name="$fieldname" value="$safefield[$_]">$safefield[$_]</td></tr>\n);
             }
             else {
                 $width = $maxwidth[$_] ? $maxwidth[$_] + 1 : 20;
-                print
-                  qq(    <td><input name="$fieldname" value="$safefield[$_]" size="$width"></td></tr>\n);
+                print qq(    <td><input name="$fieldname" value="$safefield[$_]" size="$width"></td></tr>\n);
             }
         }
 
@@ -868,7 +859,7 @@ sub getcgivars {
         ( $name, $value ) = split( '=', $_, 2 );
         $name =~ s/%(..)/sprintf("%c",hex($1))/ge;
         $value =~ s/%(..)/sprintf("%c",hex($1))/ge;
-        $in{$name} .= "\0" if defined( $in{$name} ); # concatenate multiple vars
+        $in{$name} .= "\0" if defined( $in{$name} );    # concatenate multiple vars
         $in{$name} .= $value;
     }
 
@@ -909,9 +900,10 @@ sub urlencode {
 # create URL-encoded QUERY_STRING for an associative array
 sub urlencodelist {
     local (%a) = @_;
-    return join( '&',
-        map { &urlencode($_) . '=' . &urlencode( $a{$_} ) }
-        grep( defined( $a{$_} ), keys %a ) );
+    return join(
+        '&', map { &urlencode($_) . '=' . &urlencode( $a{$_} ) }
+          grep( defined( $a{$_} ), keys %a )
+    );
 }
 
 # returns a subset of associative array
@@ -939,11 +931,7 @@ sub hiddenvars {
 
     foreach ( keys %a ) {
         if ( defined( $a{$_} ) ) {
-            $ret .=
-                '<input type=hidden name="'
-              . &HTMLescape($_)
-              . '" value="'
-              . &HTMLescape( $a{$_} ) . "\">\n";
+            $ret .= '<input type=hidden name="' . &HTMLescape($_) . '" value="' . &HTMLescape( $a{$_} ) . "\">\n";
         }
     }
     return $ret;
diff --git a/web/bin/display_map.pl b/web/bin/display_map.pl
index d31705cd3..b59f8cd67 100644
--- a/web/bin/display_map.pl
+++ b/web/bin/display_map.pl
@@ -25,8 +25,7 @@
 #u2 = qq|&FAM=myblast&W=600&H=350|;
 $u2 = qq|&FAM=myblast&W=300&H=300|;
 
-$u1 =
-  qq|http://maps.aprsworld.net/mapserver/map.php?lat=$y&lon=$x&label=$text2|;
+$u1 = qq|http://maps.aprsworld.net/mapserver/map.php?lat=$y&lon=$x&label=$text2|;
 
 my $html = "<p><b>$text</b></p>\n";
 
diff --git a/web/bin/flight_status.pl b/web/bin/flight_status.pl
index 8b6f41bb7..b0f09ce45 100644
--- a/web/bin/flight_status.pl
+++ b/web/bin/flight_status.pl
@@ -31,8 +31,7 @@
 }
 
 if ( $statusURL ne '' ) {
-    $html .=
-      qq[<p><h3>Airline: $HTTP_ARGV{airline}.  Flight Number: $HTTP_ARGV{flight}.</h3></p>
+    $html .= qq[<p><h3>Airline: $HTTP_ARGV{airline}.  Flight Number: $HTTP_ARGV{flight}.</h3></p>
 <p><img src="$statusURL"></p>
 <p><a href="$scriptLocation">Request the status of another flight</a></p>
 <p><a href="$scriptLocation?airline=$HTTP_ARGV{airline}&flight=$HTTP_ARGV{flight}">Refresh this flight status page</a></p>];
@@ -150,8 +149,7 @@
 </form>
 <hr />
 ];
-    $html .= &insert_keyboard(
-        { form => 'main', target => 'flight', numeric_keypad => 'yes' } );
+    $html .= &insert_keyboard( { form => 'main', target => 'flight', numeric_keypad => 'yes' } );
 }
 
 return $html;
diff --git a/web/bin/floorplan.pl b/web/bin/floorplan.pl
index 343d1756a..df9392215 100644
--- a/web/bin/floorplan.pl
+++ b/web/bin/floorplan.pl
@@ -44,8 +44,7 @@
 
 my $object_name = shift || '$Property';
 my $object = &get_object_by_name($object_name);
-return &html_page( 'FloorPlan',
-    "No $object_name Group found to generate a floorplan from" )
+return &html_page( 'FloorPlan', "No $object_name Group found to generate a floorplan from" )
   unless $object;
 
 my $html = "<meta http-equiv='refresh' content='10;URL='>";
@@ -87,13 +86,9 @@ sub web_fp    #render table representation of objects and their co-ordinates
         for my $obj (@l_objs) {
             ( $l_x, $l_y, $l_w, $l_h ) = $obj->get_fp_location();
             if ( $l_x ne "" ) {    #Only do items with co-ordinates
-                for ( my $h = $l_y;
-                    $h < $l_y + $l_h;
-                    $h++ )    # Create Virtual Frame Buffer of object blocks
+                for ( my $h = $l_y; $h < $l_y + $l_h; $h++ )    # Create Virtual Frame Buffer of object blocks
                 {
-                    for ( my $w = $l_x;
-                        $w < $l_x + $l_w;
-                        $w++ )    # Create Virtual Frame buffer of object blocks
+                    for ( my $w = $l_x; $w < $l_x + $l_w; $w++ )    # Create Virtual Frame buffer of object blocks
                     {
                         $l_fp[$w][$h] = $obj;
                         $l_xmax = $w if $l_xmax < $w;
@@ -104,37 +99,27 @@ sub web_fp    #render table representation of objects and their co-ordinates
         }
         $l_html .= web_fp_item($p_obj) . "<br>";
         if ( @l_objs > 0 ) {
-            $l_html .=
-                "<table border='0' width='"
-              . $l_xmax * $l_xscale
-              . "' height='"
-              . $l_ymax * $l_yscale . "'>\n";
-            for ( my $x = 0;
-                $x <= $l_xmax;
-                $x++ )    #initialize table with (hopefully) accurate sizing
+            $l_html .= "<table border='0' width='" . $l_xmax * $l_xscale . "' height='" . $l_ymax * $l_yscale . "'>\n";
+            for ( my $x = 0; $x <= $l_xmax; $x++ )                  #initialize table with (hopefully) accurate sizing
             {
                 $l_html .= "<td></td>";
             }
-            for ( my $y = 0;
-                $y <= $l_ymax;
-                $y++ )    #Create HTML Table stucture of Virtual Frame buffer
+            for ( my $y = 0; $y <= $l_ymax; $y++ )                  #Create HTML Table stucture of Virtual Frame buffer
             {
                 $l_html .= "<tr>\n";
-                $l_html .=
-                  "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
+                $l_html .= "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
                 $l_html .= "</td>\n";
                 for ( my $x = 0; $x <= $l_xmax; $x++ ) {
                     $l_obj = $l_fp[$x][$y];
-                    if ( $l_obj ne "" ) {   #Only do if object is at coordinates
+                    if ( $l_obj ne "" ) {                           #Only do if object is at coordinates
                         if ( $l_rendered{$l_obj} eq '' ) {
                             $l_rendered{$l_obj} = 1;
-                            ( $l_x, $l_y, $l_w, $l_h ) =
-                              $l_obj->get_fp_location();
+                            ( $l_x, $l_y, $l_w, $l_h ) = $l_obj->get_fp_location();
                             if ( $l_x eq '' ) { $l_x = 1; }
                             if ( $l_y eq '' ) { $l_y = 1; }
                             if ( $l_w eq '' ) { $l_w = 1; }
                             if ( $l_h eq '' ) { $l_h = 1; }
-                            if ( $l_obj->isa('Group') ) {    #recurse groups
+                            if ( $l_obj->isa('Group') ) {           #recurse groups
                                 $l_html .=
                                     "\t<td bgcolor='$l_bcolor' width='"
                                   . $l_xscale * $l_w
@@ -144,9 +129,9 @@ sub web_fp    #render table representation of objects and their co-ordinates
                                 $l_html .= web_fp($l_obj);
                             }
                             else {
-                                $l_html .= "\t<td bgcolor='"
-                                  . web_fp_idle_color( $l_obj, $l_acolor,
-                                    $l_bcolor )
+                                $l_html .=
+                                    "\t<td bgcolor='"
+                                  . web_fp_idle_color( $l_obj, $l_acolor, $l_bcolor )
                                   . "' colspan='$l_w' rowspan='$l_h'>";
                                 $l_html .= web_fp_item($l_obj);
                             }
@@ -154,11 +139,7 @@ sub web_fp    #render table representation of objects and their co-ordinates
                         }
                     }
                     else {    #Blank space
-                        $l_html .=
-                            "\t<td width='"
-                          . $l_xscale
-                          . "' height='"
-                          . $l_yscale . "'>";
+                        $l_html .= "\t<td width='" . $l_xscale . "' height='" . $l_yscale . "'>";
                         $l_html .= "</td>\n";
                     }
                 }
@@ -335,11 +316,7 @@ sub web_fp_item    #render all items based on type
 
     if ( $l_state ne '' ) {
         my ($l_str) = $l_text =~ /\$(.*)/;
-        $l_html .=
-            "<a href='/bin/SET;referer?"
-          . $p_obj->{object_name}
-          . "=$l_state' title='"
-          . $l_str . "'>";
+        $l_html .= "<a href='/bin/SET;referer?" . $p_obj->{object_name} . "=$l_state' title='" . $l_str . "'>";
     }
     if ( $l_image ne '' ) {
         $l_html .= "<img src='/graphics/$l_image' border=0 alt='$l_text'>";
@@ -353,17 +330,15 @@ sub web_fp_item    #render all items based on type
     return $l_html;
 }
 
-sub web_fp_idle_color #Fade color from acolor to bcolor over idle_time of object
+sub web_fp_idle_color    #Fade color from acolor to bcolor over idle_time of object
 {
     my ( $p_object, $p_acolor, $p_bcolor, $p_maxtime ) = @_;
 
     my ( $l_ared, $l_agreen, $l_ablue ) = $p_acolor =~ /#*(..)(..)(..)/;
     my ( $l_bred, $l_bgreen, $l_bblue ) = $p_bcolor =~ /#*(..)(..)(..)/;
 
-    ( $l_ared, $l_agreen, $l_ablue ) =
-      ( hex $l_ared, hex $l_agreen, hex $l_ablue );
-    ( $l_bred, $l_bgreen, $l_bblue ) =
-      ( hex $l_bred, hex $l_bgreen, hex $l_bblue );
+    ( $l_ared, $l_agreen, $l_ablue ) = ( hex $l_ared, hex $l_agreen, hex $l_ablue );
+    ( $l_bred, $l_bgreen, $l_bblue ) = ( hex $l_bred, hex $l_bgreen, hex $l_bblue );
 
     my ( $l_red, $l_green, $l_blue );
     my $l_time;
@@ -401,10 +376,7 @@ sub web_fp_idle_color #Fade color from acolor to bcolor over idle_time of object
         $l_blue = int( $l_ablue + ( ( $l_bblue - $l_ablue ) * ($l_percent) ) );
     }
 
-    return ("#"
-          . sprintf( "%02X", $l_red )
-          . sprintf( "%02X", $l_green )
-          . sprintf( "%02X", $l_blue ) );
+    return ( "#" . sprintf( "%02X", $l_red ) . sprintf( "%02X", $l_green ) . sprintf( "%02X", $l_blue ) );
 }
 
 sub web_fp_camera_popup {
diff --git a/web/bin/floorplan_svg.pl b/web/bin/floorplan_svg.pl
index a1c123ab8..f10351300 100644
--- a/web/bin/floorplan_svg.pl
+++ b/web/bin/floorplan_svg.pl
@@ -112,8 +112,7 @@ sub web_fp    #render table representation of objects and their co-ordinates
     my $l_bcolor = '#CCCCCC';
     my $l_acolor = '#00FF00';
 
-    my $title_room = $svg->text( id => "title", x => 50, y => 75 )
-      ->cdata( web_fp_filter_name($object_name) );
+    my $title_room = $svg->text( id => "title", x => 50, y => 75 )->cdata( web_fp_filter_name($object_name) );
     my $y = $svg->group(
         id    => 'group_y',
         style => { stroke => 'black', fill => 'white' }
@@ -128,11 +127,9 @@ sub web_fp    #render table representation of objects and their co-ordinates
             # It was 10, I'm not sure that 12 is correct
             # times 10, the rooms are given in feet (I guess)
             $l_x *= 12;
-            $l_x += $xOffset
-              ; # Corrective offset to move it of the right edge of the display area
+            $l_x += $xOffset;    # Corrective offset to move it of the right edge of the display area
             $l_y *= 12;
-            $l_y += $yOffset
-              ; # Corrective offset to move it of the top edge of the display area
+            $l_y += $yOffset;    # Corrective offset to move it of the top edge of the display area
             $l_w *= 12;
             $l_h *= 12;
 
@@ -153,7 +150,7 @@ sub web_fp    #render table representation of objects and their co-ordinates
                 )->cdata( web_fp_filter_name( $obj->{object_name} ) );
                 $i++;
             }
-            @n_objs = @{ $$obj{members} }; # This is the Devices within the Room
+            @n_objs = @{ $$obj{members} };    # This is the Devices within the Room
             for my $item (@n_objs) {
                 my ( $width, $height );
                 my $ob = Ob($item);
@@ -204,8 +201,7 @@ sub web_fp    #render table representation of objects and their co-ordinates
     else {
         ( $l_x, $l_y, $l_w, $l_h ) = $p_obj->get_fp_location();
         my ( $l_text, $l_state, $l_image ) = web_fp_item($p_obj);
-        $svg->text( x => $l_x + 6, y => $l_y + 6 )
-          ->cdata( web_fp_filter_name($l_text) );
+        $svg->text( x => $l_x + 6, y => $l_y + 6 )->cdata( web_fp_filter_name($l_text) );
         $svg->image(
             x       => $l_x,
             y       => $l_y,
diff --git a/web/bin/headercontrol.pl b/web/bin/headercontrol.pl
index 3b06dd4ea..887de2ef7 100644
--- a/web/bin/headercontrol.pl
+++ b/web/bin/headercontrol.pl
@@ -17,8 +17,7 @@
     &save_header_control_list(@parms);
 }
 
-my $phone_dir =
-  "$config_parms{data_dir}/headerallow.tab";    # Avoid redefined sub msgs
+my $phone_dir = "$config_parms{data_dir}/headerallow.tab";                  # Avoid redefined sub msgs
 my $form_type = &html_form_select( 'type', 0, 'True', 'True', 'False', );
 return &headercontrol_list();
 my $GuestValueTrue;
@@ -39,8 +38,7 @@ sub headercontrol_list {
     my $html_calls;
     my @calls = &read_headercontrol_list;
     for my $r (@calls) {
-        my ( $HeaderName, $family, $guest ) =
-          $r =~ /Name=(.*) Family=(.*) Guest=(.*)/;
+        my ( $HeaderName, $family, $guest ) = $r =~ /Name=(.*) Family=(.*) Guest=(.*)/;
 
         #print "$HeaderName, $family, $guest\n";
         if ( $Authorized eq 'admin' ) {
@@ -131,8 +129,7 @@ sub save_header_control_list {
 
             #print_log "counter is $counter:$writedata";
             #now we need to write this to the file
-            my ( $HeaderToWrite, $FamilyValue, $junk, $GuestValue ) =
-              $writedata =~ /(.*)=(true|false)(.*)=(true|false)/i;
+            my ( $HeaderToWrite, $FamilyValue, $junk, $GuestValue ) = $writedata =~ /(.*)=(true|false)(.*)=(true|false)/i;
 
             #print_log "Header:$HeaderToWrite, $FamilyValue, $GuestValue";
             my $WritingData = "$HeaderToWrite\t$FamilyValue\t$GuestValue";
@@ -194,8 +191,7 @@ sub read_headercontrol_list {
         #ok, we have the number and name is filled with the rest, lets break up name a little
 
         #print_log "HeaderName;$HeaderName, Family;$family, Guest;$guest\n";
-        push @header,
-          sprintf( "Name=%s Family=%s Guest=%s", $HeaderName, $family, $guest );
+        push @header, sprintf( "Name=%s Family=%s Guest=%s", $HeaderName, $family, $guest );
 
     }
     close MYFILE;
diff --git a/web/bin/hvac.pl b/web/bin/hvac.pl
index 1c798e72c..c47b3ddc3 100644
--- a/web/bin/hvac.pl
+++ b/web/bin/hvac.pl
@@ -68,8 +68,7 @@ sub hvac_ask {
     $html .= "</tr></table>";
 
     if ( $state eq 'hold' ) {
-        $html .=
-          '<P>Click <a href="hvac.pl?cancel">here to cancel the hold</a>.</P>';
+        $html .= '<P>Click <a href="hvac.pl?cancel">here to cancel the hold</a>.</P>';
     }
     else {
         $html .= qq|
diff --git a/web/bin/icon_auth.pl b/web/bin/icon_auth.pl
index 4a52bb3ea..81c8fb194 100644
--- a/web/bin/icon_auth.pl
+++ b/web/bin/icon_auth.pl
@@ -18,7 +18,4 @@
   : "/SET_PASSWORD?user=$Authorized";
 
 #print "\ndbx a=$Authorized i=$icon a=$action\n";
-return
-    "<a href='$action'><img src='$icon' alt='"
-  . ( ($Authorized) ? 'Logout' : 'Login' )
-  . "' border=0></a>";
+return "<a href='$action'><img src='$icon' alt='" . ( ($Authorized) ? 'Logout' : 'Login' ) . "' border=0></a>";
diff --git a/web/bin/icon_mode.pl b/web/bin/icon_mode.pl
index 1f89b83ee..d53c8fc58 100644
--- a/web/bin/icon_mode.pl
+++ b/web/bin/icon_mode.pl
@@ -3,6 +3,5 @@
 # and cycle them when users click on it.
 # Is being called from modes/main.shtml.
 
-return
-  "<a href='/RUN;referer?Toggle_the_house_mode'><img src=/ia5/images/$Save{mode}.gif alt='$Save{mode} Mode' border=0></a>";
+return "<a href='/RUN;referer?Toggle_the_house_mode'><img src=/ia5/images/$Save{mode}.gif alt='$Save{mode} Mode' border=0></a>";
 
diff --git a/web/bin/iniedit.pl b/web/bin/iniedit.pl
index cce5a3e8b..89e1dfbde 100644
--- a/web/bin/iniedit.pl
+++ b/web/bin/iniedit.pl
@@ -46,8 +46,7 @@
 
 return localize() if $testing and !@ARGV;    # For testing only
 
-my ( %dparms, %cparms, @order, %pparms, %categories, @catorder, %changed,
-    %help );
+my ( %dparms, %cparms, @order, %pparms, %categories, @catorder, %changed, %help );
 my $private_parms = $Pgm_Path . "/mh.private.ini";
 $private_parms = $ENV{mh_parms} if $ENV{mh_parms};
 
@@ -131,15 +130,11 @@ sub commit {
     #     print_log "Error in backup up parms file $private_parms: $!";
 
     open( PRIVATE, ">$private_parms" )
-      or return $head
-      . "\nError, could not open $private_parms for writing.<p>\n"
-      . $tail;
-    print PRIVATE
-      "# Misterhouse configuration file generated by iniedit.pl\n\n";
+      or return $head . "\nError, could not open $private_parms for writing.<p>\n" . $tail;
+    print PRIVATE "# Misterhouse configuration file generated by iniedit.pl\n\n";
     my $data;
     if ( defined $args{edit_list} ) {
-        $data =
-          '<A HREF="/bin/iniedit.pl" onclick="self.close();return(false);">Close</A>';
+        $data = '<A HREF="/bin/iniedit.pl" onclick="self.close();return(false);">Close</A>';
     }
     else {
         $data = '<A HREF="/bin/iniedit.pl">Back</A>';
@@ -168,8 +163,7 @@ sub commit {
 sub edit {
     my $data = '
        <br>';
-    $data .=
-      '<font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font><br>'
+    $data .= '<font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font><br>'
       unless $Authorized eq 'admin';
     $data .= '
         Note: Commit will resort and filter out comments.'
@@ -184,15 +178,13 @@ sub edit {
     ';
 
     foreach ( @catorder, 'Other' ) {
-        $data .=
-          '<option' . ( $_ eq $category ? ' selected' : '' ) . '> ' . $_ . "\n";
+        $data .= '<option' . ( $_ eq $category ? ' selected' : '' ) . '> ' . $_ . "\n";
     }
 
     $data .= '
         </select>';
     $data .= '<input type=submit name="Switch" value="Switch">&nbsp;&nbsp;';
-    $data .=
-      '<input type=submit name="Commit" value="Commit"><input type=submit name="Reset Values" value="Reset Values">'
+    $data .= '<input type=submit name="Commit" value="Commit"><input type=submit name="Reset Values" value="Reset Values">'
       if $Authorized eq 'admin';
     $data .= '
         </td></tr>
@@ -215,18 +207,11 @@ sub edit {
         }
 
         $data .= "<b>$_</b></td><td>";
-        $data .=
-            '<input'
-          . $disabledhtml
-          . ' type=text size=30 name="'
-          . $_
-          . '" value="';
+        $data .= '<input' . $disabledhtml . ' type=text size=30 name="' . $_ . '" value="';
         $data .= map_chars( $cparms{$_} ) . '">';
-        $data .=
-          '<input type=button value="Set Default" onClick="' . $_ . ".value='"
+        $data .= '<input type=button value="Set Default" onClick="' . $_ . ".value='"
           if $Authorized eq 'admin';
-        $data .=
-          ( defined $dparms{$_} ? map_chars( $dparms{$_} ) : '' ) . "'\">"
+        $data .= ( defined $dparms{$_} ? map_chars( $dparms{$_} ) : '' ) . "'\">"
           if $Authorized eq 'admin';
         $data .= "</td></tr>\n";
         $rowcount++;
@@ -289,13 +274,8 @@ sub edit_list {
         }
         $data .= "<b>$_</b></td><td>";
         $data .= '<input type=text size=30 name="' . $_ . '" value="';
-        $data .=
-            map_chars( $cparms{$_} )
-          . '"><input type=button value="Set Default" onClick="'
-          . $_
-          . ".value='";
-        $data .= ( defined $dparms{$_} ? map_chars( $dparms{$_} ) : '' )
-          . "'\"></td></tr>\n";
+        $data .= map_chars( $cparms{$_} ) . '"><input type=button value="Set Default" onClick="' . $_ . ".value='";
+        $data .= ( defined $dparms{$_} ? map_chars( $dparms{$_} ) : '' ) . "'\"></td></tr>\n";
         $rowcount++;
     }
 
@@ -342,8 +322,7 @@ sub make_doc {
         next unless defined $dparms{$_};
         $data .= '<A NAME="' . $_ . '"><H3>' . $_ . '</H3></A><P>' . "\n";
         $data .= 'Insert description here.<P>' . "\n";
-        $data .=
-          '<B>Default value: </B>' . map_chars( $dparms{$_} ) . '<P><P>' . "\n";
+        $data .= '<B>Default value: </B>' . map_chars( $dparms{$_} ) . '<P><P>' . "\n";
     }
 
     return $head . $data . $tail;
@@ -359,8 +338,7 @@ sub map_chars {
 
 # This is similar to handy_Utils read_opts ... maybe should merge or share code?
 sub my_read_opts {
-    my ( $ref_parms, $ref_order, $ref_cats, $ref_catorder, $config_file,
-        $debug ) = @_;
+    my ( $ref_parms, $ref_order, $ref_cats, $ref_catorder, $config_file, $debug ) = @_;
     my ( $key, $value, $value_continued, $help, $help_flag );
 
     # If debug == 0 (instead of undef) this is disabled
@@ -428,8 +406,7 @@ sub my_read_opts {
                 $$ref_cats{$key} = $category;
             }
         }
-        print
-          "parm key=$key value=$$ref_parms{$key} category=$$ref_cats{$key}\n"
+        print "parm key=$key value=$$ref_parms{$key} category=$$ref_cats{$key}\n"
           if $debug;
     }
     close CONFIG;
@@ -445,11 +422,9 @@ sub localize {
     closedir(DIR);
     foreach my $file ( sort @files ) {
         next
-          if $file =~ /location_specimen|example/
-          ;    # Ignore mh.location_specimen.ini and mh.example.ini
-        next if $file =~ /^\./;    # Ignore ./ and ../
-        $file =~ s/(mh\.|\.ini)//i
-          ;    # problem with this line (next line should not be needed)
+          if $file =~ /location_specimen|example/;    # Ignore mh.location_specimen.ini and mh.example.ini
+        next if $file =~ /^\./;                       # Ignore ./ and ../
+        $file =~ s/(mh\.|\.ini)//i;                   # problem with this line (next line should not be needed)
         $file =~ s/\.ini//i;
 
         # $file = ucfirst($file);
diff --git a/web/bin/items.pl b/web/bin/items.pl
index f93a91951..214e67bed 100644
--- a/web/bin/items.pl
+++ b/web/bin/items.pl
@@ -16,8 +16,7 @@
 
 return &web_items_list();
 
-use vars '$web_item_file_name'
-  ;         # Avoid my, so we can keep the same name between web calls
+use vars '$web_item_file_name';    # Avoid my, so we can keep the same name between web calls
 my (@file_data);
 
 sub web_items_list {
@@ -27,8 +26,7 @@ sub web_items_list {
     $html = qq|
 <HTML><HEAD><TITLE>Items Menu</TITLE></HEAD><BODY>\n<a name='Top'></a>$html
 Use this page to review or update your .mht file.|;
-    $html .=
-      qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
+    $html .= qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
       unless $Authorized eq 'admin';
     $html .= qq|A backup is made and comments and record order are preserved.
 To update existing items, enter/change the field and hit Enter.|
@@ -63,10 +61,8 @@ sub web_items_list {
       if $ARGV[0] =~ /^file=(.+)$/;    # User selected another mht file
 
     # Create a form to pick which file
-    $html .=
-      "<table border><tr><form action=/bin/items.pl method=post><td>Which .mht file to edit?\n";
-    $html .= &html_form_select( 'file', 1, $web_item_file_name, @file_paths )
-      . "</td></form></tr>\n";
+    $html .= "<table border><tr><form action=/bin/items.pl method=post><td>Which .mht file to edit?\n";
+    $html .= &html_form_select( 'file', 1, $web_item_file_name, @file_paths ) . "</td></form></tr>\n";
 
     # Create form to add an item
     my $form_type = &html_form_select(
@@ -134,10 +130,8 @@ sub web_items_list {
     }
 
     # Add an index
-    $html .=
-      "<tr><td><a href=/bin/items.pl?file=$web_item_file_name>Refresh</a>\n";
-    $html .=
-      "&nbsp;&nbsp;<a href=/RUN;/bin/items.pl?Reload_code>ReLoad Code</a>&nbsp;\n";
+    $html .= "<tr><td><a href=/bin/items.pl?file=$web_item_file_name>Refresh</a>\n";
+    $html .= "&nbsp;&nbsp;<a href=/RUN;/bin/items.pl?Reload_code>ReLoad Code</a>&nbsp;\n";
     $html .= "<B>Item Index: <B>\n";
     for my $type ( sort keys %item_pos ) {
         $html .= "<a href='#$type'>$type</a>\n";
@@ -146,31 +140,30 @@ sub web_items_list {
 
     # Define fields by type
     my %headers = (
-        ANALOG_SENSOR =>
-          [ 'Identifier', 'Name', 'Conduit', 'Groups', 'Type', 'Tokens' ],
-        EIB1  => [ 'Address', 'Name', 'Groups', 'Mode' ],
-        EIB1G => [ 'Address', 'Name', 'Groups', 'Addresses' ],
-        EIB2  => [ 'Address', 'Name', 'Groups' ],
-        EIB5  => [qw(Address Name Groups Mode)],
-        EIB7    => [ 'Address', 'Name', 'Groups' ],
-        GENERIC => [qw(Name Groups)],
-        GROUP   => [qw(Name FloorPlan Groups)],
-        IBUTTON => [qw(ID Name Port Channel)],
-        SERIAL  => [qw(String Name Groups State Port)],
-        VOICE   => [qw(Item Phrase)],
-        X10A    => [qw(Address Name Groups Interface)],
-        X10I                  => [qw(Address Name Groups Interface Options)],
-        X10SL                 => [qw(Address Name Groups Interface Options)],
-        X10MS                 => [qw(Address Name Groups Type)],
-        X106BUTTON            => [qw(Address Name)],
-        UPBPIM                => [qw(Name NetworkID Password Address)],
-        UPBD                  => [qw(Name Interface NetworkID Address Groups)],
-        UPBL                  => [qw(Name Interface NetworkID Address Groups)],
-        INSTEON_PLM           => [qw(Name)],
-        INSTEON_LAMPLINC      => [qw(Address Name Groups)],
-        INSTEON_BULBLINC      => [qw(Address Name Groups)],
-        INSTEON_APPLIANCELINC => [qw(Address Name Groups)],
-        INSTEON_SWITCHLINC    => [qw(Address Name Groups)],
+        ANALOG_SENSOR => [ 'Identifier', 'Name', 'Conduit', 'Groups', 'Type', 'Tokens' ],
+        EIB1          => [ 'Address',    'Name', 'Groups',  'Mode' ],
+        EIB1G         => [ 'Address',    'Name', 'Groups',  'Addresses' ],
+        EIB2          => [ 'Address',    'Name', 'Groups' ],
+        EIB5          => [qw(Address Name Groups Mode)],
+        EIB7                    => [ 'Address', 'Name', 'Groups' ],
+        GENERIC                 => [qw(Name Groups)],
+        GROUP                   => [qw(Name FloorPlan Groups)],
+        IBUTTON                 => [qw(ID Name Port Channel)],
+        SERIAL                  => [qw(String Name Groups State Port)],
+        VOICE                   => [qw(Item Phrase)],
+        X10A                    => [qw(Address Name Groups Interface)],
+        X10I                    => [qw(Address Name Groups Interface Options)],
+        X10SL                   => [qw(Address Name Groups Interface Options)],
+        X10MS                   => [qw(Address Name Groups Type)],
+        X106BUTTON              => [qw(Address Name)],
+        UPBPIM                  => [qw(Name NetworkID Password Address)],
+        UPBD                    => [qw(Name Interface NetworkID Address Groups)],
+        UPBL                    => [qw(Name Interface NetworkID Address Groups)],
+        INSTEON_PLM             => [qw(Name)],
+        INSTEON_LAMPLINC        => [qw(Address Name Groups)],
+        INSTEON_BULBLINC        => [qw(Address Name Groups)],
+        INSTEON_APPLIANCELINC   => [qw(Address Name Groups)],
+        INSTEON_SWITCHLINC      => [qw(Address Name Groups)],
         INSTEON_SWITCHLINCRELAY => [qw(Address Name Groups)],
         INSTEON_KEYPADLINC      => [qw(Address Name Groups)],
         INSTEON_KEYPADLINCRELAY => [qw(Address Name Groups)],
@@ -194,8 +187,7 @@ sub web_items_list {
 
         $html .= "<tr>";
         for my $header ( '', 'Type', @headers ) {
-            $html .=
-              qq[<td><a href="javascript:openparmhelp('$header')">$header</a></td>];
+            $html .= qq[<td><a href="javascript:openparmhelp('$header')">$header</a></td>];
 
             #           $html .= "<td>$header</td> ";
         }
@@ -209,16 +201,12 @@ sub web_items_list {
             $html .= "<td>";
             $html .= "<a href=/SUB;/bin/items.pl?web_item_copy($pos)>Copy</a>"
               if $Authorized eq 'admin';
-            $html .=
-              "    <a href=/SUB;/bin/items.pl?web_item_delete($pos)>Delete</a>"
+            $html .= "    <a href=/SUB;/bin/items.pl?web_item_delete($pos)>Delete</a>"
               if $Authorized eq 'admin';
             $html .= "</td> ";
             $html .= "<td>$item_info[0]</td> ";
             for my $field ( 1 .. $headers - 1 ) {
-                $html .= &html_form_input_set_func(
-                    'web_item_set_field', "/bin/items.pl",
-                    "$pos,$field",        $item_info[$field]
-                );
+                $html .= &html_form_input_set_func( 'web_item_set_field', "/bin/items.pl", "$pos,$field", $item_info[$field] );
             }
             $html .= "</tr>\n";
         }
@@ -324,8 +312,7 @@ sub web_item_add {
     $other2 =~ s/,$//;
 
     # write out new record to mht file
-    $file_data[@file_data] = sprintf( "%-20s%-20s%-20s%-20s%-20s%s",
-        $type, $address, $name, $group, $other1, $other2 );
+    $file_data[@file_data] = sprintf( "%-20s%-20s%-20s%-20s%-20s%s", $type, $address, $name, $group, $other1, $other2 );
     &mht_item_file_write( $web_item_file_name, \@file_data );
 
     return 0;
@@ -342,19 +329,15 @@ sub web_item_help {
         Groups    => 'List of groups the item belongs to, seperated by |',
         Interface => 'The X10 Interface to use (e.g. CM17, CM11)',
         X10_Type  => 'The type of X10 device (e.g. LM14 or preset)',
-        String =>
-          'The serial characters to match (e.g. XA1A1 to match 2 A1 button pushes)',
-        State => 'The state name to correlate to this items serial String',
-        Port  => 'Which port to look for the serial data on',
-        ID =>
-          'Ibutton ID:  type|serial|crc  crc is optional.  type=01 (1990) type=10 (1820)',
-        Channel => 'When using a switch, choose channel A or B',
-        Item    => 'Item name to tie this voice command to',
-        Phrase  => 'Voice_Cmd Text',
-        Mode =>
-          '\'R\' (readable): generate read request to learn current state at initialization',
-        Options =>
-          'List the device options separated by | (e.g. preset, resume=80)',
+        String    => 'The serial characters to match (e.g. XA1A1 to match 2 A1 button pushes)',
+        State     => 'The state name to correlate to this items serial String',
+        Port      => 'Which port to look for the serial data on',
+        ID        => 'Ibutton ID:  type|serial|crc  crc is optional.  type=01 (1990) type=10 (1820)',
+        Channel   => 'When using a switch, choose channel A or B',
+        Item      => 'Item name to tie this voice command to',
+        Phrase    => 'Voice_Cmd Text',
+        Mode      => '\'R\' (readable): generate read request to learn current state at initialization',
+        Options   => 'List the device options separated by | (e.g. preset, resume=80)',
         FloorPlan => 'Floor Plan location',
         Other     => 'Other stuff :)'
     );
diff --git a/web/bin/k8055.pl b/web/bin/k8055.pl
index 62172e46f..49a4038ba 100644
--- a/web/bin/k8055.pl
+++ b/web/bin/k8055.pl
@@ -23,8 +23,7 @@
 ];
 
 if ( $param{autorefresh} > 0 ) {
-    $html .=
-      qq[<meta http-equiv="refresh" content="$param{autorefresh}; URL=$myURL?autorefresh=$param{autorefresh}">\n];
+    $html .= qq[<meta http-equiv="refresh" content="$param{autorefresh}; URL=$myURL?autorefresh=$param{autorefresh}">\n];
 }
 
 $html .= qq[</head>
@@ -49,8 +48,7 @@
     for ( $i = 1; $i <= $numCounters; $i++ ) {
         if ( $param{"c$i"} ne '' ) {
             $k8055->setDebounce( $i, $param{"c$i"} );
-            push( @result,
-                "Setting Counter $i Debounce to " . $param{"c$i"} . " ms" );
+            push( @result, "Setting Counter $i Debounce to " . $param{"c$i"} . " ms" );
         }
     }
 }
@@ -74,8 +72,7 @@
 }
 elsif ( $param{action} eq 'autoupdate' ) {
     $k8055->setUpdatePeriod( $param{autoupdatetime} );
-    push( @result,
-        "Setting auto-update period to $param{autoupdatetime} seconds" );
+    push( @result, "Setting auto-update period to $param{autoupdatetime} seconds" );
 }
 elsif ( $param{action} eq 'update' ) {
     $k8055->update();
@@ -147,8 +144,7 @@
 ];
 
 for ( $i = 1; $i <= $numAnalogueOutputPorts; $i++ ) {
-    $html .=
-      qq[<p>Port $i: <input type="text" name="a$i" value="" maxlength=3></p>];
+    $html .= qq[<p>Port $i: <input type="text" name="a$i" value="" maxlength=3></p>];
 }
 $html .= qq[<p><input type="submit" name="action" value="analogue"></p>\n];
 
@@ -161,8 +157,7 @@
 
 $html .= "</p>";
 for ( $i = 1; $i <= $numCounters; $i++ ) {
-    $html .=
-      qq[<p>Counter $i: <input type="text" name="c$i" value="" maxlength=4></p>];
+    $html .= qq[<p>Counter $i: <input type="text" name="c$i" value="" maxlength=4></p>];
 }
 $html .= qq[<p><input type="submit" name="action" value="counter"></p>\n];
 
diff --git a/web/bin/list_buttons.pl b/web/bin/list_buttons.pl
index 09a3119a6..d6dde59b9 100644
--- a/web/bin/list_buttons.pl
+++ b/web/bin/list_buttons.pl
@@ -110,10 +110,7 @@
 
 #$html = "<html><body>\n<base target ='output'>\n" .
 if ($html_refrate) {
-    $htm_hdr =
-        "<html><head><meta HTTP-EQUIV=\"refresh\" CONTENT=\""
-      . $html_refrate
-      . ";\"><\/head><body>\n";
+    $htm_hdr = "<html><head><meta HTTP-EQUIV=\"refresh\" CONTENT=\"" . $html_refrate . ";\"><\/head><body>\n";
 }
 else {
     $htm_hdr = "<html><body>\n";
diff --git a/web/bin/list_categories.pl b/web/bin/list_categories.pl
index 348635bba..9dc083e72 100644
--- a/web/bin/list_categories.pl
+++ b/web/bin/list_categories.pl
@@ -14,29 +14,24 @@
     # Use custom icons if they exist
     my $image = "/graphics/category-$category2.gif";
     if ( &http_get_local_file($image) ) {
-        $h .=
-          qq[<a href=list?$category><img src="$image" alt='$category2' border="0"></a>\n];
+        $h .= qq[<a href=list?$category><img src="$image" alt='$category2' border="0"></a>\n];
     }
 
     # Create buttons with GD module if available
     elsif ( $Info{module_GD} ) {
         my $name = &pretty_object_name($category);
-        $h .=
-          qq[<a href=list?$category><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
+        $h .= qq[<a href=list?$category><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
     }
 
     # Otherwise use text
     else {
-        $h .=
-          &html_active_href( "list?$category", &pretty_object_name($category) )
-          . "\n";
+        $h .= &html_active_href( "list?$category", &pretty_object_name($category) ) . "\n";
     }
     $html .= $h . "</td>\n";
     $html .= "</tr><tr>\n" unless ++$count % 3;
 }
 
-$html = "<html><body>\n<base target ='output'>\n"
-  . &html_header('Browse Categories') . "
+$html = "<html><body>\n<base target ='output'>\n" . &html_header('Browse Categories') . "
 <table width='100%' border='0'>
 <center>
  <table cellSpacing=4 cellPadding=0 width='100%' border=0>  
diff --git a/web/bin/list_items.pl b/web/bin/list_items.pl
index 45bd63e4e..97b4aa512 100644
--- a/web/bin/list_items.pl
+++ b/web/bin/list_items.pl
@@ -17,24 +17,19 @@
     my $name  = &pretty_object_name($object_type);
 
     if ( &http_get_local_file($image) ) {
-        $h .=
-          qq[<a href=list?$object_type><img src="$image" alt='$name' border="0"></a>\n];
+        $h .= qq[<a href=list?$object_type><img src="$image" alt='$name' border="0"></a>\n];
     }
 
     # Create buttons with GD module if available
     elsif ( $Info{module_GD} ) {
 
         #        $name =~ s/ /%20/g;
-        $h .=
-          qq[<a href=list?$object_type><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
+        $h .= qq[<a href=list?$object_type><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
     }
 
     # Otherwise use text
     else {
-        $h .=
-          &html_active_href( "list?$object_type",
-            &pretty_object_name($object_type) )
-          . "\n";
+        $h .= &html_active_href( "list?$object_type", &pretty_object_name($object_type) ) . "\n";
     }
     $html .= $h . "</td>\n";
     $html .= "</tr><tr>\n" unless ++$count % 3;
diff --git a/web/bin/list_widgets.pl b/web/bin/list_widgets.pl
index 02fc72def..262559f72 100644
--- a/web/bin/list_widgets.pl
+++ b/web/bin/list_widgets.pl
@@ -5,12 +5,7 @@
 
 my ( $html, $count );
 
-for my $type (
-    'Widgets',          'Widgets_Label',
-    'Widgets_Entry',    'Widgets_RadioButton',
-    'Widgets_Checkbox', 'Vars_Global',
-    'Vars_Save'
-  )
+for my $type ( 'Widgets', 'Widgets_Label', 'Widgets_Entry', 'Widgets_RadioButton', 'Widgets_Checkbox', 'Vars_Global', 'Vars_Save' )
 {
     # Look for custom icon
     my $type2 = lc $type;
@@ -27,8 +22,7 @@
     # Create buttons with GD module if available
     elsif ( $Info{module_GD} ) {
         my $name = &pretty_object_name($type);
-        $h .=
-          qq[<a href=$url><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
+        $h .= qq[<a href=$url><img src="/bin/button.pl?$name" alt='$name' border="0"></a>\n];
     }
 
     # Otherwise use text
diff --git a/web/bin/menu.pl b/web/bin/menu.pl
index 139b24b7e..452b14e97 100644
--- a/web/bin/menu.pl
+++ b/web/bin/menu.pl
@@ -110,8 +110,7 @@ sub menu_list_top {
         $html .= &menu_button( $menu_group, "/bin/menu.pl?$menu_group" );
         $html .= "&nbsp;&nbsp;&nbsp;&nbsp;" unless $menu_buttons;
     }
-    $html .=
-      'No menus defined.  Enable menu.pl in the <a href="/bin/code_select.pl">common code selector</a>'
+    $html .= 'No menus defined.  Enable menu.pl in the <a href="/bin/code_select.pl">common code selector</a>'
       unless %Menus > 1;
     return &html_top . $html;
 }
@@ -137,8 +136,7 @@ sub menu_list {
         $menus_prev1 .= $menu_prev;
 
         #       $html .= &menu_button($menu_prev, ($menu_prev eq $menus[-1]) ? '' : "/bin/menu.pl?$menu_group&$menus_prev1");
-        $html .=
-          &menu_button( $menu_prev, "/bin/menu.pl?$menu_group&$menus_prev1" );
+        $html .= &menu_button( $menu_prev, "/bin/menu.pl?$menu_group&$menus_prev1" );
     }
     $html .= "<hr>\n";
 
@@ -187,16 +185,14 @@ sub menu_list {
             $href = "/bin/menu.pl?$menu_group&$menus|$goto";
             $text = $goto;
         }
-        my $color =
-          ( $target eq 'speech' or $target eq 'main' ) ? 'blue' : 'white';
+        my $color = ( $target eq 'speech' or $target eq 'main' ) ? 'blue' : 'white';
 
         # Use an active button if 2 states and tied to an object
         my $states = @{ $$ptr2{Dstates} } if $$ptr2{Dstates};
         my $action = $$ptr2{A};
 
         if ( $states >= 1 and $action =~ /^ *set +(\$\S+)/ and eval "ref $1" ) {
-            $html .=
-              &menu_button2( $1, $text, $menu_group, $menus, $menu, $item );
+            $html .= &menu_button2( $1, $text, $menu_group, $menus, $menu, $item );
         }
         else {
             $html .= &menu_button( $text, $href, $target, $color );
@@ -220,22 +216,16 @@ sub menu_states {
     my $border = ( $buttons and $menu_buttons ) ? 0 : 1;
 
     #   my $html = "<hr><BASE TARGET='speech'>\n";
-    my $html =
-      "<table border=$border width='100%'><tr><td><b>$$ptr2{Dprefix}</b></td>";
+    my $html  = "<table border=$border width='100%'><tr><td><b>$$ptr2{Dprefix}</b></td>";
     my $state = 0;
     for my $state_name ( @{ $$ptr2{Dstates} } ) {
         my $href = "sub?menu_run($menu_group,$menu,$item,$state,h)";
         $href =~ s/ /%20/g;
         if ($buttons) {
-            $html .= "<td>"
-              . &menu_button( $state_name, $href, 'speech', 'blue' )
-              . "</td>\n";
+            $html .= "<td>" . &menu_button( $state_name, $href, 'speech', 'blue' ) . "</td>\n";
         }
         else {
-            $html .=
-                "<td><a target='speech' href='$href'>$state_name "
-              . &key_pointer
-              . "</a></td>\n";
+            $html .= "<td><a target='speech' href='$href'>$state_name " . &key_pointer . "</a></td>\n";
         }
         $state++;
     }
@@ -314,8 +304,7 @@ sub menu_button2 {
     #   my $href = "sub?menu_run($menu_group,$menu,$item,$state_next,hr,/bin/menu.pl?$menu_group&$menus)";
     # &button_action is in mh/code/common/html_functions.pl
     # Need the function form, not the .pl form, since the argument has ? and & in it
-    my $href =
-      "sub?button_action($object_name,$state_next,/bin/menu.pl?$menu_group&$menus)";
+    my $href = "sub?button_action($object_name,$state_next,/bin/menu.pl?$menu_group&$menus)";
     $href =~ s/ /%20/g;
     return "<a id=a$menu_key_index href='$href'>$link</a>\n";
 }
@@ -323,8 +312,7 @@ sub menu_button2 {
 sub key_pointer {
     $menu_key_index++;
     return unless $menu_keys;
-    return
-      "<img style='Display:None' border=0 alt='pointer' Id=i$menu_key_index src=/graphics/pointer1.gif>";
+    return "<img style='Display:None' border=0 alt='pointer' Id=i$menu_key_index src=/graphics/pointer1.gif>";
 }
 
 sub html_top {
@@ -336,28 +324,19 @@ sub html_top {
     #   $html =~ s|<head>|<head><meta forua="true" http-equiv="Cache-Control" content="max-age=999"/>\n|;
 
     if ($menu_keys) {
-        my $script = "<script src='/bin/menu_keys.js'></script>\n"
-          . "<script>\nvar last_key = $menu_key_index;\n</script>\n";
+        my $script = "<script src='/bin/menu_keys.js'></script>\n" . "<script>\nvar last_key = $menu_key_index;\n</script>\n";
         $html =~ s/<head>/<head>$script/;
         $html =~ s/body /body onload='load(); self.focus()' /;
     }
 
     $html .= "<table border=0 width='100%'><tr>\n";
-    $html .= "<td align=left>"
-      . &html_file( undef, '../web/bin/set_cookie.pl',
-        'menu_keys&&<b>Keyboard Control</b>', 1 )
-      . "</td>\n"
+    $html .=
+      "<td align=left>" . &html_file( undef, '../web/bin/set_cookie.pl', 'menu_keys&&<b>Keyboard Control</b>', 1 ) . "</td>\n"
       if $menu_keys_allowed;
-    $html .= "<td align=left>"
-      . &html_file( undef, '../web/bin/set_cookie.pl',
-        'menu_buttons&&<b>Buttons</b>', 1 )
-      . "</td>\n";
-    $html .= "<td align=left>"
-      . &html_file( undef, '../web/bin/set_cookie.pl',
-        'webmute&&<b>Webmute</b>&&&&/bin/menu.pl', 1 )
-      . "</td>\n";
+    $html .= "<td align=left>" . &html_file( undef, '../web/bin/set_cookie.pl', 'menu_buttons&&<b>Buttons</b>', 1 ) . "</td>\n";
     $html .=
-      "<td><a href=/bin/menu.pl?help><font size=+1>Help</font></a></td>\n";
+      "<td align=left>" . &html_file( undef, '../web/bin/set_cookie.pl', 'webmute&&<b>Webmute</b>&&&&/bin/menu.pl', 1 ) . "</td>\n";
+    $html .= "<td><a href=/bin/menu.pl?help><font size=+1>Help</font></a></td>\n";
     $html .= "</tr></table>\n";
     return $html;
 }
diff --git a/web/bin/menu_old.pl b/web/bin/menu_old.pl
index a632a9a13..ead5fdcc0 100644
--- a/web/bin/menu_old.pl
+++ b/web/bin/menu_old.pl
@@ -35,8 +35,7 @@ sub menu_list {
     $target++;
     $target = 'speech' if $target eq 'menu4';
     my $html = "<base target='$target'><table  width='100%'>\n";
-    $html .=
-      "<tr><td align='middle' bgColor='#cccccc'><font size='+3'>$menu</font></td></tr>\n";
+    $html .= "<tr><td align='middle' bgColor='#cccccc'><font size='+3'>$menu</font></td></tr>\n";
     my $item = 0;
     my $ptr  = $Menus{$menu_group};
     for my $ptr2 ( @{ $$ptr{$menu}{items} } ) {
@@ -96,11 +95,9 @@ sub menu_states {
     my $ptr2 = $Menus{$menu_group}{$menu}{items}[$item];
 
     my $state = 0;
-    my $html =
-      "<table border=1 width='100%' height='100%'><tr><td>$$ptr2{Dprefix}</td>";
+    my $html  = "<table border=1 width='100%' height='100%'><tr><td>$$ptr2{Dprefix}</td>";
     for my $state_name ( @{ $$ptr2{Dstates} } ) {
-        $html .=
-          "<td><a href='/sub?menu_run($menu_group,$menu,$item,$state,h)' target='speech'>$state_name</a></td>\n";
+        $html .= "<td><a href='/sub?menu_run($menu_group,$menu,$item,$state,h)' target='speech'>$state_name</a></td>\n";
         $state++;
     }
     $html .= "</table>";
diff --git a/web/bin/mh_usage.pl b/web/bin/mh_usage.pl
index bc41488a9..bffe3bac2 100644
--- a/web/bin/mh_usage.pl
+++ b/web/bin/mh_usage.pl
@@ -13,12 +13,10 @@
     $msg = "City and State/Country not filled in, so no data was sent.";
 }
 else {
-    $msg =
-      "Usage data logged:\n\n  city=$city state/country=$state name=$name\n";
+    $msg = "Usage data logged:\n\n  city=$city state/country=$state name=$name\n";
     $msg .= "\nThanks!\n";
     display $msg, 0, "$Time_Date: Usage survey";
-    logit "$config_parms{data_dir}/mh_usage.txt",
-      "city=$city state=$state name=$name";
+    logit "$config_parms{data_dir}/mh_usage.txt", "city=$city state=$state name=$name";
 }
 
 return html_page '', $msg;
diff --git a/web/bin/mp3_applet_playlist.pl b/web/bin/mp3_applet_playlist.pl
index ec35de755..a7e5e8e29 100644
--- a/web/bin/mp3_applet_playlist.pl
+++ b/web/bin/mp3_applet_playlist.pl
@@ -18,8 +18,7 @@
       "<html><head><meta http-equiv='Refresh' content='120;url=/bin/mp3_applet_playlist.pl'><title>MisterHouse Jukebox Playlist</title>";
     $Mp3List = "$Mp3List    <script src='/bin/mp3_cookies.js'></script>";
     $Mp3List = "$Mp3List    <script src='/bin/mp3_ctrl.js'></script>";
-    $Mp3List =
-      "$Mp3List    </head><body background='http://localhost/Channels/.MisterHouse/background.gif' bgcolor='#ccffff'>";
+    $Mp3List = "$Mp3List    </head><body background='http://localhost/Channels/.MisterHouse/background.gif' bgcolor='#ccffff'>";
     $Mp3List = "$Mp3List <script>";                  # LANGUAGE='JavaScript'>";
 
     #    $Mp3List = "$Mp3List   eraseCookie('Playlist');";
@@ -35,8 +34,7 @@
     $Mp3List = "$Mp3List //createCookie('Playlist','KILL','1');";
     $Mp3List = "$Mp3List //setTimeout('UpdateYou()', 2000);";
     $Mp3List = "$Mp3List </script>";
-    $Mp3List =
-      "$Mp3List <table  background='http://localhost/Channels/.Misterhouse/background.gif'> ";
+    $Mp3List = "$Mp3List <table  background='http://localhost/Channels/.Misterhouse/background.gif'> ";
     $Mp3List =
       "$Mp3List<TR><th><small>Track<br>(<u>del</u>)</small></th><th><small>Song Title<br>(<u>jump</u>)</small></th><th><small>Play<br>Time</small></th></TR><small>";
 
@@ -49,8 +47,7 @@
         my $pos = 1;
         foreach my $item (@$titles) {
             my $Time = &mp3_get_playlist_timestr( $pos - 1 );
-            my $Str =
-              "                                                            ";
+            my $Str  = "                                                            ";
             $Str = substr( "$pos. $item", 1 );
             my $my_pos = $pos - 1;
 
@@ -58,16 +55,15 @@
             # Only highlight the current song otherwise just add to the list
             #  v 1.10 and Add a Track Jump URL
             if ( $pos - 1 == $currPos ) {
-                $Mp3List = $Mp3List
-                  . "<tr bgcolor='yellow'><td id=$pos><B>$pos</B></td><td><b>$item</b></td><td><b>$Time</b></td></tr>";
+                $Mp3List =
+                  $Mp3List . "<tr bgcolor='yellow'><td id=$pos><B>$pos</B></td><td><b>$item</b></td><td><b>$Time</b></td></tr>";
             }
 
             #		if ( $pos - 1 == $currPos ) { $Mp3List = $Mp3List ."<tr bgcolor='yellow'><td id=$pos><B>$pos</B></td><td><b>$item</b></td><td><b>$Time</b></td></tr>" ; }
             #		if ( $pos - 1 != $currPos ) { $Mp3List = $Mp3List ."<tr><td id=$pos><a target='invisi' href='$serv/SUB:mp3_playlist_delete(%22$my_pos%22)'$pos >$pos</a>\
             #								    </td><td><a target='invisi'href='$serv/SUB:mp3_set_playlist_pos(%22$my_pos%22)'>$item</a></td><td>$Time</td></tr>" ; }
             if ( $pos - 1 != $currPos ) {
-                $Mp3List = $Mp3List
-                  . "<tr><td id=$pos><a href='javascript:remove($my_pos)'> $pos </a>\
+                $Mp3List = $Mp3List . "<tr><td id=$pos><a href='javascript:remove($my_pos)'> $pos </a>\
 								           </td><td><a href='javascript:skipTo($my_pos)'>$item </a></td><td>$Time</td></tr>";
             }
 
diff --git a/web/bin/mp3_search.pl b/web/bin/mp3_search.pl
index ed9b2defa..828a0de01 100644
--- a/web/bin/mp3_search.pl
+++ b/web/bin/mp3_search.pl
@@ -38,18 +38,15 @@
         my $href = encode_url( '"' . $playfiles{$playlist} . '"' );
         $href = "<a href='/sub?mp3_play($href)' target=invisible>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
-        $html .=
-          "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$playlist</b></a><br></td>";
+        $html .= "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$playlist</b></a><br></td>";
         $html .= "</tr><tr>\n" unless ++$i % 3;
     }
 }
 elsif ( $string eq 'stations' ) {
     my @stations = &mp3_radio_stations;
-    $html .=
-      "<td align='center' colspan=2 bgColor='#cccccc'><b>Station</b><br></td>";
+    $html .= "<td align='center' colspan=2 bgColor='#cccccc'><b>Station</b><br></td>";
     $html .= "<td align='center' bgColor='#cccccc'><b>URL</b><br></td>";
     $html .= "<td align='center' bgColor='#cccccc'><b>Bandwidth</b><br></td>";
     $html .= "<td align='center' bgColor='#cccccc'><b>Style</b><br></td>";
@@ -60,8 +57,7 @@
         my ( $station, $url, $bandwidth, $style ) = split $;, $station;
         my $href = "<a href='sub;mp3_radio_play($url)' target=invisible>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
         $html .= "<td align='left'   width='10%'>$station</td>";
         $html .= "<td align='middle' width='50%'>$href$url</a></td>";
@@ -70,8 +66,7 @@
         $html .= "</tr><tr>\n";
     }
     $html .= "<td align=rignt colspan=100>";
-    $html .=
-      "<a href='RUN;referer?Get_internet_radio_station_list'>Get internet radio station list</a></td></tr>\n";
+    $html .= "<a href='RUN;referer?Get_internet_radio_station_list'>Get internet radio station list</a></td></tr>\n";
 }
 elsif ( $string eq 'artists' ) {
     my %artists = &mp3_find_all('artist');
@@ -90,14 +85,11 @@
         my $href = encode_url( quotemeta($artist) );
         my $n    = $artists{$artist};
         $artist = 'none' if $artist eq '';
-        $href =
-          "<a href='/bin/mp3_search.pl?artist=\^$href\$' target=mp3_output>";
+        $href = "<a href='/bin/mp3_search.pl?artist=\^$href\$' target=mp3_output>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
-        $html .=
-          "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$artist ($n)</b></a><br></td>";
+        $html .= "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$artist ($n)</b></a><br></td>";
         $html .= "</tr><tr>\n" unless ++$i % 3;
     }
 }
@@ -119,14 +111,11 @@
         next if $album eq '' or $albums{$artistalbum} < 3;
         my $href = encode_url( quotemeta($album) );
         my $n    = $albums{$artistalbum};
-        $href =
-          "<a href='/bin/mp3_search.pl?album=\^$href\$' target=mp3_output>";
+        $href = "<a href='/bin/mp3_search.pl?album=\^$href\$' target=mp3_output>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
-        $html .=
-          "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$artist - $album ($n)</b></a><br></td>";
+        $html .= "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$artist - $album ($n)</b></a><br></td>";
         $html .= "</tr><tr>\n" unless ++$i % 3;
     }
 }
@@ -138,14 +127,11 @@
         my $href = encode_url( quotemeta($year) );
         my $n    = $years{$year};
         $year = 'none' if $year eq '';
-        $href =
-          "<a href='/bin/mp3_search.pl?year=\^$href\$' target=mp3_output>";
+        $href = "<a href='/bin/mp3_search.pl?year=\^$href\$' target=mp3_output>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
-        $html .=
-          "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$year ($n)</b></a><br></td>";
+        $html .= "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$year ($n)</b></a><br></td>";
         $html .= "</tr><tr>\n" unless ++$i % 3;
     }
 }
@@ -157,14 +143,11 @@
         my $href = encode_url( quotemeta($genre) );
         my $n    = $genres{$genre};
         $genre = 'none' if $genre eq '';
-        $href =
-          "<a href='/bin/mp3_search.pl?genre=\^$href\$' target=mp3_output>";
+        $href = "<a href='/bin/mp3_search.pl?genre=\^$href\$' target=mp3_output>";
         my $icon = $href;
-        $icon .=
-          "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
+        $icon .= "<img src='/graphics/playlist.gif' alt='playlist' border=0></a>";
         $html .= "<td align='right'  width='1%'>$icon</td>";
-        $html .=
-          "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$genre ($n)</b></a><br></td>";
+        $html .= "<td align='middle' width='15%' bgColor='#cccccc'>$href<b>$genre ($n)</b></a><br></td>";
         $html .= "</tr><tr>\n" unless ++$i % 3;
     }
 }
@@ -177,28 +160,21 @@
     $string =~ s/album=.+//;
     my $year = $1 if $string =~ /year=(.+)/;
     $string =~ s/year=.+//;
-    my ( $results1, $results2, $count1, $count2 ) =
-      &mp3_search( $string, $genre, $artist, $album, $year );
+    my ( $results1, $results2, $count1, $count2 ) = &mp3_search( $string, $genre, $artist, $album, $year );
 
     #   print "db r=$results1\n";
     if ($count2) {
 
         #        $html .= "<td colspan=5><a href='/sub?mp3_play($config_parms{data_dir}/mp3_search_results.m3u)' target=invisible><b>Play All</b></a></td></tr><tr>\n";
-        $html .=
-          "<a href='/sub?mp3_play($config_parms{data_dir}/mp3_search_results.m3u)' target=invisible><b>Play All</b></a>\n";
+        $html .= "<a href='/sub?mp3_play($config_parms{data_dir}/mp3_search_results.m3u)' target=invisible><b>Play All</b></a>\n";
         $html .=
           " <a href='/sub?mp3_queue($config_parms{data_dir}/mp3_search_results.m3u)' target=invisible><b>Add All</b></a><p>\n";
         if ($show_details) {
-            $html .=
-              "<td align='center' width='15%' bgColor='#cccccc'><b>Title</b><br></td>";
-            $html .=
-              "<td align='center' width='15%' bgColor='#cccccc'><b>Artist</b><br></td>";
-            $html .=
-              "<td align='center' width='15%' bgColor='#cccccc'><b>Album</b><br></td>";
-            $html .=
-              "<td align='center' width='5%' bgColor='#cccccc'><b>Year</b><br></td>";
-            $html .=
-              "<td align='center' width='10%' bgColor='#cccccc'><b>Genre</b><br></td>";
+            $html .= "<td align='center' width='15%' bgColor='#cccccc'><b>Title</b><br></td>";
+            $html .= "<td align='center' width='15%' bgColor='#cccccc'><b>Artist</b><br></td>";
+            $html .= "<td align='center' width='15%' bgColor='#cccccc'><b>Album</b><br></td>";
+            $html .= "<td align='center' width='5%' bgColor='#cccccc'><b>Year</b><br></td>";
+            $html .= "<td align='center' width='10%' bgColor='#cccccc'><b>Genre</b><br></td>";
             $html .= "</tr><tr>\n";
         }
     }
@@ -207,11 +183,9 @@
     }
 
     while ( $results1 =~
-        /Title: (.+?) *Album: (.+?) *Year: (.+?) *Genre: *(.+?) *- Artist: (.+?) *Comments: *(.+?) *- File: (.+?)$/smg
-      )
+        /Title: (.+?) *Album: (.+?) *Year: (.+?) *Genre: *(.+?) *- Artist: (.+?) *Comments: *(.+?) *- File: (.+?)$/smg )
     {
-        my ( $title, $album, $year, $genre, $artist, $comments, $file ) =
-          ( $1, $2, $3, $4, $5, $6, $7 );
+        my ( $title, $album, $year, $genre, $artist, $comments, $file ) = ( $1, $2, $3, $4, $5, $6, $7 );
 
         #       print "db t=$title a=$album y=$year g=$genre art=$artist c=$comments f=$file \n";
         last unless $title;
@@ -220,12 +194,9 @@
         my ( $href, $arg );
         if ($show_details) {
             $href = encode_url( '"' . $file . '"' );
-            $href =~
-              s/\\/\//g;    # Forward slashes work ok in windows, and are easier
-            $html .=
-              "<td align='left' width='15%' bgColor='#cccccc'>[<a href='/SUB?mp3_queue($href)' target=invisible>add</a>]";
-            $html .=
-              " <a href='/SUB?mp3_play($href)' target=invisible><b>$title</b></a><br></td>";
+            $href =~ s/\\/\//g;    # Forward slashes work ok in windows, and are easier
+            $html .= "<td align='left' width='15%' bgColor='#cccccc'>[<a href='/SUB?mp3_queue($href)' target=invisible>add</a>]";
+            $html .= " <a href='/SUB?mp3_play($href)' target=invisible><b>$title</b></a><br></td>";
             $href = encode_url( quotemeta($artist) );
             $html .=
               "<td align='left' width='15%' bgColor='#cccccc'><a href='/bin/mp3_search.pl?artist=\^$href\$' target=mp3_output><b>$artist</b></a><br></td>";
@@ -241,8 +212,7 @@
             $html .= "</tr><tr>\n";
         }
         else {
-            $html .=
-              "<td align='left' width='15%' bgColor='#cccccc'>$href<b>$title</b></a><br></td>";
+            $html .= "<td align='left' width='15%' bgColor='#cccccc'>$href<b>$title</b></a><br></td>";
             $html .= "</tr><tr>\n" unless ++$i % 3;
         }
     }
diff --git a/web/bin/mrwiki.pl b/web/bin/mrwiki.pl
index 722c30534..68d94531d 100644
--- a/web/bin/mrwiki.pl
+++ b/web/bin/mrwiki.pl
@@ -36,71 +36,71 @@ package UseModWiki;
   $q $Now $UserID $TimeZoneOffset $ScriptName $BrowseCode $OtherCode);
 
 # == Configuration =====================================================
-$DataDir = $main::config_parms{wiki_data};
-$UseConfig = 0;    # 1 = use config file,    0 = do not look for config
+$DataDir   = $main::config_parms{wiki_data};
+$UseConfig = 0;                                # 1 = use config file,    0 = do not look for config
 
 # Default configuration (used if UseConfig is 0)
-$CookieName = "MrWiki";           # Name for this wiki (for multi-wiki sites)
-$SiteName   = "MrWiki";           # Name of site (used for titles)
-$HomePage   = "HomePage";         # Home page (change space to _)
-$RCName     = "RecentChanges";    # Name of changes page (change space to _)
-$LogoUrl = "/graphics/mrwiki.gif";    # URL for site logo ("" for no logo)
+$CookieName = "MrWiki";                        # Name for this wiki (for multi-wiki sites)
+$SiteName   = "MrWiki";                        # Name of site (used for titles)
+$HomePage   = "HomePage";                      # Home page (change space to _)
+$RCName     = "RecentChanges";                 # Name of changes page (change space to _)
+$LogoUrl    = "/graphics/mrwiki.gif";          # URL for site logo ("" for no logo)
 
 #$ENV{PATH}   = $main::config_parms{wiki_diff}; #Path to find "diff"
-$ScriptTZ   = "";                   # Local time zone ("" means do not print)
-$RcDefault  = 30;                   # Default number of RecentChanges days
-@RcDays     = qw(1 3 7 30 90);      # Days for links on RecentChanges
-$KeepDays   = 14;                   # Days to keep old revisions
-$SiteBase   = "";                   # Full URL for <BASE> header
-$FullUrl    = "";                   # Set if the auto-detected URL is wrong
-$RedirType  = 1;                    # 1 = CGI.pm, 2 = script, 3 = no redirect
-$AdminPass  = "";                   # Set to non-blank to enable password(s)
-$EditPass   = "";                   # Like AdminPass, but for editing only
-$StyleSheet = "/ia5/default.css";   # URL for CSS stylesheet (like "/wiki.css")
-$NotFoundPg = "";                   # Page for not-found links ("" for blank pg)
-$EmailFrom  = "MrWiki";             # Text for "From: " field of email notes.
-$SendMail   = "/usr/sbin/sendmail"; # Full path to sendmail executable
-$FooterNote = "";                   # HTML for bottom of every page
-$EditNote   = "";                   # HTML notice above buttons on edit page
-$MaxPost    = 1024 * 210;           # Maximum 210K posts (about 200K for pages)
-$NewText    = "";                   # New page text ("" for default message)
-$HttpCharset = "";                  # Charset for pages, like "iso-8859-2"
-$UserGotoBar = "";                  # HTML added to end of goto bar
+$ScriptTZ    = "";                             # Local time zone ("" means do not print)
+$RcDefault   = 30;                             # Default number of RecentChanges days
+@RcDays      = qw(1 3 7 30 90);                # Days for links on RecentChanges
+$KeepDays    = 14;                             # Days to keep old revisions
+$SiteBase    = "";                             # Full URL for <BASE> header
+$FullUrl     = "";                             # Set if the auto-detected URL is wrong
+$RedirType   = 1;                              # 1 = CGI.pm, 2 = script, 3 = no redirect
+$AdminPass   = "";                             # Set to non-blank to enable password(s)
+$EditPass    = "";                             # Like AdminPass, but for editing only
+$StyleSheet  = "/ia5/default.css";             # URL for CSS stylesheet (like "/wiki.css")
+$NotFoundPg  = "";                             # Page for not-found links ("" for blank pg)
+$EmailFrom   = "MrWiki";                       # Text for "From: " field of email notes.
+$SendMail    = "/usr/sbin/sendmail";           # Full path to sendmail executable
+$FooterNote  = "";                             # HTML for bottom of every page
+$EditNote    = "";                             # HTML notice above buttons on edit page
+$MaxPost     = 1024 * 210;                     # Maximum 210K posts (about 200K for pages)
+$NewText     = "";                             # New page text ("" for default message)
+$HttpCharset = "";                             # Charset for pages, like "iso-8859-2"
+$UserGotoBar = "";                             # HTML added to end of goto bar
 
 # Major options:
-$UseSubpage  = 1;    # 1 = use subpages,       0 = do not use subpages
-$UseCache    = 0;    # 1 = cache HTML pages,   0 = generate every page
-$EditAllowed = 1;    # 1 = editing allowed,    0 = read-only
-$RawHtml     = 0;    # 1 = allow <HTML> tag,   0 = no raw HTML in pages
-$HtmlTags    = 0;    # 1 = "unsafe" HTML tags, 0 = only minimal tags
-$UseDiff     = 1;    # 1 = use diff features,  0 = do not use diff
-$FreeLinks   = 1;    # 1 = use [[word]] links, 0 = LinkPattern only
-$WikiLinks   = 1;    # 1 = use LinkPattern,    0 = use [[word]] only
-$AdminDelete = 1;    # 1 = Admin only page,    0 = Editor can delete pages
-$RunCGI      = 1;    # 1 = Run script as CGI,  0 = Load but do not run
-$EmailNotify = 0;    # 1 = use email notices,  0 = no email on changes
-$EmbedWiki   = 0;    # 1 = no headers/footers, 0 = normal wiki pages
+$UseSubpage  = 1;                              # 1 = use subpages,       0 = do not use subpages
+$UseCache    = 0;                              # 1 = cache HTML pages,   0 = generate every page
+$EditAllowed = 1;                              # 1 = editing allowed,    0 = read-only
+$RawHtml     = 0;                              # 1 = allow <HTML> tag,   0 = no raw HTML in pages
+$HtmlTags    = 0;                              # 1 = "unsafe" HTML tags, 0 = only minimal tags
+$UseDiff     = 1;                              # 1 = use diff features,  0 = do not use diff
+$FreeLinks   = 1;                              # 1 = use [[word]] links, 0 = LinkPattern only
+$WikiLinks   = 1;                              # 1 = use LinkPattern,    0 = use [[word]] only
+$AdminDelete = 1;                              # 1 = Admin only page,    0 = Editor can delete pages
+$RunCGI      = 1;                              # 1 = Run script as CGI,  0 = Load but do not run
+$EmailNotify = 0;                              # 1 = use email notices,  0 = no email on changes
+$EmbedWiki   = 0;                              # 1 = no headers/footers, 0 = normal wiki pages
 
 # Minor options:
-$LogoLeft    = 0;    # 1 = logo on left,       0 = logo on right
-$RecentTop   = 1;    # 1 = recent on top,      0 = recent on bottom
-$UseDiffLog  = 1;    # 1 = save diffs to log,  0 = do not save diffs
-$KeepMajor   = 1;    # 1 = keep major rev,     0 = expire all revisions
-$KeepAuthor  = 1;    # 1 = keep author rev,    0 = expire all revisions
-$ShowEdits   = 0;    # 1 = show minor edits,   0 = hide edits by default
-$HtmlLinks   = 0;    # 1 = allow A HREF links, 0 = no raw HTML links
-$SimpleLinks = 0;    # 1 = only letters,       0 = allow _ and numbers
-$NonEnglish  = 0;    # 1 = extra link chars,   0 = only A-Za-z chars
-$ThinLine    = 0;    # 1 = fancy <hr> tags,    0 = classic wiki <hr>
-$BracketText = 1;    # 1 = allow [URL text],   0 = no link descriptions
-$UseAmPm     = 1;    # 1 = use am/pm in times, 0 = use 24-hour times
-$UseIndex    = 0;    # 1 = use index file,     0 = slow/reliable method
-$UseHeadings = 1;    # 1 = allow = h1 text =,  0 = no header formatting
-$NetworkFile = 1;    # 1 = allow remote file:, 0 = no file:// links
-$BracketWiki = 0;    # 1 = [WikiLnk txt] link, 0 = no local descriptions
-$UseLookup   = 1;    # 1 = lookup host names,  0 = skip lookup (IP only)
-$FreeUpper   = 1;    # 1 = force upper case,   0 = do not force case
-$FastGlob    = 1;    # 1 = new faster code,    0 = old compatible code
+$LogoLeft    = 0;                              # 1 = logo on left,       0 = logo on right
+$RecentTop   = 1;                              # 1 = recent on top,      0 = recent on bottom
+$UseDiffLog  = 1;                              # 1 = save diffs to log,  0 = do not save diffs
+$KeepMajor   = 1;                              # 1 = keep major rev,     0 = expire all revisions
+$KeepAuthor  = 1;                              # 1 = keep author rev,    0 = expire all revisions
+$ShowEdits   = 0;                              # 1 = show minor edits,   0 = hide edits by default
+$HtmlLinks   = 0;                              # 1 = allow A HREF links, 0 = no raw HTML links
+$SimpleLinks = 0;                              # 1 = only letters,       0 = allow _ and numbers
+$NonEnglish  = 0;                              # 1 = extra link chars,   0 = only A-Za-z chars
+$ThinLine    = 0;                              # 1 = fancy <hr> tags,    0 = classic wiki <hr>
+$BracketText = 1;                              # 1 = allow [URL text],   0 = no link descriptions
+$UseAmPm     = 1;                              # 1 = use am/pm in times, 0 = use 24-hour times
+$UseIndex    = 0;                              # 1 = use index file,     0 = slow/reliable method
+$UseHeadings = 1;                              # 1 = allow = h1 text =,  0 = no header formatting
+$NetworkFile = 1;                              # 1 = allow remote file:, 0 = no file:// links
+$BracketWiki = 0;                              # 1 = [WikiLnk txt] link, 0 = no local descriptions
+$UseLookup   = 1;                              # 1 = lookup host names,  0 = skip lookup (IP only)
+$FreeUpper   = 1;                              # 1 = force upper case,   0 = do not force case
+$FastGlob    = 1;                              # 1 = new faster code,    0 = old compatible code
 
 # HTML tag lists, enabled if $HtmlTags is set.
 # Scripting is currently possible with these tags,
@@ -176,8 +176,7 @@ sub InitLinkPatterns {
     $AnyLetter   .= "]";
 
     # Main link pattern: lowercase between uppercase, then anything
-    $LpA =
-      $UpperLetter . "+" . $LowerLetter . "+" . $UpperLetter . $AnyLetter . "*";
+    $LpA = $UpperLetter . "+" . $LowerLetter . "+" . $UpperLetter . $AnyLetter . "*";
 
     # Optional subpage link pattern: uppercase, lowercase, then anything
     $LpB = $UpperLetter . "+" . $LowerLetter . "+" . $AnyLetter . "*";
@@ -225,8 +224,7 @@ sub InitLinkPatterns {
     #   5.  A $FS (field separator) character    (kept in output)
     #   6.  A double double-quote ("")           (removed from output)
 
-    $UrlProtocols = "http|https|ftp|afs|news|nntp|mid|cid|mailto|wais|"
-      . "prospero|telnet|gopher";
+    $UrlProtocols = "http|https|ftp|afs|news|nntp|mid|cid|mailto|wais|" . "prospero|telnet|gopher";
     $UrlProtocols .= '|file' if $NetworkFile;
     $UrlPattern      = "((?:(?:$UrlProtocols):[^\\]\\s\"<>$FS]+)$QDelim)";
     $ImageExtensions = "(gif|jpg|png|bmp|jpeg)";
@@ -313,24 +311,24 @@ sub InitRequest {
     $IndexInit     = 0;                   # Must be reset for each request
     $InterSiteInit = 0;
     %InterSite     = ();
-    $MainPage     = ".";    # For subpages only, the name of the top-level page
-    $OpenPageName = "";     # Currently open page
-    &CreateDir($DataDir);   # Create directory if it doesn't exist
+    $MainPage      = ".";                 # For subpages only, the name of the top-level page
+    $OpenPageName  = "";                  # Currently open page
+    &CreateDir($DataDir);                 # Create directory if it doesn't exist
     if ( !-d $DataDir ) {
         &ReportError( Ts( 'Could not create %s', $DataDir ) . ": $!" );
         return 0;
     }
-    &InitCookie();          # Reads in user data
+    &InitCookie();                        # Reads in user data
     return 1;
 }
 
 sub InitCookie {
     %SetCookie      = ();
     $TimeZoneOffset = 0;
-    undef $q->{'.cookies'};    # Clear cache if it exists (for SpeedyCGI)
+    undef $q->{'.cookies'};               # Clear cache if it exists (for SpeedyCGI)
     %UserCookie = $q->cookie($CookieName);
     $UserID     = $UserCookie{'id'};
-    $UserID =~ s/\D//g;        # Numeric only
+    $UserID =~ s/\D//g;                   # Numeric only
     if ( $UserID < 200 ) {
         $UserID = 111;
     }
@@ -342,7 +340,7 @@ sub InitCookie {
             || ( $UserData{'randkey'} != $UserCookie{'randkey'} ) )
         {
             $UserID   = 113;
-            %UserData = ();    # Invalid.  Later consider warning message.
+            %UserData = ();               # Invalid.  Later consider warning message.
         }
     }
     if ( $UserData{'tzoffset'} != 0 ) {
@@ -353,12 +351,12 @@ sub InitCookie {
 sub DoBrowseRequest {
     my ( $id, $action, $text );
 
-    if ( !$q->param ) {        # No parameter
+    if ( !$q->param ) {                   # No parameter
         &BrowsePage($HomePage);
         return 1;
     }
     $id = &GetParam( 'keywords', '' );
-    if ($id) {                 # Just script?PageName
+    if ($id) {                            # Just script?PageName
         if ( $FreeLinks && ( !-f &GetPageFile($id) ) ) {
             $id = &FreeToNormal($id);
         }
@@ -450,26 +448,19 @@ sub BrowsePage {
 
         # Later maybe add edit time?
         if ( $goodRevision ne '' ) {
-            $fullHtml .=
-              '<b>' . Ts( 'Showing revision %s', $revision ) . "</b><br>";
+            $fullHtml .= '<b>' . Ts( 'Showing revision %s', $revision ) . "</b><br>";
         }
         else {
-            $fullHtml .= '<b>'
-              . Ts( 'Revision %s not available', $revision ) . ' ('
-              . T('showing current revision instead')
-              . ')</b><br>';
+            $fullHtml .=
+              '<b>' . Ts( 'Revision %s not available', $revision ) . ' (' . T('showing current revision instead') . ')</b><br>';
         }
     }
     $allDiff = &GetParam( 'alldiff', 0 );
     if ( $allDiff != 0 ) {
         $allDiff = &GetParam( 'defaultdiff', 1 );
     }
-    if (
-        (
-            ( $id eq $RCName ) || ( T($RCName) eq $id ) || ( T($id) eq $RCName )
-        )
-        && &GetParam( 'norcdiff', 1 )
-      )
+    if ( ( ( $id eq $RCName ) || ( T($RCName) eq $id ) || ( T($id) eq $RCName ) )
+        && &GetParam( 'norcdiff', 1 ) )
     {
         $allDiff = 0;    # Only show if specifically requested
     }
@@ -484,8 +475,7 @@ sub BrowsePage {
     }
     $fullHtml .= &WikiToHTML( $Text{'text'} );
     $fullHtml .= "<hr>\n" if ( !&GetParam( 'embed', $EmbedWiki ) );
-    if ( ( $id eq $RCName ) || ( T($RCName) eq $id ) || ( T($id) eq $RCName ) )
-    {
+    if ( ( $id eq $RCName ) || ( T($RCName) eq $id ) || ( T($id) eq $RCName ) ) {
         print $fullHtml;
         &DoRc();
         print "<hr>\n" if ( !&GetParam( 'embed', $EmbedWiki ) );
@@ -502,9 +492,8 @@ sub BrowsePage {
 sub ReBrowsePage {
     my ( $id, $oldId, $isEdit ) = @_;
 
-    if ( $oldId ne "" ) {    # Target of #REDIRECT (loop breaking)
-        print &GetRedirectPage( "action=browse&id=$id&oldid=$oldId",
-            $id, $isEdit );
+    if ( $oldId ne "" ) {                         # Target of #REDIRECT (loop breaking)
+        print &GetRedirectPage( "action=browse&id=$id&oldid=$oldId", $id, $isEdit );
     }
     else {
         print &GetRedirectPage( $id, $id, $isEdit );
@@ -519,19 +508,14 @@ sub DoRc {
 
     if ( &GetParam( "from", 0 ) ) {
         $starttime = &GetParam( "from", 0 );
-        print "<h2>" . Ts( 'Updates since %s', &TimeToText($starttime) )
-          . "</h2>\n";
+        print "<h2>" . Ts( 'Updates since %s', &TimeToText($starttime) ) . "</h2>\n";
     }
     else {
         $daysago = &GetParam( "days", 0 );
         $daysago = &GetParam( "rcdays", 0 ) if ( $daysago == 0 );
         if ($daysago) {
             $starttime = $Now - ( ( 24 * 60 * 60 ) * $daysago );
-            print "<h2>"
-              . Ts(
-                'Updates in the last %s day' . ( ( $daysago != 1 ) ? "s" : "" ),
-                $daysago
-              ) . "</h2>\n";
+            print "<h2>" . Ts( 'Updates in the last %s day' . ( ( $daysago != 1 ) ? "s" : "" ), $daysago ) . "</h2>\n";
 
             # Note: must have two translations (for "day" and "days")
             # Following comment line is for translation helper script
@@ -540,11 +524,7 @@ sub DoRc {
     }
     if ( $starttime == 0 ) {
         $starttime = $Now - ( ( 24 * 60 * 60 ) * $RcDefault );
-        print "<h2>"
-          . Ts(
-            'Updates in the last %s day' . ( ( $RcDefault != 1 ) ? "s" : "" ),
-            $RcDefault )
-          . "</h2>\n";
+        print "<h2>" . Ts( 'Updates in the last %s day' . ( ( $RcDefault != 1 ) ? "s" : "" ), $RcDefault ) . "</h2>\n";
 
         # Translation of above line is identical to previous version
     }
@@ -561,8 +541,7 @@ sub DoRc {
           . ":</strong> $RcFile<p>"
           . T('Error was')
           . ":\n<pre>$!</pre>\n" . '<p>'
-          . T('Note: This error is normal if no changes have been made.')
-          . "\n";
+          . T('Note: This error is normal if no changes have been made.') . "\n";
     }
     @fullrc = split( /\n/, $fileData );
     $firstTs = 0;
@@ -594,22 +573,18 @@ sub DoRc {
 
     $idOnly = &GetParam( "rcidonly", "" );
     if ( $idOnly ne "" ) {
-        print '<b>(' . Ts( 'for %s only', &ScriptLink( $idOnly, $idOnly ) )
-          . ')</b><br>';
+        print '<b>(' . Ts( 'for %s only', &ScriptLink( $idOnly, $idOnly ) ) . ')</b><br>';
     }
     foreach $i (@RcDays) {
         print " | " if $showbar;
         $showbar = 1;
-        print &ScriptLink( "action=rc&days=$i",
-            Ts( '%s day' . ( ( $i != 1 ) ? 's' : '' ), $i ) );
+        print &ScriptLink( "action=rc&days=$i", Ts( '%s day' . ( ( $i != 1 ) ? 's' : '' ), $i ) );
 
         # Note: must have two translations (for "day" and "days")
         # Following comment line is for translation helper script
         # Ts('%s days', '');
     }
-    print "<br>"
-      . &ScriptLink( "action=rc&from=$lastTs",
-        T('List new changes starting from') );
+    print "<br>" . &ScriptLink( "action=rc&from=$lastTs", T('List new changes starting from') );
     print " " . &TimeToText($lastTs) . "<br>\n";
 
     # Later consider a binary search?
@@ -628,13 +603,11 @@ sub DoRc {
         last if ( $ts >= $starttime );
     }
     if ( $i == @fullrc ) {
-        print '<br><strong>'
-          . Ts( 'No updates since %s', &TimeToText($starttime) )
-          . "</strong><br>\n";
+        print '<br><strong>' . Ts( 'No updates since %s', &TimeToText($starttime) ) . "</strong><br>\n";
     }
     else {
         splice( @fullrc, 0, $i );    # Remove items before index $i
-              # Later consider an end-time limit (items older than X)
+                                     # Later consider an end-time limit (items older than X)
         print &GetRcHtml(@fullrc);
     }
     print '<p>' . Ts( 'Page generated %s', &TimeToText($Now) ), "<br>\n";
@@ -650,7 +623,7 @@ sub GetRcHtml {
     my %changetime = ();
     my %pagecount  = ();
 
-    $tEdit    = T('(edit)');    # Optimize translations out of main loop
+    $tEdit    = T('(edit)');                             # Optimize translations out of main loop
     $tDiff    = T('(diff)');
     $tChanges = T('changes');
     $showedit = &GetParam( "rcshowedit", $ShowEdits );
@@ -660,10 +633,10 @@ sub GetRcHtml {
         foreach $rcline (@outrc) {
             ( $ts, $pagename, $summary, $isEdit, $host ) =
               split( /$FS3/, $rcline );
-            if ( $showedit == 0 ) {    # 0 = No edits
+            if ( $showedit == 0 ) {                      # 0 = No edits
                 push( @temprc, $rcline ) if ( !$isEdit );
             }
-            else {                     # 2 = Only edits
+            else {                                       # 2 = Only edits
                 push( @temprc, $rcline ) if ($isEdit);
             }
         }
@@ -741,7 +714,7 @@ sub GetRcHtml {
 
         # Later do new-RC looping here.
         $html .= &CalcTime($ts) . " $count$edit" . " $sum";
-        $html .= ". . . . . $author\n";                    # Make dots optional?
+        $html .= ". . . . . $author\n";                       # Make dots optional?
     }
     $html .= "</UL>\n" if ($inlist);
     return $html;
@@ -759,17 +732,16 @@ sub DoHistory {
     my ($id) = @_;
     my ( $html, $canEdit );
 
-    print &GetHeader( "", &QuoteHtml( Ts( 'History of %s', $id ) ), "" )
-      . "<br>";
+    print &GetHeader( "", &QuoteHtml( Ts( 'History of %s', $id ) ), "" ) . "<br>";
     &OpenPage($id);
     &OpenDefaultText();
     $canEdit = &UserCanEdit($id);
-    $canEdit = 0;                   # Turn off direct "Edit" links
-    $html = &GetHistoryLine( $id, $Page{'text_default'}, $canEdit, 1 );
+    $canEdit = 0;                                                            # Turn off direct "Edit" links
+    $html    = &GetHistoryLine( $id, $Page{'text_default'}, $canEdit, 1 );
     &OpenKeptRevisions('text_default');
 
     foreach ( reverse sort { $a <=> $b } keys %KeptRevisions ) {
-        next if ( $_ eq "" );       # (needed?)
+        next if ( $_ eq "" );                                                # (needed?)
         $html .= &GetHistoryLine( $id, $KeptRevisions{$_}, $canEdit, 0 );
     }
     print $html;
@@ -917,10 +889,10 @@ sub GetSearchLink {
     my ($id) = @_;
     my $name = $id;
 
-    $id =~ s|.+/|/|;    # Subpage match: search for just /SubName
+    $id =~ s|.+/|/|;                    # Subpage match: search for just /SubName
     if ($FreeLinks) {
-        $name =~ s/_/ /g;    # Display with spaces
-        $id =~ s/_/+/g;      # Search for url-escaped spaces
+        $name =~ s/_/ /g;               # Display with spaces
+        $id =~ s/_/+/g;                 # Search for url-escaped spaces
     }
     return &ScriptLink( "search=$id", $name );
 }
@@ -973,8 +945,7 @@ sub GetAuthorLink {
 
     # Later have user preference for link titles and/or host text?
     if ( ( $uid > 0 ) && ( $userName ne "" ) ) {
-        $html = &ScriptLinkTitle( $userName, $userNameShow,
-            Ts( 'ID %s', $uid ) . ' ' . Ts( 'from %s', $host ) );
+        $html = &ScriptLinkTitle( $userName, $userNameShow, Ts( 'ID %s', $uid ) . ' ' . Ts( 'from %s', $host ) );
     }
     else {
         $html = $host;
@@ -1007,10 +978,7 @@ sub GetHeader {
     return $result if ($embed);
 
     if ( $oldId ne '' ) {
-        $result .=
-          $q->h3( '('
-              . Ts( 'redirected from %s', &GetEditLink( $oldId, $oldId ) )
-              . ')' );
+        $result .= $q->h3( '(' . Ts( 'redirected from %s', &GetEditLink( $oldId, $oldId ) ) . ')' );
     }
     if ( ( !$embed ) && ( $LogoUrl ne "" ) ) {
         $logoImage = "img src=\"$LogoUrl\" alt=\"$altText\" border=0";
@@ -1036,12 +1004,7 @@ sub GetHeader {
 sub GetHttpHeader {
     my $cookie;
     if ( defined( $SetCookie{'id'} ) ) {
-        $cookie =
-            "$CookieName=" . "rev&"
-          . $SetCookie{'rev'} . "&id&"
-          . $SetCookie{'id'}
-          . "&randkey&"
-          . $SetCookie{'randkey'};
+        $cookie = "$CookieName=" . "rev&" . $SetCookie{'rev'} . "&id&" . $SetCookie{'id'} . "&randkey&" . $SetCookie{'randkey'};
         $cookie .= ";expires=Fri, 08-Sep-2010 19:48:23 GMT";
         if ( $HttpCharset ne '' ) {
             return $q->header(
@@ -1097,8 +1060,7 @@ sub GetFooterText {
     $result .= &GetGotoBar($id);
     if ( &UserCanEdit( $id, 0 ) ) {
         if ( $rev ne '' ) {
-            $result .= &GetOldPageLink( 'edit', $id, $rev,
-                Ts( 'Edit revision %s of this page', $rev ) );
+            $result .= &GetOldPageLink( 'edit', $id, $rev, Ts( 'Edit revision %s of this page', $rev ) );
         }
         else {
             $result .= &GetEditLink( $id, T('Edit text of this page') );
@@ -1128,12 +1090,7 @@ sub GetFooterText {
     }
     $result .= '<br>' . &GetSearchForm();
     if ( $DataDir =~ m|/tmp/| ) {
-        $result .=
-            '<br><b>'
-          . T('Warning')
-          . ':</b> '
-          . Ts( 'Database is stored in temporary directory %s', $DataDir )
-          . '<br>';
+        $result .= '<br><b>' . T('Warning') . ':</b> ' . Ts( 'Database is stored in temporary directory %s', $DataDir ) . '<br>';
     }
     $result .= $q->endform;
     $result .= &GetMinimumFooter();
@@ -1141,13 +1098,7 @@ sub GetFooterText {
 }
 
 sub GetCommonFooter {
-    return
-        "<hr>"
-      . &GetFormStart()
-      . &GetGotoBar("")
-      . &GetSearchForm()
-      . $q->endform
-      . &GetMinimumFooter();
+    return "<hr>" . &GetFormStart() . &GetGotoBar("") . &GetSearchForm() . $q->endform . &GetMinimumFooter();
 }
 
 sub GetMinimumFooter {
@@ -1158,8 +1109,7 @@ sub GetMinimumFooter {
 }
 
 sub GetFormStart {
-    return $q->startform( "POST", "$ScriptName",
-        "application/x-www-form-urlencoded" );
+    return $q->startform( "POST", "$ScriptName", "application/x-www-form-urlencoded" );
 }
 
 sub GetGotoBar {
@@ -1187,10 +1137,7 @@ sub GetGotoBar {
 sub GetSearchForm {
     my ($result);
 
-    $result =
-        T('Search:') . ' '
-      . $q->textfield( -name => 'search', -size => 20 )
-      . &GetHiddenValue( "dosearch", 1 );
+    $result = T('Search:') . ' ' . $q->textfield( -name => 'search', -size => 20 ) . &GetHiddenValue( "dosearch", 1 );
     return $result;
 }
 
@@ -1205,14 +1152,14 @@ sub GetRedirectPage {
     $nameLink = "<a href=\"$url\">$name</a>";
     if ( $RedirType < 3 ) {
         if ( $RedirType == 1 ) {    # Use CGI.pm
-             # NOTE: do NOT use -method (does not work with old CGI.pm versions)
-             # Thanks to Daniel Neri for fixing this problem.
+                                    # NOTE: do NOT use -method (does not work with old CGI.pm versions)
+                                    # Thanks to Daniel Neri for fixing this problem.
             $html = $q->redirect( -uri => $url );
         }
-        else {    # Minimal header
+        else {                      # Minimal header
             $html = "Status: 302 Moved\n";
             $html .= "Location: $url\n";
-            $html .= "Content-Type: text/html\n";   # Needed for browser failure
+            $html .= "Content-Type: text/html\n";    # Needed for browser failure
             $html .= "\n";
         }
         $html .= "\n" . Ts( 'Your browser should go to the %s page.', $newid );
@@ -1259,7 +1206,7 @@ sub CommonMarkup {
     local $_ = $text;
 
     if ( $doLines < 2 ) {                            # 2 = do line-oriented only
-            # The <nowiki> tag stores text with no markup (except quoting HTML)
+                                                     # The <nowiki> tag stores text with no markup (except quoting HTML)
         s/\&lt;nowiki\&gt;((.|\n)*?)\&lt;\/nowiki\&gt;/&StoreRaw($1)/ige;
 
         # The <pre> tag wraps the stored text with the HTML <pre> tag
@@ -1317,8 +1264,8 @@ sub CommonMarkup {
         }
     }
     if ($doLines) {    # 0 = no line-oriented, 1 or 2 = do line-oriented
-            # The quote markup patterns avoid overlapping tags (with 5 quotes)
-            # by matching the inner quotes for the strong pattern.
+                       # The quote markup patterns avoid overlapping tags (with 5 quotes)
+                       # by matching the inner quotes for the strong pattern.
         s/('*)'''(.*?)'''/$1<strong>$2<\/strong>/g;
         s/''(.*?)''/<em>$1<\/em>/g;
         if ($UseHeadings) {
@@ -1514,8 +1461,7 @@ sub UrlLink {
     }
 
     # Restricted image URLs so that mailto:foo@bar.gif is not an image
-    if ( $useImage && ( $name =~ /^(http:|https:|ftp:).+\.$ImageExtensions$/ ) )
-    {
+    if ( $useImage && ( $name =~ /^(http:|https:|ftp:).+\.$ImageExtensions$/ ) ) {
         return ( "<img src=\"$name\">", $punct );
     }
     return ( "<a href=\"$name\">$name</a>", $punct );
@@ -1578,17 +1524,10 @@ sub ISBNLink {
     if ( length($num) != 10 ) {
         return "ISBN $rawnum";
     }
-    $first = "<a href=\"http://shop.barnesandnoble.com/bookSearch/"
-      . "isbnInquiry.asp?isbn=$num\">";
-    $second =
-        "<a href=\"http://www.amazon.com/exec/obidos/"
-      . "ISBN=$num\">"
-      . T('alternate') . "</a>";
-    $third =
-        "<a href=\"http://www.pricescan.com/books/"
-      . "BookDetail.asp?isbn=$num\">"
-      . T('search') . "</a>";
-    $html = $first . "ISBN " . $rawprint . "</a> ";
+    $first  = "<a href=\"http://shop.barnesandnoble.com/bookSearch/" . "isbnInquiry.asp?isbn=$num\">";
+    $second = "<a href=\"http://www.amazon.com/exec/obidos/" . "ISBN=$num\">" . T('alternate') . "</a>";
+    $third  = "<a href=\"http://www.pricescan.com/books/" . "BookDetail.asp?isbn=$num\">" . T('search') . "</a>";
+    $html   = $first . "ISBN " . $rawprint . "</a> ";
     $html .= "($second, $third)";
     $html .= " " if ( $rawnum =~ / $/ );    # Add space if old ISBN had space.
     return $html;
@@ -1627,8 +1566,7 @@ sub WikiHeading {
 sub GetDiffHTML {
     my ( $diffType, $id, $rev, $newText ) = @_;
     my ( $html, $diffText, $diffTextTwo, $priorName, $links, $usecomma );
-    my ( $major, $minor, $author, $useMajor, $useMinor, $useAuthor,
-        $cacheName );
+    my ( $major, $minor, $author, $useMajor, $useMinor, $useAuthor, $cacheName );
 
     $links     = "(";
     $usecomma  = 0;
@@ -1711,10 +1649,7 @@ sub GetDiffHTML {
                 || ( &GetPageCache("old$cacheName") < 1 ) )
           )
         {
-            $html = '<b>'
-              . Ts( 'No diff available--this is the first %s revision.',
-                $priorName )
-              . "</b>\n$links<hr>";
+            $html = '<b>' . Ts( 'No diff available--this is the first %s revision.', $priorName ) . "</b>\n$links<hr>";
         }
         else {
             $html = '<b>'
@@ -1770,7 +1705,7 @@ sub GetDiff {
     print STDERR "<br>diff=$diff_out\n";
     &ReleaseDiffLock() if ($lock);
     $diff_out =~ s/\\ No newline.*\n//g;    # Get rid of common complaint.
-        # No need to unlink temp files--next diff will just overwrite.
+                                            # No need to unlink temp files--next diff will just overwrite.
     return $diff_out;
 }
 
@@ -1808,8 +1743,7 @@ sub ColorDiff {
     $diff =~ s/$FS(\d+)$FS/$SaveUrl{$1}/ge;  # Restore saved text
     $diff =~ s/$FS(\d+)$FS/$SaveUrl{$1}/ge;  # Restore nested saved text
     $diff =~ s/\r?\n/<br>/g;
-    return "<table width=\"95\%\" bgcolor=#$color><tr><td>\n" . $diff
-      . "</td></tr></table>\n";
+    return "<table width=\"95\%\" bgcolor=#$color><tr><td>\n" . $diff . "</td></tr></table>\n";
 }
 
 # ==== Database (Page, Section, Text, Kept, User) functions ====
@@ -1833,15 +1767,15 @@ sub OpenNewSection {
     $Section{'tscreate'} = $Now;                # Set once at creation
     $Section{'ts'}       = $Now;                # Updated every edit
     $Section{'ip'}       = $ENV{REMOTE_ADDR};
-    $Section{'host'} = '';        # Updated only for real edits (can be slow)
-    $Section{'id'}   = $UserID;
+    $Section{'host'}     = '';                  # Updated only for real edits (can be slow)
+    $Section{'id'}       = $UserID;
     $Section{'username'} = &GetParam( "username", "" );
-    $Section{'data'}     = $data;
-    $Page{$name} = join( $FS2, %Section );    # Replace with save?
+    $Section{'data'} = $data;
+    $Page{$name} = join( $FS2, %Section );      # Replace with save?
 }
 
 sub OpenNewText {
-    my ($name) = @_;                          # Name of text (usually "default")
+    my ($name) = @_;                            # Name of text (usually "default")
     %Text = ();
 
     # Later consider translation of new-page message? (per-user difference?)
@@ -1852,8 +1786,8 @@ sub OpenNewText {
         $Text{'text'} = T('Describe the new page here.') . "\n";
     }
     $Text{'text'} .= "\n" if ( substr( $Text{'text'}, -1, 1 ) ne "\n" );
-    $Text{'minor'}     = 0;                   # Default as major edit
-    $Text{'newauthor'} = 1;                   # Default as new author
+    $Text{'minor'}     = 0;                     # Default as major edit
+    $Text{'newauthor'} = 1;                     # Default as new author
     $Text{'summary'}   = '';
     &OpenNewSection( "text_$name", join( $FS3, %Text ) );
 }
@@ -1971,8 +1905,7 @@ sub UpdatePageVersion {
 }
 
 sub KeepFileName {
-    return $KeepDir . "/" . &GetPageDirectory($OpenPageName)
-      . "/$OpenPageName.kp";
+    return $KeepDir . "/" . &GetPageDirectory($OpenPageName) . "/$OpenPageName.kp";
 }
 
 sub SaveKeepSection {
@@ -2172,7 +2105,7 @@ sub UserCanEdit {
     # Optimized for the "everyone can edit" case (don't check passwords)
     if ( ( $id ne "" ) && ( -f &GetLockedPageFile($id) ) ) {
         return 1 if ( &UserIsAdmin() );    # Requires more privledges
-             # Later option for editor-level to edit these pages?
+                                           # Later option for editor-level to edit these pages?
         return 0;
     }
     if ( !$EditAllowed ) {
@@ -2183,7 +2116,7 @@ sub UserCanEdit {
         return 1 if ( &UserIsEditor() );
         return 0;
     }
-    if ($deepCheck) {    # Deeper but slower checks (not every page)
+    if ($deepCheck) {                      # Deeper but slower checks (not every page)
         return 1 if ( &UserIsEditor() );
         return 0 if ( &UserIsBanned() );
     }
@@ -2194,7 +2127,7 @@ sub UserIsBanned {
     my ( $host, $ip, $data, $status );
 
     ( $status, $data ) = &ReadFile("$DataDir/banlist");
-    return 0 if ( !$status );    # No file exists, so no ban
+    return 0 if ( !$status );              # No file exists, so no ban
     $ip   = $ENV{'REMOTE_ADDR'};
     $host = &GetRemoteHost(0);
     foreach ( split( /\n/, $data ) ) {
@@ -2480,11 +2413,8 @@ sub CalcDay {
     $ts += $TimeZoneOffset;
     my ( $sec, $min, $hour, $mday, $mon, $year ) = localtime($ts);
 
-    return (
-        "January",   "February", "March",    "April",
-        "May",       "June",     "July",     "August",
-        "September", "October",  "November", "December"
-      )[$mon]
+    return ( "January", "February", "March", "April", "May", "June", "July", "August",
+        "September", "October", "November", "December" )[$mon]
       . " "
       . $mday . ", "
       . ( $year + 1900 );
@@ -2555,8 +2485,7 @@ sub GetRemoteHost {
     if ( $UseLookup && ( $rhost eq "" ) ) {
 
         # Catch errors (including bad input) without aborting the script
-        eval 'use Socket; $iaddr = inet_aton($ENV{REMOTE_ADDR});'
-          . '$rhost = gethostbyaddr($iaddr, AF_INET)';
+        eval 'use Socket; $iaddr = inet_aton($ENV{REMOTE_ADDR});' . '$rhost = gethostbyaddr($iaddr, AF_INET)';
     }
     if ( $rhost eq "" ) {
         $rhost = $ENV{REMOTE_ADDR};
@@ -2570,7 +2499,7 @@ sub FreeToNormal {
 
     $id =~ s/ /_/g;
     $id = ucfirst($id);
-    if ( index( $id, '_' ) > -1 ) {    # Quick check for any space/underscores
+    if ( index( $id, '_' ) > -1 ) {            # Quick check for any space/underscores
         $id =~ s/__+/_/g;
         $id =~ s/^_//;
         $id =~ s/_$//;
@@ -2582,7 +2511,7 @@ sub FreeToNormal {
     if ($FreeUpper) {
 
         # Note that letters after ' are *not* capitalized
-        if ( $id =~ m|[-_.,\(\)/][a-z]| ) { # Quick check for non-canonical case
+        if ( $id =~ m|[-_.,\(\)/][a-z]| ) {    # Quick check for non-canonical case
             $id =~ s|([-_.,\(\)/])([a-z])|$1 . uc($2)|ge;
         }
     }
@@ -2735,8 +2664,7 @@ sub DoEdit {
     if ( $revision ne '' ) {
         print "\n<b>"
           . Ts( 'Editing old revision %s.', $revision ) . "  "
-          . T(
-            'Saving this page will replace the latest revision with this text.')
+          . T('Saving this page will replace the latest revision with this text.')
           . '</b><br>';
     }
     if ($isConflict) {
@@ -2750,12 +2678,10 @@ sub DoEdit {
         }
         print "<p><strong>",
           T('Someone saved this page after you started editing.'), " ",
-          T('The top textbox contains the saved text.'),           " ",
-          T('Only the text in the top textbox will be saved.'),
+          T('The top textbox contains the saved text.'), " ", T('Only the text in the top textbox will be saved.'),
           "</strong><br>\n",
           T('Scroll down to see your edited text.'), "<br>\n";
-        print T('Last save time:'), ' ', &TimeToText($oldTime),
-          " (", T('Current time is:'), ' ', &TimeToText($Now), ")<br>\n";
+        print T('Last save time:'), ' ', &TimeToText($oldTime), " (", T('Current time is:'), ' ', &TimeToText($Now), ")<br>\n";
     }
     print &GetFormStart();
     print &GetHiddenValue( "title", $id ), "\n",
@@ -2792,9 +2718,8 @@ sub DoEdit {
     if ($EmailNotify) {
         print "&nbsp;&nbsp;&nbsp;"
           . $q->checkbox(
-            -name => 'do_email_notify',
-            -label =>
-              Ts( 'Send email notification that %s has been changed.', $id )
+            -name  => 'do_email_notify',
+            -label => Ts( 'Send email notification that %s has been changed.', $id )
           );
     }
     print "<br>";
@@ -2807,8 +2732,7 @@ sub DoEdit {
         print ' (', T('Your user name is'), ' ', &GetPageLink($userName) . ') ';
     }
     else {
-        print ' (', Ts( 'Visit %s to set your user name.', &GetPrefsLink() ),
-          ') ';
+        print ' (', Ts( 'Visit %s to set your user name.', &GetPrefsLink() ), ') ';
     }
     print $q->submit( -name => 'Preview', -value => T('Preview') ), "\n";
 
@@ -2822,9 +2746,7 @@ sub DoEdit {
     if ($preview) {
         print "<h2>", T('Preview:'), "</h2>\n";
         if ($isConflict) {
-            print "<b>",
-              T('NOTE: This preview shows the revision of the other author.'),
-              "</b><hr>\n";
+            print "<b>", T('NOTE: This preview shows the revision of the other author.'), "</b><hr>\n";
         }
         $MainPage = $id;
         $MainPage =~ s|/.*||;    # Only the main page name (remove subpage)
@@ -2881,8 +2803,7 @@ sub DoEditPrefs {
         -size      => 15,
         -maxlength => 50
       ),
-      ' ', T('(blank to remove password)'), '<br>(',
-      T('Passwords allow sharing preferences between multiple systems.'),
+      ' ', T('(blank to remove password)'), '<br>(', T('Passwords allow sharing preferences between multiple systems.'),
       ' ', T('Passwords are completely optional.'), ')';
 
     if ( $AdminPass ne '' ) {
@@ -2898,20 +2819,15 @@ sub DoEditPrefs {
     }
     if ($EmailNotify) {
         print "<br>";
-        print &GetFormCheck( 'notify', 1,
-            T('Include this address in the site email list.') ),
+        print &GetFormCheck( 'notify', 1, T('Include this address in the site email list.') ),
           ' ',
           T('(Uncheck the box to remove the address.)');
-        print '<br>', T('Email Address:'), ' ',
-          &GetFormText( 'email', "", 30, 60 );
+        print '<br>', T('Email Address:'), ' ', &GetFormText( 'email', "", 30, 60 );
     }
     print "<hr><b>$recentName:</b>\n";
-    print '<br>', T('Default days to display:'), ' ',
-      &GetFormText( 'rcdays', $RcDefault, 4, 9 );
-    print "<br>",
-      &GetFormCheck( 'rcnewtop', $RecentTop, T('Most recent changes on top') );
-    print "<br>",
-      &GetFormCheck( 'rcall', 0, T('Show all changes (not just most recent)') );
+    print '<br>', T('Default days to display:'), ' ', &GetFormText( 'rcdays', $RcDefault, 4, 9 );
+    print "<br>", &GetFormCheck( 'rcnewtop', $RecentTop, T('Most recent changes on top') );
+    print "<br>", &GetFormCheck( 'rcall',    0,          T('Show all changes (not just most recent)') );
     %labels = (
         0 => T('Hide minor edits'),
         1 => T('Show minor edits'),
@@ -2924,20 +2840,13 @@ sub DoEditPrefs {
         -labels => \%labels,
         -default => &GetParam( "rcshowedit", $ShowEdits )
     );
-    print "<br>",
-      &GetFormCheck( 'rcchangehist', 1, T('Use "changes" as link to history') );
+    print "<br>", &GetFormCheck( 'rcchangehist', 1, T('Use "changes" as link to history') );
 
     if ($UseDiff) {
         print '<hr><b>', T('Differences:'), "</b>\n";
-        print "<br>",
-          &GetFormCheck( 'diffrclink', 1,
-            Ts( 'Show (diff) links on %s', $recentName ) );
-        print "<br>",
-          &GetFormCheck( 'alldiff', 0, T('Show differences on all pages') );
-        print "  (",
-          &GetFormCheck( 'norcdiff', 1,
-            Ts( 'No differences on %s', $recentName ) ),
-          ")";
+        print "<br>", &GetFormCheck( 'diffrclink', 1, Ts( 'Show (diff) links on %s', $recentName ) );
+        print "<br>", &GetFormCheck( 'alldiff', 0, T('Show differences on all pages') );
+        print "  (", &GetFormCheck( 'norcdiff', 1, Ts( 'No differences on %s', $recentName ) ), ")";
         %labels = ( 1 => T('Major'), 2 => T('Minor'), 3 => T('Author') );
         print '<br>', T('Default difference type:'), ' ';
         print $q->popup_menu(
@@ -2951,18 +2860,13 @@ sub DoEditPrefs {
 
     # Note: TZ offset is added by TimeToText, so pre-subtract to cancel.
     print '<br>', T('Server time:'), ' ', &TimeToText( $Now - $TimeZoneOffset );
-    print '<br>', T('Time Zone offset (hours):'), ' ',
-      &GetFormText( 'tzoffset', 0, 4, 9 );
-    print '<br>',
-      &GetFormCheck( 'editwide', 1,
-        T('Use 100% wide edit area (if supported)') );
-    print '<br>',
-      T('Edit area rows:'), ' ', &GetFormText( 'editrows', 20, 4, 4 ),
+    print '<br>', T('Time Zone offset (hours):'), ' ', &GetFormText( 'tzoffset', 0, 4, 9 );
+    print '<br>', &GetFormCheck( 'editwide', 1, T('Use 100% wide edit area (if supported)') );
+    print '<br>', T('Edit area rows:'), ' ', &GetFormText( 'editrows', 20, 4, 4 ),
       ' ', T('columns:'), ' ', &GetFormText( 'editcols', 65, 4, 4 );
 
     print '<br>', &GetFormCheck( 'toplinkbar', 1, T('Show link bar on top') );
-    print '<br>',
-      &GetFormCheck( 'linkrandom', 0, T('Add "Random Page" link to link bar') );
+    print '<br>', &GetFormCheck( 'linkrandom', 0, T('Add "Random Page" link to link bar') );
     print '<br>', $q->submit( -name => 'Save', -value => T('Save') ), "\n";
     print "<hr>\n";
     print &GetGotoBar('');
@@ -3004,11 +2908,9 @@ sub DoUpdatePrefs {
     print &GetHeader( '', T('Saving Preferences'), '' );
     print '<br>';
     if ( $UserID < 1001 ) {
-        print '<b>',
-          Ts( 'Invalid UserID %s, preferences not saved.', $UserID ), '</b>';
+        print '<b>', Ts( 'Invalid UserID %s, preferences not saved.', $UserID ), '</b>';
         if ( $UserID == 111 ) {
-            print '<br>',
-              T('(Preferences require cookies, but no cookie was sent.)');
+            print '<br>', T('(Preferences require cookies, but no cookie was sent.)');
         }
         print &GetCommonFooter();
         return;
@@ -3030,8 +2932,7 @@ sub DoUpdatePrefs {
         print Ts( 'Invalid UserName %s: not saved.', $username ), "<br>\n";
     }
     elsif ( length($username) > 50 ) {    # Too long
-        print T('UserName must be 50 characters or less. (not saved)'),
-          "<br>\n";
+        print T('UserName must be 50 characters or less. (not saved)'), "<br>\n";
     }
     else {
         print Ts( 'UserName %s saved.', $username ), '<br>';
@@ -3105,8 +3006,7 @@ sub UpdateEmailList {
         my $notify = $UserData{'notify'};
         if ( -f "$DataDir/emails" ) {
             open( NOTIFY, "$DataDir/emails" )
-              or die(
-                Ts( 'Could not read from %s:', "$DataDir/emails" ) . " $!\n" );
+              or die( Ts( 'Could not read from %s:', "$DataDir/emails" ) . " $!\n" );
             @old_emails = <NOTIFY>;
             close(NOTIFY);
         }
@@ -3117,8 +3017,7 @@ sub UpdateEmailList {
         if ( $notify and ( not $already_in_list ) ) {
             &RequestLock() or die( T('Could not get mail lock') );
             open( NOTIFY, ">>$DataDir/emails" )
-              or die(
-                Ts( 'Could not append to %s:', "$DataDir/emails" ) . " $!\n" );
+              or die( Ts( 'Could not append to %s:', "$DataDir/emails" ) . " $!\n" );
             print NOTIFY $new_email, "\n";
             close(NOTIFY);
             &ReleaseLock();
@@ -3126,8 +3025,7 @@ sub UpdateEmailList {
         elsif ( ( not $notify ) and $already_in_list ) {
             &RequestLock() or die( T('Could not get mail lock') );
             open( NOTIFY, ">$DataDir/emails" )
-              or die(
-                Ts( 'Could not overwrite %s:', "$DataDir/emails" ) . " $!\n" );
+              or die( Ts( 'Could not overwrite %s:', "$DataDir/emails" ) . " $!\n" );
             foreach (@old_emails) {
                 print NOTIFY "$_" unless /$new_email/;
             }
@@ -3452,8 +3350,7 @@ sub GetPageLinks {
     if ($pagelink) {
         if ($FreeLinks) {
             my $fl = $FreeLinkPattern;
-            $text =~
-              s/\[\[$fl\|[^\]]+\]\]/push(@links, &FreeToNormal($1)), ' '/ge;
+            $text =~ s/\[\[$fl\|[^\]]+\]\]/push(@links, &FreeToNormal($1)), ' '/ge;
             $text =~ s/\[\[$fl\]\]/push(@links, &FreeToNormal($1)), ' '/ge;
         }
         if ($WikiLinks) {
@@ -3526,12 +3423,12 @@ sub DoPost {
     else {
         $newAuthor = ( $Section{'ip'} ne $authorAddr );    # hostname fallback
     }
-    $newAuthor = 1 if ( $oldrev == 0 );    # New page
-    $newAuthor = 0 if ( !$newAuthor );     # Standard flag form, not empty
-          # Detect editing conflicts and resubmit edit
+    $newAuthor = 1 if ( $oldrev == 0 );                    # New page
+    $newAuthor = 0 if ( !$newAuthor );                     # Standard flag form, not empty
+                                                           # Detect editing conflicts and resubmit edit
     if ( ( $oldrev > 0 ) && ( $newAuthor && ( $oldtime != $pgtime ) ) ) {
         &ReleaseLock();
-        if ( $oldconflict > 0 ) {    # Conflict again...
+        if ( $oldconflict > 0 ) {                          # Conflict again...
             print STDERR "db1b\n";
 
             &DoEdit( $id, 2, $pgtime, $string, $preview );
@@ -3609,8 +3506,7 @@ sub UpdateDiffs {
         &SetPageCache( 'diff_default_major', "1" );
     }
     else {
-        &SetPageCache( 'diff_default_major',
-            &GetKeptDiff( $new, $oldMajor, 0 ) );
+        &SetPageCache( 'diff_default_major', &GetKeptDiff( $new, $oldMajor, 0 ) );
     }
     if ($newAuthor) {
         &SetPageCache( 'diff_default_author', "1" );
@@ -3619,8 +3515,7 @@ sub UpdateDiffs {
         &SetPageCache( 'diff_default_author', "2" );
     }
     else {
-        &SetPageCache( 'diff_default_author',
-            &GetKeptDiff( $new, $oldAuthor, 0 ) );
+        &SetPageCache( 'diff_default_author', &GetKeptDiff( $new, $oldAuthor, 0 ) );
     }
 }
 
@@ -3779,8 +3674,7 @@ sub WriteRcLog {
     $extraTemp = join( $FS2, %extra );
 
     # The two fields at the end of a line are kind and extension-hash
-    my $rc_line =
-      join( $FS3, $editTime, $id, $summary, $isEdit, $rhost, "0", $extraTemp );
+    my $rc_line = join( $FS3, $editTime, $id, $summary, $isEdit, $rhost, "0", $extraTemp );
     if ( !open( OUT, ">>$RcFile" ) ) {
         die( Ts( '%s log error:', $RCName ) . " $!" );
     }
@@ -3846,8 +3740,7 @@ sub UserIsEditorOrError {
 
 sub UserIsAdminOrError {
     if ( !&UserIsAdmin() ) {
-        print '<p>',
-          T('This operation is restricted to administrators only...');
+        print '<p>', T('This operation is restricted to administrators only...');
         print &GetCommonFooter();
         return 0;
     }
@@ -4089,8 +3982,7 @@ sub EditRecentChangesFile {
     if ( !$status ) {
 
         # Save error text if needed.
-        $errorText = "<p><strong>Could not open $RCName log file:"
-          . "</strong> $fname<p>Error was:\n<pre>$!</pre>\n";
+        $errorText = "<p><strong>Could not open $RCName log file:" . "</strong> $fname<p>Error was:\n<pre>$!</pre>\n";
         print $errorText;    # Maybe handle differently later?
         return;
     }
@@ -4136,7 +4028,7 @@ sub DeletePage {
     unlink($fname) if ( -f $fname );
     unlink($IndexFile) if ($UseIndex);
     &EditRecentChanges( 1, $page, "" ) if ($doRC);    # Delete page
-           # Currently don't do anything with page text
+                                                      # Currently don't do anything with page text
 }
 
 # Given text, returns substituted text
@@ -4146,7 +4038,7 @@ sub SubstituteTextLinks {
     # Much of this is taken from the common markup
     %SaveUrl      = ();
     $SaveUrlIndex = 0;
-    $text =~ s/$FS//g;    # Remove separators (paranoia)
+    $text =~ s/$FS//g;                                # Remove separators (paranoia)
     if ($RawHtml) {
         $text =~ s/(<html>((.|\n)*?)<\/html>)/&StoreRaw($1)/ige;
     }
@@ -4155,11 +4047,10 @@ sub SubstituteTextLinks {
     $text =~ s/(<nowiki>((.|\n)*?)<\/nowiki>)/&StoreRaw($1)/ige;
 
     if ($FreeLinks) {
-        $text =~
-          s/\[\[$FreeLinkPattern\|([^\]]+)\]\]/&SubFreeLink($1,$2,$old,$new)/geo;
+        $text =~ s/\[\[$FreeLinkPattern\|([^\]]+)\]\]/&SubFreeLink($1,$2,$old,$new)/geo;
         $text =~ s/\[\[$FreeLinkPattern\]\]/&SubFreeLink($1,"",$old,$new)/geo;
     }
-    if ($BracketText) {    # Links like [URL text of link]
+    if ($BracketText) {                               # Links like [URL text of link]
         $text =~ s/(\[$UrlPattern\s+([^\]]+?)\])/&StoreRaw($1)/geo;
         $text =~ s/(\[$InterLinkPattern\s+([^\]]+?)\])/&StoreRaw($1)/geo;
     }
@@ -4169,7 +4060,7 @@ sub SubstituteTextLinks {
         $text =~ s/$LinkPattern/&SubWikiLink($1, $old, $new)/geo;
     }
 
-    $text =~ s/$FS(\d+)$FS/$SaveUrl{$1}/ge;    # Restore saved text
+    $text =~ s/$FS(\d+)$FS/$SaveUrl{$1}/ge;           # Restore saved text
     return $text;
 }
 
@@ -4180,8 +4071,7 @@ sub SubFreeLink {
     $oldlink = $link;
     $link =~ s/^\s+//;
     $link =~ s/\s+$//;
-    if ( ( $link eq $old ) || ( &FreeToNormal($old) eq &FreeToNormal($link) ) )
-    {
+    if ( ( $link eq $old ) || ( &FreeToNormal($old) eq &FreeToNormal($link) ) ) {
         $link = $new;
     }
     else {
@@ -4374,6 +4264,6 @@ sub DoShowVersion {
 #END_OF_OTHER_CODE
 
 &DoWikiRequest() if ( $RunCGI && ( $_ ne 'nocgi' ) );    # Do everything.
-1;    # In case we are loaded from elsewhere
+1;                                                       # In case we are loaded from elsewhere
 
 # == End of UseModWiki script. ===========================================
diff --git a/web/bin/phone_in.pl b/web/bin/phone_in.pl
index 45626f4e9..47251fd93 100644
--- a/web/bin/phone_in.pl
+++ b/web/bin/phone_in.pl
@@ -5,8 +5,7 @@
 my @logs = &read_phone_logs1('callerid');
 my @calls = &read_phone_logs2( 100, @logs );
 for my $r (@calls) {
-    my ( $time, $num, $name, $line, $type ) =
-      $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
+    my ( $time, $num, $name, $line, $type ) = $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
     ( $time, $num, $name ) = $r =~ /(.+\d+:\d+:\d+) (\S+) (.+)/ unless $name;
     $display_name = $name;
     $display_name =~ s/_/ /g;    # remove underscores to make it print pretty
@@ -14,8 +13,7 @@
 
     #   next unless $line;
 
-    $html_calls .=
-      "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
+    $html_calls .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>";
 
     #    $html_calls .= "<td nowrap><a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a>&nbsp;<a href=\"phone_search.pl?search=$num\"><img src='/graphics/ico_magnify.gif' border=0 alt='Show last call from $num'></a></td>";
     $html_calls .=
diff --git a/web/bin/phone_in_old.pl b/web/bin/phone_in_old.pl
index ee79c3810..6e420745e 100644
--- a/web/bin/phone_in_old.pl
+++ b/web/bin/phone_in_old.pl
@@ -6,8 +6,7 @@
 for my $r (@calls) {
     my ( $time, $num, $name ) = $r =~ /(.+\d+:\d+:\d+) (\S+) (.+)/;
     next unless $num;
-    $html_calls .=
-      "<tr vAlign=center bgColor='#cccccc'><td nowrap>$time</td><td nowrap>$num</td><td nowrap>$name</td></tr>";
+    $html_calls .= "<tr vAlign=center bgColor='#cccccc'><td nowrap>$time</td><td nowrap>$num</td><td nowrap>$name</td></tr>";
 }
 
 #my $html_calls;
diff --git a/web/bin/phone_list.pl b/web/bin/phone_list.pl
index fb436846c..d31ef4607 100644
--- a/web/bin/phone_list.pl
+++ b/web/bin/phone_list.pl
@@ -24,8 +24,7 @@ sub rejected_call_list {
     my $html_calls;
     my @calls = &read_reject_call_list();
     for my $r (@calls) {
-        my ( $number, $name, $sound, $type ) =
-          $r =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
+        my ( $number, $name, $sound, $type ) = $r =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
         $html_calls .=
           "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'><td nowrap><a href=/SUB;rej_call_item_delete($pos)>Delete</a>   $number</td><td nowrap>$name</a></td><td nowrap>$sound</td><td nowrap>$type</td></tr>";
         $pos = $pos + 1;
@@ -49,9 +48,7 @@ sub rejected_call_list {
 </font></tbody></table>
 ";
     print "dbx2\n";
-    my $form_type =
-      &html_form_select( 'type', 0, 'Friend', 'Friend', 'Business', 'reject',
-        'Family' );
+    my $form_type = &html_form_select( 'type', 0, 'Friend', 'Friend', 'Business', 'reject', 'Family' );
 
     #form action='/bin/items.pl?add' method=post>
 
@@ -116,8 +113,7 @@ sub rej_call_item_delete {
     my @ReadRejFile = &read_reject_call_list();
     unlink $phone_dir;
     for $line (@ReadRejFile) {
-        ( $number, $name, $sound, $type ) =
-          $line =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
+        ( $number, $name, $sound, $type ) = $line =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
 
         $number =~ s/\s*$//;    #trim the fat off the end
         $name =~ s/\s*$//;      #trim the fat off the end
@@ -179,9 +175,7 @@ sub read_reject_call_list {
         $type  = 'general' unless $type;
 
         #	    print_log "Number;$number, Name;$name, Sound;$sound, Type;$type\n";
-        push @calls,
-          sprintf( "number=%-12s name=%s sound=%s type=%s",
-            $number, $name, $sound, $type );
+        push @calls, sprintf( "number=%-12s name=%s sound=%s type=%s", $number, $name, $sound, $type );
 
     }
     close MYFILE;
diff --git a/web/bin/phone_out.pl b/web/bin/phone_out.pl
index ef1b1d882..a5b9e2922 100644
--- a/web/bin/phone_out.pl
+++ b/web/bin/phone_out.pl
@@ -11,8 +11,7 @@
     my ( $time, $num, $name, $line, $type, $dur, $ext, $color, $coloroff );
     $coloroff = "</font>";
 
-    ( $time, $num, $name, $line, $type ) = $r =~
-      /date=(.+\d+:\d+:\d+) number=(\S+) +name=(.*?) line=(\S*) type=(\S*)/;
+    ( $time, $num, $name, $line, $type ) = $r =~ /date=(.+\d+:\d+:\d+) number=(\S+) +name=(.*?) line=(\S*) type=(\S*)/;
     ( $dur, $ext ) = $r =~ / dur=(\S*) ext=(\S*)/;
 
     $name = '' unless $name;
@@ -35,8 +34,7 @@
 
     #    $color = "<FONT Color='#000000'>" if ( $name ne 'NA' ) ;
 
-    $html_calls .=
-      "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>
+    $html_calls .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>
     <td nowrap>$color$time$coloroff</td>
     <td nowrap>$color$num$coloroff</td>
     <td nowrap>$color$name$coloroff</td>
diff --git a/web/bin/phone_out2.pl b/web/bin/phone_out2.pl
index dec378154..6d0c3e813 100644
--- a/web/bin/phone_out2.pl
+++ b/web/bin/phone_out2.pl
@@ -10,8 +10,7 @@
 for my $r (@calls) {
     my ( $time, $num, $name, $line, $type, $dur, $ext, $color, $coloroff );
     $coloroff = "</font>";
-    ( $time, $num, $name, $line, $type ) = $r =~
-      /date=(.+\d+:\d+:\d+) number=(\S+) +name=(.*?) line=(\S*) type=(\S*)/;
+    ( $time, $num, $name, $line, $type ) = $r =~ /date=(.+\d+:\d+:\d+) number=(\S+) +name=(.*?) line=(\S*) type=(\S*)/;
     ( $dur, $ext ) = $r =~ / dur=(\S*) ext=(\S*)/;
     $name = '' unless $name;
     next unless $num;
@@ -33,8 +32,7 @@
 
     #    $color = "<FONT Color='#000000'>" if ( $name ne 'NA' ) ;
 
-    $html_calls .=
-      "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>
+    $html_calls .= "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'>
     <td nowrap>$color$time$coloroff</td>
     <td nowrap>$color$num$coloroff</td>
     <td nowrap>$color$name$coloroff</td>
diff --git a/web/bin/photo_search.pl b/web/bin/photo_search.pl
index cee28fc22..79a98389c 100644
--- a/web/bin/photo_search.pl
+++ b/web/bin/photo_search.pl
@@ -21,7 +21,7 @@
 
 $string =~ s/search=//;    # Allow for ?string or ?search=string
 
-use vars '@photos';    # This will be persistent across passes and code reloads
+use vars '@photos';        # This will be persistent across passes and code reloads
 @photos = file_read $config_parms{photo_index} unless @photos;
 
 my @match = sort grep /$string/i, @photos;
@@ -33,8 +33,7 @@
 print_log $results;
 my $html .= "<b>$results</b>";
 $html .= "<b> (only first $limit are shown)</b>" if $count1 > $limit;
-$html .=
-  ".  <a href='/misc/photo_search.html'>Search Again</a>.  Back to <a href=photos.pl>photo slideshow</a>\n<br>\n";
+$html .= ".  <a href='/misc/photo_search.html'>Search Again</a>.  Back to <a href=photos.pl>photo slideshow</a>\n<br>\n";
 
 my $i;
 my ( $index, $photos );
@@ -49,8 +48,7 @@
     if ( $i < $limit ) {
         $index .= "<br><a href='#$href'>$name</a>\n";
         $href++;
-        $photos .=
-          "<hr><br><a name='$href' href='#top'>Back to top</a>.  <b>$name</b><br><img src='$photo'>\n";
+        $photos .= "<hr><br><a name='$href' href='#top'>Back to top</a>.  <b>$name</b><br><img src='$photo'>\n";
     }
     else {
         $index .= "<br><a href='$photo'>$name</a>\n";
diff --git a/web/bin/photos.pl b/web/bin/photos.pl
index 8fa326597..9492be789 100644
--- a/web/bin/photos.pl
+++ b/web/bin/photos.pl
@@ -29,8 +29,7 @@
 my $time = $config_parms{photo_time};
 $time = 60 unless defined $time;
 $config_parms{photo_url} = '/ia5' unless $config_parms{photo_url};
-my $background =
-  ( $config_parms{photo_background} =~ /$Http{'User-Agent'}/ ) ? 1 : 0;
+my $background = ( $config_parms{photo_background} =~ /$Http{'User-Agent'}/ ) ? 1 : 0;
 
 #$background = 1;
 my $browser_size = &http_agent_size;
@@ -44,13 +43,8 @@
 
 # If sync, and requested photo does not match up with the last
 # photo served, then change the refresh time to sync up the 2 browsers
-elsif (
-    $parm eq 'sync'
-    and !(
-        $i == $Save{photo_index} + 1
-        or ( $i == 0 and $Save{photo_index} == $#photos )
-    )
-  )
+elsif ( $parm eq 'sync'
+    and !( $i == $Save{photo_index} + 1 or ( $i == 0 and $Save{photo_index} == $#photos ) ) )
 {
     $i = $Save{photo_index};
     my $time_diff = $Time - $Save{photo_index_time};
@@ -131,8 +125,7 @@
 my $time2 = $time * 1000;
 
 # This is simplier.
-my $refresh =
-  "<meta HTTP-EQUIV='Refresh' CONTENT='$time;URL=/bin/photos.pl?$i_n&sync'>";
+my $refresh = "<meta HTTP-EQUIV='Refresh' CONTENT='$time;URL=/bin/photos.pl?$i_n&sync'>";
 
 # This can cause problems.   When the java timer expires
 # to triggers a refresh on the Audrey, it will interrupt any other voyager browser activity
@@ -150,8 +143,7 @@
 
 # Create header html with optional search
 my $header = '';
-$header =
-  "<font size='3' color='#ff0000'><a href=/misc/photo_search.html>$i</a> :
+$header = "<font size='3' color='#ff0000'><a href=/misc/photo_search.html>$i</a> :
 <a href=$big_photo>$photo_name</a></font>" unless $config_parms{photo_no_title};
 $header = "<form action='/bin/photo_search.pl'>
 <input size=15 name='search' onChange='form.submit()'>
diff --git a/web/bin/photos_slideshow.pl b/web/bin/photos_slideshow.pl
index 44d04e4ee..4e691d9ac 100644
--- a/web/bin/photos_slideshow.pl
+++ b/web/bin/photos_slideshow.pl
@@ -76,8 +76,7 @@
 if ( $captions ne '0' ) {
     $sseffect .= "captions: true, ";
 }
-$sseffect .=
-  "controller: true, delay: ${time}000, duration: 1000, height: $height, hu: '$config_parms{photo_dirs}', ";
+$sseffect .= "controller: true, delay: ${time}000, duration: 1000, height: $height, hu: '$config_parms{photo_dirs}', ";
 if ( $thumbs ne '0' ) {
     $sseffect .= "thumbnails: true, ";
 }
diff --git a/web/bin/rejectcall.pl b/web/bin/rejectcall.pl
index 00530414a..92b3b2698 100644
--- a/web/bin/rejectcall.pl
+++ b/web/bin/rejectcall.pl
@@ -20,8 +20,7 @@ sub rejected_call_list {
     my $html_calls;
     my @calls = read_reject_call_list;
     for my $r (@calls) {
-        my ( $number, $name, $sound, $type ) =
-          $r =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
+        my ( $number, $name, $sound, $type ) = $r =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
         $html_calls .=
           "<tr id='resultrow' vAlign=center bgcolor='#EEEEEE' class='wvtrow'><td nowrap><a href=/SUB;rej_call_item_delete($pos)>Delete</a>   $number</td><td nowrap>$name</a></td><td nowrap>$sound</td><td nowrap>$type</td></tr>";
         $pos = $pos + 1;
@@ -45,9 +44,7 @@ sub rejected_call_list {
 </font></tbody></table>
 </body>
 ";
-    my $form_type =
-      &html_form_select( 'type', 0, 'Friend', 'Friend', 'Business', 'reject',
-        'Family' );
+    my $form_type = &html_form_select( 'type', 0, 'Friend', 'Friend', 'Business', 'reject', 'Family' );
 
     #form action='/bin/items.pl?add' method=post>
 
@@ -106,8 +103,7 @@ sub rej_call_item_delete {
     my @ReadRejFile = read_reject_call_list;
     unlink "$phone_dir/phone.caller_id.list";
     for $line (@ReadRejFile) {
-        ( $number, $name, $sound, $type ) =
-          $line =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
+        ( $number, $name, $sound, $type ) = $line =~ /number=(.+) name=(.+) sound=(.*) type=(.*)/;
 
         $number =~ s/\s*$//;    #trim the fat off the end
         $name =~ s/\s*$//;      #trim the fat off the end
@@ -115,8 +111,7 @@ sub rej_call_item_delete {
         $type =~ s/\s*$//;      #trim the fat off the end
         $writeparms = "$number\t\t$name\t\t$sound\t\t$type";
         if ( $filePos ne $deletepos ) {
-            &rej_call_file_write( "$phone_dir/phone.caller_id.list",
-                $writeparms );
+            &rej_call_file_write( "$phone_dir/phone.caller_id.list", $writeparms );
 
         }
 
diff --git a/web/bin/rss_logs.pl b/web/bin/rss_logs.pl
index c28ff87f9..76a0a5f8e 100644
--- a/web/bin/rss_logs.pl
+++ b/web/bin/rss_logs.pl
@@ -53,8 +53,7 @@
 use vars '%rss_logs_data';
 
 if ($article) {
-    return &html_page( "RSS $log article $article",
-        "Log: $log<br>Article: $article<br>$rss_logs_data{$log}{$article}" );
+    return &html_page( "RSS $log article $article", "Log: $log<br>Article: $article<br>$rss_logs_data{$log}{$article}" );
 }
 else {
     return &rss_log($log);
@@ -70,9 +69,7 @@ sub rss_log {
     $config_parms{rss_maxitems} = 100 unless $config_parms{rss_maxitems};
     $config_parms{rss_image} = "http://misterhouse.sourceforge.net/mh_logo.gif"
       unless $config_parms{rss_image};
-    $config_parms{rss_image} =
-        "http://$config_parms{http_server}"
-      . ":$config_parms{http_port}/ia5/images/mhlogo.gif"
+    $config_parms{rss_image} = "http://$config_parms{http_server}" . ":$config_parms{http_port}/ia5/images/mhlogo.gif"
       if $config_parms{http_server}
       and $config_parms{http_port}
       and not $config_parms{rss_image};
@@ -100,8 +97,7 @@ sub rss_log {
 
     # still working on the link for each item. can we follow this particular item for more detail?
     # maybe hook up phone number entry -> address book lookup, etc. obviously TODO
-    my $rss_link =
-      "http://$config_parms{http_server}:$config_parms{http_port}/bin/rss_logs.pl?$log&";
+    my $rss_link = "http://$config_parms{http_server}:$config_parms{http_port}/bin/rss_logs.pl?$log&";
 
     print "\tparsing $log log\n" if $Debug{rss};
     my $article = 0;
@@ -114,8 +110,7 @@ sub rss_log {
         # Create rss item from each line in log
         for my $r (@calls) {
             $article++;
-            my ( $time_date, $num, $name, $line, $type ) =
-              $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
+            my ( $time_date, $num, $name, $line, $type ) = $r =~ /date=(.+) number=(.+) name=(.+) line=(.*) type=(.*)/;
             ( $time_date, $num, $name ) = $r =~ /(.+\d+:\d+:\d+) (\S+) (.+)/
               unless $name;
             next unless $num;
@@ -124,11 +119,10 @@ sub rss_log {
 
             #           print "db t=$time_date t2=$time_date2 t3=$time_date3\n";
             $rss->add_item(
-                title   => $time_date,
-                link    => $rss_link . $article,
-                pubDate => $time_date3,
-                description =>
-                  "Incoming call from $num ($name). line=$line type=$type."
+                title       => $time_date,
+                link        => $rss_link . $article,
+                pubDate     => $time_date3,
+                description => "Incoming call from $num ($name). line=$line type=$type."
             );
             $rss_logs_data{$log}{$article} = $r;
             last if $article >= $config_parms{rss_maxitems};
@@ -136,9 +130,7 @@ sub rss_log {
     }
     else {
         # Reverse logdata to show newest items first
-        for
-          my $line ( reverse file_read "$config_parms{data_dir}/logs/$log.log" )
-        {
+        for my $line ( reverse file_read "$config_parms{data_dir}/logs/$log.log" ) {
             next unless $line;
             $article++;
             my ( $time_date, $data ) = $line =~ /(.+ [AP]M) (.+)$/;
diff --git a/web/bin/set_cookie.pl b/web/bin/set_cookie.pl
index 9df2b5639..1257ebe6e 100644
--- a/web/bin/set_cookie.pl
+++ b/web/bin/set_cookie.pl
@@ -60,10 +60,8 @@
     my $html = "<form action='/bin/set_cookie.pl' ";
     $html .= "target='$target' " if $target;
     $html .= ">\n$text\n"        if $text;
-    $html .=
-      "   <input type='radio' name='$string' value='0' $checked_off onClick='form.submit()'>Off\n";
-    $html .=
-      "   <input type='radio' name='$string' value='1' $checked_on  onClick='form.submit()'>On\n";
+    $html .= "   <input type='radio' name='$string' value='0' $checked_off onClick='form.submit()'>Off\n";
+    $html .= "   <input type='radio' name='$string' value='1' $checked_on  onClick='form.submit()'>On\n";
     $html .= "</form>\n";
 
     # Checkboxes do not return values when not checked :(
diff --git a/web/bin/set_cookie2.pl b/web/bin/set_cookie2.pl
index e26611dfa..c2f0add8a 100644
--- a/web/bin/set_cookie2.pl
+++ b/web/bin/set_cookie2.pl
@@ -60,7 +60,6 @@
     $state2 = '' if defined $Cookies{$string} and $Cookies{$string} eq '0';
 
     my $image = "/graphics/${string}_${state1}.gif";
-    return
-      "<a href='/bin/set_cookie2.pl?$string=$state2'><img src='$image' alt='$string $state1' border=0></a>\n";
+    return "<a href='/bin/set_cookie2.pl?$string=$state2'><img src='$image' alt='$string $state1' border=0></a>\n";
 }
 
diff --git a/web/bin/set_parm_tv_provider.pl b/web/bin/set_parm_tv_provider.pl
index b165f68ab..fd187c074 100644
--- a/web/bin/set_parm_tv_provider.pl
+++ b/web/bin/set_parm_tv_provider.pl
@@ -66,13 +66,9 @@ sub edit {
         # Update tv_provider_name if changed
         if (    $args{provider}
             and $providers{ $args{provider} }
-            and $providers{ $args{provider} } ne
-            $config_parms{tv_provider_name} )
+            and $providers{ $args{provider} } ne $config_parms{tv_provider_name} )
         {
-            my %parms = (
-                'tv_provider', '', 'tv_provider_name',
-                $providers{ $args{provider} }
-            );
+            my %parms = ( 'tv_provider', '', 'tv_provider_name', $providers{ $args{provider} } );
             print "db writing out new parm: $config_parms{tv_provider_name}\n";
             &write_mh_opts( \%parms );
             &read_parms;    # Re-read parms
@@ -91,9 +87,7 @@ sub edit {
         $html .= ' selected'
           if $id eq $config_parms{tv_provider}
           or $name eq $config_parms{tv_provider_name};
-        $html .= '>'
-          . $name
-          . '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp' . "\n";
+        $html .= '>' . $name . '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp' . "\n";
     }
     $html .= '</select></form></html>';
 
diff --git a/web/bin/set_parm_weather_local.pl b/web/bin/set_parm_weather_local.pl
index 8d67f9c89..87d92be3c 100644
--- a/web/bin/set_parm_weather_local.pl
+++ b/web/bin/set_parm_weather_local.pl
@@ -14,8 +14,7 @@
     if ( &get_parm_file( \%config_parms, 'web_href_weather_local_image' ) ) {
         $html = '<br>Our local weather.';
     }
-    $html .=
-      '<br><a href=/bin/set_parm_weather_local.pl?set>Reset the mh.ini parm for this page according to your zip code</a>';
+    $html .= '<br><a href=/bin/set_parm_weather_local.pl?set>Reset the mh.ini parm for this page according to your zip code</a>';
     return html_page '', $html;
 }
 else {
@@ -27,24 +26,18 @@
     return &html_page( '', "Connect to the internet and try again" )
       unless net_ping 'www.google.com';
 
-    $html = get
-      "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=$config_parms{zip_code}";
-    my ($id) =
-      $html =~ m|<a href="/radar/station.asp\?ID=(.*)">Local Radar</a>|i;
+    $html = get "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=$config_parms{zip_code}";
+    my ($id) = $html =~ m|<a href="/radar/station.asp\?ID=(.*)">Local Radar</a>|i;
 
     speak "Weather i d is $id";
 
     # Update the mh.ini parm if changed
-    my $parm1 =
-      "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=$config_parms{zip_code}";
+    my $parm1 = "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=$config_parms{zip_code}";
     my $parm2 = "http://radar.wunderground.com/data/nids/${id}_0.gif";
     if (   $parm1 ne $config_parms{web_href_weather_local}
         or $parm2 ne $config_parms{web_href_weather_local_image} )
     {
-        my %parms = (
-            'web_href_weather_local',       $parm1,
-            'web_href_weather_local_image', $parm2
-        );
+        my %parms = ( 'web_href_weather_local', $parm1, 'web_href_weather_local_image', $parm2 );
         main::write_mh_opts( \%parms );
 
         #       my $parmfile = $Pgm_Path . "/mh.private.ini";
@@ -53,7 +46,7 @@
     }
 
     $html =
-      "<b>Weather page result</b>: <ul><li>Zipcode used:  $config_parms{zip_code}"
+        "<b>Weather page result</b>: <ul><li>Zipcode used:  $config_parms{zip_code}"
       . "<li>ID: $id<li>web_href_weather_local: $parm1<li>web_href_weather_local_image: $parm2</ul>";
 
     return html_page '', $html;
diff --git a/web/bin/shopping_list.pl b/web/bin/shopping_list.pl
index 3bb574daf..66ec12eb5 100644
--- a/web/bin/shopping_list.pl
+++ b/web/bin/shopping_list.pl
@@ -191,20 +191,14 @@ sub shoppingListError {
 
 $param{'action'} = 'list' unless defined( $param{'action'} );
 $param{'action'} = 'list' if $param{'action'} eq 'cancel';
-my $printing = (
-         ( $param{'action'} eq 'print' )
-      or ( $param{'action'} eq 'print preview' )
-      or ( $param{'action'} eq 'e-mail' )
-);
-my $atShop = (
-         ( $param{'action'} eq 'at shop' )
-      or ( $param{'action'} eq 'remove items' )
-);
+my $printing =
+  ( ( $param{'action'} eq 'print' ) or ( $param{'action'} eq 'print preview' ) or ( $param{'action'} eq 'e-mail' ) );
+my $atShop =
+  ( ( $param{'action'} eq 'at shop' ) or ( $param{'action'} eq 'remove items' ) );
 
 if ( $param{'action'} eq 'add item' ) {
     if ( ( $param{'category'} eq 'select' ) or ( $param{'item'} eq '' ) ) {
-        $html .=
-          qq[<p>Category: <select name="category">\n<option>select</option>\n];
+        $html .= qq[<p>Category: <select name="category">\n<option>select</option>\n];
         open( SHOPLIST, $file ) || return shoppingListError("$file: $!");
         while (<SHOPLIST>) {
             chomp;
@@ -213,24 +207,20 @@ sub shoppingListError {
         }
         close(SHOPLIST);
         $html .= qq[</select></p><p>&nbsp;</p>\n];
-        $html .=
-          qq[<p>Item: <input type="text" name="item" id="item" size=50></p><br>];
-        $html .=
-          qq[<p>Add to $prettyName Now: <input type="checkbox" name="onlistnow"></p><br>];
+        $html .= qq[<p>Item: <input type="text" name="item" id="item" size=50></p><br>];
+        $html .= qq[<p>Add to $prettyName Now: <input type="checkbox" name="onlistnow"></p><br>];
         $html .= qq[<p><input type="submit" name="action" value="add item">\n];
         $html .= qq[<input type="submit" name="action" value="cancel"></p>\n];
         $html .= qq[</form>\n];
         $html .= '';
-        $html .= &insert_keyboard(
-            { form => 'main', target => 'item', autocap => 'yes' } );
+        $html .= &insert_keyboard( { form => 'main', target => 'item', autocap => 'yes' } );
         $html .= qq[</body></html>\n];
         return html_page( undef, $html );
     }
     open( OLDLIST, $file ) || return shoppingListError("$file: $!");
     my $duplicate = 0;
     my $newvalue = $param{'onlistnow'} eq 'on' ? '1' : '0';
-    $html .=
-      "<p>Param onlistnow is $param{'onlistnow'} so newvalue is $newvalue</p>\n"
+    $html .= "<p>Param onlistnow is $param{'onlistnow'} so newvalue is $newvalue</p>\n"
       if $shoppinglistdebug;
 
     while (<OLDLIST>) {
@@ -369,30 +359,19 @@ sub shoppingListError {
         }
         else {
             if ($atShop) {
-                $sectionHeader .=
-                  qq[\n<hr><h3>$1</h3><p><input type="submit" name="action" value="remove items">];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="cancel"><p><table>\n];
+                $sectionHeader .= qq[\n<hr><h3>$1</h3><p><input type="submit" name="action" value="remove items">];
+                $sectionHeader .= qq[<input type="submit" name="action" value="cancel"><p><table>\n];
             }
             else {
-                $sectionHeader .=
-                  qq[<p><input type="submit" name="action" value="update list">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="print preview">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="print">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="e-mail">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="add item">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="at shop">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="cancel">\n];
-                $sectionHeader .=
-                  qq[<input type="submit" name="action" value="clear all"></p>\n];
-                $sectionHeader .=
-                  qq[<hr><h3>$1</h3><table width="100%"><colgroup span="$numColumns" width="$columnWidth">\n];
+                $sectionHeader .= qq[<p><input type="submit" name="action" value="update list">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="print preview">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="print">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="e-mail">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="add item">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="at shop">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="cancel">\n];
+                $sectionHeader .= qq[<input type="submit" name="action" value="clear all"></p>\n];
+                $sectionHeader .= qq[<hr><h3>$1</h3><table width="100%"><colgroup span="$numColumns" width="$columnWidth">\n];
             }
         }
         next;
@@ -427,8 +406,7 @@ sub shoppingListError {
             $html .= qq[<td><input type="checkbox">$item</td>\n];
         }
         else {
-            $html .= qq[<td><input type="checkbox" name="$item"]
-              . ( $checked ? ' checked' : '' ) . '>';
+            $html .= qq[<td><input type="checkbox" name="$item"] . ( $checked ? ' checked' : '' ) . '>';
             $html .=
               qq[<a onClick="document.main.elements['$item'].checked=!document.main.elements['$item'].checked">$item</a></td>\n];
         }
diff --git a/web/bin/soapcgi.pl b/web/bin/soapcgi.pl
index dfd0aec41..8c24ed3c5 100644
--- a/web/bin/soapcgi.pl
+++ b/web/bin/soapcgi.pl
@@ -24,8 +24,7 @@
     my ( $key, $header );
     while ( ( $key, $header ) = each %Http ) {
         logit "$config_parms{data_dir}/logs/soapdebug.log", "$key $header";
-        logit "$config_parms{data_dir}/logs/soapdebug.log",
-          "$ENV{HTTP_QUERY_STRING}";
+        logit "$config_parms{data_dir}/logs/soapdebug.log", "$ENV{HTTP_QUERY_STRING}";
     }
 }
 
diff --git a/web/bin/status_line.pl b/web/bin/status_line.pl
index 27aa9819a..8880ab180 100644
--- a/web/bin/status_line.pl
+++ b/web/bin/status_line.pl
@@ -71,8 +71,7 @@
 
 $html .= qq[<form>\n];
 
-$html .=
-  qq[<table cellpadding=0 cellspacing=0 width='100%' border='0' align='center'>\n];
+$html .= qq[<table cellpadding=0 cellspacing=0 width='100%' border='0' align='center'>\n];
 $html .= qq[<tr valign='center'><td nowrap><b>$fontstart\n];
 
 # Do parms in specified order
@@ -86,18 +85,14 @@
     # Allow for sun (auto-pick), sunrise, or sunset
     elsif ( $parm =~ /sun/ ) {
         if ( $parm eq 'sun' ) {
-            $parm = (
-                     time_less_than "$Time_Sunrise + 2:00"
-                  or time_greater_than "$Time_Sunset  + 2:00"
-            ) ? 'sunrise' : 'sunset';
+            $parm =
+              ( time_less_than "$Time_Sunrise + 2:00" or time_greater_than "$Time_Sunset  + 2:00" ) ? 'sunrise' : 'sunset';
         }
         if ( $parm eq 'sunrise' ) {
-            $html .=
-              qq[&nbsp;<img src='/ia5/images/sunrise.gif' border=0>&nbsp;Rise $Time_Sunrise\n];
+            $html .= qq[&nbsp;<img src='/ia5/images/sunrise.gif' border=0>&nbsp;Rise $Time_Sunrise\n];
         }
         else {
-            $html .=
-              qq[&nbsp;<img src='/ia5/images/sunset.gif' border=0>&nbsp;Set $Time_Sunset\n];
+            $html .= qq[&nbsp;<img src='/ia5/images/sunset.gif' border=0>&nbsp;Set $Time_Sunset\n];
         }
     }
 
@@ -124,27 +119,23 @@
 
     elsif ( $parm eq 'email' ) {
         $Save{email_flag} = '' unless $Save{email_flag};
-        $html .=
-          qq[&nbsp;<img src='/ia5/images/mail.gif' border=0>$Save{email_flag}\n];
+        $html .= qq[&nbsp;<img src='/ia5/images/mail.gif' border=0>$Save{email_flag}\n];
     }
 
     elsif ( $parm eq 'weather' ) {
         $Weather{Summary_Short} = '' unless $Weather{Summary_Short};
-        $html .=
-          qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;$Weather{Summary_Short}\n];
+        $html .= qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;$Weather{Summary_Short}\n];
     }
     elsif ( $parm eq 'weather_long' ) {
         $Weather{Summary} = '' unless $Weather{Summary};
-        $html .=
-          qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;$Weather{Summary}\n];
+        $html .= qq[&nbsp;<img src='/ia5/images/temp.gif' border=0>&nbsp;$Weather{Summary}\n];
     }
 
     elsif ( $parm eq 'wind' ) {
         my $html_wind = $Weather{Wind};
         $html_wind = '' unless $html_wind;
         $html_wind =~ s/from the/ /;
-        $html .=
-          qq[&nbsp;<img src='/ia5/images/wind.gif' border=0>&nbsp;$html_wind\n];
+        $html .= qq[&nbsp;<img src='/ia5/images/wind.gif' border=0>&nbsp;$html_wind\n];
     }
 
     # Allow for user defined html (e.g. code/bruce/web_sub.pl)
@@ -157,19 +148,16 @@
 $html .= "</font></td>\n";
 
 if ( $parms{date} ) {
-    $html .=
-      qq[<td id='jdate' nowrap align='right'>$fontstart<b>$Date_Now</b></font></td>\n];
+    $html .= qq[<td id='jdate' nowrap align='right'>$fontstart<b>$Date_Now</b></font></td>\n];
 }
 if ( $parms{clock} ) {
     $html .= qq[<td nowrap>${fontstart}<b>&nbsp;$Time_Now</b></font></td>\n];
 }
 if ( $parms{jclock1} ) {
-    $html .=
-      qq[<td><form name=form><input type=button name=jclock value='' style="font-size: 15"></form></td>\n];
+    $html .= qq[<td><form name=form><input type=button name=jclock value='' style="font-size: 15"></form></td>\n];
 }
 if ( $parms{jclock2} ) {
-    $html .=
-      qq[<td nowrap align='right'><div id='jclock'>${fontstart}<b>&nbsp;$Time_Now</b></font></div></td>\n];
+    $html .= qq[<td nowrap align='right'><div id='jclock'>${fontstart}<b>&nbsp;$Time_Now</b></font></div></td>\n];
 }
 
 $html .= qq[</tr></table></form></body></html>\n];
diff --git a/web/bin/status_panel.pl b/web/bin/status_panel.pl
index 3370f3836..f288e04cc 100644
--- a/web/bin/status_panel.pl
+++ b/web/bin/status_panel.pl
@@ -22,10 +22,8 @@
     # Allow for sun (auto-pick), sunrise, or sunset
     elsif ( $parm =~ /sun/ ) {
         if ( $parm eq 'sun' ) {
-            $parm = (
-                     time_less_than "$Time_Sunrise + 2:00"
-                  or time_greater_than "$Time_Sunset  + 2:00"
-            ) ? 'sunrise' : 'sunset';
+            $parm =
+              ( time_less_than "$Time_Sunrise + 2:00" or time_greater_than "$Time_Sunset  + 2:00" ) ? 'sunrise' : 'sunset';
         }
         if ( $parm eq 'sunrise' ) {
             $html .= qq[<p><b>Sunrise:</b> $Time_Sunrise</p>\n];
diff --git a/web/bin/triggers.pl b/web/bin/triggers.pl
index 78d022c61..9da9a6411 100644
--- a/web/bin/triggers.pl
+++ b/web/bin/triggers.pl
@@ -30,12 +30,10 @@ sub web_trigger_list {
     my $html = &html_header('Triggers Menu');
 
     my $form_trigger = &html_form_select( 'trigger1', 0, 'time_now', '',
-        qw(time_now time_cron time_random new_second new_minute new_hour $New_Hour $New_Day $New_Week $New_Month $New_Year)
-    );
+        qw(time_now time_cron time_random new_second new_minute new_hour $New_Hour $New_Day $New_Week $New_Month $New_Year) );
 
     my $form_code = &html_form_select( 'code1', 0, 'speak', '',
-        qw(speak play display print_log set run run_voice_cmd net_im_send net_mail_send get)
-    );
+        qw(speak play display print_log set run run_voice_cmd net_im_send net_mail_send get) );
 
     $html = qq|
 <HTML>
@@ -101,17 +99,14 @@ sub web_trigger_list {
       )
     {
 
-        my ( $trigger, $code, $type, $triggered, $trigger_error, $code_error )
-          = trigger_get($name);
+        my ( $trigger, $code, $type, $triggered, $trigger_error, $code_error ) = trigger_get($name);
 
         if ( $type_prev ne $type ) {
             $html .= "</table>\n" if $type_prev;
             $type_prev = $type;
-            $html .=
-              "<p><B>$type:</B> (<a name='$type' href='#Top'>back to top</a>)\n";
+            $html .= "<p><B>$type:</B> (<a name='$type' href='#Top'>back to top</a>)\n";
             $html .= qq|<table class="EditTrigger" border width="100%">\n|;
-            $html .=
-              "<tr><th></th><th>Name</th><th>Trigger Event</th><th>Action Code</th><th>Type</th><th>Last Run</th></tr>\n";
+            $html .= "<tr><th></th><th>Name</th><th>Trigger Event</th><th>Action Code</th><th>Type</th><th>Last Run</th></tr>\n";
         }
 
         my $name2 = $name;
@@ -121,25 +116,16 @@ sub web_trigger_list {
         $code =~ s/"/&quot;/g;
 
         $html .= "<td>";
-        $html .=
-          "<a href=/SUB;/bin/triggers.pl?trigger_copy('$name2')>Copy</a>\n";
-        $html .=
-          "    <a href=/SUB;/bin/triggers.pl?trigger_delete('$name2')>Delete</a>\n";
-        $html .=
-          "    <a href=/SUB;/bin/triggers.pl?trigger_run('$name2')>Run</a></td>\n";
+        $html .= "<a href=/SUB;/bin/triggers.pl?trigger_copy('$name2')>Copy</a>\n";
+        $html .= "    <a href=/SUB;/bin/triggers.pl?trigger_delete('$name2')>Delete</a>\n";
+        $html .= "    <a href=/SUB;/bin/triggers.pl?trigger_run('$name2')>Run</a></td>\n";
 
-        $html .=
-          &html_form_input_set_func( 'trigger_rename', '/bin/triggers.pl',
-            $name, $name );
+        $html .= &html_form_input_set_func( 'trigger_rename', '/bin/triggers.pl', $name, $name );
         $html .= qq|<span class="error">\n| if $trigger_error;
-        $html .=
-          &html_form_input_set_func( 'trigger_set_trigger', '/bin/triggers.pl',
-            $name, $trigger );
+        $html .= &html_form_input_set_func( 'trigger_set_trigger', '/bin/triggers.pl', $name, $trigger );
         $html .= "</span>\n" if $trigger_error;
         $html .= qq|<span class="error">\n| if $code_error;
-        $html .=
-          &html_form_input_set_func( 'trigger_set_code', '/bin/triggers.pl',
-            $name, $code );
+        $html .= &html_form_input_set_func( 'trigger_set_code', '/bin/triggers.pl', $name, $code );
         $html .= "</span>\n" if $code_error;
         $html .=
           &html_form_select_set_func( 'trigger_set_type', '/bin/triggers.pl',
@@ -153,11 +139,9 @@ sub web_trigger_list {
 
         $html .= "</tr>\n\n";
 
-        $html .=
-          qq|<tr class="error">\n\n<td colspan=7>Trigger Event Error: $trigger_error</td></tr>\n|
+        $html .= qq|<tr class="error">\n\n<td colspan=7>Trigger Event Error: $trigger_error</td></tr>\n|
           if $trigger_error;
-        $html .=
-          qq|<tr class="error">\n\n<td colspan=7>Action Code Error: $code_error</td></tr>\n|
+        $html .= qq|<tr class="error">\n\n<td colspan=7>Action Code Error: $code_error</td></tr>\n|
           if $code_error;
     }
     $html .= "</table>\n";
@@ -199,13 +183,10 @@ sub web_trigger_add {
 
     # Create form
     else {
-        my $html =
-          "Add a trigger:<form action='/bin/triggers.pl?add' method=post>\n";
+        my $html = "Add a trigger:<form action='/bin/triggers.pl?add' method=post>\n";
         $html .= qq|<br>Name   <input type=input name=name    value="Test">\n|;
-        $html .=
-          qq|<br>Trigger<input type=input name=trigger value="time_now '12 pm'">\n|;
-        $html .=
-          qq|<br>Event  <input type=input name=code    value="speak 'hi'">\n|;
+        $html .= qq|<br>Trigger<input type=input name=trigger value="time_now '12 pm'">\n|;
+        $html .= qq|<br>Event  <input type=input name=code    value="speak 'hi'">\n|;
         $html .= qq|<br>Type <select name='type'>
 <option value='OneShot' selected>OneShot</option>
 <option value='NoExpire'>NoExpire</option>
diff --git a/web/bin/uptime.pl b/web/bin/uptime.pl
index bf4882692..1e6e05527 100644
--- a/web/bin/uptime.pl
+++ b/web/bin/uptime.pl
@@ -5,8 +5,7 @@
 # Authority: anyone
 
 if ( $OS_win or $^O eq 'cygwin' ) {
-    return
-      "$Tk_objects{label_uptime_mh} &nbsp;&nbsp; $Tk_objects{label_uptime_cpu}";
+    return "$Tk_objects{label_uptime_mh} &nbsp;&nbsp; $Tk_objects{label_uptime_cpu}";
 }
 else {
     return `uptime`;
diff --git a/web/bin/voicemail.pl b/web/bin/voicemail.pl
index cd76a1832..ae3835b5e 100644
--- a/web/bin/voicemail.pl
+++ b/web/bin/voicemail.pl
@@ -5,9 +5,8 @@
 # Authority: anyone
 
 if ( 'mci' eq lc $config_parms{phone_voicemail_type} ) {
-    my $phone =
-      ($Authorized) ? $config_parms{phone_voicemail_number} : '0001112222';
-    my $pin = ($Authorized) ? $config_parms{phone_voicemail_pin} : '9999';
+    my $phone = ($Authorized) ? $config_parms{phone_voicemail_number} : '0001112222';
+    my $pin   = ($Authorized) ? $config_parms{phone_voicemail_pin}    : '9999';
     return qq[
 <form method="POST" ACTION='http://messagecenter.mci.com/secure/login.jsp' NAME="login_form">
 <input type="hidden" size="12" name="partnername" value="">
@@ -20,7 +19,7 @@
 
 elsif ( 'asterisk' eq lc $config_parms{phone_voicemail_type} ) {
     my $mailbox = ($Authorized) ? $config_parms{phone_voicemail_number} : '25';
-    my $pin = ($Authorized) ? $config_parms{phone_voicemail_pin} : '9999';
+    my $pin     = ($Authorized) ? $config_parms{phone_voicemail_pin}    : '9999';
     return qq[<form method="POST"
 ACTION='$config_parms{phone_voicemail_url}'
 NAME="login_form">
@@ -32,12 +31,10 @@
 </form>];
 }
 elsif ( 'vocp' eq lc $config_parms{phone_voicemail_type} ) {
-    return
-      qq[<a href='sub?vocp_display_voicemail'><img src="images/voicemails.gif" alt='Voice Mail' border=0></a>];
+    return qq[<a href='sub?vocp_display_voicemail'><img src="images/voicemails.gif" alt='Voice Mail' border=0></a>];
 
 }
 
 else {
-    return
-      qq[<a href='voicemail.shtml'><img src="images/voicemails.gif" alt='Voice mail' border=0></a><br>];
+    return qq[<a href='voicemail.shtml'><img src="images/voicemails.gif" alt='Voice mail' border=0></a><br>];
 }
diff --git a/web/bin/wc_settings.pl b/web/bin/wc_settings.pl
index 43f4dc97c..9a50cdebd 100644
--- a/web/bin/wc_settings.pl
+++ b/web/bin/wc_settings.pl
@@ -41,8 +41,8 @@
 # We use the wc_address_x from 0 to wc_max - 1
 
 # if we pass anything in output changes to html snippet
-my $outmode = @ARGV[0];   # arg is number of columns to format to
-my $arg2    = @ARGV[1];   # if we have a second arg it is the url for full frame
+my $outmode = @ARGV[0];    # arg is number of columns to format to
+my $arg2    = @ARGV[1];    # if we have a second arg it is the url for full frame
 my ( $outimage, $rest ) = split / /, $arg2;    # because we may have extra stuff
 
 my $html   = "<!-- $outmode @ARGV --> \n ";
@@ -72,8 +72,7 @@
         #Add this cameras settings into the string
         my $wcURL = $config_parms{$wcThis};
         my ( $wcURL, $wcDescr ) = split( /\,/, $wcURL );
-        $scriptlet .=
-          "webCamRegisterCam(\"" . $wcx . ": $wcDescr\", \"$wcURL\", $wcx); \n";
+        $scriptlet .= "webCamRegisterCam(\"" . $wcx . ": $wcDescr\", \"$wcURL\", $wcx); \n";
 
         $html .=
             "<td BGCOLOR='"
diff --git a/web/bin/weather_graph.pl b/web/bin/weather_graph.pl
index 2675496d7..e432a62cd 100644
--- a/web/bin/weather_graph.pl
+++ b/web/bin/weather_graph.pl
@@ -87,12 +87,8 @@ sub select_weather_graph {
         my $i = 1;
 
         for my $periodgraph (@$tabperiod) {
-            unless ( $config_parms{weather_graph_period_skip} =~
-                /$periodgraph->[0]/ )
-            {
-                $html .=
-                  "\n<TD><IMG src=\"/graphics/graph.gif\" align=\"absbottom\"><B><A href=\"#"
-                  . $periodgraph->[0];
+            unless ( $config_parms{weather_graph_period_skip} =~ /$periodgraph->[0]/ ) {
+                $html .= "\n<TD><IMG src=\"/graphics/graph.gif\" align=\"absbottom\"><B><A href=\"#" . $periodgraph->[0];
                 $html .= "\"> " . $periodgraph->[1] . "</A></B></TD>";
 
                 # Max 6 periods by row
@@ -108,21 +104,14 @@ sub select_weather_graph {
 
         # Build link for graphs
         for my $periodgraph (@$tabperiod) {
-            unless ( $config_parms{weather_graph_period_skip} =~
-                /$periodgraph->[0]/ )
-            {
+            unless ( $config_parms{weather_graph_period_skip} =~ /$periodgraph->[0]/ ) {
                 $j = 0;
                 $html .= "\n" . qq|<A NAME="$periodgraph->[0]"></A><BR>|;
                 $html .= "\n<IMG SRC = ";
 
                 #    $html .= "\'/rrd/weather_" . $typegraph . "_" . $periodgraph->[0] . ".png?" . int(100000*rand) . "'>\n";
                 $html .=
-                    "\'/rrd/weather_"
-                  . $typegraph . "_"
-                  . $periodgraph->[0]
-                  . ".$rrd_format?"
-                  . time()
-                  . '\' border=0><BR><BR>';
+                  "\'/rrd/weather_" . $typegraph . "_" . $periodgraph->[0] . ".$rrd_format?" . time() . '\' border=0><BR><BR>';
             }
         }
     }
diff --git a/web/bin/weather_graph_zoom.pl b/web/bin/weather_graph_zoom.pl
index 74b43060c..c8d887511 100755
--- a/web/bin/weather_graph_zoom.pl
+++ b/web/bin/weather_graph_zoom.pl
@@ -100,33 +100,25 @@
     #  my $day = $cgi->param('debday');
     #  my $month = $cgi->param('debmonth');
     #  my $year = $cgi->param('debyear');
-    my $debepochtime = timelocal(
-        0, 0, 0,
-        $cgi->param('debday'),
-        $cgi->param('debmonth') - 1,
-        $cgi->param('debyear') - 1900
-    );
+    my $debepochtime = timelocal( 0, 0, 0, $cgi->param('debday'), $cgi->param('debmonth') - 1, $cgi->param('debyear') - 1900 );
 
     # Convert end date in Epoch date
-    my $endepochtime = timelocal(
-        59, 59, 23,
-        $cgi->param('endday'),
-        $cgi->param('endmonth') - 1,
-        $cgi->param('endyear') - 1900
-    );
+    my $endepochtime = timelocal( 59, 59, 23, $cgi->param('endday'), $cgi->param('endmonth') - 1, $cgi->param('endyear') - 1900 );
     if ( $endepochtime > time() ) {
         $endepochtime = time();
     }
 
     if ( $debepochtime <= $endepochtime ) {
         my %sensor_names;
-        &main::read_parm_hash( \%sensor_names,
-            $main::config_parms{weather_graph_sensor_names} );
+        &main::read_parm_hash( \%sensor_names, $main::config_parms{weather_graph_sensor_names} );
         &create_rrdgraph_zoom(
-            $debepochtime,          $endepochtime,
-            $cgi->param('width'),   $cgi->param('height'),
-            $cgi->param('sensor1'), $sensor_names{ $cgi->param('sensor1') },
-            $cgi->param('sensor2'), $sensor_names{ $cgi->param('sensor2') }
+            $debepochtime, $endepochtime,
+            $cgi->param('width'),
+            $cgi->param('height'),
+            $cgi->param('sensor1'),
+            $sensor_names{ $cgi->param('sensor1') },
+            $cgi->param('sensor2'),
+            $sensor_names{ $cgi->param('sensor2') }
         );
     }
     else {
@@ -176,9 +168,7 @@ sub print_graph {
     );
     print $cgi->start_Tr;
     print $cgi->start_td( { -align => 'center' } );
-    print $cgi->img(
-        { src => "/rrd/weather_zoom.$rrd_format?" . time(), align => 'center' }
-    );
+    print $cgi->img( { src => "/rrd/weather_zoom.$rrd_format?" . time(), align => 'center' } );
     print $cgi->end_td;
     print $cgi->end_Tr;
     print $cgi->end_table();
@@ -232,13 +222,11 @@ sub print_prompts {
             -cellspacing => "0"
         }
     );
-    print $cgi->start_form(
-        { -method => 'GET', -action => '/bin/weather_graph_zoom.pl' } );
+    print $cgi->start_form( { -method => 'GET', -action => '/bin/weather_graph_zoom.pl' } );
 
     # Choose RRD database
     print $cgi->start_Tr;
-    print $cgi->start_td(
-        { -align => 'right', valign => "center", width => "90" } );
+    print $cgi->start_td( { -align => 'right', valign => "center", width => "90" } );
     print '<B>Round Robin Database</B>';
     print $cgi->end_td;
     $RRDDIR = "$config_parms{rrd_dir}";
@@ -260,10 +248,8 @@ sub print_prompts {
     print '<B>Sensor 2</B>';
     print $cgi->end_td;
 
-    print $cgi->start_td(
-        { -align => 'left', -colspan => 1, valign => "center" } );
-    &main::read_parm_hash( \%sensor_names,
-        $main::config_parms{weather_graph_sensor_names} );
+    print $cgi->start_td( { -align => 'left', -colspan => 1, valign => "center" } );
+    &main::read_parm_hash( \%sensor_names, $main::config_parms{weather_graph_sensor_names} );
     for my $sensor_name ( sort keys %sensor_names ) {
         push @list_sensors, $sensor_name;
     }
@@ -292,15 +278,13 @@ sub print_prompts {
     );
     print $cgi->end_td;
 
-    print $cgi->start_td(
-        { -align => 'right', -colspan => 1, valign => "center" } );
+    print $cgi->start_td( { -align => 'right', -colspan => 1, valign => "center" } );
     print $cgi->start_b;
     print "Width ";
     print $cgi->br;
     print "Height ";
     print $cgi->end_td;
-    print $cgi->start_td(
-        { -align => 'left', -colspan => 1, valign => "center" } );
+    print $cgi->start_td( { -align => 'left', -colspan => 1, valign => "center" } );
     print $cgi->popup_menu(
         -name      => 'width',
         -size      => 1,
@@ -485,10 +469,7 @@ sub get_footer1 {
     else {
         $colon = ':';
     }
-    $footer =
-        "Step size$colon "
-      . convertstepz($step)
-      . "   Data points$colon $datapoint";
+    $footer = "Step size$colon " . convertstepz($step) . "   Data points$colon $datapoint";
     return $footer;
 }
 
@@ -511,10 +492,9 @@ sub get_footer2 {
 sub create_rrdgraph_zoom {
     my $celgtime;
     my $create_graph;
-    my $colordatamoy  = 'ff0000'; # color of primary variable average line (red)
-    my $colordatamoy2 = '330099'; # color of primary variable average line (red)
-    my $colorna =
-      'C0C0C0';   # color for unknown area or 0 for gaps (barre noire verticale)
+    my $colordatamoy  = 'ff0000';    # color of primary variable average line (red)
+    my $colordatamoy2 = '330099';    # color of primary variable average line (red)
+    my $colorna       = 'C0C0C0';    # color for unknown area or 0 for gaps (barre noire verticale)
     my $colordatamax  = '330099';    # color of min and max
     my $colordatamax2 = 'FFFF00';    # color of min and max
     my $colorwhite    = 'ffffff';    # color white
@@ -529,10 +509,7 @@ sub create_rrdgraph_zoom {
     my $secs;
     my $titrerrd;
 
-    my (
-        $time1,   $time2,      $gwidth,  $gheight,
-        $sensor1, $libsensor1, $sensor2, $libsensor2
-    ) = @_;
+    my ( $time1, $time2, $gwidth, $gheight, $sensor1, $libsensor1, $sensor2, $libsensor2 ) = @_;
 
     print "SENSOR1=$sensor1 LIBSENSOR1=$libsensor1" if $debug;
     print "SENSOR2=$sensor2 LIBSENSOR2=$libsensor2" if $debug;
@@ -554,12 +531,9 @@ sub create_rrdgraph_zoom {
     $time1 = int( $time1 / $secs ) * $secs;
     $time2 = int( $time2 / $secs ) * $secs;
 
-    $titrerrd =
-      ( $sensor2 ne "nosensor" ) ? "$libsensor1, $libsensor2" : "$libsensor1";
+    $titrerrd = ( $sensor2 ne "nosensor" ) ? "$libsensor1, $libsensor2" : "$libsensor1";
 
-    ( $start, $step, $names, $array ) =
-      RRDs::fetch "$config_parms{weather_data_rrd}", "AVERAGE", "-s", "$time1",
-      "-e", "$time2";
+    ( $start, $step, $names, $array ) = RRDs::fetch "$config_parms{weather_data_rrd}", "AVERAGE", "-s", "$time1", "-e", "$time2";
     $err = RRDs::error;
     die "ERROR : function RRDs::fetch : $err" if $err;
     $datapoint = $#$array + 1;
@@ -736,8 +710,7 @@ sub create_rrdgraph_zoom {
     ( $strminvar2 = $strminvar ) =~ s/mindata/mindata2/g;
     ( $strmaxvar2 = $strmaxvar ) =~ s/maxdata/maxdata2/g;
 
-    $str_graph =
-      qq^RRDs::graph("$rrd_graph_dir/weather_zoom.$native_rrd_format",
+    $str_graph = qq^RRDs::graph("$rrd_graph_dir/weather_zoom.$native_rrd_format",
 "--title", "Environmental data : $titrerrd",
 "--height","$gheight",
 "--width", "$gwidth",
@@ -749,12 +722,7 @@ sub create_rrdgraph_zoom {
 "--color","SHADEA#0000CC",
 "--color","SHADEB#0000CC",
 ^
-      . "\"--vertical-label\","
-      . "$libuom"
-      . "\"--start\","
-      . "\"$time1\","
-      . "\"--end\","
-      . "\"$time2\","
+      . "\"--vertical-label\"," . "$libuom" . "\"--start\"," . "\"$time1\"," . "\"--end\"," . "\"$time2\","
 
       . "\"DEF:var=$rrd_dir:"
       . $sensor1
@@ -770,20 +738,17 @@ sub create_rrdgraph_zoom {
       . "$strmaxvar"
 
       . (
-        $sensor2 ne "nosensor"
-        ? "\"DEF:var2=$rrd_dir:" . $sensor2 . ":AVERAGE\","
+        $sensor2 ne "nosensor" ? "\"DEF:var2=$rrd_dir:" . $sensor2 . ":AVERAGE\","
         : ''
       )
       . ( $sensor2 ne "nosensor" ? "$strvar2" : '' )
       . (
-        $sensor2 ne "nosensor"
-        ? "\"DEF:mindata2=$rrd_dir:" . $sensor2 . ":MIN\","
+        $sensor2 ne "nosensor" ? "\"DEF:mindata2=$rrd_dir:" . $sensor2 . ":MIN\","
         : ''
       )
       . ( $sensor2 ne "nosensor" ? "$strminvar2" : '' )
       . (
-        $sensor2 ne "nosensor"
-        ? "\"DEF:maxdata2=$rrd_dir:" . $sensor2 . ":MAX\","
+        $sensor2 ne "nosensor" ? "\"DEF:maxdata2=$rrd_dir:" . $sensor2 . ":MAX\","
         : ''
       )
       . ( $sensor2 ne "nosensor" ? "$strmaxvar2" : '' )
@@ -798,10 +763,7 @@ sub create_rrdgraph_zoom {
 "GPRINT:fvar:LAST:Last \\\\: %5.1lf\\\\n",
 ^
       . (
-        $sensor2 ne "nosensor"
-        ? "\"LINE2:fvar2#$colordatamoy2:"
-          . sprintf( "%-${max}s", $libsensor2 )
-          . " (Average)\","
+        $sensor2 ne "nosensor" ? "\"LINE2:fvar2#$colordatamoy2:" . sprintf( "%-${max}s", $libsensor2 ) . " (Average)\","
         : ''
       )
       . (
@@ -817,8 +779,7 @@ sub create_rrdgraph_zoom {
         : ''
       )
       . (
-        $sensor2 ne "nosensor"
-        ? "\"GPRINT:fvar2:LAST:Last \\\\: %5.1lf\\\\n\","
+        $sensor2 ne "nosensor" ? "\"GPRINT:fvar2:LAST:Last \\\\: %5.1lf\\\\n\","
         : ''
       )
       . qq^
@@ -833,18 +794,13 @@ sub create_rrdgraph_zoom {
     die "ERROR : function RRDs::graph : $err\n" if $err;
     if ( $rrd_format ne $native_rrd_format ) {
         if ( $rrd_format eq 'gif' and $native_rrd_format eq 'png' ) {
-            my $pngFilename =
-              File::Spec->catfile( $rrd_graph_dir, "weather_zoom.png" );
-            my $gifFilename =
-              File::Spec->catfile( $rrd_graph_dir, "weather_zoom.gif" );
+            my $pngFilename = File::Spec->catfile( $rrd_graph_dir, "weather_zoom.png" );
+            my $gifFilename = File::Spec->catfile( $rrd_graph_dir, "weather_zoom.gif" );
 
-            system( $config_parms{weather_convert_png_to_gif},
-                $pngFilename, $gifFilename );
+            system( $config_parms{weather_convert_png_to_gif}, $pngFilename, $gifFilename );
         }
         else {
-            &print_log(
-                "weather_graph_zoom: sorry, don't know how to convert from $native_rrd_format to $rrd_format"
-            );
+            &print_log( "weather_graph_zoom: sorry, don't know how to convert from $native_rrd_format to $rrd_format" );
         }
     }
 }
diff --git a/web/bin/webcam_dirs.pl b/web/bin/webcam_dirs.pl
index b8ab92759..366be1244 100644
--- a/web/bin/webcam_dirs.pl
+++ b/web/bin/webcam_dirs.pl
@@ -29,19 +29,18 @@
 my $html = "<HTML><HEAD>
  <!-- include var='$config_parms{html_style}' -->
 </HEAD><BODY  VLINK='#CC00FF'>
-<BASE TARGET='output'>";    # basic html page to the target
-                            # setup our starting point
-my @dirs    = $search_from; # Start with a simple array of One entry
-my @endDirs = "";           # We fill this as we find the ending dirs
+<BASE TARGET='output'>";                            # basic html page to the target
+                                                    # setup our starting point
+my @dirs    = $search_from;                         # Start with a simple array of One entry
+my @endDirs = "";                                   # We fill this as we find the ending dirs
 
-&recurse_dirs();            # Here we go off and find all the dirs !
+&recurse_dirs();                                    # Here we go off and find all the dirs !
 
-@endDirs = sort @endDirs;   # Sort our entries because its easier to read
+@endDirs = sort @endDirs;                           # Sort our entries because its easier to read
 
-$html .=
-  "<TABLE BORDER=2 BORDERCOLOR='#4169E1' BGCOLOR='#64 95 ED' ALIGN='center' NOWRAP>";
+$html .= "<TABLE BORDER=2 BORDERCOLOR='#4169E1' BGCOLOR='#64 95 ED' ALIGN='center' NOWRAP>";
 
-my $mycol = 1;              # table column counter
+my $mycol = 1;                                      # table column counter
 
 #my $columns =3;					#  and limits (width)
 my $columns = $wcMax - 1;
@@ -119,16 +118,16 @@ sub get_dirs {
 
         next if ( $files =~ /^\./ );           # no dot dirs
         $thisDir = $search_this . "/" . $files;    # usable path
-             # here we need to strip off everything up to and incl ./web/
+                                                   # here we need to strip off everything up to and incl ./web/
         ( $base, $here ) = split( /\/web/, $thisDir );
         if ( -d $thisDir ) {
 
             # we need to see if we're at the end of the line
-            my $Status = &test_for_dirs();    # use the quick check
-            if ( $Status eq "end" ) {         # to see if were done on this one
-                push @endDirs, "$thisDir";    #  yep save it to the display list
+            my $Status = &test_for_dirs();         # use the quick check
+            if ( $Status eq "end" ) {              # to see if were done on this one
+                push @endDirs, "$thisDir";         #  yep save it to the display list
             }
-            push @dirs, "$thisDir";           #and put on recurson stack
+            push @dirs, "$thisDir";                #and put on recurson stack
         }
     }
     return;
diff --git a/web/bin/webcam_shows.pl b/web/bin/webcam_shows.pl
index aab25a01c..45b38c8c1 100644
--- a/web/bin/webcam_shows.pl
+++ b/web/bin/webcam_shows.pl
@@ -16,8 +16,7 @@
 my $wcx = "" unless $config_parms{wc_address_1};    # 1 ?
 
 # Get the list of directories in the camera directory
-my $abs_dir =
-  $config_parms{html_dir} . "/" . $config_parms{wc_slide_dir} . "/cams";
+my $abs_dir = $config_parms{html_dir} . "/" . $config_parms{wc_slide_dir} . "/cams";
 opendir( DIR, $abs_dir );
 my @files = grep { !/\.$/ && -d "$abs_dir/$_" } readdir(DIR);    #readdir(DIR);
 closedir(DIR);
@@ -27,10 +26,8 @@
 
 my $bgcolor = "#333366";
 
-my $webdir =
-  $config_parms{wc_slide_dir} . $config_parms{wc_slide_dir} . "/cams/";
-my $html =
-  "<!-- Dynmically Generated List for $config_parms{wc_slide_dir} -->\n";
+my $webdir = $config_parms{wc_slide_dir} . $config_parms{wc_slide_dir} . "/cams/";
+my $html   = "<!-- Dynmically Generated List for $config_parms{wc_slide_dir} -->\n";
 $html .= "<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=3>\n";
 
 # make the links to the movie files ...
@@ -56,15 +53,11 @@
     #Add this cameras settings into the string
     my $wcURL = $config_parms{$wcThis};
     my ( $wcURL, $wcDescr ) = split( /\,/, $wcURL );
-    my $currDir =
-      "/bin/webcam_movie.pl?" . $config_parms{wc_slide_dir} . "/cams/" . $file;
-    my $href = "<a href='" . $currDir . "' target='_blank' >";
+    my $currDir = "/bin/webcam_movie.pl?" . $config_parms{wc_slide_dir} . "/cams/" . $file;
+    my $href    = "<a href='" . $currDir . "' target='_blank' >";
 
     $html .= "<TR><TD WIDTH=50>  </TD>\n";
-    $html .=
-        "<TD BGCOLOR='$bgcolor' ALIGN='center'>"
-      . $href
-      . "<img SRC='/graphics/icons/security1.png'>
+    $html .= "<TD BGCOLOR='$bgcolor' ALIGN='center'>" . $href . "<img SRC='/graphics/icons/security1.png'>
     		 </a></td>";
 
     $html .=
@@ -91,17 +84,9 @@
         #$last_image = sprintf ('%04s/2%02s%02d%02d%02d%02d%02d',$last_image, $last_image);
     }
     else { $jnk = "None"; }
-    $html .=
-        "<TD BGCOLOR='$bgcolor' ALIGN='center'>"
-      . $href
-      . " Last Image <br>" . " "
-      . $jnk
-      . "</a></td>";
+    $html .= "<TD BGCOLOR='$bgcolor' ALIGN='center'>" . $href . " Last Image <br>" . " " . $jnk . "</a></td>";
 
-    $html .=
-        "<TD BGCOLOR='$bgcolor' ALIGN='center'>"
-      . $href
-      . "<IMG SRC='/graphics/movie.gif'>
+    $html .= "<TD BGCOLOR='$bgcolor' ALIGN='center'>" . $href . "<IMG SRC='/graphics/movie.gif'>
     		 </a></td>";
 
     $html .= "</TR>\n";
diff --git a/web/comics/dailystrips/dailystrips-update b/web/comics/dailystrips/dailystrips-update
index 8ea5ad1bb..8f19a6cbe 100644
--- a/web/comics/dailystrips/dailystrips-update
+++ b/web/comics/dailystrips/dailystrips-update
@@ -29,9 +29,8 @@ $dailystrips_version = "1.0.28";
 
 # Get options
 GetOptions(
-    \%options,     'quiet|q',    'verbose',   'proxy=s',
-    'proxyauth=s', 'noenvproxy', 'version|v', 'help|h',
-    'retries=s',   'updates=s',  'minage=s'
+    \%options,   'quiet|q', 'verbose',   'proxy=s',   'proxyauth=s', 'noenvproxy',
+    'version|v', 'help|h',  'retries=s', 'updates=s', 'minage=s'
 ) or exit 1;
 
 # Process options:
@@ -83,8 +82,7 @@ unless ( $options{'retries'} ) {
 if ( $options{'proxy'} ) {
     $options{'proxy'} =~ /^(http:\/\/)?(.*?):(.+?)\/?$/i;
     unless ( $2 and $3 ) {
-        die
-          "Error: incorrectly formatted proxy server ('http://server:port' expected)\n";
+        die "Error: incorrectly formatted proxy server ('http://server:port' expected)\n";
     }
 
     $options{'proxy'} = "http://$2:$3";
@@ -93,8 +91,7 @@ if ( $options{'proxy'} ) {
 if ( !$options{'noenvproxy'} and !$options{'proxy'} and $ENV{'http_proxy'} ) {
     $ENV{'http_proxy'} =~ /(http:\/\/)?(.*?):(.+?)\/?$/i;
     unless ( $2 and $3 ) {
-        die
-          "Error: incorrectly formatted proxy server environment variable\n('http://server:port' expected)\n";
+        die "Error: incorrectly formatted proxy server environment variable\n('http://server:port' expected)\n";
     }
 
     $options{'proxy'} = "http://$2:$3";
@@ -102,8 +99,7 @@ if ( !$options{'noenvproxy'} and !$options{'proxy'} and $ENV{'http_proxy'} ) {
 
 if ( $options{'proxyauth'} ) {
     unless ( $options{'proxyauth'} =~ /^.+?:.+?$/ ) {
-        die
-          "Error: incorrectly formatted proxy credentials ('user:pass' expected)\n";
+        die "Error: incorrectly formatted proxy credentials ('user:pass' expected)\n";
     }
 }
 
@@ -163,8 +159,7 @@ sub http_get {
 
         if ( $response->is_error() ) {
             if ( $options{'verbose'} ) {
-                warn
-                  "Warning: could not download $url: $status (attempt $_ of $options{'retries'})\n";
+                warn "Warning: could not download $url: $status (attempt $_ of $options{'retries'})\n";
             }
         }
         else {
@@ -180,12 +175,9 @@ sub http_get {
 sub get_updated_defs {
 
     # set parameters
-    my $updates_file = shift;
-    my $updates_rev_url =
-      "http://dailystrips.sourceforge.net/UPDATES/ds-update-"
-      . $dailystrips_version . ".rev";
-    my $updates_url = "http://dailystrips.sourceforge.net/UPDATES/ds-update-"
-      . $dailystrips_version;
+    my $updates_file    = shift;
+    my $updates_rev_url = "http://dailystrips.sourceforge.net/UPDATES/ds-update-" . $dailystrips_version . ".rev";
+    my $updates_url     = "http://dailystrips.sourceforge.net/UPDATES/ds-update-" . $dailystrips_version;
     my $local_revision  = 0;
     my $remote_revision = 0;
 
@@ -198,9 +190,7 @@ sub get_updated_defs {
     }
 
     # check revision of local file
-    if (
-        open( UPDATES, "<$updates_file" )
-      )    # or die "Error: cannot read updates file: $!\n";
+    if ( open( UPDATES, "<$updates_file" ) )    # or die "Error: cannot read updates file: $!\n";
     {
         while (<UPDATES>) {
             if (/^#REVISION:\s*(\-?\d+)/i) {
diff --git a/web/comics/dailystrips/install.pl b/web/comics/dailystrips/install.pl
index 996b9b6d4..faa7be11e 100644
--- a/web/comics/dailystrips/install.pl
+++ b/web/comics/dailystrips/install.pl
@@ -20,8 +20,7 @@
 
 # Not for Win32
 if ( $^O =~ /Win32/ ) {
-    die
-      "install.pl is not for use on Win32 systems. Please see INSTALL file.\n";
+    die "install.pl is not for use on Win32 systems. Please see INSTALL file.\n";
 }
 
 # Editable paths
@@ -100,12 +99,7 @@
     die "Error creating documentation directory. See above for reason.\n";
 }
 
-if (
-    system(
-        "install BUGS CHANGELOG CONTRIBUTORS COPYING INSTALL README README.DEFS README.LOCAL TODO $options{'docdir'}"
-    )
-  )
-{
+if ( system( "install BUGS CHANGELOG CONTRIBUTORS COPYING INSTALL README README.DEFS README.LOCAL TODO $options{'docdir'}" ) ) {
     die "Error installing documentation files. See above for reason.\n";
 }
 
@@ -118,12 +112,7 @@
     die "Error creating scripts directory. See above for reason.\n";
 }
 
-if (
-    system(
-        "install dailystrips dailystrips-clean dailystrips-update $options{'scriptdir'}"
-    )
-  )
-{
+if ( system( "install dailystrips dailystrips-clean dailystrips-update $options{'scriptdir'}" ) ) {
     die "Error installing script. See above for reason.\n";
 }
 
diff --git a/web/ia4/web_sub.pl b/web/ia4/web_sub.pl
index e5bc2d63c..8a0a7f022 100644
--- a/web/ia4/web_sub.pl
+++ b/web/ia4/web_sub.pl
@@ -11,18 +11,13 @@ sub X10Lamp {
     $o = &get_object_by_name($arg1);
     return 'not found' unless $o;
     $objState = $o->state;
-    $icon =
-      "<a href=\"/SET;&webpause?$arg1=off\"><font face=arial size=+3 color=990033><b>"
-      . $objState
-      . "</b></a></font>";
+    $icon     = "<a href=\"/SET;&webpause?$arg1=off\"><font face=arial size=+3 color=990033><b>" . $objState . "</b></a></font>";
 
     if ( $objState eq 'on' ) {
-        $icon =
-          "<a href=\"/SET;&webpause?$arg1=off\"><img border=0 src=$onIcon></a>";
+        $icon = "<a href=\"/SET;&webpause?$arg1=off\"><img border=0 src=$onIcon></a>";
     }
     if ( $objState eq 'off' ) {
-        $icon =
-          "<a href=\"/SET;&webpause?$arg1=on\"><img border=0 src=$offIcon></a>";
+        $icon = "<a href=\"/SET;&webpause?$arg1=on\"><img border=0 src=$offIcon></a>";
     }
     return $icon;
 }
@@ -54,12 +49,10 @@ sub housemode {
     $icon     = "/graphics/$arg3.gif";
 
     if ( $objState eq 'on' ) {
-        $icon =
-          "<a href=\"/SET;&housemodepause?$arg1=off\"><img border=0 src=$onIcon></a>";
+        $icon = "<a href=\"/SET;&housemodepause?$arg1=off\"><img border=0 src=$onIcon></a>";
     }
     if ( $objState eq 'off' ) {
-        $icon =
-          "<a href=\"/SET;&housemodepause?$arg1=on\"><img border=0 src=$offIcon></a>";
+        $icon = "<a href=\"/SET;&housemodepause?$arg1=on\"><img border=0 src=$offIcon></a>";
     }
     return $icon;
 }
@@ -101,14 +94,12 @@ sub web_phonelog {
     print_log "Announced Recent Callers.";
 
     $NumofCalls = 0;
-    $log_out =
-      "<table width=100% columns=4 cellspacing=3><tr><font color=white size=2>";
+    $log_out    = "<table width=100% columns=4 cellspacing=3><tr><font color=white size=2>";
     foreach $CallLogTempLine (@callloglines) {
         $NumofCalls = $NumofCalls + 1;
         ( $PhoneDateLog, $PhoneTimeLog, $PhoneNameLog, $PhoneNumberLog ) =
           ( split( '`', $CallLogTempLine ) )[ 0, 1, 2, 3 ];
-        $log_out .=
-          "<td>$PhoneDateLog</td>     <td>$PhoneTimeLog</td>     <td>$PhoneNameLog</td>      <td>$PhoneNumberLog</td>";
+        $log_out .= "<td>$PhoneDateLog</td>     <td>$PhoneTimeLog</td>     <td>$PhoneNameLog</td>      <td>$PhoneNumberLog</td>";
         $log_out .= "</tr>";
     }
 
@@ -116,8 +107,7 @@ sub web_phonelog {
     $log_out .= "</td></tr><tr><td>";
 
     $log_out .= "<table width=100% columns=2><tr>";
-    $log_out .=
-      "<td align=left colspan=2 bgcolor=silver><font color=black size=3><b>NUMBER OF CALLS:  $NumofCalls</td>";
+    $log_out .= "<td align=left colspan=2 bgcolor=silver><font color=black size=3><b>NUMBER OF CALLS:  $NumofCalls</td>";
     $log_out .=
       "<td align=right colspan=2><a href=\"/SUB;phone.shtml?web_clearphonelog\"><img src=\"/graphics/icon_eraser.gif\"></a></td>";
     $log_out .= "</tr></table>";
diff --git a/web/ia5/phone/voicemail.pl b/web/ia5/phone/voicemail.pl
index 9188db484..6107c0b84 100644
--- a/web/ia5/phone/voicemail.pl
+++ b/web/ia5/phone/voicemail.pl
@@ -5,9 +5,8 @@
 # Authority: anyone
 
 if ( 'mci' eq lc $config_parms{phone_voicemail_type} ) {
-    my $phone =
-      ($Authorized) ? $config_parms{phone_voicemail_number} : '0001112222';
-    my $pin = ($Authorized) ? $config_parms{phone_voicemail_pin} : '9999';
+    my $phone = ($Authorized) ? $config_parms{phone_voicemail_number} : '0001112222';
+    my $pin   = ($Authorized) ? $config_parms{phone_voicemail_pin}    : '9999';
     return qq[
 <form method="POST" ACTION='http://messagecenter.mci.com/secure/login.jsp' NAME="login_form">
 <input type="hidden" size="12" name="partnername" value="">
@@ -20,7 +19,7 @@
 
 elsif ( 'asterisk' eq lc $config_parms{phone_voicemail_type} ) {
     my $mailbox = ($Authorized) ? $config_parms{phone_voicemail_number} : '25';
-    my $pin = ($Authorized) ? $config_parms{phone_voicemail_pin} : '9999';
+    my $pin     = ($Authorized) ? $config_parms{phone_voicemail_pin}    : '9999';
     return qq[<form method="POST"
 ACTION='$config_parms{phone_voicemail_url}'
 NAME="login_form">
@@ -32,12 +31,10 @@
 </form>];
 }
 elsif ( 'vocp' eq lc $config_parms{phone_voicemail_type} ) {
-    return
-      qq[<a href='sub?vocp_display_voicemail'><img src="images/voicemails.gif" alt='Voice Mail' border=0></a>];
+    return qq[<a href='sub?vocp_display_voicemail'><img src="images/voicemails.gif" alt='Voice Mail' border=0></a>];
 
 }
 
 else {
-    return
-      qq[<a href='voicemail.shtml'><img src="images/voicemails.gif" alt='Voice mail' border=0></a><br>];
+    return qq[<a href='voicemail.shtml'><img src="images/voicemails.gif" alt='Voice mail' border=0></a><br>];
 }
diff --git a/web/ia5/pictures/getcomics.pl b/web/ia5/pictures/getcomics.pl
index 78454994b..54a327252 100644
--- a/web/ia5/pictures/getcomics.pl
+++ b/web/ia5/pictures/getcomics.pl
@@ -15,10 +15,8 @@ BEGIN
 my $base;
 my %pages;
 
-$pages{'dilbert'} = [
-    'http://www.dilbert.com/comics/dilbert/archive/',
-    'img.*?src="(/comics/dilbert/archive/images/dilbert\d+.gif)"'
-];
+$pages{'dilbert'} =
+  [ 'http://www.dilbert.com/comics/dilbert/archive/', 'img.*?src="(/comics/dilbert/archive/images/dilbert\d+.gif)"' ];
 
 #$pages{'bobbins'} =
 #  [
@@ -157,10 +155,8 @@ BEGIN
                 $filename =~ s|/|.|g;
 
                 if ( -f $filename ) {
-                    (
-                        undef, undef, undef,  undef, undef, undef, undef,
-                        undef, undef, $mtime, undef, undef, undef
-                    ) = stat($filename);
+                    ( undef, undef, undef, undef, undef, undef, undef, undef, undef, $mtime, undef, undef, undef ) =
+                      stat($filename);
                     if ( $mtime > $utime ) {
                         $cached = 1;
                     }
@@ -206,8 +202,7 @@ BEGIN
         next if !defined($content);
         next if $n < $numrules;
 
-        print
-          "   Item $page, content type $contenttype successfully fetched.\n";
+        print "   Item $page, content type $contenttype successfully fetched.\n";
 
         # Now, filter the page.
         if ( defined( $filters{$page} ) ) {
@@ -276,15 +271,8 @@ BEGIN
         my $srcurl = "";
         $srcurl = " (<a href=\"$url\">from $url</a>)<br>";
         $srcurl .= " ($date)" if $date;
-        if (
-            !(
-                $compilation =~
-                s|(<!-- feed me $page -->)|<a href="$filename">$page</a>$srcurl\n|
-            )
-          )
-        {
-            $compilation =~
-              s|(<!-- feed me text -->)|<a href="$filename">$page</a>$srcurl\n$1|;
+        if ( !( $compilation =~ s|(<!-- feed me $page -->)|<a href="$filename">$page</a>$srcurl\n| ) ) {
+            $compilation =~ s|(<!-- feed me text -->)|<a href="$filename">$page</a>$srcurl\n$1|;
         }
     }
 }
@@ -344,8 +332,7 @@ sub carve_image {
             }
 
             `pnmcut $x $y $w $h $name/$filename 2>/dev/null | ppmtogif 2>/dev/null > $name/$ {name}_$ {x}_$ {y}.gif`;
-            $html .=
-              qq(<td><img src="$name/$ {name}_$ {x}_$ {y}.gif" width="$w" height="$h"></td>);
+            $html .= qq(<td><img src="$name/$ {name}_$ {x}_$ {y}.gif" width="$w" height="$h"></td>);
         }
         $html .= "</tr>\n";
     }
@@ -365,12 +352,12 @@ sub patchurl {
 
     eval {
         if ( !defined( $uri->scheme ) or !$uri->scheme ) {
-            $uri = new URI $url, ( $base->scheme || 'http' );   # what the hell?
+            $uri = new URI $url, ( $base->scheme || 'http' );    # what the hell?
         }
 
         # Gack! relative URL!
         if ( $uri->path !~ m|^/| ) {
-            local $URI::ABS_ALLOW_RELATIVE_SCHEME = 1;          # gack gack
+            local $URI::ABS_ALLOW_RELATIVE_SCHEME = 1;           # gack gack
             $uri = URI->new($url)->abs($base);
         }
 
@@ -380,9 +367,9 @@ sub patchurl {
         }
     };
 
-    $uri->scheme('http') unless $uri->scheme;    # thanks, slashdot
+    $uri->scheme('http') unless $uri->scheme;                    # thanks, slashdot
 
-    return $url if $@;                           # bail out if there's an error.
+    return $url if $@;                                           # bail out if there's an error.
 
     $uri->as_string;
 }
diff --git a/web/ia6/date.pl b/web/ia6/date.pl
index 7dd47916f..af2b47e24 100644
--- a/web/ia6/date.pl
+++ b/web/ia6/date.pl
@@ -1,13 +1,8 @@
 my $html;
 
-my @months = (
-    'January', 'February', 'March',     'April',   'May',      'June',
-    'July',    'August',   'September', 'October', 'November', 'December'
-);
-my @days = (
-    'Sunday',   'Monday', 'Tuesday', 'Wednesday',
-    'Thursday', 'Friday', 'Saturday'
-);
+my @months =
+  ( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
+my @days = ( 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' );
 my ( $sec, $min, $hour, $day, $month, $year, $day2 ) =
   ( localtime(time) )[ 0, 1, 2, 3, 4, 5, 6 ];
 
diff --git a/web/ia6/weatherpoint.pl b/web/ia6/weatherpoint.pl
index ec4b2fff8..c22d138b1 100644
--- a/web/ia6/weatherpoint.pl
+++ b/web/ia6/weatherpoint.pl
@@ -9,9 +9,8 @@
 
 my $f_weatherpoint_page = "$config_parms{data_dir}/web/weatherpoint.txt";
 my $f_weatherpoint_html = "$config_parms{data_dir}/web/weatherpoint.html";
-$p_weatherpoint_page = new Process_Item(
-    "get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\"");
-$v_get_weatherpoint = new Voice_Cmd('Get weather point');
+$p_weatherpoint_page = new Process_Item("get_url \"$config_parms{weatherpointURL}\" \"$f_weatherpoint_html\"");
+$v_get_weatherpoint  = new Voice_Cmd('Get weather point');
 
 if ( $Startup or $Reload ) {    # Used for testing
 
@@ -28,8 +27,7 @@
     $text = file_read $f_weatherpoint_html;
 
     # Find beginning of table and replace table tag
-    $text =~
-      s/.+<b>5-Day Forecast.+?width=468>(.+)/<table border=0 cellpadding=0 cellspacing=0 width=500>$1/s;
+    $text =~ s/.+<b>5-Day Forecast.+?width=468>(.+)/<table border=0 cellpadding=0 cellspacing=0 width=500>$1/s;
 
     # Find last TH tag and add all needed closing tags
     $text =~ s/(.+)<\/th>.+/$1<\/th><\/tr><\/table>/s;
diff --git a/web/misc/mp3Rip.pl b/web/misc/mp3Rip.pl
index 5480ea0be..100b9549a 100644
--- a/web/misc/mp3Rip.pl
+++ b/web/misc/mp3Rip.pl
@@ -42,8 +42,7 @@ sub abort {
     my $dir    = &mp3Rip_abort($cddbid);
     my $html   = &html_header("Misterhouse mp3Rip: Aborted Rip $cddbid");
     $html .= "<P> <B>The MP3 Rip process has been aborted.</B>\n";
-    $html .=
-      "<P> The data will be stored as an incomplete process and you can delete it or try to resume.\n";
+    $html .= "<P> The data will be stored as an incomplete process and you can delete it or try to resume.\n";
     if ( -d $dir ) {
         $html .=
           "<P> The directory '$dir' exists and may contain a partially ripped CD.  You may want to examine this directory manually to see if any manual actions are necessary.\n";
@@ -102,8 +101,7 @@ sub resume_rip {
     }
     $html .=
       "<P> <B>The MP3 Rip is in progress.</B> <P>Since this disc was somehow lost by the system before, you should monitor the progress closely to verify it is completing sucessfully. \n";
-    $html .=
-      "<P><a href=\"?\">Return to the mp3Rip Homepage to check the status</a>.\n";
+    $html .= "<P><a href=\"?\">Return to the mp3Rip Homepage to check the status</a>.\n";
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
     return &html_page( "Misterhouse mp3Rip: Rip Resumed", $html );
@@ -121,20 +119,13 @@ sub view_log {
 $html
 <pre>
 |;
-        foreach (
-            reverse &main::file_read(
-                "$config_parms{mp3Rip_work_dir}/$cddbid.log") )
-        {
+        foreach ( reverse &main::file_read("$config_parms{mp3Rip_work_dir}/$cddbid.log") ) {
             $html .= "$_\n";
         }
     }
     elsif ( -f "$config_parms{mp3Rip_archive_dir}/$cddbid.log" ) {
-        $html .=
-          "<P><B>NOTE</B>: This is an archived log file as the ripping process is complete.<P><pre>\n";
-        foreach (
-            reverse &main::file_read(
-                "$config_parms{mp3Rip_archive_dir}/$cddbid.log") )
-        {
+        $html .= "<P><B>NOTE</B>: This is an archived log file as the ripping process is complete.<P><pre>\n";
+        foreach ( reverse &main::file_read("$config_parms{mp3Rip_archive_dir}/$cddbid.log") ) {
             $html .= "$_\n";
         }
     }
@@ -146,8 +137,7 @@ sub view_log {
 
 sub get_cdinfo {
     &mp3Rip_get_cdinfo();
-    my $html =
-      &html_header("Misterhouse mp3Rip Step 1/$numsteps: Retrieving CD Info");
+    my $html = &html_header("Misterhouse mp3Rip Step 1/$numsteps: Retrieving CD Info");
     $html = qq|
 <meta http-equiv="refresh" content="30">
 $html
@@ -156,8 +146,7 @@ sub get_cdinfo {
 |;
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
-    return &html_page(
-        "Misterhouse mp3Rip Step 1/$numsteps: Retrieving CD Info", $html );
+    return &html_page( "Misterhouse mp3Rip Step 1/$numsteps: Retrieving CD Info", $html );
 }
 
 sub verify_cdinfo {
@@ -166,18 +155,15 @@ sub verify_cdinfo {
         $html .= "<P><B>Still processing... please wait.</B>\n";
         return $html;
     }
-    my ( $cddbid, $track_numbers, $track_lengths, $total_seconds ) =
-      &mp3Rip_parse_cdinfo();
+    my ( $cddbid, $track_numbers, $track_lengths, $total_seconds ) = &mp3Rip_parse_cdinfo();
     unless ($track_numbers) {
-        my $html .=
-          "<P><span style=\"color:red\"><B>ERROR READING CD INFORMATION!</B></span>\n";
-        $html .= "<P>Things to check:</P>\n<UL>\n";
-        $html .= "   <LI> Is there a CD in the drive?\n";
+        my $html .= "<P><span style=\"color:red\"><B>ERROR READING CD INFORMATION!</B></span>\n";
+        $html    .= "<P>Things to check:</P>\n<UL>\n";
+        $html    .= "   <LI> Is there a CD in the drive?\n";
         $html .=
           "   <LI> Try running '$config_parms{mp3Rip_cdinfo}' as the Misterhouse user ('$ENV{USER}') to see if it is working okay. \n";
         $html .= "</UL>\n";
-        $html .=
-          "<P><a href=\"?$_[0]\">Click here when you are ready to try again</a>\n";
+        $html .= "<P><a href=\"?$_[0]\">Click here when you are ready to try again</a>\n";
         return $html;
     }
     return ( undef, $cddbid, $track_numbers, $track_lengths, $total_seconds );
@@ -198,22 +184,15 @@ sub confirm_files {
     }
     my $html = &html_header("Misterhouse mp3Rip Step 4/$numsteps: Filenames");
     unless (@tracks) {
-        $html .=
-          "<P><span style=\"color:red\"><B>NO TRACKS SELECTED!</B></span>\n";
-        $html .=
-          "<P>Hit the Back button on your browser and select one or more tracks to rip.\n";
-        return &html_page( "Misterhouse mp3Rip Step 4/$numsteps: Filenames",
-            $html );
+        $html .= "<P><span style=\"color:red\"><B>NO TRACKS SELECTED!</B></span>\n";
+        $html .= "<P>Hit the Back button on your browser and select one or more tracks to rip.\n";
+        return &html_page( "Misterhouse mp3Rip Step 4/$numsteps: Filenames", $html );
     }
     $html .=
       "<form method=POST action=\"?start_rip\"><P><B>IMPORTANT</B>: The following directory should not exist or at least be empty since existing files might be deleted or overwritten!<P><table border=1>\n";
-    my $dir =
-      &mp3Rip_get_dir_name( $names{'genre'}, $names{'artist'},
-        $names{'album'} );
+    my $dir = &mp3Rip_get_dir_name( $names{'genre'}, $names{'artist'}, $names{'album'} );
     $html .=
-        "<tr><td bgcolor='9999CC'>Directory</td><td><input name=dir size="
-      . ( length($dir) * 1.5 )
-      . " value=\"$dir\"></td></tr>\n";
+      "<tr><td bgcolor='9999CC'>Directory</td><td><input name=dir size=" . ( length($dir) * 1.5 ) . " value=\"$dir\"></td></tr>\n";
     foreach my $track ( sort @tracks ) {
         my $trackname = &mp3Rip_get_filename(
             $track,
@@ -222,12 +201,11 @@ sub confirm_files {
             $names{'album'}, $names{'genre'}
         );
         $html .=
-          "<tr><td bgcolor='9999CC'>Track $track</td><td><input name=track$track-file size="
+            "<tr><td bgcolor='9999CC'>Track $track</td><td><input name=track$track-file size="
           . ( length($trackname) * 1.5 )
           . " value=\"$trackname\"></td></tr>\n";
     }
-    $html .=
-      "<tr><td align=center colspan=2><input type=submit value=\"Proceed to Step 5/$numsteps: Ripping CD\"></td></tr>\n";
+    $html .= "<tr><td align=center colspan=2><input type=submit value=\"Proceed to Step 5/$numsteps: Ripping CD\"></td></tr>\n";
     $html .= "</table>\n";
     $html .= "<input type=hidden name=tracks value=\"@tracks\">\n";
     $html .= "<input type=hidden name=album value=\"$names{'album'}\">\n";
@@ -237,20 +215,15 @@ sub confirm_files {
     $html .= "<input type=hidden name=cddbid value=\"$names{'cddbid'}\">\n";
 
     foreach my $track (@tracks) {
-        $html .= "<input type=hidden name=\"track${track}title\" value=\""
-          . $names{"track${track}title"} . "\">\n";
-        $html .= "<input type=hidden name=\"track${track}artist\" value=\""
-          . $names{"track${track}artist"} . "\">\n";
-        $html .= "<input type=hidden name=\"track${track}comment\" value=\""
-          . $names{"track${track}comment"} . "\">\n";
-        $html .= "<input type=hidden name=\"track${track}length\" value=\""
-          . $names{"track${track}length"} . "\">\n";
+        $html .= "<input type=hidden name=\"track${track}title\" value=\"" . $names{"track${track}title"} . "\">\n";
+        $html .= "<input type=hidden name=\"track${track}artist\" value=\"" . $names{"track${track}artist"} . "\">\n";
+        $html .= "<input type=hidden name=\"track${track}comment\" value=\"" . $names{"track${track}comment"} . "\">\n";
+        $html .= "<input type=hidden name=\"track${track}length\" value=\"" . $names{"track${track}length"} . "\">\n";
     }
     $html .= "</form>\n";
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
-    return &html_page( "Misterhouse mp3Rip Step 4/$numsteps: Filenames",
-        $html );
+    return &html_page( "Misterhouse mp3Rip Step 4/$numsteps: Filenames", $html );
 }
 
 sub start_rip {
@@ -258,15 +231,12 @@ sub start_rip {
     my $html  = &html_header("Misterhouse mp3Rip Step 5/$numsteps: Ripping CD");
     if ($error) {
         $html .= "<P><span style=\"color:red\"><B>ERROR: $error!</B></span>\n";
-        return &html_page( "Misterhouse mp3Rip Step 5/$numsteps: Ripping CD",
-            $html );
+        return &html_page( "Misterhouse mp3Rip Step 5/$numsteps: Ripping CD", $html );
     }
-    $html .=
-      "<P> <B>The MP3 Rip is in progress.</B><P><a href=\"?\">Return to the mp3Rip Homepage to check the status</a>.\n";
+    $html .= "<P> <B>The MP3 Rip is in progress.</B><P><a href=\"?\">Return to the mp3Rip Homepage to check the status</a>.\n";
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
-    return &html_page( "Misterhouse mp3Rip Step 5/$numsteps: Ripping CD",
-        $html );
+    return &html_page( "Misterhouse mp3Rip Step 5/$numsteps: Ripping CD", $html );
 }
 
 my $default_artist  = '';
@@ -290,8 +260,7 @@ sub do_select_row {
     if ( $special eq 'track' ) {
         my $shortname = $name;
         $shortname =~ s/title$//;
-        $html .=
-          "<td align=center bgcolor='9999CC'><input type=checkbox checked name=\"${shortname}-rip\"></td>\n";
+        $html .= "<td align=center bgcolor='9999CC'><input type=checkbox checked name=\"${shortname}-rip\"></td>\n";
         $html .= "<td>$label</td><td>";
     }
     else {
@@ -324,14 +293,11 @@ sub do_select_row {
         $shortname =~ s/title$//;
         my $id = $label;
         $id =~ s/^\s*(\d+)\s+.*$/$1/;
-        $html .=
-          "</td><td><input id=$id name=\"${shortname}artist\" size=$artist_size value=\"$default_artist\">\n";
-        $html .=
-          "</td><td align=center><input size=30 name=\"${shortname}comment\">\n";
+        $html .= "</td><td><input id=$id name=\"${shortname}artist\" size=$artist_size value=\"$default_artist\">\n";
+        $html .= "</td><td align=center><input size=30 name=\"${shortname}comment\">\n";
     }
     if ( $special eq 'artist' ) {
-        $html .=
-          "<small><I>(Changes are also applied to tracks below)</I></small>\n";
+        $html .= "<small><I>(Changes are also applied to tracks below)</I></small>\n";
     }
     $html .= "</td></tr>\n";
     return $html;
@@ -371,21 +337,17 @@ sub track_edit {
             $selected{$_}++;
         }
     }
-    my $html =
-      &html_header("Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming");
-    my ( $error, $cddbid, $track_numbers, $track_lengths, $total_seconds ) =
-      &verify_cdinfo( 'track_edit', $html );
+    my $html = &html_header("Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming");
+    my ( $error, $cddbid, $track_numbers, $track_lengths, $total_seconds ) = &verify_cdinfo( 'track_edit', $html );
     if ($error) {
-        return &html_page(
-            "Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming", $error );
+        return &html_page( "Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming", $error );
     }
     my %combined;
     my $entrycount = -1;
     $max_track_count = $#{@$track_numbers} + 1;
     foreach my $disc ( &mp3Rip_get_cddb_discs() ) {
         if ( $selected{ $disc->[1] } ) {
-            my ( $genre, $artist, $album, @tracks ) =
-              &mp3Rip_get_disc_details($disc);
+            my ( $genre, $artist, $album, @tracks ) = &mp3Rip_get_disc_details($disc);
             my $trackcount = 0;
             $entrycount++;
             $combined{'genre'}->[$entrycount]  = $genre;
@@ -397,8 +359,7 @@ sub track_edit {
             }
         }
     }
-    $html .=
-      "<P>For each row, type in or modify the value in the text box or make a selection from the list, if applicable.\n";
+    $html .= "<P>For each row, type in or modify the value in the text box or make a selection from the list, if applicable.\n";
     $html .= "<P><B><big>Disc Info</big></B>\n";
     $html .= "<script>\n";
     $html .= "function update_artists(val) {\n";
@@ -407,19 +368,12 @@ sub track_edit {
     $html .= "   }\n";
     $html .= "}\n";
     $html .= "</script>\n";
-    $html .=
-      "<form method=POST action=\"?confirm_files\"><input type=hidden name=cddbid value=\"$cddbid\"><table border=1>\n";
-    $html .=
-      &do_select_row( '', 'Genre', 'genre',
-        &remove_dups( @{ $combined{'genre'} } ),
+    $html .= "<form method=POST action=\"?confirm_files\"><input type=hidden name=cddbid value=\"$cddbid\"><table border=1>\n";
+    $html .= &do_select_row( '', 'Genre', 'genre', &remove_dups( @{ $combined{'genre'} } ),
         '------------', sort( &mp3Rip_get_id3_genres() ) );
-    $html .=
-      &do_select_row( 'artist', 'Artist', 'artist',
-        &remove_dups( &fix_caps( @{ $combined{'artist'} } ) ) );
-    $html .=
-      &do_select_row( '', 'Album', 'album',
-        &remove_dups( &fix_caps( @{ $combined{'album'} } ) ) );
-    $html .= &do_select_row( '', 'Year', 'year' );
+    $html .= &do_select_row( 'artist', 'Artist', 'artist', &remove_dups( &fix_caps( @{ $combined{'artist'} } ) ) );
+    $html .= &do_select_row( '',       'Album',  'album',  &remove_dups( &fix_caps( @{ $combined{'album'} } ) ) );
+    $html .= &do_select_row( '',       'Year',   'year' );
     $html .= "</table>\n";
     $html .= "<P><B><big>Track Info</big></B>\n";
     $html .= "<table border=1>\n";
@@ -428,43 +382,33 @@ sub track_edit {
 
     foreach ( my $i = 1; $i <= ( $#{@$track_numbers} + 1 ); $i++ ) {
         $html .= &do_select_row( 'track', "$i ($track_lengths->[$i-1])",
-            "track${i}title",
-            &remove_dups( &fix_caps( @{ $combined{'tracks'}->[$i] } ) ) );
+            "track${i}title", &remove_dups( &fix_caps( @{ $combined{'tracks'}->[$i] } ) ) );
     }
-    $html .=
-      "</table><P><input type=submit value='Proceed to Step 4/$numsteps: Filenames'>\n";
+    $html .= "</table><P><input type=submit value='Proceed to Step 4/$numsteps: Filenames'>\n";
     foreach ( my $i = 1; $i <= ( $#{@$track_numbers} + 1 ); $i++ ) {
-        $html .= "<input type=hidden name=\"track${i}length\" value=\""
-          . $track_lengths->[ $i - 1 ] . "\">\n";
+        $html .= "<input type=hidden name=\"track${i}length\" value=\"" . $track_lengths->[ $i - 1 ] . "\">\n";
     }
     $html .= "</form>\n";
     $html .= "<P><a href=\"?do_cddb_list\">Go back to Step 2</A>\n";
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
-    return &html_page( "Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming",
-        $html );
+    return &html_page( "Misterhouse mp3Rip Step 3/$numsteps: Finalize Naming", $html );
 }
 
 sub do_cddb_list {
     my $html = &html_header("Misterhouse mp3Rip Step 2/$numsteps: CDDB List");
-    my ( $error, $cddbid, $track_numbers, $track_lengths, $total_seconds ) =
-      &verify_cdinfo( 'cddb_list', $html );
+    my ( $error, $cddbid, $track_numbers, $track_lengths, $total_seconds ) = &verify_cdinfo( 'cddb_list', $html );
     if ($error) {
-        return &html_page( "Misterhouse mp3Rip Step 2/$numsteps: CDDB List",
-            $error );
+        return &html_page( "Misterhouse mp3Rip Step 2/$numsteps: CDDB List", $error );
     }
     $html .= "<B>Audio CD Found</B><UL>\n";
-    $html .=
-      "<LI><B>Total Length</B>: " . &mp3Rip_format_time($total_seconds) . "\n";
-    $html .=
-      "<LI><B>Number of Tracks</B>: " . ( $#{@$track_numbers} + 1 ) . "\n";
+    $html .= "<LI><B>Total Length</B>: " . &mp3Rip_format_time($total_seconds) . "\n";
+    $html .= "<LI><B>Number of Tracks</B>: " . ( $#{@$track_numbers} + 1 ) . "\n";
     $html .=
       "</UL><P>Select at least one CDDB entry to pre-populate your CD info.  If you select more than one you will be presented with a list box for each item on the next page.  You will still be able to make manual changes as well.\n";
-    $html .=
-      "<P>If you don't select any discs below, you will have to manually enter information about this CD.\n";
+    $html .= "<P>If you don't select any discs below, you will have to manually enter information about this CD.\n";
     $html .= "<form method=POST action=\"?track_edit\"><table border=1>\n";
-    $html .=
-      "<tr bgcolor='9999CC'><th>Select?</th><th>Genre</th><th>Artist / Album</th><th>CDDB DiscID</th></tr>\n";
+    $html .= "<tr bgcolor='9999CC'><th>Select?</th><th>Genre</th><th>Artist / Album</th><th>CDDB DiscID</th></tr>\n";
 
     foreach my $disc ( &mp3Rip_get_cddb_discs() ) {
         my ( $genre, $cddbid, $album ) = @$disc;
@@ -473,15 +417,13 @@ sub do_cddb_list {
         $html .=
           "<tr><td align=center><input name=\"$cddbid\" type=checkbox checked></td><td align=center>$genre</td><td align=center>$album</td><td align=center>$cddbid</td></tr>\n";
     }
-    $html .=
-      "<tr><td colspan=4><input type=submit value='Proceed to Step 3/$numsteps: Finalize Naming'></td></tr>\n";
+    $html .= "<tr><td colspan=4><input type=submit value='Proceed to Step 3/$numsteps: Finalize Naming'></td></tr>\n";
     $html .= "</table></form>\n";
     $html .=
       "<P><B>TIP</B>: Select all discs that appear to match your CD so you will have a wider variety of choices on the next page.\n";
     $html .=
       "<hr><P><i>Questions, bugs, comments, suggestions related to the Misterhouse mp3Rip system?  Contact <a href=\"mailto:kirk\@kaybee.org\">Kirk Bauer</a></i>\n";
-    return &html_page( "Misterhouse mp3Rip Step 2/$numsteps: CDDB List",
-        $html );
+    return &html_page( "Misterhouse mp3Rip Step 2/$numsteps: CDDB List", $html );
 }
 
 sub main_page {
@@ -508,35 +450,26 @@ sub main_page {
     my @pending = &mp3Rip_get_pending();
     if (@pending) {
         $html .= "<table border=1>\n";
-        $html .=
-          "<tr bgcolor='9999CC'><th colspan=7>Ripping in Progress</th></tr>\n";
+        $html .= "<tr bgcolor='9999CC'><th colspan=7>Ripping in Progress</th></tr>\n";
         $html .=
           "<tr bgcolor='9999CC'><th>CDDBID</th><th>Artist</th><th>Album Title</th><th>Current Activity</th><th>Rip Status</th><th>Compress Status</th><th>Actions</th></tr>\n";
         foreach (@pending) {
             my (
-                $cddbid,          $artist,
-                $album,           $current,
-                $rip_status,      $rip_percent,
-                $compress_status, $compress_percent,
-                $rip_time,        $rip_predicted_remaining,
-                $compress_time,   $compress_predicted_remaining
+                $cddbid,     $artist,                  $album,           $current,
+                $rip_status, $rip_percent,             $compress_status, $compress_percent,
+                $rip_time,   $rip_predicted_remaining, $compress_time,   $compress_predicted_remaining
             ) = @$_;
-            $html .=
-              "<tr><td align=center>$cddbid</td><td align=center>$artist</td><td align=center>$album</td>\n";
-            $html .=
-              "<td align=center>$current</td><td align=center>$rip_status\n";
+            $html .= "<tr><td align=center>$cddbid</td><td align=center>$artist</td><td align=center>$album</td>\n";
+            $html .= "<td align=center>$current</td><td align=center>$rip_status\n";
             $html .= "<br />Elapsed: " . &mp3Rip_format_time($rip_time);
-            $html .= "<br />Remaining: "
-              . &mp3Rip_format_time($rip_predicted_remaining);
+            $html .= "<br />Remaining: " . &mp3Rip_format_time($rip_predicted_remaining);
             $html .= &show_percent_bar($rip_percent);
             $html .= "</td><td align=center>$compress_status\n";
             $html .= "<br />Elapsed: " . &mp3Rip_format_time($compress_time);
-            $html .= "<br />Remaining: "
-              . &mp3Rip_format_time($compress_predicted_remaining);
+            $html .= "<br />Remaining: " . &mp3Rip_format_time($compress_predicted_remaining);
             $html .= &show_percent_bar($compress_percent);
             $html .= "</td>\n";
-            $html .=
-              "<td align=center><a href=\"?view_log&$cddbid\">View Log</a><br /><a href=\"?abort&$cddbid\">Abort</a></tr>\n";
+            $html .= "<td align=center><a href=\"?view_log&$cddbid\">View Log</a><br /><a href=\"?abort&$cddbid\">Abort</a></tr>\n";
         }
         $html .= "</table>\n";
     }
@@ -544,14 +477,11 @@ sub main_page {
     my @incomplete = &mp3Rip_get_incomplete();
     if (@incomplete) {
         $html .= "<P><table border=1>\n";
-        $html .=
-          "<tr bgcolor='9999CC'><th colspan=5>Incomplete CDs</th></tr>\n";
-        $html .=
-          "<tr bgcolor='9999CC'><th>CDDBID</th><th>Artist</th><th>Album Title</th><th>Status</th><th>Actions</th></tr>\n";
+        $html .= "<tr bgcolor='9999CC'><th colspan=5>Incomplete CDs</th></tr>\n";
+        $html .= "<tr bgcolor='9999CC'><th>CDDBID</th><th>Artist</th><th>Album Title</th><th>Status</th><th>Actions</th></tr>\n";
         foreach (@incomplete) {
             my ( $cddbid, $artist, $album, $status ) = @$_;
-            $html .=
-              "<tr><td>$cddbid</td><td>$artist</td><td>$album</td><td>$status</td><td>\n";
+            $html .= "<tr><td>$cddbid</td><td>$artist</td><td>$album</td><td>$status</td><td>\n";
             $html .= "<a href=\"?view_log&$cddbid\">View Log</a>&nbsp;\n";
             $html .= "<a href=\"?resume_rip&$cddbid\">Resume</a>&nbsp;\n";
             $html .= "<a href=\"?delete&$cddbid\">Delete</a>\n";
@@ -563,8 +493,7 @@ sub main_page {
     my @completed = &mp3Rip_get_recently_completed();
     if (@completed) {
         $html .= "<P><table border=1>\n";
-        $html .=
-          "<tr bgcolor='9999CC'><th colspan=4>Recently Completed CDs</th></tr>\n";
+        $html .= "<tr bgcolor='9999CC'><th colspan=4>Recently Completed CDs</th></tr>\n";
         foreach (@completed) {
             $html .= "<tr><td>$_</td></tr>\n";
         }
diff --git a/web/music/MP3_WebCtrl.pl b/web/music/MP3_WebCtrl.pl
index 16730cae7..4a07a0e37 100644
--- a/web/music/MP3_WebCtrl.pl
+++ b/web/music/MP3_WebCtrl.pl
@@ -32,8 +32,7 @@
 my $Song = &mp3_get_playlist_title();
 $Song =~ tr/_/ /;    # replace _ by " " to make it clear
 my $Volume = &mp3_get_volume();
-$Volume = ( int( ( $Volume + 2 ) / 5 ) * 5 )
-  ;                  # volume by slice of 5, xmms doesn't change exactly
+$Volume = ( int( ( $Volume + 2 ) / 5 ) * 5 );    # volume by slice of 5, xmms doesn't change exactly
 my $Pos      = &mp3_get_playlist_pos();
 my $SongTime = &mp3_get_output_timestr();
 
@@ -63,11 +62,7 @@ sub mp3_top {
   ";
     my $Value;
 
-    for $Value (
-        0,  5,  10, 15, 20, 25, 30, 35, 40, 45, 50, 55,
-        60, 65, 70, 75, 80, 85, 90, 95, 100
-      )
-    {
+    for $Value ( 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100 ) {
         if ( $Volume == $Value ) {
             $HTTP = $HTTP . "<option value=\"$Value\" SELECTED>Vol: $Value\n";
         }
@@ -119,14 +114,13 @@ sub PlaylistCtrl {
     my $HTTP = Header();
 
     $HTTP = $HTTP . "<table width='100%' border='0'>\n";
-    $HTTP = $HTTP
-      . "<td><a href='/music/MP3_WebPlaylist.pl?Refresh' target=MP3_Playlist><center><BIG> Refresh </BIG></center></td>\n";
+    $HTTP =
+      $HTTP . "<td><a href='/music/MP3_WebPlaylist.pl?Refresh' target=MP3_Playlist><center><BIG> Refresh </BIG></center></td>\n";
     $HTTP = $HTTP
       . "<td><a href='/music/MP3_WebPlaylist.pl?ClearPlaylist' target=MP3_Playlist><center><BIG> Clear </BIG></center></td>\n";
-    $HTTP = $HTTP
-      . "<td><a href='/music/MP3_WebPlaylist.pl?Shuffle' target=MP3_Playlist><center><BIG> Shuffle </BIG></center></td>\n";
-    $HTTP = $HTTP
-      . "<td><a href='/music/MP3_WebPlaylist.pl?Sort' target=MP3_Playlist><center><BIG> Sort </BIG></center></td>\n";
+    $HTTP =
+      $HTTP . "<td><a href='/music/MP3_WebPlaylist.pl?Shuffle' target=MP3_Playlist><center><BIG> Shuffle </BIG></center></td>\n";
+    $HTTP = $HTTP . "<td><a href='/music/MP3_WebPlaylist.pl?Sort' target=MP3_Playlist><center><BIG> Sort </BIG></center></td>\n";
 
     my ( $playlists, %playfiles ) = &mp3_playlists;
     for my $playlist ( sort keys %playfiles ) {
@@ -145,8 +139,7 @@ sub PlaylistCtrl {
         my $HTTP = "<html><body>\n";
         $HTTP = $HTTP . "<meta http-equiv='Pragma' content='no-cache'>\n";
         $HTTP = $HTTP . "<meta http-equiv='Expires' content='-1'>\n";
-        $HTTP = $HTTP
-          . "<meta http-equiv='Refresh' content='60;url=/music/MP3_WebCtrl.pl?PlaylistCtrl'>\n";
+        $HTTP = $HTTP . "<meta http-equiv='Refresh' content='60;url=/music/MP3_WebCtrl.pl?PlaylistCtrl'>\n";
         $HTTP = $HTTP . "<base target ='MP3_PlaylistCtrl'>\n";
         return $HTTP;
     }
diff --git a/web/music/MP3_WebPlaylist.pl b/web/music/MP3_WebPlaylist.pl
index dbb3bddcf..b39b91c99 100644
--- a/web/music/MP3_WebPlaylist.pl
+++ b/web/music/MP3_WebPlaylist.pl
@@ -44,8 +44,8 @@
         $DisplayName =~ tr/_/ /;
         $DisplayName =~ s/-/ - /g;
         $DisplayName =~ s/.m3u$//;
-        $HTTP = $HTTP
-          . "<td><a href=/music/MP3_WebPlaylist.pl?Add=$playfiles{$playlist} target=MP3_Playlist>$DisplayName</a></td><tr>\n";
+        $HTTP =
+          $HTTP . "<td><a href=/music/MP3_WebPlaylist.pl?Add=$playfiles{$playlist} target=MP3_Playlist>$DisplayName</a></td><tr>\n";
     }
     $HTTP = $HTTP . "</table>\n";
 }
@@ -63,8 +63,7 @@
 sub DisplayPlaylist {
     my $titles = &mp3_get_playlist();
     if ( @$titles == 0 ) {
-        $HTTP = $HTTP
-          . "<H1><CENTER>There is no track in the playlist</CENTER></H1>\n";
+        $HTTP = $HTTP . "<H1><CENTER>There is no track in the playlist</CENTER></H1>\n";
     }
     else {
         $HTTP = $HTTP . "<table width=100% borders=0>\n";
@@ -72,8 +71,7 @@ sub DisplayPlaylist {
 
         foreach my $item (@$titles) {
             my $Time = &mp3_get_playlist_timestr( $pos - 1 );
-            my $Str =
-              "                                                            ";
+            my $Str  = "                                                            ";
             $Str = substr( "$pos. $item", 1 );
             $HTTP = $HTTP
               . "<td><a href=/music/MP3_WebPlaylist.pl?Jump=$pos target=MP3_Playlist>$pos. $item</a><right> .... $Time</right></td><tr>\n";
@@ -88,8 +86,7 @@ sub Header {
     my $HTTP = "<html><body>\n";
     $HTTP = $HTTP . "<meta http-equiv='Pragma' content='no-cache'>\n";
     $HTTP = $HTTP . "<meta http-equiv='Expires' content='-1'>\n";
-    $HTTP = $HTTP
-      . "<meta http-equiv='Refresh' content='60;url=/music/MP3_WebPlaylist.pl'>\n";
+    $HTTP = $HTTP . "<meta http-equiv='Refresh' content='60;url=/music/MP3_WebPlaylist.pl'>\n";
     $HTTP = $HTTP . "<base target ='MP3_Playlist'>\n";
     return $HTTP;
 }
diff --git a/web/music/xmms/MP3_WebXmmsCtrl.pl b/web/music/xmms/MP3_WebXmmsCtrl.pl
index beea793a0..d472046a4 100644
--- a/web/music/xmms/MP3_WebXmmsCtrl.pl
+++ b/web/music/xmms/MP3_WebXmmsCtrl.pl
@@ -36,8 +36,7 @@
 my $Song = Xmms_Control("get_playlist_title");
 $Song =~ tr/_/ /;    # replace _ by " " to make it clear
 my $Volume = Xmms_Control("get_volume");
-$Volume = ( int( ( $Volume + 2 ) / 5 ) * 5 )
-  ;                  # volume by slice of 5, xmms doesn't change exactly
+$Volume = ( int( ( $Volume + 2 ) / 5 ) * 5 );    # volume by slice of 5, xmms doesn't change exactly
 my $Pos      = Xmms_Control("get_playlist_pos");
 my $SongTime = Xmms_Control("get_output_timestr");
 
@@ -67,11 +66,7 @@ sub mp3_top {
   ";
     my $Value;
 
-    for $Value (
-        0,  5,  10, 15, 20, 25, 30, 35, 40, 45, 50, 55,
-        60, 65, 70, 75, 80, 85, 90, 95, 100
-      )
-    {
+    for $Value ( 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100 ) {
         if ( $Volume == $Value ) {
             $HTTP = $HTTP . "<option value=\"$Value\" SELECTED>Vol: $Value\n";
         }
@@ -145,8 +140,8 @@ sub PlaylistCtrl {
       . "<td><a href='/jukebox/MP3_WebXmmsPlaylist.pl?ClearPlaylist' target=MP3_Playlist><center><BIG> Clear </BIG></center></td>\n";
     $HTTP = $HTTP
       . "<td><a href='/jukebox/MP3_WebXmmsPlaylist.pl?Shuffle' target=MP3_Playlist><center><BIG> Shuffle </BIG></center></td>\n";
-    $HTTP = $HTTP
-      . "<td><a href='/jukebox/MP3_WebXmmsPlaylist.pl?Sort' target=MP3_Playlist><center><BIG> Sort </BIG></center></td>\n";
+    $HTTP =
+      $HTTP . "<td><a href='/jukebox/MP3_WebXmmsPlaylist.pl?Sort' target=MP3_Playlist><center><BIG> Sort </BIG></center></td>\n";
 
     my $file;
 
@@ -170,8 +165,7 @@ sub PlaylistCtrl {
         my $HTTP = Header();
         $HTTP = $HTTP . "<H1><CENTER>";
         $HTTP = $HTTP . "I can't open $$PlaylistDir to fetch playlist.";
-        $HTTP = $HTTP
-          . "Please verify mh.ini for the correct directory namer, under mp3_playlist_dir.";
+        $HTTP = $HTTP . "Please verify mh.ini for the correct directory namer, under mp3_playlist_dir.";
         $HTTP = $HTTP . "</CENTER></H1>";
         $HTTP = $HTTP . Footer();
         return $HTTP;
@@ -181,8 +175,7 @@ sub PlaylistCtrl {
         my $HTTP = "<html><body>\n";
         $HTTP = $HTTP . "<meta http-equiv='Pragma' content='no-cache'>\n";
         $HTTP = $HTTP . "<meta http-equiv='Expires' content='-1'>\n";
-        $HTTP = $HTTP
-          . "<meta http-equiv='Refresh' content='60;url=/jukebox/MP3_WebXmmsCtrl.pl?PlaylistCtrl'>\n";
+        $HTTP = $HTTP . "<meta http-equiv='Refresh' content='60;url=/jukebox/MP3_WebXmmsCtrl.pl?PlaylistCtrl'>\n";
         $HTTP = $HTTP . "<base target ='MP3_PlaylistCtrl'>\n";
         return $HTTP;
     }
diff --git a/web/music/xmms/MP3_WebXmmsPlaylist.pl b/web/music/xmms/MP3_WebXmmsPlaylist.pl
index 568083917..5eb24ceca 100644
--- a/web/music/xmms/MP3_WebXmmsPlaylist.pl
+++ b/web/music/xmms/MP3_WebXmmsPlaylist.pl
@@ -62,8 +62,8 @@
             $DisplayName =~ tr/_/ /;
             $DisplayName =~ s/-/ - /g;
             $DisplayName =~ s/.m3u$//;
-            $HTTP = $HTTP
-              . "<td><a href=/jukebox/MP3_WebXmmsPlaylist.pl?Add=$arg/$File target=MP3_Playlist>$DisplayName</a></td><tr>\n";
+            $HTTP =
+              $HTTP . "<td><a href=/jukebox/MP3_WebXmmsPlaylist.pl?Add=$arg/$File target=MP3_Playlist>$DisplayName</a></td><tr>\n";
         }
     }
     $HTTP = $HTTP . "</table>\n";
@@ -100,8 +100,7 @@
 sub DisplayPlaylist {
     my $LIST = Xmms_Control("get_playlist_titles");
     if ( @$LIST == 0 ) {
-        $HTTP = $HTTP
-          . "<H1><CENTER>There is no track in the playlist</CENTER></H1>\n";
+        $HTTP = $HTTP . "<H1><CENTER>There is no track in the playlist</CENTER></H1>\n";
     }
     else {
         $HTTP = $HTTP . "<table width=100% borders=0>\n";
@@ -109,8 +108,7 @@ sub DisplayPlaylist {
 
         foreach $item (@$LIST) {
             my $Time = Xmms_Control( "get_playlist_timestr", $pos - 1 );
-            my $Str =
-              "                                                            ";
+            my $Str = "                                                            ";
             $Str = substr( "$pos. $item", 1 );
             $HTTP = $HTTP
               . "<td><a href=/jukebox/MP3_WebXmmsPlaylist.pl?Jump=$pos target=MP3_Playlist>$pos. $item</a><right> .... $Time</right></td><tr>\n";
@@ -125,8 +123,7 @@ sub Header {
     my $HTTP = "<html><body>\n";
     $HTTP = $HTTP . "<meta http-equiv='Pragma' content='no-cache'>\n";
     $HTTP = $HTTP . "<meta http-equiv='Expires' content='-1'>\n";
-    $HTTP = $HTTP
-      . "<meta http-equiv='Refresh' content='60;url=/jukebox/MP3_WebXmmsPlaylist.pl'>\n";
+    $HTTP = $HTTP . "<meta http-equiv='Refresh' content='60;url=/jukebox/MP3_WebXmmsPlaylist.pl'>\n";
     $HTTP = $HTTP . "<base target ='MP3_Playlist'>\n";
     return $HTTP;
 }
diff --git a/web/organizer/calendar.pl b/web/organizer/calendar.pl
index aed23a37d..49e605ae5 100644
--- a/web/organizer/calendar.pl
+++ b/web/organizer/calendar.pl
@@ -98,8 +98,7 @@ BEGIN
         # i give up!  user is going to have to set it manually
         print "Content-type: text/html\n\n";
         print "<b>Installation path could not be determined.</b>\n";
-        print
-          "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
+        print "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
         exit 1;
     }
 }    # / BEGIN
@@ -279,8 +278,7 @@ BEGIN
 
 # _____________________________________________________________________________
 sub PrintDefault {
-    print
-      "<table cellspacing='0' cellpadding=10' border='0'><tr valign='top'>\n";
+    print "<table cellspacing='0' cellpadding=10' border='0'><tr valign='top'>\n";
     print "<td>\n";
     print "<font size='2' face='arial,helvetica'>\n";
 
@@ -307,41 +305,27 @@ sub PrintDefault {
     #
 
     # display the navigation
-    print
-      "<form><table width='100%' bgcolor='$dataDarkColor' border='1' cellspacing='0' cellpadding='2'><tr><td align='center'>\n";
+    print "<form><table width='100%' bgcolor='$dataDarkColor' border='1' cellspacing='0' cellpadding='2'><tr><td align='center'>\n";
     print "<font size='2' face='arial,helvetica'><b>\n";
     print "<a href='$scriptName?vsSD=$showDayDetails&vsMonth=$month&vsYear="
       . ( $year - 1 ) . "&"
       . $ia7_suffix
       . "'>&lt;&lt;</a>\n";
-    print
-      "&nbsp;<a href='$scriptName?vsSD=$showDayDetails&vsMonth=$pmonth&vsYear=$pyear&"
-      . $ia7_suffix
-      . "'>&lt;</a>\n";
+    print "&nbsp;<a href='$scriptName?vsSD=$showDayDetails&vsMonth=$pmonth&vsYear=$pyear&" . $ia7_suffix . "'>&lt;</a>\n";
     print
       "<select name='month' onchange=\"document.location='$scriptName?vsSD=$showDayDetails&' + this.options[this.selectedIndex].value;return true;\">\n";
-    print "<option value='vsMonth=$pmonth&vsYear=$pyear&"
-      . $ia7_suffix
-      . "'>$pmonth / $pyear</option>\n";
-    print "<option value='vsMonth=$month&vsYear=$year&"
-      . $ia7_suffix
-      . "' selected>$month / $year</option>\n";
+    print "<option value='vsMonth=$pmonth&vsYear=$pyear&" . $ia7_suffix . "'>$pmonth / $pyear</option>\n";
+    print "<option value='vsMonth=$month&vsYear=$year&" . $ia7_suffix . "' selected>$month / $year</option>\n";
     my ($nM) = $month;
     my ($nY) = $year;
 
     for ( my $count = 1; $count < 12; $count++ ) {
         NextMonth( \$nM, \$nY );
-        print "<option value='vsMonth=$nM&vsYear=$nY&"
-          . $ia7_suffix
-          . "'>$nM / $nY</option>\n";
+        print "<option value='vsMonth=$nM&vsYear=$nY&" . $ia7_suffix . "'>$nM / $nY</option>\n";
     }
     print "</select>\n";
-    print
-      " <a href='$scriptName?vsSD=$showDayDetails&vsMonth=$nmonth&vsYear=$nyear&"
-      . $ia7_suffix
-      . "'>&gt;</a>\n";
-    print
-      "&nbsp;<a href='$scriptName?vsSD=$showDayDetails&vsMonth=$month&vsYear="
+    print " <a href='$scriptName?vsSD=$showDayDetails&vsMonth=$nmonth&vsYear=$nyear&" . $ia7_suffix . "'>&gt;</a>\n";
+    print "&nbsp;<a href='$scriptName?vsSD=$showDayDetails&vsMonth=$month&vsYear="
       . ( $year + 1 ) . "&"
       . $ia7_suffix
       . "'>&gt;&gt;</a>\n";
@@ -392,32 +376,24 @@ sub PrintDay {
     my $thisDate = "$year.$month.$day";
 
     # my @days = ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-    my @months = (
-        'January',   'February', 'March',    'April',
-        'May',       'June',     'July',     'August',
-        'September', 'October',  'November', 'December'
-    );
+    my @months =
+      ( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
 
     $objMyDb->RemoveFilter;
     $objMyDb->Filter( "DATE", "eq", $thisDate );
 
     print "<table border='1' cellspacing='0' cellpadding='2' width='350' >\n";
-    print
-      "<font size='2' face='arial,helvetica'><b>Details For $months[$month-1] $day, $year</b></font><br>\n";
+    print "<font size='2' face='arial,helvetica'><b>Details For $months[$month-1] $day, $year</b></font><br>\n";
     print "<tr bgcolor='$dataHighlightColor'><td width='25'>&nbsp;</td>\n";
-    print
-      "<td width='75'><font size='2' face='arial,helvetica'><b>Time</b></font></td>\n";
-    print
-      "<td width='250'><font size='2' face='arial,helvetica'><b>Event</b></font></td></tr>\n";
+    print "<td width='75'><font size='2' face='arial,helvetica'><b>Time</b></font></td>\n";
+    print "<td width='250'><font size='2' face='arial,helvetica'><b>Event</b></font></td></tr>\n";
 
     if ( $objMyDb->EOF ) {
-        print
-          "<tr><td colspan='3'><font size='2' face='arial,helvetica'>No Events</font></td></tr>\n";
+        print "<tr><td colspan='3'><font size='2' face='arial,helvetica'>No Events</font></td></tr>\n";
     }
 
     while ( !$objMyDb->EOF ) {
-        unless ( $objMyDb->FieldValue("CONTROL") eq "on" )
-        {    #Don't display CONTROL calendars
+        unless ( $objMyDb->FieldValue("CONTROL") eq "on" ) {    #Don't display CONTROL calendars
             my $custcolor = "";
             $custcolor = " bgcolor='$dataHolidayColor' "
               if ( $objMyDb->FieldValue("HOLIDAY") eq "on" );
@@ -425,8 +401,7 @@ sub PrintDay {
               if ( $objMyDb->FieldValue("VACATION") eq "on" );
             $custcolor = " bgcolor='$dataMultipleColor' "
               if (  ( $objMyDb->FieldValue("VACATION") eq "on" )
-                and ( $objMyDb->FieldValue("HOLIDAY") eq "on" ) )
-              ;    # if a day is both vacation and holiday
+                and ( $objMyDb->FieldValue("HOLIDAY") eq "on" ) );    # if a day is both vacation and holiday
             my $icon   = $detailIcon;
             my $source = $objMyDb->FieldValue("SOURCE");
             $icon = "images/ical_1.jpg" if ( $source =~ /^ical=/ );
@@ -435,11 +410,8 @@ sub PrintDay {
               "<a href='$scriptName?vsSD=$showDayDetails&vsMA=$showforAudrey&vsCOM=EDIT&vsMonth=$month&vsYear=$year&vsDay=$day&vsID="
               . $objMyDb->FieldValue("ID") . "&"
               . $ia7_suffix . "'>";
-            print "<tr $custcolor><td>" . $link
-              . "<img src='$icon' border='0'></a></td>";
-            print "<td><font size='2' face='arial,helvetica'>"
-              . $objMyDb->FieldValue("TIME")
-              . "&nbsp;</font></td>";
+            print "<tr $custcolor><td>" . $link . "<img src='$icon' border='0'></a></td>";
+            print "<td><font size='2' face='arial,helvetica'>" . $objMyDb->FieldValue("TIME") . "&nbsp;</font></td>";
             print "<td>"
               . $link
               . "<font size='2' face='arial,helvetica'>"
@@ -464,11 +436,8 @@ sub PrintMonth {
     my ( $firstDay, $numDays, $numWeeks ) = &GetMonthInfo( $month, $year );
 
     my @days = ( 'Su', 'M', 'Tu', 'W', 'Th', 'F', 'Sa' );
-    my @months = (
-        'January',   'February', 'March',    'April',
-        'May',       'June',     'July',     'August',
-        'September', 'October',  'November', 'December'
-    );
+    my @months =
+      ( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
     my $temp;
     my $dayCount     = 0;
     my $weekDayCount = 0;
@@ -483,17 +452,14 @@ sub PrintMonth {
     my $highlightDate = shift || $today;
 
     print "<p>\n";
-    print
-      "<font face='arial,helvetica' size='2'><b>$months[$month-1] $year</b></font>\n";
+    print "<font face='arial,helvetica' size='2'><b>$months[$month-1] $year</b></font>\n";
     if ($showDayDetails) {
-        print
-          " <font size='1'>[<a href='$scriptName?vsSD=0&vsMA=$showforAudrey&vsMonth=$month&vsYear=$year&"
+        print " <font size='1'>[<a href='$scriptName?vsSD=0&vsMA=$showforAudrey&vsMonth=$month&vsYear=$year&"
           . $ia7_suffix
           . "'>Hide Details</a>]</font>\n";
     }
     else {
-        print
-          " <font size='1'>[<a href='$scriptName?vsSD=1&vsMA=$showforAudrey&vsMonth=$month&vsYear=$year&"
+        print " <font size='1'>[<a href='$scriptName?vsSD=1&vsMA=$showforAudrey&vsMonth=$month&vsYear=$year&"
           . $ia7_suffix
           . "'>Show Details</a>]</font>\n";
     }
@@ -502,16 +468,14 @@ sub PrintMonth {
     # print the days of the week
     print "<tr>\n";
     foreach $temp (@days) {
-        print
-          "<td bgcolor='$dataDarkColor'><font face='arial,helvetica' size='2'><b>$temp</b></font></td>";
+        print "<td bgcolor='$dataDarkColor'><font face='arial,helvetica' size='2'><b>$temp</b></font></td>";
     }
     print "</tr>\n";
 
     for ( my $cellCount = 1; $cellCount <= $numWeeks; $cellCount++ ) {
         print "<tr valign='top'>\n";
         foreach $temp (@days) {
-            if ( ( $dayCount > $firstDay - 1 ) && ( $weekDayCount < $numDays ) )
-            {
+            if ( ( $dayCount > $firstDay - 1 ) && ( $weekDayCount < $numDays ) ) {
                 $weekDayCount++;
 
                 $thisDate = $year . "." . $month . "." . $weekDayCount;
@@ -546,12 +510,10 @@ sub PrintMonth {
                 }
 
                 if ( defined $bgcolor ) {
-                    print
-                      "<td width='$cellSize' height='$cellSize' bgcolor='$bgcolor'><font face='arial,helvetica' size='2'>";
+                    print "<td width='$cellSize' height='$cellSize' bgcolor='$bgcolor'><font face='arial,helvetica' size='2'>";
                 }
                 else {
-                    print
-                      "<td width='$cellSize' height='$cellSize'><font face='arial,helvetica' size='2'>";
+                    print "<td width='$cellSize' height='$cellSize'><font face='arial,helvetica' size='2'>";
                 }
 
                 if ( $thisDate eq $today ) {
@@ -584,8 +546,7 @@ sub PrintMonth {
                           . $ia7_suffix . "'>"
                           . $objMyDb->FieldValue("EVENT")
                           . "</a><br>"
-                          unless ( $objMyDb->FieldValue("CONTROL") eq "on" )
-                          ;    #Don't display CONTROL calendars;
+                          unless ( $objMyDb->FieldValue("CONTROL") eq "on" );    #Don't display CONTROL calendars;
                         $objMyDb->MoveNext;
                     }
                     print "</font>";
@@ -596,8 +557,7 @@ sub PrintMonth {
                 print "</font></td>\n";
             }
             else {
-                print
-                  "<td bgcolor='$dataLightColor'><font face='arial,helvetica' size='1'>&nbsp;</font></td>\n";
+                print "<td bgcolor='$dataLightColor'><font face='arial,helvetica' size='1'>&nbsp;</font></td>\n";
             }
 
             $dayCount++;
@@ -634,12 +594,7 @@ sub GetMonthInfo {
       ( localtime( Time::Local::timelocal( 0, 0, 0, 1, $month, $year ) ) )[6];
 
     # numDays is one day prior to 1st of month after
-    $numDays = (
-        localtime(
-            Time::Local::timelocal( 0, 0, 0, 1, $nmonth, $nyear ) -
-              60 * 60 * 24
-        )
-    )[3];
+    $numDays = ( localtime( Time::Local::timelocal( 0, 0, 0, 1, $nmonth, $nyear ) - 60 * 60 * 24 ) )[3];
 
     # figure out the number of weeks the month spans across
     my $numWeeks = ( $numDays + $firstDow ) / 7;
@@ -663,21 +618,17 @@ sub PrintCurrentRecord {
 
     foreach $fieldName ( $objMyDB->FieldNames ) {
         if ( $fieldName eq "ID" ) {
-            print "<input type='hidden' name='vsID' value='"
-              . $objMyDB->FieldValue("ID") . "'>\n";
+            print "<input type='hidden' name='vsID' value='" . $objMyDB->FieldValue("ID") . "'>\n";
         }
         elsif ( $fieldName eq "DATE" ) {
             if ( $objMyDB->FieldValue("ID") ) {
-                print "<input type='hidden' name='DATE' value='"
-                  . $objMyDB->FieldValue("DATE") . "'>\n";
+                print "<input type='hidden' name='DATE' value='" . $objMyDB->FieldValue("DATE") . "'>\n";
                 $date_entry = $objMyDB->FieldValue($fieldName);
             }
         }
         elsif ( $fieldName eq "DETAILS" ) {
             print "<tr valign='top' bgcolor='#DDDDDD'>\n";
-            print "<td><font face='arial' size='2'>"
-              . $fieldName
-              . "</font></td>\n";
+            print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
             print "<td colspan=3><textarea name='DETAILS' cols='30' rows='3'>";
             $fieldValue = $objMyDB->FieldValue($fieldName);
             $fieldValue =~ s/\"/&quot;/g;
@@ -693,20 +644,15 @@ sub PrintCurrentRecord {
             $fieldValue = $objMyDB->FieldValue($fieldName);
             print "checked " if ( $fieldValue eq "on" );
             print ">";
-            print "<font face='arial' size='2'>   "
-              . $fieldName
-              . "</font></td>";
+            print "<font face='arial' size='2'>   " . $fieldName . "</font></td>";
 
         }
         elsif ( $fieldName eq "VACATION" ) {
             $fieldValue = $objMyDB->FieldValue($fieldName);
-            print
-              "<td colspan=2><input name='VACATION' type=\"checkbox\" value=\"on\" ";
+            print "<td colspan=2><input name='VACATION' type=\"checkbox\" value=\"on\" ";
             print "checked " if ( $fieldValue eq "on" );
             print ">";
-            print "<font face='arial' size='2'>"
-              . $fieldName
-              . "</font></td>\n";
+            print "<font face='arial' size='2'>" . $fieldName . "</font></td>\n";
             print "</tr>\n";
 
         }
@@ -730,12 +676,8 @@ sub PrintCurrentRecord {
         }
         else {
             print "<tr valign='top' bgcolor='#DDDDDD'>\n";
-            print "<td><font face='arial' size='2'>"
-              . $fieldName
-              . "</font></td>\n";
-            print "<td colspan=3><input size=\"40\" name=\""
-              . $fieldName
-              . "\" value=\"";
+            print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
+            print "<td colspan=3><input size=\"40\" name=\"" . $fieldName . "\" value=\"";
             $fieldValue = $objMyDB->FieldValue($fieldName);
             $fieldValue =~ s/\"/&quot;/g;
             print $fieldValue . "\"></td>\n";
@@ -850,21 +792,18 @@ sub PrintCurrentRecord {
               . "';return false;} else {return false;};\">\n";
         }
         else {
-            print
-              "<input type='hidden' name='DATE' value='$year.$month.$day'>\n";
+            print "<input type='hidden' name='DATE' value='$year.$month.$day'>\n";
             print "<input type='hidden' name='ia7' value='$ia7_keys'>\n";
             print "<input type='hidden' name='vsCOM' value='INSERT'>\n";
             print "<input type='submit' value='Add'>\n";
         }
-        print
-          "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
+        print "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
     }
     else {
         $source =~ /^ical=(.*)\ssync=(.*)/;
         my $icalname = $1;
         my $icalsync = $2;
-        print
-          "<tr><td colspan=4><font face='arial' size='2'>iCal2vsdb (ical $icalname) $icalsync\n";
+        print "<tr><td colspan=4><font face='arial' size='2'>iCal2vsdb (ical $icalname) $icalsync\n";
         print "</font></td></tr></table>\n";
     }
     print "</form>\n";
@@ -884,10 +823,7 @@ sub UpdateCurrentRecord {
     my ($objMyCGI) = shift;
     my ( $fieldName, $fieldValue );
     my ( $starttime, $endtime );
-    my @fields = (
-        "TIME_hour",      "TIME_minute",  "TIME_ampm", "ENDTIME_hour",
-        "ENDTIME_minute", "ENDTIME_ampm", "SOURCE"
-    );
+    my @fields = ( "TIME_hour", "TIME_minute", "TIME_ampm", "ENDTIME_hour", "ENDTIME_minute", "ENDTIME_ampm", "SOURCE" );
     push( @fields, $objMyDB->FieldNames );
     foreach $fieldName (@fields) {
         $fieldValue = $objMyCGI->param($fieldName);
@@ -958,8 +894,7 @@ sub PreviousMonth {
 sub PrintLogin {
     print "<script>\n";
     print "function ValidateForm(objForm) {\n";
-    print
-      "	if (objForm.vsUserId.value == '' || objForm.vsPassword.value == '') {\n";
+    print "	if (objForm.vsUserId.value == '' || objForm.vsPassword.value == '') {\n";
     print "		alert('Please enter your User ID and Password.');\n";
     print "		return false;\n";
     print "	} else {\n";
@@ -969,10 +904,8 @@ sub PrintLogin {
     print "</script>\n";
     print "<b>Please login to continue:</b>\n";
     print "<p>\n";
-    print
-      "<form action='$scriptName' method='post' onsubmit=\"return ValidateForm(this);\">\n";
-    print
-      "<table border='0' cellspacing='1' cellpadding='2' style=\"FONT-SIZE: 10pt;FONT-FAMILY: 'Arial,Helvetica';\">\n";
+    print "<form action='$scriptName' method='post' onsubmit=\"return ValidateForm(this);\">\n";
+    print "<table border='0' cellspacing='1' cellpadding='2' style=\"FONT-SIZE: 10pt;FONT-FAMILY: 'Arial,Helvetica';\">\n";
     print "<tr valign='top' bgcolor='$dataLightColor'>\n";
     print "<td>User ID:</font></td>\n";
     print "<td><input type='text' size='40' name='vsUserId'></td>\n";
@@ -1015,8 +948,7 @@ sub Redirect {
     my ($rUrl) = shift || "";
     print "One moment please...\n";
     print "<p>\n";
-    print
-      "(<a href='$rUrl'>click here</a> if you are not automatically redirected in 5 seconds.)\n";
+    print "(<a href='$rUrl'>click here</a> if you are not automatically redirected in 5 seconds.)\n";
     print "<script>\n";
     print "document.location='$rUrl';\n";
     print "</script>\n";
@@ -1028,19 +960,15 @@ sub FatalError {
     my ($strMessage) = shift || "Unknown Error";
     print "Content-type: text/html\n\n" unless defined($HEADER_PRINTED);
     print "<p><font face='arial,helvetica' size='2'>\n";
-    print
-      "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
+    print "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
     print "<p><font color='red'>" . $strMessage . "</font>";
     print "<p>The most common causes of fatal errors are:\n";
     print "<ol>\n";
-    print
-      "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
-    print
-      "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
+    print "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
+    print "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
     print "</ol>\n";
     print "<p>If you have already tried these, you may want to visit the ";
-    print
-      "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
+    print "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
     print "to see if there is a solution available.\n";
     print "</font>\n";
     exit 1;
diff --git a/web/organizer/contacts.pl b/web/organizer/contacts.pl
index c2ebfbc00..3ea420e79 100644
--- a/web/organizer/contacts.pl
+++ b/web/organizer/contacts.pl
@@ -86,8 +86,7 @@ BEGIN
         # i give up!  user is going to have to set it manually
         print "Content-type: text/html\n\n";
         print "<b>Installation path could not be determined.</b>\n";
-        print
-          "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
+        print "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
         exit 1;
     }
 }    # / BEGIN
@@ -263,26 +262,20 @@ sub PrintAllRecords {
 
     $objMyDB->PageSize($visiblePageSize);
     $objMyDB->ActivePage($activePage);
-    $activePage =
-      $objMyDB->ActivePage;    # (in case we specified one out of range)
+    $activePage = $objMyDB->ActivePage;    # (in case we specified one out of range)
 
     my ($pageCount) = $objMyDB->PageCount;
 
     print "<form action='$scriptName' method='GET'>\n";
-    print
-      "<table cellspacing='2' cellpadding='2' border='0'><tr valign='middle'><td bgcolor='$dataDarkColor'>\n";
+    print "<table cellspacing='2' cellpadding='2' border='0'><tr valign='middle'><td bgcolor='$dataDarkColor'>\n";
     if ( !$showforAudrey ) {
         if ($showAll) {
-            print
-              "<input type='button' onclick=\"window.location='$scriptName?vsALL=0&"
+            print "<input type='button' onclick=\"window.location='$scriptName?vsALL=0&"
               . $ia7_suffix
               . "';\" value='Show $pageSize Per Page'>";
         }
         else {
-            print
-              "<input type='button' onclick=\"window.location='$scriptName?vsALL=1&"
-              . $ia7_suffix
-              . "';\" value='Show All'>";
+            print "<input type='button' onclick=\"window.location='$scriptName?vsALL=1&" . $ia7_suffix . "';\" value='Show All'>";
         }
     }
     print
@@ -302,16 +295,13 @@ sub PrintAllRecords {
     print " selected" if ( $filterField eq "FirstName" );
     print ">First Name</option>\n";
     print "</select>&nbsp;";
-    print
-      "<font face='Arial,Helvetica' size='2'><b>&nbsp;~=&nbsp;</b></font>\n";
-    print
-      "<input type='text' size='10' name='vsFilterValue' value='$filterValue'>&nbsp;";
+    print "<font face='Arial,Helvetica' size='2'><b>&nbsp;~=&nbsp;</b></font>\n";
+    print "<input type='text' size='10' name='vsFilterValue' value='$filterValue'>&nbsp;";
     print "<input type='hidden' name='vsMA' value='$showforAudrey'>\n";
     print "<input type='submit' value='Search'>&nbsp;";
 
     if ( $filterField && $filterValue ) {
-        print
-          "<input type='submit' value='Clear' onclick=\"this.form.vsFilterValue.value = ''; return true;\">";
+        print "<input type='submit' value='Clear' onclick=\"this.form.vsFilterValue.value = ''; return true;\">";
     }
     print "</td></tr></table>\n";
     print "</form>\n";
@@ -348,9 +338,7 @@ sub PrintAllRecords {
                   . "</a></font></td>\n";
             }
             else {
-                print "<td><font face='arial' size='2'>"
-                  . $fieldValue
-                  . "</font></td>\n";
+                print "<td><font face='arial' size='2'>" . $fieldValue . "</font></td>\n";
             }
         }
         print "</tr>\n";
@@ -362,16 +350,14 @@ sub PrintAllRecords {
 
     print "Result Page " . $activePage . " of " . $pageCount;
     if ( $activePage > 1 ) {
-        print
-          " <a href='?vsALL=$showAll&vsMA=$showforAudrey&vsSORT=$sortField&vsAP="
+        print " <a href='?vsALL=$showAll&vsMA=$showforAudrey&vsSORT=$sortField&vsAP="
           . ( $activePage - 1 )
           . "&vsFilterField=$filterField&vsFilterValue=$filterValue&"
           . $ia7_suffix
           . "'>Previous</a>";
     }
     if ( $activePage < $pageCount ) {
-        print
-          " <a href='?vsALL=$showAll&vsMA=$showforAudrey&vsSORT=$sortField&vsAP="
+        print " <a href='?vsALL=$showAll&vsMA=$showforAudrey&vsSORT=$sortField&vsAP="
           . ( $activePage + 1 )
           . "&vsFilterField=$filterField&vsFilterValue=$filterValue&"
           . $ia7_suffix
@@ -394,15 +380,13 @@ sub PrintCurrentRecord {
         elsif ( $fieldName eq "Notes" ) {
             print "<tr valign='top' bgcolor='$dataLightColor'>\n";
             print "<td><font face='arial' size='2'>$fieldName</font></td>\n";
-            print
-              "<td><textarea cols=\"38\" rows='3' name=\"$fieldName\">$fieldValue</textarea></td>\n";
+            print "<td><textarea cols=\"38\" rows='3' name=\"$fieldName\">$fieldValue</textarea></td>\n";
             print "</tr>\n";
         }
         else {
             print "<tr valign='top' bgcolor='$dataLightColor'>\n";
             print "<td><font face='arial' size='2'>$fieldName</font></td>\n";
-            print
-              "<td><input size=\"50\" name=\"$fieldName\" value=\"$fieldValue\"></td>\n";
+            print "<td><input size=\"50\" name=\"$fieldName\" value=\"$fieldValue\"></td>\n";
             print "</tr>\n";
         }
     }
@@ -427,8 +411,7 @@ sub PrintCurrentRecord {
         print "<input type='submit' value='Add'>\n";
     }
     print "<input type='hidden' name='ia7' value='$ia7_keys'>\n";
-    print
-      "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
+    print "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
     print "<p>\n";
 }
 
@@ -459,19 +442,15 @@ sub FatalError {
     my ($strMessage) = shift || "Unknown Error";
     print "Content-type: text/html\n\n" unless defined($HEADER_PRINTED);
     print "<p><font face='arial,helvetica' size='2'>\n";
-    print
-      "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
+    print "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
     print "<p><font color='red'>" . $strMessage . "</font>";
     print "<p>The most common causes of fatal errors are:\n";
     print "<ol>\n";
-    print
-      "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
-    print
-      "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
+    print "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
+    print "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
     print "</ol>\n";
     print "<p>If you have already tried these, you may want to visit the ";
-    print
-      "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
+    print "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
     print "to see if there is a solution available.\n";
     print "</font>\n";
     exit 1;
diff --git a/web/organizer/tasks.pl b/web/organizer/tasks.pl
index de8a8344d..84b3483d3 100644
--- a/web/organizer/tasks.pl
+++ b/web/organizer/tasks.pl
@@ -90,8 +90,7 @@ BEGIN
         # i give up!  user is going to have to set it manually
         print "Content-type: text/html\n\n";
         print "<b>Installation path could not be determined.</b>\n";
-        print
-          "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
+        print "<p>Please edit the script and set \$ENV{\"CWD\"} to the full path in which the script is installed.";
         exit 1;
     }
 }    # / BEGIN
@@ -260,12 +259,10 @@ sub PrintAllRecords {
     #$activePage = $objMyDB->ActivePage; # (in case we specified one out of range)
     my ($pageCount) = $objMyDB->PageCount;
 
-    print
-      "<table cellspacing='2' cellpadding='2' border='0'><tr valign='middle'><td bgcolor='$dataDarkColor'>\n";
+    print "<table cellspacing='2' cellpadding='2' border='0'><tr valign='middle'><td bgcolor='$dataDarkColor'>\n";
 
     #if ($m_blnIsSysAdmin) {
-    print
-      "<input type='submit' value='Add New Task' onclick=\"self.location='$scriptName"
+    print "<input type='submit' value='Add New Task' onclick=\"self.location='$scriptName"
       . PassThrough( "vsCOM", "ADD" )
       . "';return false\">\n";
 
@@ -276,8 +273,7 @@ sub PrintAllRecords {
     #}
 
     if ($showCompleted) {
-        print
-          " <input type='submit' value='Hide Completed' onclick=\"self.location='$scriptName?vsSORT=$sortField&vsPS=$pageSize&"
+        print " <input type='submit' value='Hide Completed' onclick=\"self.location='$scriptName?vsSORT=$sortField&vsPS=$pageSize&"
           . $ia7_suffix
           . "';return false\">\n";
     }
@@ -293,8 +289,7 @@ sub PrintAllRecords {
     print "<tr valign='top' bgcolor='#CCCCCC'>\n";
     print "<td>&nbsp;</td>\n";
     foreach $fieldName (@showFields) {
-        print
-          "<td><b><font face='arial' size='2'><a href='$scriptName?vsSORT=$fieldName&vsPS=$pageSize&vsSC=$showCompleted&"
+        print "<td><b><font face='arial' size='2'><a href='$scriptName?vsSORT=$fieldName&vsPS=$pageSize&vsSC=$showCompleted&"
           . $ia7_suffix . "'>"
           . $fieldName
           . "</a></font></b></td>\n";
@@ -315,11 +310,7 @@ sub PrintAllRecords {
           . $objMyDB->FieldValue("ID") . "&"
           . $ia7_suffix . "'>";
         $link_close = "</a>";
-        print "<td>"
-          . $link_open
-          . "<img src='$icon' alt='Details' border='0'></font>"
-          . $link_close
-          . "</td>\n";
+        print "<td>" . $link_open . "<img src='$icon' alt='Details' border='0'></font>" . $link_close . "</td>\n";
 
         foreach $fieldName (@showFields) {
             $fieldValue = $objMyDB->FieldValue($fieldName);
@@ -327,22 +318,10 @@ sub PrintAllRecords {
             if ( $fieldName eq "SpecialField" ) {
 
                 # not used at the moment, but maybe later...
-                print "<td>"
-                  . $link_open
-                  . "<font face='arial' size='2'>"
-                  . $fieldValue
-                  . "</font>"
-                  . $link_close
-                  . "</td>\n";
+                print "<td>" . $link_open . "<font face='arial' size='2'>" . $fieldValue . "</font>" . $link_close . "</td>\n";
             }
             elsif ( lc $fieldName eq "SPEAK" ) {
-                print "<td>"
-                  . $link_open
-                  . "<font face='arial' size='2'>"
-                  . $fieldValue
-                  . "</font>"
-                  . $link_close
-                  . "</td>\n";
+                print "<td>" . $link_open . "<font face='arial' size='2'>" . $fieldValue . "</font>" . $link_close . "</td>\n";
             }
             elsif ( $fieldName eq "SOURCE" ) {
             }
@@ -353,13 +332,7 @@ sub PrintAllRecords {
                     $link_open  = "";
                     $link_close = "";
                 }
-                print "<td>"
-                  . $link_open
-                  . "<font face='arial' size='2'>"
-                  . $fieldValue
-                  . "</font>"
-                  . $link_close
-                  . "</td>\n";
+                print "<td>" . $link_open . "<font face='arial' size='2'>" . $fieldValue . "</font>" . $link_close . "</td>\n";
             }
         }
         print "</tr>\n";
@@ -397,14 +370,11 @@ sub PrintCurrentRecord {
     print "<table cellspacing='2' cellpadding='2' border='0'>\n";
     foreach $fieldName ( $objMyDB->FieldNames ) {
         if ( $fieldName eq "ID" ) {
-            print "<input type='hidden' name='vsID' value='"
-              . $objMyDB->FieldValue("ID") . "'>\n";
+            print "<input type='hidden' name='vsID' value='" . $objMyDB->FieldValue("ID") . "'>\n";
         }
         else {
             print "<tr valign='top' bgcolor='$dataLightColor'>\n";
-            print "<td><font face='arial' size='2'>"
-              . $fieldName
-              . "</font></td>\n"
+            print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n"
               if ( $fieldName ne "SOURCE" );
             if ( $fieldName eq "Complete" ) {
                 my ($yes) = "";
@@ -413,10 +383,8 @@ sub PrintCurrentRecord {
                   if ( $objMyDB->FieldValue("Complete") eq "Yes" );
                 $no = "checked" if ( $objMyDB->FieldValue("Complete") eq "No" );
                 print "<td><font face='arial' size='2'>";
-                print
-                  "<input type=\"radio\" name=\"Complete\" value=\"Yes\" $yes>Yes\n";
-                print
-                  "<input type=\"radio\" name=\"Complete\" value=\"No\" $no>No\n";
+                print "<input type=\"radio\" name=\"Complete\" value=\"Yes\" $yes>Yes\n";
+                print "<input type=\"radio\" name=\"Complete\" value=\"No\" $no>No\n";
                 print "</font></td>";
             }
             elsif ( $fieldName eq "Notes" ) {
@@ -427,8 +395,7 @@ sub PrintCurrentRecord {
             }
             elsif ( $fieldName eq "SPEAK" ) {
                 $fieldValue = $objMyDB->FieldValue($fieldName);
-                print
-                  "<td><input name='SPEAK' type=\"checkbox\" value=\"Yes\" ";
+                print "<td><input name='SPEAK' type=\"checkbox\" value=\"Yes\" ";
                 if ( $fieldValue eq "Yes" ) {
                     print "CHECKED > ";
                 }
@@ -444,9 +411,7 @@ sub PrintCurrentRecord {
 
             }
             else {
-                print "<td><input size=\"50\" name=\""
-                  . $fieldName
-                  . "\" value=\"";
+                print "<td><input size=\"50\" name=\"" . $fieldName . "\" value=\"";
                 $fieldValue = $objMyDB->FieldValue($fieldName);
                 $fieldValue =~ s/\"/&quot;/g;
                 print $fieldValue . "\"></td>\n";
@@ -469,16 +434,14 @@ sub PrintCurrentRecord {
           "<input style=\"COLOR: maroon;\" type='reset' value='Delete'  onclick=\"if (confirm('Permenantly delete this task?')) {self.location='$scriptName?vsSORT=$sortField&vsAP=$activePage&vsPS=$pageSize&vsSC=$showCompleted&vsCOM=DELETE&vsID="
           . $objMyDB->FieldValue("ID")
           . "';return false;} else {return false;};\">\n";
-        print
-          "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
+        print "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
         print "<p>\n";
     }
     else {
         $source =~ /^ical=(\S*)\ssync=(.*)/;
         my $icalname = $1;
         my $icalsync = $2;
-        print
-          "<tr><td colspan=4><font face='arial' size='2'>iCal2vsdb (ical $icalname) $icalsync\n";
+        print "<tr><td colspan=4><font face='arial' size='2'>iCal2vsdb (ical $icalname) $icalsync\n";
         print "</font></td></tr></table>\n";
     }
 }
@@ -492,40 +455,26 @@ sub PrintBlankRecord {
         if ( $fieldName ne "ID" ) {
             print "<tr valign='top' bgcolor='$dataLightColor'>\n";
             if ( $fieldName eq "Complete" ) {
-                print "<td><font face='arial' size='2'>"
-                  . $fieldName
-                  . "</font></td>\n";
+                print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
                 print "<td><font face='arial' size='2'>";
-                print
-                  "<input type=\"radio\" name=\"Complete\" value=\"Yes\">Yes\n";
-                print
-                  "<input type=\"radio\" name=\"Complete\" value=\"No\" checked>No\n";
+                print "<input type=\"radio\" name=\"Complete\" value=\"Yes\">Yes\n";
+                print "<input type=\"radio\" name=\"Complete\" value=\"No\" checked>No\n";
                 print "</font></td>";
             }
             elsif ( $fieldName eq "Notes" ) {
-                print "<td><font face='arial' size='2'>"
-                  . $fieldName
-                  . "</font></td>\n";
-                print
-                  "<td><textarea name='Notes' cols='38' rows='3'></textarea></td>\n";
+                print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
+                print "<td><textarea name='Notes' cols='38' rows='3'></textarea></td>\n";
             }
             elsif ( $fieldName eq "SPEAK" ) {
-                print "<td><font face='arial' size='2'>"
-                  . $fieldName
-                  . "</font></td>\n";
-                print
-                  "<td><input name='SPEAK' type=\"checkbox\" value=\"Yes\" >";
+                print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
+                print "<td><input name='SPEAK' type=\"checkbox\" value=\"Yes\" >";
                 print "</tr>\n";
             }
             elsif ( $fieldName eq "SOURCE" ) {    #do nothing
             }
             else {
-                print "<td><font face='arial' size='2'>"
-                  . $fieldName
-                  . "</font></td>\n";
-                print "<td><input size=\"50\" name=\""
-                  . $fieldName
-                  . "\" value=\"\"></td>\n";
+                print "<td><font face='arial' size='2'>" . $fieldName . "</font></td>\n";
+                print "<td><input size=\"50\" name=\"" . $fieldName . "\" value=\"\"></td>\n";
             }
             print "</tr>\n";
         }
@@ -541,8 +490,7 @@ sub PrintBlankRecord {
     print "<input type='hidden' name='ia7' value='$ia7_keys'>\n";
 
     print "<input type='submit' value='Add'>\n";
-    print
-      "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
+    print "<input type='reset' value='Cancel' onclick=\"window.history.go(-1);return false;\">\n";
     print "<p>\n";
 }
 
@@ -589,19 +537,15 @@ sub FatalError {
     my ($strMessage) = shift || "Unknown Error";
     print "Content-type: text/html\n\n" unless defined($HEADER_PRINTED);
     print "<p><font face='arial,helvetica' size='2'>\n";
-    print
-      "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
+    print "<b>A fatal error occured.  The script cannot continue.  Details are below:</b>";
     print "<p><font color='red'>" . $strMessage . "</font>";
     print "<p>The most common causes of fatal errors are:\n";
     print "<ol>\n";
-    print
-      "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
-    print
-      "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
+    print "<li>One of the script files was uploaded via FTP in Binary mode instead of ASCII\n";
+    print "<li>The file permissions for the data directory and all .tab and .cfg files is not readable/writable\n";
     print "</ol>\n";
     print "<p>If you have already tried these, you may want to visit the ";
-    print
-      "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
+    print "<a href='http://www.verysimple.com/support/'>VerySimple Support Forum</a> \n";
     print "to see if there is a solution available.\n";
     print "</font>\n";
     exit 1;
diff --git a/web/test/test1.pl b/web/test/test1.pl
index 0dc99dc4d..4a36e17b4 100644
--- a/web/test/test1.pl
+++ b/web/test/test1.pl
@@ -12,13 +12,9 @@
 print "Returning Time: $Time_Now\n";
 
 $data .= "Time: <b>$Time_Now</b>\n";
-$data .=
-  "Current Temperature: Indoor <b>$weather{TempIndoor}</b> degrees   Outdoor<b>$weather{TempOutdoor}</b> degrees";
-$data .=
-  "<br><IMG border=1 height=5 SRC=\"/graphics/appledot.gif\" width=$weather{TempIndoor}><br>";
-$data .=
-  "<br><IMG border=1 height=5 SRC=\"/graphics/appledot.gif\" width=$weather{TempOutdoor}><br>";
-$data .=
-  "<br><IMG border=1 height=5 SRC=\"/graphics/bluedot.gif\" width=$weather{HumidOutdoor}><br>";
+$data .= "Current Temperature: Indoor <b>$weather{TempIndoor}</b> degrees   Outdoor<b>$weather{TempOutdoor}</b> degrees";
+$data .= "<br><IMG border=1 height=5 SRC=\"/graphics/appledot.gif\" width=$weather{TempIndoor}><br>";
+$data .= "<br><IMG border=1 height=5 SRC=\"/graphics/appledot.gif\" width=$weather{TempOutdoor}><br>";
+$data .= "<br><IMG border=1 height=5 SRC=\"/graphics/bluedot.gif\" width=$weather{HumidOutdoor}><br>";
 
 return $data;