diff --git a/bin/netdisco-do b/bin/netdisco-do
index f24da01f..34d6c16c 100755
--- a/bin/netdisco-do
+++ b/bin/netdisco-do
@@ -421,7 +421,7 @@ L<DBIx::Class> trace enabled
 
 =back
 
-In case of issues with the colored output, setting the environment variable 
+In case of issues with the colored output, setting the environment variable
 C<ANSI_COLORS_DISABLED> can be used to suppress it.
 
 =cut
diff --git a/lib/App/Netdisco/Backend/Job.pm b/lib/App/Netdisco/Backend/Job.pm
index 75879326..bab5d036 100644
--- a/lib/App/Netdisco/Backend/Job.pm
+++ b/lib/App/Netdisco/Backend/Job.pm
@@ -94,7 +94,7 @@ sub best_status {
   my $cur_status = '';
 
   foreach my $status (reverse @{ $job->_statuslist }) {
-    next if $status->phase 
+    next if $status->phase
       and $status->phase !~ m/^(?:early|main|store|late)$/;
 
     if ($status->level >= $cur_level) {
@@ -123,7 +123,7 @@ sub finalise_status {
   my $max_level = Status->error()->level;
 
   foreach my $status (reverse @{ $job->_statuslist }) {
-    next if $status->phase 
+    next if $status->phase
       and $status->phase !~ m/^(?:check|early|main|store|late)$/;
 
     # done() from check phase should not be the action's done()
diff --git a/lib/App/Netdisco/Util/DeviceAuth.pm b/lib/App/Netdisco/Util/DeviceAuth.pm
index 80ed8d8a..034ab669 100644
--- a/lib/App/Netdisco/Util/DeviceAuth.pm
+++ b/lib/App/Netdisco/Util/DeviceAuth.pm
@@ -89,7 +89,7 @@ sub fixup_device_auth {
     push @new_stanzas, $stanza;
   }
 
-  # legacy config 
+  # legacy config
   # note: read strings tried before write
   # note: read-write is no longer used for read operations
 
diff --git a/lib/App/Netdisco/Util/SNMP.pm b/lib/App/Netdisco/Util/SNMP.pm
index 26708726..efbb19ad 100644
--- a/lib/App/Netdisco/Util/SNMP.pm
+++ b/lib/App/Netdisco/Util/SNMP.pm
@@ -100,18 +100,18 @@ sub snmp_comm_reindex {
       }
       $prefix ||= 'vlan-';
 
-      if ($vlan =~ /^[0-9]+$/i && $vlan) { 
+      if ($vlan =~ /^[0-9]+$/i && $vlan) {
         debug sprintf '[%s] reindexing to "%s%s" (ver: %s, class: %s)',
         $device->ip, $prefix, $vlan, $ver, $snmp->class;
         $snmp->update(Context => ($prefix . $vlan));
-      } elsif ($vlan =~ /^[a-z0-9]+$/i && $vlan) { 
+      } elsif ($vlan =~ /^[a-z0-9]+$/i && $vlan) {
         debug sprintf '[%s] reindexing to "%s" (ver: %s, class: %s)',
           $device->ip, $vlan, $ver, $snmp->class;
         $snmp->update(Context => ($vlan));
-      } else { 
+      } else {
         debug sprintf '[%s] reindexing without context (ver: %s, class: %s)',
           $device->ip, $ver, $snmp->class;
-        $snmp->update(Context => ''); 
+        $snmp->update(Context => '');
       }
   }
   else {
diff --git a/share/views/ajax/admintask/duplicatedevices.tt b/share/views/ajax/admintask/duplicatedevices.tt
index ec654be6..71c71790 100644
--- a/share/views/ajax/admintask/duplicatedevices.tt
+++ b/share/views/ajax/admintask/duplicatedevices.tt
@@ -15,7 +15,7 @@
       <th class="nd_center-cell">Delete</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% SET count = 0 %]
     [% FOREACH row IN results %]
     [% SET count = count + 1 %]
diff --git a/share/views/ajax/admintask/jobqueue.tt b/share/views/ajax/admintask/jobqueue.tt
index 10ec7df6..cfcf7d52 100644
--- a/share/views/ajax/admintask/jobqueue.tt
+++ b/share/views/ajax/admintask/jobqueue.tt
@@ -16,7 +16,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr
       [% ' class="nd_jobqueueitem success"' IF row.status == 'done' %]
diff --git a/share/views/ajax/admintask/nodemonitor.tt b/share/views/ajax/admintask/nodemonitor.tt
index 7fc9cca1..b2f0c1cb 100644
--- a/share/views/ajax/admintask/nodemonitor.tt
+++ b/share/views/ajax/admintask/nodemonitor.tt
@@ -10,7 +10,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     <tr>
       <td class="nd_center-cell"></td>
       <td class="nd_center-cell"><input data-form="add" name="mac" type="text"></td>
diff --git a/share/views/ajax/admintask/performance.tt b/share/views/ajax/admintask/performance.tt
index 6b1d62f5..37484229 100644
--- a/share/views/ajax/admintask/performance.tt
+++ b/share/views/ajax/admintask/performance.tt
@@ -12,7 +12,7 @@
       <th class="nd_center-cell">Time Elapsed</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% WHILE (row = results.next) %]
     <tr
       [% IF NOT mac AND row.action == 'macsuck' %]
diff --git a/share/views/ajax/admintask/pseudodevice.tt b/share/views/ajax/admintask/pseudodevice.tt
index a781c27f..d08fce1b 100644
--- a/share/views/ajax/admintask/pseudodevice.tt
+++ b/share/views/ajax/admintask/pseudodevice.tt
@@ -7,7 +7,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     <tr>
       <td class="nd_center-cell"><input data-form="add" name="dns" type="text"></td>
       <td class="nd_center-cell"><input data-form="add" name="ip" type="text"></td>
diff --git a/share/views/ajax/admintask/slowdevices.tt b/share/views/ajax/admintask/slowdevices.tt
index f2c5ebe8..dfb84385 100644
--- a/share/views/ajax/admintask/slowdevices.tt
+++ b/share/views/ajax/admintask/slowdevices.tt
@@ -11,7 +11,7 @@
       <th class="nd_center-cell">Time Elapsed</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% WHILE (row = results.next) %]
     <tr>
       <td class="nd_center-cell">[% row.action.ucfirst | html_entity %]</td>
diff --git a/share/views/ajax/admintask/timedoutdevices.tt b/share/views/ajax/admintask/timedoutdevices.tt
index e86667d8..3046c154 100644
--- a/share/views/ajax/admintask/timedoutdevices.tt
+++ b/share/views/ajax/admintask/timedoutdevices.tt
@@ -12,7 +12,7 @@
       <th class="nd_center-cell">Try Again</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr>
       <td class="nd_center-cell">[% row.backend | html_entity %]</td>
diff --git a/share/views/ajax/admintask/topology.tt b/share/views/ajax/admintask/topology.tt
index 510a8c25..fb5f49fe 100644
--- a/share/views/ajax/admintask/topology.tt
+++ b/share/views/ajax/admintask/topology.tt
@@ -8,7 +8,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     <tr>
       <td class="nd_center-cell">
         <div class="input-append">
diff --git a/share/views/ajax/admintask/undiscoveredneighbors.tt b/share/views/ajax/admintask/undiscoveredneighbors.tt
index c8ec1624..b61925c8 100644
--- a/share/views/ajax/admintask/undiscoveredneighbors.tt
+++ b/share/views/ajax/admintask/undiscoveredneighbors.tt
@@ -7,7 +7,7 @@
       <th nowrap>Last Discovery</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     [% NEXT IF NOT row.remote_ip %]
     <tr>
diff --git a/share/views/ajax/admintask/users.tt b/share/views/ajax/admintask/users.tt
index 45e1da16..9c14b1eb 100644
--- a/share/views/ajax/admintask/users.tt
+++ b/share/views/ajax/admintask/users.tt
@@ -13,7 +13,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     <tr>
       <td class="nd_center-cell"><input data-form="add" name="fullname" type="text"></td>
       <td class="nd_center-cell"><input data-form="add" name="username" type="text"></td>
diff --git a/share/views/ajax/device/details.tt b/share/views/ajax/device/details.tt
index 30ae863f..049c9c96 100644
--- a/share/views/ajax/device/details.tt
+++ b/share/views/ajax/device/details.tt
@@ -1,6 +1,6 @@
 [% SET user_can_port_control = user_has_role('port_control') %]
 <table class="table table-condensed table-striped">
-  </tbody>
+  <tbody>
     <tr>
       <td>System Name</td>
       <td>[% d.name %]</td>
diff --git a/share/views/ajax/report/generic_report.tt b/share/views/ajax/report/generic_report.tt
index 4b690ef2..7a583597 100644
--- a/share/views/ajax/report/generic_report.tt
+++ b/share/views/ajax/report/generic_report.tt
@@ -6,7 +6,7 @@
       [% END %]
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr>
       [% FOREACH col IN columns %]
diff --git a/share/views/ajax/report/inventorybymodelbyos.tt b/share/views/ajax/report/inventorybymodelbyos.tt
index 925946f6..52d82732 100644
--- a/share/views/ajax/report/inventorybymodelbyos.tt
+++ b/share/views/ajax/report/inventorybymodelbyos.tt
@@ -6,7 +6,7 @@
       <th>Count</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr>
       <td>
diff --git a/share/views/ajax/report/portlog.tt b/share/views/ajax/report/portlog.tt
index b229065e..6d45fe55 100644
--- a/share/views/ajax/report/portlog.tt
+++ b/share/views/ajax/report/portlog.tt
@@ -10,7 +10,7 @@
       <th class="nd_center-cell">Action</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     <tr>
       <td class="nd_center-cell">-</td>
       <td class="nd_center-cell">[% session.logged_in_user | html_entity %]</td>
diff --git a/share/views/ajax/report/subnets.tt b/share/views/ajax/report/subnets.tt
index 79f05d18..4f03b2bd 100644
--- a/share/views/ajax/report/subnets.tt
+++ b/share/views/ajax/report/subnets.tt
@@ -8,7 +8,7 @@
       <th class="nd_center-cell">Percent Utilization</th>
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% FOREACH row IN results %]
     <tr>
       <td class="nd_center-cell"><a href="[% uri_for('/report/ipinventory') %]?subnet=[% row.subnet | uri %]&daterange=[% params.daterange | uri %]&age_invert=[% params.age_invert | uri %]&limit=[% row.subnet_size | uri %]">
diff --git a/share/views/ajax/search/node_by_ip.tt b/share/views/ajax/search/node_by_ip.tt
index 759b03c2..1548bf81 100644
--- a/share/views/ajax/search/node_by_ip.tt
+++ b/share/views/ajax/search/node_by_ip.tt
@@ -12,7 +12,7 @@
       [% END %]
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% WHILE (row = macs.next) %]
     [% IF row.nbname %]
     <tr>
diff --git a/share/views/ajax/search/node_by_mac.tt b/share/views/ajax/search/node_by_mac.tt
index cb07db8b..3440ba4d 100644
--- a/share/views/ajax/search/node_by_mac.tt
+++ b/share/views/ajax/search/node_by_mac.tt
@@ -11,7 +11,7 @@
       [% END %]
     </tr>
   </thead>
-  </tbody>
+  <tbody>
     [% WHILE (row = ips.next) %]
     <tr>
       <td>