diff --git a/includes/polling/os/airport.inc.php b/includes/polling/os/airport.inc.php
index 7fe77e76b..fd1e214d1 100644
--- a/includes/polling/os/airport.inc.php
+++ b/includes/polling/os/airport.inc.php
@@ -1,5 +1,5 @@
 <?php
 
-$version  = snmp_get($device, "sysConfFirmwareVersion.0 ", "-Ovq", "AIRPORT-BASESTATION-3-MIB");
+$version = snmp_get($device, "sysConfFirmwareVersion.0 ", "-Ovq", "AIRPORT-BASESTATION-3-MIB");
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/akcp.inc.php b/includes/polling/os/akcp.inc.php
index c736396b1..99bf7cdd6 100644
--- a/includes/polling/os/akcp.inc.php
+++ b/includes/polling/os/akcp.inc.php
@@ -3,4 +3,4 @@
 $hardware = trim(snmp_get($device, "1.3.6.1.4.1.3854.1.1.6.0", "-OQv", "", ""),'"');
 $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.3854.1.1.8.0", "-OQv", "", ""),'" ');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/allied.inc.php b/includes/polling/os/allied.inc.php
index af39d67e8..c12f2b240 100644
--- a/includes/polling/os/allied.inc.php
+++ b/includes/polling/os/allied.inc.php
@@ -1,16 +1,15 @@
 <?php
 
-echo("Doing Allied Telesyn AlliedWare ");
-
 ### Allied Telesis have somewhat messy MIBs. It's often hard to work out what is where. :)
 
-
 $hardware = snmp_get($device, "atiswitchProductType.0", "-OsvQU", "+AtiSwitch-MIB");
 $version  = snmp_get($device, "atiswitchSwVersion.0", "-OsvQU", "+AtiSwitch-MIB");
 $software = snmp_get($device, "atiswitchSw.0", "-OsvQU", "+AtiSwitch-MIB");
 
-if($software && $version)
+if ($software && $version)
+{
   $version = $software . " " . $version;
+}
 
 # sysDescr.0 = STRING: "Allied Telesis AT-8624T/2M version 2.9.1-13 11-Dec-2007"
 # sysDescr.0 = STRING: "Allied Telesyn Ethernet Switch AT-8012M"
@@ -21,7 +20,8 @@ if($software && $version)
 # AtiL2-MIB::atiL2SwProduct.0 = STRING: "AT-8326GB"
 # AtiL2-MIB::atiL2SwVersion.0 = STRING: "AT-S41 v1.1.6 "
 
