diff --git a/html/includes/hostbox-basic.inc.php b/html/includes/hostbox-basic.inc.php
index c1d49644b..e4bd2b991 100644
--- a/html/includes/hostbox-basic.inc.php
+++ b/html/includes/hostbox-basic.inc.php
@@ -38,6 +38,6 @@ echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
 
-echo (' </tr>');
+echo(' </tr>');
 
 ?>
diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index cd31d1e5c..dc84c1c4d 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -44,11 +44,11 @@ echo('  <tr class="'.$class.'" bgcolor="' . $bg . '" onmouseover="this.style.bac
           <br />' . $device['sysName'] . '</td>'
         );
 
-echo ('<td width="55">');
+echo('<td width="55">');
 if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
-echo ('</td>');
+echo('</td>');
 echo('    <td class="paddedcell">' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
 echo('    <td class="paddedcell">' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
 echo('    <td class="paddedcell">' . formatUptime($device['uptime'], 'short') . ' <br />');
@@ -56,6 +56,6 @@ echo('    <td class="paddedcell">' . formatUptime($device['uptime'], 'short') .
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
 
-echo (' </tr>');
+echo(' </tr>');
 
 ?>
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 3b605ccd8..c6b3bdbbc 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -92,9 +92,9 @@ if ($device['os'] == "ios" || $device['os'] == "iosxe")
 
     echo('<p class=box-desc><span class=purple><a title="');
     $vlans = dbFetchRows("SELECT * FROM `ports_vlans` AS PV, vlans AS V WHERE PV.`interface_id` ='".$port['interface_id']."' and PV.`device_id` = '".$device['device_id']."' AND V.`vlan_vlan` = PV.vlan AND V.device_id = PV.device_id");
-    foreach($vlans as $vlan)
+    foreach ($vlans as $vlan)
     {
-      if($vlan['state'] == "blocking") { $class="red"; } elseif ($vlan['state'] == "forwarding" ) { $class="green"; } else { $class = "none"; }
+      if ($vlan['state'] == "blocking") { $class="red"; } elseif ($vlan['state'] == "forwarding" ) { $class="green"; } else { $class = "none"; }
       echo("<b class=".$class.">".$vlan['vlan'] ."</b> ".$vlan['vlan_descr']."<br />");
     }
     echo('">'.$port['ifTrunk'].'</a></span></p>');
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index d1dd3f044..863372941 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -346,7 +346,7 @@ foreach (array('fanspeed','humidity','temperature') as $item)
 {
   if ($menu_sensors[$item])
   {
-    echo ('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
+    echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
     unset($menu_sensors[$item]);$sep++;
   }
 }
@@ -361,7 +361,7 @@ foreach (array('current','frequency','power','voltage') as $item)
 {
   if ($menu_sensors[$item])
   {
-    echo ('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
+    echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
     unset($menu_sensors[$item]);$sep++;
   }
 }
@@ -374,7 +374,7 @@ if ($sep && array_keys($menu_sensors))
 
 foreach (array_keys($menu_sensors) as $item)
 {
-  echo ('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
+  echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
   unset($menu_sensors[$item]);$sep++;
 }
 
@@ -456,7 +456,6 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
 <?php
 }
 
-
 $packages  = dbFetchCell("SELECT COUNT(package_id) from `packages`");
 
 if ($packages)
diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index 53593c6fd..1f4a3223f 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -10,12 +10,12 @@ echo("<td class=list-bold>");
 
   $vlan_ports = array();
   $otherports = dbFetchRows("SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.interface_id = V.interface_id", array($device['device_id'], $vlan['vlan_vlan']));
-  foreach($otherports as $otherport)
+  foreach ($otherports as $otherport)
   {
    $vlan_ports[$otherport[ifIndex]] = $otherport;
   }
   $otherports = dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan']));
-  foreach($otherports as $otherport)
+  foreach ($otherports as $otherport)
   {
    $vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
   }
@@ -42,7 +42,7 @@ foreach ($vlan_ports as $port)
   {
     echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label'])));
     $vlan['port_sep'] = ", ";
-    if($port['untagged']) { echo("(U)"); }
+    if ($port['untagged']) { echo("(U)"); }
 
   }
 }
diff --git a/html/includes/topnav.inc.php b/html/includes/topnav.inc.php
index de5ab8637..7d068479e 100644
--- a/html/includes/topnav.inc.php
+++ b/html/includes/topnav.inc.php
@@ -14,7 +14,7 @@ foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $device)
 
   $cache['devices']['hostname'][$device['hostname']] = $device['device_id'];
   $cache['devices']['id'][$device['device_id']] = $device;
-  
+
   $cache['device_types'][$device['type']]++;
 }