-if(!$hardware && !$version && !$features) {
+if (!$hardware && !$version && !$features)
+{
   $hardware = snmp_get($device, "atiL2SwProduct.0", "-OsvQU", "+AtiL2-MIB");
   $version = snmp_get($device, "atiL2SwVersion.0", "-OsvQU", "+AtiL2-MIB");
 }
@@ -29,22 +29,24 @@ if(!$hardware && !$version && !$features) {
 #Allied Telesyn AT-8948 version 2.7.4-02 22-Aug-2005
 
 list($a,$b,$c,$d,$e,$f) = explode(" ", $sysDescr);
-if(!$hardware && !$version && !$features) {
-  if($a == "Allied" && $d == "version") {
+
+if (!$hardware && !$version && !$features)
+{
+  if ($a == "Allied" && $d == "version")
+  {
     $version = $e;
     $features = $f;
     $hardware = $c;
   }
 }
 
-if ($a == "Allied" && $d == "Switch") {
+if ($a == "Allied" && $d == "Switch")
+{
   $hardware = $e;
 }
 
-
-
 $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/apc.inc.php b/includes/polling/os/apc.inc.php
index 89030dd5f..1088ce325 100755
--- a/includes/polling/os/apc.inc.php
+++ b/includes/polling/os/apc.inc.php
@@ -57,20 +57,20 @@ if ($hardware == " ")
 
 ######################
 
-$AOSrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.1", "-OQv", "", ""),'"'); 
+$AOSrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.1", "-OQv", "", ""),'"');
 $APPrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.2", "-OQv", "", ""),'"');
 
 if ($AOSrev == '')
 {
   # PDU
   $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.3.0", "-OQv", "", ""),'"');
-  
+
   if ($version == "")
   {
     # ATS
     $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.2.0", "-OQv", "", ""),'"');
   }
-  
+
   if ($version == "")
   {
     # Masterswitch/AP9606
@@ -82,4 +82,4 @@ else
   $version = "AOS $AOSrev / App $APPrev";
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/areca.inc.php b/includes/polling/os/areca.inc.php
index 8f2bfd9c4..3f6664165 100644
--- a/includes/polling/os/areca.inc.php
+++ b/includes/polling/os/areca.inc.php
@@ -14,5 +14,5 @@ if (isHexString($serial))
   # Sometimes firmware outputs serial as hex-string
   $serial = snmp_hexstring($serial);
 }
-  
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/polling/os/arista_eos.inc.php b/includes/polling/os/arista_eos.inc.php
index ca05e417a..4d0ea20ad 100755
--- a/includes/polling/os/arista_eos.inc.php
+++ b/includes/polling/os/arista_eos.inc.php
@@ -3,4 +3,4 @@
 $version = preg_replace("/.+ version (.+) running on .+ (\S+)$/", "\||\\2", $sysDescr );
 list($version,$hardware) = explode("||", $version);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/brother.inc.php b/includes/polling/os/brother.inc.php
index f7705c518..98f0eab75 100644
--- a/includes/polling/os/brother.inc.php
+++ b/includes/polling/os/brother.inc.php
@@ -41,5 +41,5 @@ if (isHexString($serial))
   # Sometimes firmware outputs serial as hex-string
   $serial = snmp_hexstring($serial);
 }
-    
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/polling/os/cat1900.inc.php b/includes/polling/os/cat1900.inc.php
index 9bb333b8e..b78a7f71a 100755
--- a/includes/polling/os/cat1900.inc.php
+++ b/includes/polling/os/cat1900.inc.php
@@ -1,7 +1,6 @@
 <?php
 
-   list(,$version) = split(',',$sysDescr,2);
-   
-   $hardware = "1900";
+list(,$version) = split(',',$sysDescr,2);
+$hardware = "1900";
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/catos.inc.php b/includes/polling/os/catos.inc.php
index e419fe21d..b2ff952bf 100755
--- a/includes/polling/os/catos.inc.php
+++ b/includes/polling/os/catos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo("Cisco Catalyst OS\n");
-
 #Cisco Systems, Inc. WS-C2948 Cisco Catalyst Operating System Software, Version 4.5(9) Copyright (c) 1995-2000 by Cisco Systems, Inc.
 #Cisco Systems WS-C5509 Cisco Catalyst Operating System Software, Version 5.5(19) Copyright (c) 1995-2003 by Cisco Systems
 #Cisco Systems WS-C5500 Cisco Catalyst Operating System Software, Version 5.5(18) Copyright (c) 1995-2002 by Cisco Systems
@@ -10,17 +8,17 @@ echo("Cisco Catalyst OS\n");
 #Cisco Systems, Inc. WS-C4003 Cisco Catalyst Operating System Software, Version 6.4(13) Copyright (c) 1995-2004 by Cisco Systems, Inc.
 #Cisco Systems, Inc. WS-C4006 Cisco Catalyst Operating System Software, Version 6.3(9) Copyright (c) 1995-2002 by Cisco Systems, Inc.
 
+if (strstr($ciscomodel, "OID")){ unset($ciscomodel); }
 
-   if(strstr($ciscomodel, "OID")){ unset($ciscomodel); }
-   if(!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3') {
-     $hardware = $ciscomodel;
-   }
+if (!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3')
+{
+  $hardware = $ciscomodel;
+}
 
-   $sysDescr = str_replace(", Inc.", "", $sysDescr); ## Make the two formats the same
-   $sysDescr = str_replace("\n", " ", $sysDescr);
+$sysDescr = str_replace(", Inc.", "", $sysDescr); ## Make the two formats the same
+$sysDescr = str_replace("\n", " ", $sysDescr);
 
-   list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $sysDescr);
-   list(,$features) = explode("-", $features);
+list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $sysDescr);
+list(,$features) = explode("-", $features);
 
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/dell-laser.inc.php b/includes/polling/os/dell-laser.inc.php
index d5276423e..c2a4bc9b9 100644
--- a/includes/polling/os/dell-laser.inc.php
+++ b/includes/polling/os/dell-laser.inc.php
@@ -10,11 +10,11 @@ foreach ($dellinfo as $dellinf)
   list($key,$value) = explode(':',$dellinf);
   $dell_laser[$key] = $value;
 }
-    
+
 $hardware = $dell_laser['MDL'];
-    
+
 list(,$version) = split('Engine ',$sysDescr);
 
 $version = "Engine " . trim($version,')');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/drac.inc.php b/includes/polling/os/drac.inc.php
index a54974523..f99269d4e 100644
--- a/includes/polling/os/drac.inc.php
+++ b/includes/polling/os/drac.inc.php
@@ -3,5 +3,5 @@
 $version = trim(snmp_get($device, ".1.3.6.1.4.1.674.10892.2.1.2.1.0", "-OQv"),'"');
 $hardware = trim(snmp_get($device, ".1.3.6.1.4.1.674.10892.2.1.1.2.0", "-OQv"),'"');
 $serial = trim(snmp_get($device, ".1.3.6.1.4.1.674.10892.2.1.1.11.0", "-OQv"),'"');
-  
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/polling/os/engenius.inc.php b/includes/polling/os/engenius.inc.php
index 55ecc46d2..a0fa3b4e9 100644
--- a/includes/polling/os/engenius.inc.php
+++ b/includes/polling/os/engenius.inc.php
@@ -34,4 +34,4 @@ switch ($mode)
     break;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/extremeware.inc.php b/includes/polling/os/extremeware.inc.php
index 63f5cba30..e1429cdbb 100644
--- a/includes/polling/os/extremeware.inc.php
+++ b/includes/polling/os/extremeware.inc.php
@@ -9,35 +9,38 @@ echo("Doing Extreme: ");
 #Summit48(Yonetan) - Version 4.1.19 (Build 2) by Release_Master  Wed 08/09/2000  6:09p
 #Alpine3808 - Version 7.2.0 (Build 33) by Release_Master 07/09/04 14:05:12
 
-if(!strpos($sysDescr, "XOS")) {
+if (!strpos($sysDescr, "XOS"))
+{
   echo(" Extremeware \n");
   list(, $datas) = explode(" - ", $sysDescr);
   $datas = str_replace("(","", $datas);
   $datas = str_replace(")","", $datas);
   list($a,$b,$c,$d,$e,$f,$g,$h) = explode(" ", $datas);
-  if($a == "Version") {
+  if ($a == "Version") {
     $version = $b;
     $features = $c . " " . $d . " " . $g;
   }
-} else {
+}
+else
+{
 
-#ExtremeXOS version 12.4.1.7 v1241b7 by release-manager on Sat Mar 13 02:36:57 EST 2010
-#ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
+  #ExtremeXOS version 12.4.1.7 v1241b7 by release-manager on Sat Mar 13 02:36:57 EST 2010
+  #ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
 
   echo(" XOS \n");
   list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m) = explode(" ", str_replace("ExtremeWare XOS", "ExtremeXOS", $sysDescr));
-  if($b == "version") {
+  if ($b == "version")
+  {
     $version = $c;
     $features = $d . " ".$i." ".$j." ".$m;
   }
 }
 
-
 $hardware = rewrite_extreme_hardware($sysObjectID);
-if($hardware == $sysObjectID) { unset($hardware); }
+if ($hardware == $sysObjectID) { unset($hardware); }
 
 $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/fortigate.inc.php b/includes/polling/os/fortigate.inc.php
index cc570d0ff..a65b70be4 100755
--- a/includes/polling/os/fortigate.inc.php
+++ b/includes/polling/os/fortigate.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-echo("Fortinet Fortigate Poller\n");
-
-## FIX ME - find some fortigate hardware to test this on, and to update and generify it
+## FIXME - find some fortigate hardware to test this on, and to update and generify it
 
 $fnSysVersion = snmp_get($device, "FORTINET-MIB-280::fnSysVersion.0", "-Ovq");
 $serial       = snmp_get($device, "FORTINET-MIB-280::fnSysSerial.0", "-Ovq");
@@ -10,7 +8,8 @@ $serial       = snmp_get($device, "FORTINET-MIB-280::fnSysSerial.0", "-Ovq");
 $version = preg_replace("/(.+),(.+),(.+)/", "\\1||\\2||\\3", $fnSysVersion);
 list($version,$features) = explode("||", $version);
 
-if(isset($rewrite_fortinet_hardware[$sysObjectID])) {
+if (isset($rewrite_fortinet_hardware[$sysObjectID]))
+{
   $hardware = $rewrite_fortinet_hardware[$sysObjectID];
 }
 
@@ -23,16 +22,16 @@ $sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate_session
 
 $sessions = snmp_get($device, "fnSysSesCount.0", "FORTINET-MIB-280");
 
-if(is_numeric($sessions))
+if (is_numeric($sessions))
 {
-  if (!is_file($sessrrd)) 
+  if (!is_file($sessrrd))
   {
-   `rrdtool create $sessrrd --step 300 DS:sessions:GAUGE:600:0:3000000 \
+    rrdtool_create($sessrrd," --step 300 DS:sessions:GAUGE:600:0:3000000 \
      RRA:AVERAGE:0.5:1:800 RRA:AVERAGE:0.5:6:800 RRA:AVERAGE:0.5:24:800 RRA:AVERAGE:0.5:288:800 \
-     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800`;  
+     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800");
   }
-  shell_exec($config['rrdtool'] . " update $sessrrd N:$ses");
+  rrdtool_update($sessrrd,"N:".$ses);
   $graphs['fortigate_sessions'] = TRUE;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/ftos.inc.php b/includes/polling/os/ftos.inc.php
index 78f24448b..91769b3fe 100644
--- a/includes/polling/os/ftos.inc.php
+++ b/includes/polling/os/ftos.inc.php
@@ -33,15 +33,17 @@ echo("Doing Force10 FTOS ");
 $sysObjectID = snmp_get($device, "sysObjectID.0", "-Oqvn");
 $hardware = rewrite_ftos_hardware($sysObjectID);
 
-if(strstr($sysObjectID, ".1.3.6.1.4.1.6027.1.3.")) 
+if (strstr($sysObjectID, ".1.3.6.1.4.1.6027.1.3."))
 {
   echo("S-Series ");
   $version = snmp_get($device, "chStackUnitCodeVersion.1", "-Oqvn", "F10-S-SERIES-CHASSIS-MIB");
-} elseif(strstr($sysObjectID, ".1.3.6.1.4.1.6027.1.2.")) 
+}
+elseif (strstr($sysObjectID, ".1.3.6.1.4.1.6027.1.2."))
 {
   echo("C-Series ");
   $version = snmp_get($device, "chSwVersion.0", "-Oqvn", "F10-C-SERIES-CHASSIS-MIB");
-} else 
+}
+else
 {
   echo("E-Series ");
   $version = snmp_get($device, "chSysSwRuntimeImgVersion.1.1", "-Oqvn", "F10-CHASSIS-MIB");
@@ -51,4 +53,4 @@ $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/ies.inc.php b/includes/polling/os/ies.inc.php
index 9a1af6d27..af3c43a46 100644
--- a/includes/polling/os/ies.inc.php
+++ b/includes/polling/os/ies.inc.php
@@ -4,5 +4,5 @@ $version = trim(snmp_get($device, "accessSwitchFWVersion.0", "-OQv", "ZYXEL-AS-M
 
 preg_match("/IES-(\d)*/",$sysDescr, $matches);
 $hardware = $matches[0];
-  
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/polling/os/ios.inc.php b/includes/polling/os/ios.inc.php
index 0da9c24d4..02a8419c7 100755
--- a/includes/polling/os/ios.inc.php
+++ b/includes/polling/os/ios.inc.php
@@ -1,44 +1,40 @@
 <?php
 
-   $sysDescr = str_replace("IOS (tm)", "IOS (tm),", $sysDescr);
-   list(,$features,$version) = explode(",", $sysDescr);
-   $version = str_replace(" Version ", "", $version);
-   list(,$features) = explode("(", $features);
-   list(,$features) = explode("-", $features);
+$sysDescr = str_replace("IOS (tm)", "IOS (tm),", $sysDescr);
+list(,$features,$version) = explode(",", $sysDescr);
+$version = str_replace(" Version ", "", $version);
+list(,$features) = explode("(", $features);
+list(,$features) = explode("-", $features);
 
-   $oids = "entPhysicalModelName.1 entPhysicalContainedIn.1 entPhysicalName.1 entPhysicalSoftwareRev.1 entPhysicalModelName.1001 entPhysicalContainedIn.1001 cardDescr.1 cardSlotNumber.1";
+$oids = "entPhysicalModelName.1 entPhysicalContainedIn.1 entPhysicalName.1 entPhysicalSoftwareRev.1 entPhysicalModelName.1001 entPhysicalContainedIn.1001 cardDescr.1 cardSlotNumber.1";
 
-   $data = snmp_get_multi($device, $oids, "-OQUs", "ENTITY-MIB:OLD-CISCO-CHASSIS-MIB");
+$data = snmp_get_multi($device, $oids, "-OQUs", "ENTITY-MIB:OLD-CISCO-CHASSIS-MIB");
 
-   #print_r($data);
+if ($data[1]['entPhysicalContainedIn'] == "0")
+{
+  if (isset($data[1]['entPhysicalSoftwareRev']) && $data[1]['entPhysicalSoftwareRev'] != "")
+  {
+    $version = $data[1]['entPhysicalSoftwareRev'];
+  }
+  if (isset($data[1]['entPhysicalName']) && $data[1]['entPhysicalName'] != "")
+  {
+    $hardware = $data[1]['entPhysicalName'];
+  }
+  if (isset($data[1]['entPhysicalModelName']) && $data[1]['entPhysicalModelName'] != "")
+  {
+    $hardware = $data[1]['entPhysicalModelName'];
+  }
+}
 
-   if($data[1]['entPhysicalContainedIn'] == "0")
-   {
-     if(isset($data[1]['entPhysicalSoftwareRev']) && $data[1]['entPhysicalSoftwareRev'] != "")
-     {
-       $version = $data[1]['entPhysicalSoftwareRev'];
-     }
-     if(isset($data[1]['entPhysicalName']) && $data[1]['entPhysicalName'] != "")
-     {
-       $hardware = $data[1]['entPhysicalName'];
-     }
-     if(isset($data[1]['entPhysicalModelName']) && $data[1]['entPhysicalModelName'] != "")
-     {
-       $hardware = $data[1]['entPhysicalModelName'];
-     }
-   }
+list($version) = explode(",", $version);
 
-   list($version) = explode(",", $version);
-
-
-
-#   if($slot_1 == "-1" && strpos($descr_1, "No") === FALSE) { $ciscomodel = $descr_1; }
-#   if(($contained_1 == "0" || $name_1 == "Chassis") && strpos($model_1, "No") === FALSE) { $ciscomodel = $model_1; list($version_1) = explode(",",$ver_1); }
-#   if($contained_1001 == "0" && strpos($model_1001, "No") === FALSE) { $ciscomodel = $model_1001; }
+#   if ($slot_1 == "-1" && strpos($descr_1, "No") === FALSE) { $ciscomodel = $descr_1; }
+#   if (($contained_1 == "0" || $name_1 == "Chassis") && strpos($model_1, "No") === FALSE) { $ciscomodel = $model_1; list($version_1) = explode(",",$ver_1); }
+#   if ($contained_1001 == "0" && strpos($model_1001, "No") === FALSE) { $ciscomodel = $model_1001; }
 #   $ciscomodel = str_replace("\"","",$ciscomodel);
-#   if($ciscomodel) { $hardware = $ciscomodel; unset($ciscomodel); }
+#   if ($ciscomodel) { $hardware = $ciscomodel; unset($ciscomodel); }
 
-#   if(strpos($sysDescr, "IOS XR")) { 
+#   if (strpos($sysDescr, "IOS XR")) {
 #    list(,$version) = explode(",", $sysDescr);
 #    $version = trim($version);
 #    list(,$version) = explode(" ", $version);
@@ -46,8 +42,4 @@
 #    trim($version);
 #   }
 
-
-   echo("$hostname\n");
-
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/ipoman.inc.php b/includes/polling/os/ipoman.inc.php
index 9dad62a8a..294db2c46 100644
--- a/includes/polling/os/ipoman.inc.php
+++ b/includes/polling/os/ipoman.inc.php
@@ -7,4 +7,4 @@ preg_match("/v(.*) \(SN (.*)\)/", $SoftwareVersion, $matches);
 if ($matches[1]) { $version = $matches[1]; }
 if ($matches[2]) { $serial = $matches[2]; }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/ironware.inc.php b/includes/polling/os/ironware.inc.php
index a1ad81dce..bc4bd0d54 100644
--- a/includes/polling/os/ironware.inc.php
+++ b/includes/polling/os/ironware.inc.php
@@ -1,15 +1,15 @@
 <?php
 
 #FIXME snmp_ function!
-  $hardware = trim(exec($config['snmpget'] . " -M ".$config['mibdir'] . " -O vqs -m FOUNDRY-SN-AGENT-MIB:FOUNDRY-SN-ROOT-MIB -" . $device['snmpver'] . " -c " . $device['community'] . " " .
+$hardware = trim(exec($config['snmpget'] . " -M ".$config['mibdir'] . " -O vqs -m FOUNDRY-SN-AGENT-MIB:FOUNDRY-SN-ROOT-MIB -" . $device['snmpver'] . " -c " . $device['community'] . " " .
     $device['hostname'].":".$device['port'] . " sysObjectID.0"));
 
-  $hardware = rewrite_ironware_hardware($hardware);
+$hardware = rewrite_ironware_hardware($hardware);
 
-  $version = trim(exec($config['snmpget'] . " -M ".$config['mibdir'] . " -O vqs -m FOUNDRY-SN-AGENT-MIB:FOUNDRY-SN-ROOT-MIB -" . $device['snmpver'] . " -c " . $device['community'] . " " .
-    $device['hostname'].":".$device['port'] . " snAgBuildVer.0"));
+$version = trim(exec($config['snmpget'] . " -M ".$config['mibdir'] . " -O vqs -m FOUNDRY-SN-AGENT-MIB:FOUNDRY-SN-ROOT-MIB -" . $device['snmpver'] . " -c " . $device['community'] . " " .
+$device['hostname'].":".$device['port'] . " snAgBuildVer.0"));
 
-  $version = str_replace("V", "", $version);
-  $version = str_replace("\"", "", $version);
+$version = str_replace("V", "", $version);
+$version = str_replace("\"", "", $version);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/jetdirect.inc.php b/includes/polling/os/jetdirect.inc.php
index a8debf651..370ef363e 100644
--- a/includes/polling/os/jetdirect.inc.php
+++ b/includes/polling/os/jetdirect.inc.php
@@ -28,4 +28,4 @@ $hardware = str_replace('Hewlett-Packard ','',$hardware);
 $hardware = str_ireplace(' Series','',$hardware);
 $hardware = ucfirst($hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/junos.inc.php b/includes/polling/os/junos.inc.php
index 57021fa07..ea4f3227e 100644
--- a/includes/polling/os/junos.inc.php
+++ b/includes/polling/os/junos.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-echo("Doing Juniper JunOS ");
-
 $jun_ver = snmp_get($device, ".1.3.6.1.2.1.25.6.3.1.2.2", "-Oqv", "HOST-RESOURCES-MIB");
 
-if(strpos($sysDescr, "olive"))
+if (strpos($sysDescr, "olive"))
 {
   $hardware = "Olive";
   $serial = "";
@@ -27,7 +25,7 @@ $cpurrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/junos-cpu.rrd";
 
 if (is_numeric($cpu_usage))
 {
-  if (!is_file($cpurrd)) 
+  if (!is_file($cpurrd))
   {
     rrd_create($cpurrd," --step 300 DS:LOAD:GAUGE:600:-1:100 RRA:AVERAGE:0.5:1:1200                  RRA:AVERAGE:0.5:1:2000 \
                     RRA:AVERAGE:0.5:6:2000 \
@@ -46,4 +44,4 @@ if (is_numeric($cpu_usage))
   rrdtool_update($cpurrd, " N:$cpu_usage");
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/junose.inc.php b/includes/polling/os/junose.inc.php
index 26a68df26..0d9877e1e 100644
--- a/includes/polling/os/junose.inc.php
+++ b/includes/polling/os/junose.inc.php
@@ -1,11 +1,12 @@
 <?php
 
-echo("Doing Juniper JunOSe ");
-
-if(strpos($sysDescr, "olive")) {
+if (strpos($sysDescr, "olive"))
+{
   $hardware = "Olive";
   $serial = "";
-} else {
+}
+else
+{
   $junose_hardware  = snmp_get($device, "sysObjectID.0", "-Ovqs", "+Juniper-Products-MIB", $config['install_dir']."/mibs/junose");
   $junose_version   = snmp_get($device, "juniSystemSwVersion.0", "-Ovqs", "+Juniper-System-MIB", $config['install_dir']."/mibs/junose");
   $junose_serial    = "";
@@ -24,4 +25,4 @@ $cpurrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/junose-cpu.rrd";
 #$cpu_cmd .= " .1.3.6.1.4.1.2636.3.1.13.1.8.9.1.0.0";
 #$cpu_usage = trim(shell_exec($cpu_cmd));
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/jwos.inc.php b/includes/polling/os/jwos.inc.php
index b391bc212..91b649bfd 100644
--- a/includes/polling/os/jwos.inc.php
+++ b/includes/polling/os/jwos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo("Doing Juniper JWOS ");
-
 #JUNIPER-WX-COMMON-MIB::jnxWxSysSwVersion.0 = STRING: 5.6.2.0
 #JUNIPER-WX-COMMON-MIB::jnxWxSysHwVersion.0 = STRING: 1.0
 #JUNIPER-WX-COMMON-MIB::jnxWxSysSerialNumber.0 = STRING: 0060000604
@@ -15,4 +13,4 @@ $hardware = snmp_get($device, "jnxWxChassisType.0", "-Ovq", "JUNIPER-WX-GLOBAL-R
 $hardware = strtoupper(str_replace('jnx','',$hardware));
 $hardware .= ' ' . snmp_get($device, "jnxWxSysHwVersion.0", "-Ovq", "JUNIPER-WX-GLOBAL-REG");
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/konica.inc.php b/includes/polling/os/konica.inc.php
index 5a58be27b..fe94a8d86 100644
--- a/includes/polling/os/konica.inc.php
+++ b/includes/polling/os/konica.inc.php
@@ -10,4 +10,4 @@ $version = trim(snmp_get($device, "1.3.6.1.4.1.18334.1.1.1.1.6.1.0", "-OQv", "",
 $hardware = str_ireplace('KONICA MINOLTA ','',$hardware);
 $hardware = ucfirst($hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/kyocera.inc.php b/includes/polling/os/kyocera.inc.php
index 4f8fa5dd8..4931342cf 100644
--- a/includes/polling/os/kyocera.inc.php
+++ b/includes/polling/os/kyocera.inc.php
@@ -11,4 +11,4 @@ $serial = trim(snmp_get($device, "1.3.6.1.4.1.1347.43.5.1.1.28.1", "-OQv", "", "
 # SNMPv2-SMI::enterprises.1347.43.5.4.1.5.1.1 = STRING: "2H9_2F00.002.002"
 $version = trim(snmp_get($device, "1.3.6.1.4.1.1347.43.5.4.1.5.1.1", "-OQv", "", ""),'" ');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/mgeups.inc.php b/includes/polling/os/mgeups.inc.php
index a1bfb8db7..7d0bac261 100644
--- a/includes/polling/os/mgeups.inc.php
+++ b/includes/polling/os/mgeups.inc.php
@@ -10,4 +10,5 @@ $hardware = trim(snmp_get($device,"upsmgIdentFamilyName.0","-OQv","MG-SNMP-UPS-M
 $hardware .= ' ' . trim(snmp_get($device,"upsmgIdentModelName.0","-OQv","MG-SNMP-UPS-MIB"),'" ');
 
 $serial = trim(snmp_get($device,"upsmgIdentSerialNumber.0","-OQv","MG-SNMP-UPS-MIB"),'" ');
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/polling/os/minkelsrms.inc.php b/includes/polling/os/minkelsrms.inc.php
index 6b6717614..a7bc0b4c6 100644
--- a/includes/polling/os/minkelsrms.inc.php
+++ b/includes/polling/os/minkelsrms.inc.php
@@ -4,4 +4,4 @@
 
 include('includes/polling/os/akcp.inc.php');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/netmanplus.inc.php b/includes/polling/os/netmanplus.inc.php
index fdfe10baa..5b76ea3d4 100644
--- a/includes/polling/os/netmanplus.inc.php
+++ b/includes/polling/os/netmanplus.inc.php
@@ -2,4 +2,4 @@
 
 $version = trim(snmp_get($device, "1.3.6.1.2.1.33.1.1.3.0", "-OQv", "UPS-MIB"),'"');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/okilan.inc.php b/includes/polling/os/okilan.inc.php
index 8bb45cc2a..6cf8b486a 100644
--- a/includes/polling/os/okilan.inc.php
+++ b/includes/polling/os/okilan.inc.php
@@ -7,4 +7,4 @@ include('includes/polling/os/jetdirect.inc.php');
 # Strip off useless brand fields
 $hardware = str_replace('OKI ','',$hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/powerconnect.inc.php b/includes/polling/os/powerconnect.inc.php
index 319ea7580..e08ad783f 100644
--- a/includes/polling/os/powerconnect.inc.php
+++ b/includes/polling/os/powerconnect.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-
+# FIXME snmp_get
 $snmp_cmd =  $config['snmpget'] . " -M ".$config['mibdir'] . " -m Dell-Vendor-MIB -O Qv -" . $device['snmpver'] . " -c " . $device['community'] . " " .
                  $device['hostname'].":".$device['port'];
 $snmp_cmd .= " productIdentificationDisplayName.0 productIdentificationVersion.0 productIdentificationDescription.0";
@@ -12,4 +12,4 @@ if (strstr($hardware,"No Such Object available"))
   $hardware = $sysDescr;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/powervault.inc.php b/includes/polling/os/powervault.inc.php
index 763c945d1..3cb155875 100644
--- a/includes/polling/os/powervault.inc.php
+++ b/includes/polling/os/powervault.inc.php
@@ -2,4 +2,4 @@
 
 $version = trim(snmp_get($device, "1.3.6.1.4.1.674.10893.2.102.3.1.1.9.1", "-OQv", "", ""),'"');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/procurve.inc.php b/includes/polling/os/procurve.inc.php
index d62e88431..c43da1202 100755
--- a/includes/polling/os/procurve.inc.php
+++ b/includes/polling/os/procurve.inc.php
@@ -7,10 +7,9 @@ $fdb_rrd_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/fdb_count.rrd
 
 $FdbAddressCount = snmp_get ($device, "hpSwitchFdbAddressCount.0", "-Ovqn", "STATISTICS-MIB");
 
-if(is_numeric($FdbAddressCount)) 
+if (is_numeric($FdbAddressCount))
 {
-
-  if (!is_file($fdb_rrd_file)) 
+  if (!is_file($fdb_rrd_file))
   {
     rrdtool_create($fdb_rrd_file, " --step 300 \
                     DS:value:GAUGE:600:-1:100000 \
@@ -34,7 +33,6 @@ if(is_numeric($FdbAddressCount))
   $graphs['fdb_count'] = TRUE;
 
   echo("FDB Count ");
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/radlan.inc.php b/includes/polling/os/radlan.inc.php
index 96543722b..cc7241e2e 100644
--- a/includes/polling/os/radlan.inc.php
+++ b/includes/polling/os/radlan.inc.php
@@ -1,11 +1,13 @@
 <?php
 
-
-if($sysDescr == "Neyland 24T") {
+if ($sysDescr == "Neyland 24T")
+{
   #$hardware = snmp_get($device, "productIdentificationVendor.0", "-Ovq", "Dell-Vendor-MIB");
   $hardware = "Dell ".snmp_get($device, "productIdentificationDisplayName.0", "-Ovq", "Dell-Vendor-MIB");
   $version  = snmp_get($device, "productIdentificationVersion.0", "-Ovq", "Dell-Vendor-MIB");
-} else {
+}
+else
+{
   $version  = snmp_get($device, "rndBrgVersion.0", "-Ovq", "RADLAN-MIB");
   $hardware = str_replace("ATI", "Allied Telesis", $sysDescr);
 }
@@ -15,4 +17,4 @@ $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/redback.inc.php b/includes/polling/os/redback.inc.php
deleted file mode 100644
index 6eff33c4e..000000000
--- a/includes/polling/os/redback.inc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-
-?>
diff --git a/includes/polling/os/ricoh.inc.php b/includes/polling/os/ricoh.inc.php
index 8c49cd7b8..a72773159 100644
--- a/includes/polling/os/ricoh.inc.php
+++ b/includes/polling/os/ricoh.inc.php
@@ -9,4 +9,4 @@ $version = trim(snmp_get($device, "1.3.6.1.4.1.367.3.2.1.1.1.2.0", "-OQv", "", "
 # SNMPv2-SMI::enterprises.367.3.2.1.2.1.4.0 = STRING: "M6394300657"
 $serial = trim(snmp_get($device, "1.3.6.1.4.1.367.3.2.1.2.1.4.0", "-OQv", "", ""),'" ');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/routeros.inc.php b/includes/polling/os/routeros.inc.php
index fe472fdfe..3d8683ca4 100644
--- a/includes/polling/os/routeros.inc.php
+++ b/includes/polling/os/routeros.inc.php
@@ -3,4 +3,4 @@
 $version = trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.4.0", "-OQv", "", ""),'"');
 $features = "Level " . trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.3.0", "-OQv", "", ""),'"');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/screenos.inc.php b/includes/polling/os/screenos.inc.php
index b9d831617..427e74b4f 100755
--- a/includes/polling/os/screenos.inc.php
+++ b/includes/polling/os/screenos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo("Doing Juniper Netscreen (ScreenOS)");
-
 $version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $sysDescr);
 list($hardware,$version,$serial,$features) = explode("||", $version);
 
@@ -11,7 +9,8 @@ $sess_cmd .= " .1.3.6.1.4.1.3224.16.3.2.0 .1.3.6.1.4.1.3224.16.3.3.0 .1.3.6.1.4.
 $sess_data = shell_exec($sess_cmd);
 list ($sessalloc, $sessmax, $sessfailed) = explode("\n", $sess_data);
 
-if (!is_file($sessrrd)) {
+if (!is_file($sessrrd))
+{
    rrdtool_create($sessrrd, " --step 300 \
      DS:allocate:GAUGE:600:0:3000000 \
      DS:max:GAUGE:600:0:3000000 \
@@ -34,4 +33,4 @@ rrdtool_update("$sessrrd", "N:$sessalloc:$sessmax:$sessfailed");
 
 $graphs['screenos_sessions'] = TRUE;
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/snom.inc.php b/includes/polling/os/snom.inc.php
index 359fa59bb..eb811ebf2 100755
--- a/includes/polling/os/snom.inc.php
+++ b/includes/polling/os/snom.inc.php
@@ -1,51 +1,51 @@
 <?php
 
-   echo("Polling SNOM device...\n");
+echo("Polling SNOM device...\n");
 
-   // Get SNOM specific version string from silly SNOM location. Silly SNOM!
+// Get SNOM specific version string from silly SNOM location. Silly SNOM!
 
-   ## Lol fixme?
+## FIXME - This needs a good cleanup...
 
-   $cmd      = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.4";
-   $sysDescr = `$cmd`;
-   $sysDescr = str_replace("-", " ", $sysDescr);
-   $sysDescr = str_replace("\"", "", $sysDescr);
-   list($hardware, $features, $version) = explode(" ", $sysDescr);
+$cmd      = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.4";
+$sysDescr = `$cmd`;
+$sysDescr = str_replace("-", " ", $sysDescr);
+$sysDescr = str_replace("\"", "", $sysDescr);
+list($hardware, $features, $version) = explode(" ", $sysDescr);
 
-   // Get data for calls and network from SNOM specific SNMP OIDs.
+// Get data for calls and network from SNOM specific SNMP OIDs.
 
-   $cmda = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.1.1 1.3.6.1.2.1.7526.2.1.2 1.3.6.1.2.1.7526.2.2.1 1.3.6.1.2.1.7526.2.2.2";
-   $cmdb = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.5 1.3.6.1.2.1.7526.2.6";
-   echo($cmda);
-   $snmpdata = `$cmda`;
-   $snmpdatab = `$cmdb`;
+$cmda = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.1.1 1.3.6.1.2.1.7526.2.1.2 1.3.6.1.2.1.7526.2.2.1 1.3.6.1.2.1.7526.2.2.2";
+$cmdb = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.5 1.3.6.1.2.1.7526.2.6";
+#echo($cmda);
+$snmpdata = `$cmda`;
+$snmpdatab = `$cmdb`;
 
-   list($rxbytes, $rxpkts, $txbytes, $txpkts) = explode("\n", $snmpdata);
-   list($calls, $registrations) = explode("\n", $snmpdatab);
-   $txbytes = 0 - $txbytes * 8;
-   $rxbytes = 0 - $rxbytes * 8;
-   echo("$rxbytes, $rxpkts, $txbytes, $txpkts, $calls, $registrations");
+list($rxbytes, $rxpkts, $txbytes, $txpkts) = explode("\n", $snmpdata);
+list($calls, $registrations) = explode("\n", $snmpdatab);
+$txbytes = 0 - $txbytes * 8;
+$rxbytes = 0 - $rxbytes * 8;
+echo("$rxbytes, $rxpkts, $txbytes, $txpkts, $calls, $registrations");
 
-   $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/data.rrd";
-   if(!is_file($rrdfile)) {
-    $woo = `rrdtool create $rrdfile \
-      DS:INOCTETS:COUNTER:600:U:100000000000 \
-      DS:OUTOCTETS:COUNTER:600:U:10000000000 \
-      DS:INPKTS:COUNTER:600:U:10000000000 \
-      DS:OUTPKTS:COUNTER:600:U:10000000000 \
-      DS:CALLS:COUNTER:600:U:10000000000 \
-      DS:REGISTRATIONS:COUNTER:600:U:10000000000 \
-      RRA:AVERAGE:0.5:1:600 \
-      RRA:AVERAGE:0.5:6:700 \
-      RRA:AVERAGE:0.5:24:775 \
-      RRA:AVERAGE:0.5:288:797 \
-      RRA:MAX:0.5:1:600 \
-      RRA:MAX:0.5:6:700 \
-      RRA:MAX:0.5:24:775 \
-      RRA:MAX:0.5:288:797`;
-   }
+$rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/data.rrd";
+if (!is_file($rrdfile))
+{
+  rrdtool_create($rrdfile,"DS:INOCTETS:COUNTER:600:U:100000000000 \
+   DS:OUTOCTETS:COUNTER:600:U:10000000000 \
+   DS:INPKTS:COUNTER:600:U:10000000000 \
+   DS:OUTPKTS:COUNTER:600:U:10000000000 \
+   DS:CALLS:COUNTER:600:U:10000000000 \
+   DS:REGISTRATIONS:COUNTER:600:U:10000000000 \
+   RRA:AVERAGE:0.5:1:600 \
+   RRA:AVERAGE:0.5:6:700 \
+   RRA:AVERAGE:0.5:24:775 \
+   RRA:AVERAGE:0.5:288:797 \
+   RRA:MAX:0.5:1:600 \
+   RRA:MAX:0.5:6:700 \
+   RRA:MAX:0.5:24:775 \
+   RRA:MAX:0.5:288:797");
+}
 
-   $rrdupdate = "N:$rxbytes:$txbytes:$rxpkts:$rxbytes:$calls:$registrations";
-   $ret = rrdtool_update("$rrdfile", $rrdupdate);
+$rrdupdate = "N:$rxbytes:$txbytes:$rxpkts:$rxbytes:$calls:$registrations";
+rrdtool_update("$rrdfile", $rrdupdate);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/speedtouch.inc.php b/includes/polling/os/speedtouch.inc.php
index 1dc0121bc..2ec23dc9d 100644
--- a/includes/polling/os/speedtouch.inc.php
+++ b/includes/polling/os/speedtouch.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo("Doing Thompson Speedtouch ");
-
 $serial = "";
 #list(,$hardware,) = explode(" ", $hardware);
 $hardware = $sysDescr;
@@ -11,10 +9,12 @@ $features = "";
 ### Filthy hack to get software version. may not work on anything but 585v7 :)
 
 $loop = shell_exec($config['snmpget'] . " -M ".$config['mibdir'] . ' -Ovq -v1 -c '.$device['community'].' '.$device['hostname'].' ifDescr.101');
-if($loop) { 
+
+if ($loop)
+{
   preg_match('@([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)@i',
     $loop, $matches);
     $version = $matches[1];
- }
+}
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/tranzeo.inc.php b/includes/polling/os/tranzeo.inc.php
index 126f4919d..5fc7ae6dc 100644
--- a/includes/polling/os/tranzeo.inc.php
+++ b/includes/polling/os/tranzeo.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-# Tranzeo sysDescr is quite uniform : 
+# Tranzeo sysDescr is quite uniform :
 #
 # Tranzeo TR6SL5, OS 6.8.0(1024), FW TR6-5.0.2SL5, 5.xGHz, 0dBi int. antenna
 # Tranzeo TR6Rt, OS 6.8.0(1024), FW TR6-3.6.0Rt, 5.xGHz, 19dBi int. antenna
@@ -13,4 +13,4 @@ list(,$version) = explode(" ", $version);
 list($version) = explode("(", $version);
 list(,$features) = explode(" ", $features);
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/unix.inc.php b/includes/polling/os/unix.inc.php
index 0d4cbaa9c..2493ff14a 100755
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -34,19 +34,19 @@ elseif ($device['os'] == "monowall" || $device['os'] == "Voswall")
 elseif ($device['os'] == "linux")
 {
   list(,,$version) = explode (" ", $sysDescr);
-  if(strstr($sysDescr, "386")|| strstr($sysDescr, "486")||strstr($sysDescr, "586")||strstr($sysDescr, "686")) { $hardware = "Generic x86"; }
-  else if(strstr($sysDescr, "x86_64")) { $hardware = "Generic x86 64-bit"; }
-  else if(strstr($sysDescr, "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
-  else if(strstr($sysDescr, "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
-  else if(strstr($sysDescr, "armv5")) { $hardware = "Generic ARMv5"; }
-  else if(strstr($sysDescr, "armv6")) { $hardware = "Generic ARMv6"; }
-  else if(strstr($sysDescr, "armv7")) { $hardware = "Generic ARMv7"; }
-  else if(strstr($sysDescr, "armv")) { $hardware = "Generic ARM"; }
-  
+  if (strstr($sysDescr, "386")|| strstr($sysDescr, "486")||strstr($sysDescr, "586")||strstr($sysDescr, "686")) { $hardware = "Generic x86"; }
+  else if (strstr($sysDescr, "x86_64")) { $hardware = "Generic x86 64-bit"; }
+  else if (strstr($sysDescr, "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
+  else if (strstr($sysDescr, "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
+  else if (strstr($sysDescr, "armv5")) { $hardware = "Generic ARMv5"; }
+  else if (strstr($sysDescr, "armv6")) { $hardware = "Generic ARMv6"; }
+  else if (strstr($sysDescr, "armv7")) { $hardware = "Generic ARMv7"; }
+  else if (strstr($sysDescr, "armv")) { $hardware = "Generic ARM"; }
+
   # Distro "extend" support
   $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111", "-Oqv", "UCD-SNMP-MIB");
   $features = str_replace("\"", "", $features);
-  
+
   if (!$features) // No "extend" support, try "exec" support
     {
       $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.101.1", "-Oqv", "UCD-SNMP-MIB");
@@ -59,4 +59,4 @@ elseif ($device['os'] == "linux")
   if ($hw) { $hardware = "Dell " . $hw; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/vrp.inc.php b/includes/polling/os/vrp.inc.php
index 36fb347f2..5a2ad75f1 100644
--- a/includes/polling/os/vrp.inc.php
+++ b/includes/polling/os/vrp.inc.php
@@ -5,4 +5,4 @@ $hardware = trim(snmp_get($device, ".1.3.6.1.4.1.2011.2.33.20.1.1.1.3.0", "-OQv"
 preg_match("/Version .*\n/",$sysDescr, $matches);
 $version = trim(str_replace("Version ","",$matches[0]));
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/windows.inc.php b/includes/polling/os/windows.inc.php
index 52d93f4da..7e7ea3cd9 100755
--- a/includes/polling/os/windows.inc.php
+++ b/includes/polling/os/windows.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-   echo("Microsoft Windows");
-
 #sysDescr.0 = STRING: Hardware: x86 Family 6 Model 1 Stepping 9 AT/AT COMPATIBLE  - Software: Windows NT Version 4.0  (Build Number: 1381 Multiprocessor Free )
 #sysDescr.0 = STRING: Hardware: x86 Family 6 Model 3 Stepping 4 AT/AT COMPATIBLE  - Software: Windows NT Version 3.51  (Build Number: 1057 Multiprocessor Free )
 #sysDescr.0 = STRING: Hardware: x86 Family 16 Model 4 Stepping 2 AT/AT COMPATIBLE - Software: Windows 2000 Version 5.1 (Build 2600 Multiprocessor Free)
@@ -11,25 +9,25 @@
 #sysDescr.0 = STRING: Hardware: Intel64 Family 6 Model 23 Stepping 6 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
 #sysDescr.0 = STRING: Hardware: AMD64 Family 16 Model 8 Stepping 0 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
 
-   if(strstr($sysDescr, "x86"))     { $hardware = "Generic x86"; }
-   if(strstr($sysDescr, "ia64"))    { $hardware = "Intel Itanium IA64"; }
-   if(strstr($sysDescr, "EM64"))    { $hardware = "Intel x64"; }
-   if(strstr($sysDescr, "AMD64"))   { $hardware = "AMD x64"; }
-   if(strstr($sysDescr, "Intel64")) { $hardware = "Intel x64"; }  
+if (strstr($sysDescr, "x86"))     { $hardware = "Generic x86"; }
+if (strstr($sysDescr, "ia64"))    { $hardware = "Intel Itanium IA64"; }
+if (strstr($sysDescr, "EM64"))    { $hardware = "Intel x64"; }
+if (strstr($sysDescr, "AMD64"))   { $hardware = "AMD x64"; }
+if (strstr($sysDescr, "Intel64")) { $hardware = "Intel x64"; }
 
-   if(strstr($sysDescr, "Build Number: 1057")) { $version = "NT 3.51"; }
-   if(strstr($sysDescr, "Build Number: 1381")) { $version = "NT 4.0"; }
-   if(strstr($sysDescr, "Build 2195"))         { $version = "2000 (NT 5.0)"; }
-   if(strstr($sysDescr, "Build 2600"))         { $version = "XP (NT 5.1)"; }
-   if(strstr($sysDescr, "Build 3790"))         { $version = "XP / 2003 (NT 5.2)"; }
-   if(strstr($sysDescr, "Build 6000"))         { $version = "Vista (NT 6.0)"; }
-   if(strstr($sysDescr, "Build 6001"))         { $version = "Vista SP1 / 2008 (NT 6.0)"; }
-   if(strstr($sysDescr, "Build 6002"))         { $version = "Vista SP2 / 2008 SP2 (NT 6.0)"; }
-   if(strstr($sysDescr, "Build 7600"))         { $version = "7 / 2008 R2 (NT 6.1)"; }
+if (strstr($sysDescr, "Build Number: 1057")) { $version = "NT 3.51"; }
+if (strstr($sysDescr, "Build Number: 1381")) { $version = "NT 4.0"; }
+if (strstr($sysDescr, "Build 2195"))         { $version = "2000 (NT 5.0)"; }
+if (strstr($sysDescr, "Build 2600"))         { $version = "XP (NT 5.1)"; }
+if (strstr($sysDescr, "Build 3790"))         { $version = "XP / 2003 (NT 5.2)"; }
+if (strstr($sysDescr, "Build 6000"))         { $version = "Vista (NT 6.0)"; }
+if (strstr($sysDescr, "Build 6001"))         { $version = "Vista SP1 / 2008 (NT 6.0)"; }
+if (strstr($sysDescr, "Build 6002"))         { $version = "Vista SP2 / 2008 SP2 (NT 6.0)"; }
+if (strstr($sysDescr, "Build 7600"))         { $version = "7 / 2008 R2 (NT 6.1)"; }
 
-   if(strstr($sysDescr, "Uniprocessor Free")) { $features = "Uniprocessor"; }
-   if(strstr($sysDescr, "Multiprocessor Free")) { $features = "Multiprocessor"; }
+if (strstr($sysDescr, "Uniprocessor Free"))   { $features = "Uniprocessor"; }
+if (strstr($sysDescr, "Multiprocessor Free")) { $features = "Multiprocessor"; }
 
-   ### Detect processor type? : I.E.  x86 Family 15 Model 2 Stepping 7
+### Detect processor type? : I.E.  x86 Family 15 Model 2 Stepping 7
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/xerox.inc.php b/includes/polling/os/xerox.inc.php
index c6c975364..a63bda998 100644
--- a/includes/polling/os/xerox.inc.php
+++ b/includes/polling/os/xerox.inc.php
@@ -22,4 +22,4 @@ if ($hardware == '')
 
 $version = trim(snmp_get($device, "1.3.6.1.4.1.236.11.5.1.1.1.2.0", "-OQv", "", ""),'" ');
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/polling/os/zywall.inc.php b/includes/polling/os/zywall.inc.php
index 35c2911b1..eb812a528 100644
--- a/includes/polling/os/zywall.inc.php
+++ b/includes/polling/os/zywall.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo("Doing ZyXEL ZyWALL ");
-
 $hardware = $sysDescr;
 
-?>
+?>
\ No newline at end of file