diff --git a/Changes b/Changes
index 07de36b9..493b50ca 100644
--- a/Changes
+++ b/Changes
@@ -679,7 +679,7 @@
 
   [NEW FEATURES]
 
-  * #401 Autodiscovery via EIGRP peers
+  * #401 Autodiscovery via EIGRP peers
 
   [BUG FIXES]
 
@@ -746,7 +746,7 @@
 
   [NEW FEATURES]
 
-  * #48 Node Monitor supports matching on OUI
+  * #48 Node Monitor supports matching on OUI
   * #31 configurable Free Time in Port Utilization Report
   * improvements to network map, location filtering and auto saving
 
diff --git a/bin/netdisco-backend b/bin/netdisco-backend
index 4fb057bf..a5990da5 100755
--- a/bin/netdisco-backend
+++ b/bin/netdisco-backend
@@ -55,7 +55,7 @@ my $result = GetOptions(
 use App::Netdisco::Environment;
 my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml';
 
-# make sure there is a config file in place
+# make sure there is a config file in place
 my $template_config = file($ENV{DANCER_CONFDIR}, 'environments', $config);
 my $app_config = file($ENV{DANCER_ENVDIR}, $config);
 if (! -e $app_config and -e $template_config) {
diff --git a/bin/netdisco-backend-fg b/bin/netdisco-backend-fg
index 31e2764d..8437795a 100755
--- a/bin/netdisco-backend-fg
+++ b/bin/netdisco-backend-fg
@@ -29,7 +29,7 @@ BEGIN {
   setting('workers')->{'BACKEND'} ||= (hostfqdn || 'fqdn-undefined');
 }
 
-use App::Netdisco::Util::MCE; # set $0 and parse maxworkers
+use App::Netdisco::Util::MCE; # set $0 and parse maxworkers
 use NetAddr::IP::Lite ':lower'; # to quench AF_INET6 symbol errors
 use Role::Tiny::With;
 
diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy
index f99f6f1b..2d8562ee 100755
--- a/bin/netdisco-deploy
+++ b/bin/netdisco-deploy
@@ -310,7 +310,7 @@ sub shorten {
 }
 
 sub deploy_mibs {
-  my $mibhome = dir(shift); # /path/to/netdisco-mibs
+  my $mibhome = dir(shift); # /path/to/netdisco-mibs
   my $fail = 0;
 
   my $latest = 'https://github.com/netdisco/netdisco-mibs/releases/latest';
diff --git a/bin/netdisco-web b/bin/netdisco-web
index 7e54bb7a..7342f9a6 100755
--- a/bin/netdisco-web
+++ b/bin/netdisco-web
@@ -56,7 +56,7 @@ my $result = GetOptions(
 use App::Netdisco::Environment;
 my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml';
 
-# make sure there is a config file in place
+# make sure there is a config file in place
 my $template_config = file($ENV{DANCER_CONFDIR}, 'environments', $config);
 my $app_config = file($ENV{DANCER_ENVDIR}, $config);
 if (! -e $app_config and -e $template_config) {
diff --git a/lib/App/Netdisco/Backend/Job.pm b/lib/App/Netdisco/Backend/Job.pm
index 4b8429f7..15ff7e0c 100644
--- a/lib/App/Netdisco/Backend/Job.pm
+++ b/lib/App/Netdisco/Backend/Job.pm
@@ -118,7 +118,7 @@ sub finalise_status {
   my $job = shift;
   # use DDP; p $job->_statuslist;
 
-  # fallback
+  # fallback
   $job->status('error');
   $job->log('failed to report from any worker!');
 
@@ -134,7 +134,7 @@ sub finalise_status {
     next if $status->phase
       and $status->phase !~ m/^(?:check|early|main|store|late)$/;
 
-    # done() from check phase should not be the action's done()
+    # done() from check phase should not be the action's done()
     next if $status->phase eq 'check' and $status->is_ok;
 
     if ($status->level >= $max_level) {
diff --git a/lib/App/Netdisco/Backend/Role/Poller.pm b/lib/App/Netdisco/Backend/Role/Poller.pm
index 27f49cc5..cc921852 100644
--- a/lib/App/Netdisco/Backend/Role/Poller.pm
+++ b/lib/App/Netdisco/Backend/Role/Poller.pm
@@ -42,7 +42,7 @@ sub worker_body {
 
       $self->close_job($job);
       sleep( setting('workers')->{'min_runtime'} || 0 );
-      $self->exit(0); # recycle worker
+      $self->exit(0); # recycle worker
   }
 }
 
diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm
index 03a449cd..706aae0d 100644
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -21,7 +21,7 @@ BEGIN {
 
 # set up database schema config from simple config vars
 if (ref {} eq ref setting('database')) {
-    # override from env for docker
+    # override from env for docker
 
     setting('database')->{name} =
       ($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
@@ -73,19 +73,19 @@ if (ref {} eq ref setting('database')) {
 # always set this
 $ENV{DBIC_TRACE_PROFILE} = 'console';
 
-# override from env for docker
+# override from env for docker
 config->{'community'} = ($ENV{NETDISCO_RO_COMMUNITY} ?
   [split ',', $ENV{NETDISCO_RO_COMMUNITY}] : config->{'community'});
 config->{'community_rw'} = ($ENV{NETDISCO_RW_COMMUNITY} ?
   [split ',', $ENV{NETDISCO_RW_COMMUNITY}] : config->{'community_rw'});
 
-# if snmp_auth and device_auth not set, add defaults to community{_rw}
+# if snmp_auth and device_auth not set, add defaults to community{_rw}
 if ((setting('snmp_auth') and 0 == scalar @{ setting('snmp_auth') })
     and (setting('device_auth') and 0 == scalar @{ setting('device_auth') })) {
   config->{'community'} = [ @{setting('community')}, 'public' ];
   config->{'community_rw'} = [ @{setting('community_rw')}, 'private' ];
 }
-# fix up device_auth (or create it from old snmp_auth and community settings)
+# fix up device_auth (or create it from old snmp_auth and community settings)
 # also imports legacy sshcollector config
 config->{'device_auth'}
   = [ App::Netdisco::Util::DeviceAuth::fixup_device_auth() ];
@@ -122,7 +122,7 @@ setting('dns')->{'ETCHOSTS'} = {};
     for keys %AnyEvent::DNS::EtcHosts::HOSTS;
 }
 
-# override from env for docker
+# override from env for docker
 if ($ENV{NETDISCO_DOMAIN}) {
   if ($ENV{NETDISCO_DOMAIN} eq 'discover') {
     delete $ENV{NETDISCO_DOMAIN};
@@ -187,7 +187,7 @@ elsif (ref [] eq ref setting('tacacs')) {
   config->{'tacacs'} = [ @newservers ];
 }
 
-# support unordered dictionary as if it were a single item list
+# support unordered dictionary as if it were a single item list
 if (ref {} eq ref setting('device_identity')) {
   config->{'device_identity'} = [ setting('device_identity') ];
 }
@@ -236,8 +236,8 @@ setting('workers')->{'timeout'} = setting('timeout')
   if defined setting('timeout')
      and !defined setting('workers')->{'timeout'};
 
-# 0 for workers max_deferrals and retry_after is like disabling
-# but we need to fake it with special values
+# 0 for workers max_deferrals and retry_after is like disabling
+# but we need to fake it with special values
 setting('workers')->{'max_deferrals'} ||= (2**30);
 setting('workers')->{'retry_after'}   ||= '100 years';
 
@@ -254,15 +254,15 @@ if (setting('reports') and ref {} eq ref setting('reports')) {
     }} keys %{ setting('reports') } ];
 }
 
-# add system_reports onto reports
+# add system_reports onto reports
 config->{'reports'} = [ @{setting('system_reports')}, @{setting('reports')} ];
 
 # set swagger ui location
 #config->{plugins}->{Swagger}->{ui_dir} =
   #dir(dist_dir('App-Netdisco'), 'share', 'public', 'swagger-ui')->absolute;
 
-# setup helpers for when request->uri_for() isn't available
-# (for example when inside swagger_path())
+# setup helpers for when request->uri_for() isn't available
+# (for example when inside swagger_path())
 config->{url_base}
   = URI::Based->new((config->{path} eq '/') ? '' : config->{path});
 config->{api_base}
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index 676aeed4..6d44a5d5 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -8,9 +8,9 @@ use base 'DBIx::Class::Core';
 __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 
 # note to future devs:
-# this query does not use the slave_of field in device_port table to group
-# ports because what we actually want is total b/w between devices on all
-# links, regardless of whether those links are in an aggregate.
+# this query does not use the slave_of field in device_port table to group
+# ports because what we actually want is total b/w between devices on all
+# links, regardless of whether those links are in an aggregate.
 
 __PACKAGE__->table('device_links');
 __PACKAGE__->result_source_instance->is_virtual(1);
diff --git a/lib/App/Netdisco/DB/ResultSet/Admin.pm b/lib/App/Netdisco/DB/ResultSet/Admin.pm
index a6f15c01..8dc841fd 100644
--- a/lib/App/Netdisco/DB/ResultSet/Admin.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Admin.pm
@@ -24,11 +24,11 @@ C<retry_after> when devices will be retried once (disabled if 0/undef passed).
 sub skipped {
   my ($rs, $backend, $max_deferrals, $retry) = @_;
   $backend ||= 'fqdn-undefined';
-  $max_deferrals ||= (2**30); # not really 'disabled'
-  $retry ||= '100 years'; # not really 'disabled'
+  $max_deferrals ||= (2**30); # not really 'disabled'
+  $retry ||= '100 years'; # not really 'disabled'
 
   return $rs->correlate('device_skips')->search(undef,{
-    # NOTE: bind param list order is significant
+    # NOTE: bind param list order is significant
     bind => [[deferrals => $max_deferrals], [last_defer => $retry], [backend => $backend]],
   });
 }
diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm
index c63651e6..23a3ee1c 100644
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -26,7 +26,7 @@ sub device_ips_with_address_or_name {
   $q ||= '255.255.255.255/32';
 
   return $rs->search(undef,{
-    # NOTE: bind param list order is significant
+    # NOTE: bind param list order is significant
     join => ['device_ips_by_address_or_name'],
     bind => [$q, $ipbind, $q],
   });
@@ -44,7 +44,7 @@ sub ports_with_mac {
   $mac ||= '00:00:00:00:00:00';
 
   return $rs->search(undef,{
-    # NOTE: bind param list order is significant
+    # NOTE: bind param list order is significant
     join => ['ports_by_mac'],
     bind => [$mac],
   });
diff --git a/lib/App/Netdisco/DB/SetOperations.pm b/lib/App/Netdisco/DB/SetOperations.pm
index fef5efb4..63e422a1 100644
--- a/lib/App/Netdisco/DB/SetOperations.pm
+++ b/lib/App/Netdisco/DB/SetOperations.pm
@@ -25,7 +25,7 @@ sub _set_operation {
          unless $self->_compare_arrays($as, $attrs->{as});
  
       my ($sql, @bind) = @{${$_->as_query}};
-      # $sql =~ s/^\s*\((.*)\)\s*$/$1/;
+      # $sql =~ s/^\s*\((.*)\)\s*$/$1/;
       $sql = q<(> . $sql . q<)>;
  
       push @sql, $sql;
diff --git a/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm
index 92b9c814..70a16910 100644
--- a/lib/App/Netdisco/JobQueue/PostgreSQL.pm
+++ b/lib/App/Netdisco/JobQueue/PostgreSQL.pm
@@ -27,8 +27,8 @@ our @EXPORT_OK = qw/
 /;
 our %EXPORT_TAGS = ( all => \@EXPORT_OK );
 
-# given a device, tests if any of the primary acls applies
-# returns a list of job actions to be denied/skipped on this host.
+# given a device, tests if any of the primary acls applies
+# returns a list of job actions to be denied/skipped on this host.
 sub _get_denied_actions {
   my $device = shift;
   my @badactions = ();
@@ -110,10 +110,10 @@ sub jq_getsome {
 
   while (my $job = $tasty->next) {
     if ($job->device) {
-      # need to handle device discovered since backend daemon started
+      # need to handle device discovered since backend daemon started
       # and the skiplist was primed. these should be checked against
-      # the various acls and have device_skip entry added if needed,
-      # and return false if it should have been skipped.
+      # the various acls and have device_skip entry added if needed,
+      # and return false if it should have been skipped.
       my @badactions = _get_denied_actions($job->device);
       if (scalar @badactions) {
         schema('netdisco')->resultset('DeviceSkip')->find_or_create({
@@ -128,10 +128,10 @@ sub jq_getsome {
     # remove any duplicate jobs, incuding possibly this job if there
     # is already an equivalent job running
 
-    # note that the self-removal of a job has an unhelpful log: it is
-    # reported as a duplicate of itself! however what's happening is that
-    # netdisco has seen another running job with same params (but the query
-    # cannot see that ID to use it in the message).
+    # note that the self-removal of a job has an unhelpful log: it is
+    # reported as a duplicate of itself! however what's happening is that
+    # netdisco has seen another running job with same params (but the query
+    # cannot see that ID to use it in the message).
 
     my %job_properties = (
       action => $job->action,
@@ -217,12 +217,12 @@ sub jq_defer {
   my $job = shift;
   my $happy = false;
 
-  # note this taints all actions on the device. for example if both
-  # macsuck and arpnip are allowed, but macsuck fails 10 times, then
-  # arpnip (and every other action) will be prevented on the device.
+  # note this taints all actions on the device. for example if both
+  # macsuck and arpnip are allowed, but macsuck fails 10 times, then
+  # arpnip (and every other action) will be prevented on the device.
 
-  # seeing as defer is only triggered by an SNMP connect failure, this
-  # behaviour seems reasonable, to me (or desirable, perhaps).
+  # seeing as defer is only triggered by an SNMP connect failure, this
+  # behaviour seems reasonable, to me (or desirable, perhaps).
 
   try {
     schema('netdisco')->txn_do(sub {
@@ -252,9 +252,9 @@ sub jq_complete {
 
   # lock db row and update to show job is done/error
 
-  # now that SNMP connect failures are deferrals and not errors, any complete
-  # status, whether success or failure, indicates an SNMP connect. reset the
-  # connection failures counter to forget about occasional connect glitches.
+  # now that SNMP connect failures are deferrals and not errors, any complete
+  # status, whether success or failure, indicates an SNMP connect. reset the
+  # connection failures counter to forget about occasional connect glitches.
 
   try {
     schema('netdisco')->txn_do(sub {
diff --git a/lib/App/Netdisco/Transport/SNMP.pm b/lib/App/Netdisco/Transport/SNMP.pm
index 5fbf5fed..a2a3b43d 100644
--- a/lib/App/Netdisco/Transport/SNMP.pm
+++ b/lib/App/Netdisco/Transport/SNMP.pm
@@ -84,7 +84,7 @@ Returns C<undef> if the connection fails.
 sub test_connection {
   my ($class, $ip) = @_;
   my $addr = NetAddr::IP::Lite->new($ip) or return undef;
-  # avoid renumbering to localhost loopbacks
+  # avoid renumbering to localhost loopbacks
   return undef if $addr->addr eq '0.0.0.0'
                   or check_acl_no($addr->addr, 'group:__LOCAL_ADDRESSES__');
   my $device = schema('netdisco')->resultset('Device')
diff --git a/lib/App/Netdisco/Util/DeviceAuth.pm b/lib/App/Netdisco/Util/DeviceAuth.pm
index 5ee09b33..df7a6bce 100644
--- a/lib/App/Netdisco/Util/DeviceAuth.pm
+++ b/lib/App/Netdisco/Util/DeviceAuth.pm
@@ -91,8 +91,8 @@ sub fixup_device_auth {
   }
 
   # legacy config
-  # note: read strings tried before write
-  # note: read-write is no longer used for read operations
+  # note: read strings tried before write
+  # note: read-write is no longer used for read operations
 
   push @new_stanzas, map {{
     read => 1, write => 0,
diff --git a/lib/App/Netdisco/Util/FastResolver.pm b/lib/App/Netdisco/Util/FastResolver.pm
index 569c7af6..39a2674a 100644
--- a/lib/App/Netdisco/Util/FastResolver.pm
+++ b/lib/App/Netdisco/Util/FastResolver.pm
@@ -79,7 +79,7 @@ sub hostnames_resolve_async {
   $done->recv;
 
   # Remove reference to resolver so that we close sockets
-  # and allow return to any instance defaults we have changed
+  # and allow return to any instance defaults we have changed
   undef $AnyEvent::DNS::RESOLVER if $AnyEvent::DNS::RESOLVER;
 
   return $ips;
diff --git a/lib/App/Netdisco/Util/Permission.pm b/lib/App/Netdisco/Util/Permission.pm
index 74504f10..6d7fa1ab 100644
--- a/lib/App/Netdisco/Util/Permission.pm
+++ b/lib/App/Netdisco/Util/Permission.pm
@@ -65,7 +65,7 @@ for details of what C<$acl> may contain.
 sub check_acl_only {
   my ($thing, $setting_name) = @_;
   return 0 unless $thing and $setting_name;
-  # logic to make an empty config be equivalent to 'any' (i.e. a match)
+  # logic to make an empty config be equivalent to 'any' (i.e. a match)
   my $config = (exists config->{"$setting_name"} ? setting($setting_name)
                                                  : $setting_name);
   return 1 if not $config # undef or empty string
@@ -99,7 +99,7 @@ sub check_acl {
         $thing->can('addr') ? $thing->addr : $thing )));
   }
   return 0 if !defined $real_ip
-    or blessed $real_ip; # class we do not understand
+    or blessed $real_ip; # class we do not understand
 
   $config  = [$config] if ref '' eq ref $config;
   if (ref [] ne ref $config) {
@@ -113,12 +113,12 @@ sub check_acl {
   return 1 if $find and not $all;
 
   my $addr = NetAddr::IP::Lite->new($real_ip) or return 0;
-  my $name = undef; # only look up once, and only if qr// is used
+  my $name = undef; # only look up once, and only if qr// is used
   my $ropt = { retry => 1, retrans => 1, udp_timeout => 1, tcp_timeout => 2 };
   my $qref = ref qr//;
 
   INLIST: foreach (@$config) {
-      my $item = $_; # must copy so that we can modify safely
+      my $item = $_; # must copy so that we can modify safely
       next INLIST if !defined $item or $item eq 'op:and';
 
       if ($qref eq ref $item) {
diff --git a/lib/App/Netdisco/Util/Statistics.pm b/lib/App/Netdisco/Util/Statistics.pm
index 8046ce15..8d2a46bb 100644
--- a/lib/App/Netdisco/Util/Statistics.pm
+++ b/lib/App/Netdisco/Util/Statistics.pm
@@ -3,7 +3,7 @@ package App::Netdisco::Util::Statistics;
 use Dancer qw/:syntax :script/;
 use Dancer::Plugin::DBIC 'schema';
 
-use Time::Piece; # for OO localtime
+use Time::Piece; # for OO localtime
 
 use base 'Exporter';
 our @EXPORT = ();
@@ -36,7 +36,7 @@ sub update_stats {
   my $snmpinfo_ver = ($@ ? 'n/a' : $SNMP::Info::VERSION);
   my $postgres_ver = pretty_version($schema->storage->dbh->{pg_server_version}, 2);
 
-  # TODO: (when we have the capabilities table?)
+  # TODO: (when we have the capabilities table?)
   #  $stats{waps} = sql_scalar('device',['COUNT(*)'], {"model"=>"AIR%"});
 
   $schema->txn_do(sub {
diff --git a/lib/App/Netdisco/Util/Worker.pm b/lib/App/Netdisco/Util/Worker.pm
index 51213b04..9cce76bc 100644
--- a/lib/App/Netdisco/Util/Worker.pm
+++ b/lib/App/Netdisco/Util/Worker.pm
@@ -17,7 +17,7 @@ sub queue_hook {
   my $extra = { action_conf => dclone ($conf->{'with'} || {}),
                 event_data  => dclone (vars->{'hook_data'} || {}) };
 
-  # remove scalar references which to_json cannot handle
+  # remove scalar references which to_json cannot handle
   visit( $extra->{'event_data'}, sub {
     my ($key, $valueref) = @_;
     $$valueref = '' if ref $$valueref eq 'SCALAR';
diff --git a/lib/App/Netdisco/Web.pm b/lib/App/Netdisco/Web.pm
index 81def9e0..f623cfa1 100644
--- a/lib/App/Netdisco/Web.pm
+++ b/lib/App/Netdisco/Web.pm
@@ -94,7 +94,7 @@ if (setting('extra_web_plugins') and ref [] eq ref setting('extra_web_plugins'))
 push @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} },
      setting('views');
 
-# any template paths in deployment.yml (should override plugins)
+# any template paths in deployment.yml (should override plugins)
 if (setting('template_paths') and ref [] eq ref setting('template_paths')) {
     if (setting('site_local_files')) {
       push @{setting('template_paths')},
@@ -135,7 +135,7 @@ hook after_error_render => sub { setting('layout' => 'main') };
 
   set('port_columns' => \@port_columns);
 
-  # update sidebar_defaults so hooks scanning params see new plugin cols
+  # update sidebar_defaults so hooks scanning params see new plugin cols
   setting('sidebar_defaults')->{'device_ports'}->{ $_->{name} } = $_
     for @port_columns;
 }
@@ -151,7 +151,7 @@ hook 'before' => sub {
   # trim whitespace
   params->{'q'} =~ s/^\s+|\s+$//g if param('q');
 
-  # copy sidebar defaults into vars so we can mess about with it
+  # copy sidebar defaults into vars so we can mess about with it
   foreach my $sidebar (keys %{setting('sidebar_defaults')}) {
     vars->{'sidebar_defaults'}->{$sidebar} = { map {
       ($_ => setting('sidebar_defaults')->{$sidebar}->{$_}->{'default'})
@@ -160,19 +160,19 @@ hook 'before' => sub {
 };
 
 # swagger submits "false" params whereas web UI does not - remove them
-# so that code testing for param existence as truth still works.
+# so that code testing for param existence as truth still works.
 hook 'before' => sub {
   return unless request_is_api_report or request_is_api_search;
   map {delete params->{$_} if params->{$_} eq 'false'} keys %{params()};
 };
 
 hook 'before_template' => sub {
-  # search or report from navbar, or reset of sidebar, can ignore params
+  # search or report from navbar, or reset of sidebar, can ignore params
   return if param('firstsearch')
     or var('sidebar_key') !~ m/^\w+_\w+$/;
 
-  # update defaults to contain the passed url params
-  # (this follows initial copy from config.yml, then cookie restore)
+  # update defaults to contain the passed url params
+  # (this follows initial copy from config.yml, then cookie restore)
   var('sidebar_defaults')->{var('sidebar_key')}->{$_} = param($_)
     for keys %{ var('sidebar_defaults')->{var('sidebar_key')} || {} };
 };
@@ -187,7 +187,7 @@ hook 'before_template' => sub {
     # allow portable dynamic content
     $tokens->{uri_for} = sub { uri_for(@_)->path_query };
 
-    # current query string to all resubmit from within ajax template
+    # current query string to all resubmit from within ajax template
     my $queryuri = URI->new();
     $queryuri->query_param($_ => param($_))
       for grep {$_ ne 'return_url'} keys %{params()};
@@ -222,7 +222,7 @@ hook 'before_template' => sub {
         $tokens->{$sidebar_key} = $tokens->{$sidebar_key}->path_query;
     }
 
-    # helper from NetAddr::MAC for the MAC formatting
+    # helper from NetAddr::MAC for the MAC formatting
     $tokens->{mac_format_call} = 'as_'. lc(param('mac_format'))
       if param('mac_format');
 
diff --git a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
index e92ddcd1..5d072dc4 100644
--- a/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
+++ b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
@@ -239,7 +239,7 @@ sub match_with_radius {
   my $conf = setting('radius');
   my $radius = Authen::Radius->new(@$conf);
   # my $dict_dir = Path::Class::Dir->new( dist_dir('App-Netdisco') )
-  #   ->subdir('radius_dictionaries')->stringify;
+  #   ->subdir('radius_dictionaries')->stringify;
   Authen::Radius->load_dictionary(); # put $dict_dir in here once it's useful
 
   $radius->add_attributes(
diff --git a/lib/App/Netdisco/Web/AuthN.pm b/lib/App/Netdisco/Web/AuthN.pm
index 6d42bcf3..95bc8d24 100644
--- a/lib/App/Netdisco/Web/AuthN.pm
+++ b/lib/App/Netdisco/Web/AuthN.pm
@@ -157,7 +157,7 @@ post '/login' => sub {
 };
 
 # ugh, *puke*, but D::P::Swagger has no way to set this with swagger_path
-# must be after the path is declared, above.
+# must be after the path is declared, above.
 Dancer::Plugin::Swagger->instance->doc
   ->{paths}->{ setting('url_base')->with('/login')->path }
   ->{post}->{security}->[0]->{BasicAuth} = [];
diff --git a/lib/App/Netdisco/Web/Device.pm b/lib/App/Netdisco/Web/Device.pm
index 56ca283a..ce5a1d92 100644
--- a/lib/App/Netdisco/Web/Device.pm
+++ b/lib/App/Netdisco/Web/Device.pm
@@ -26,7 +26,7 @@ hook 'before_template' => sub {
     or return;
 
   # override ports form defaults with cookie settings
-  # always do this so that embedded links to device ports page have user prefs
+  # always do this so that embedded links to device ports page have user prefs
   if (param('reset')) {
     cookie('nd_ports-form' => '', expires => '-1 day');
   }
@@ -50,7 +50,7 @@ hook 'before_template' => sub {
   return if param('reset')
     or not var('sidebar_key') or (var('sidebar_key') ne 'device_ports');
 
-  # update cookie from params we just recieved in form submit
+  # update cookie from params we just recieved in form submit
   my $uri = URI->new();
   foreach my $key (keys %{ $defaults }) {
     $uri->query_param($key => param($key));
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
index 13a74fc3..7a29f00e 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
@@ -32,15 +32,15 @@ ajax '/ajax/data/device/netmappositions' => require_login sub {
     my $mapshow = param('mapshow');
     return if !defined $mapshow or $mapshow !~ m/^(?:all|neighbors)$/;
 
-    # list of groups selected by user and passed in param
+    # list of groups selected by user and passed in param
     my $hgroup = (ref [] eq ref param('hgroup') ? param('hgroup') : [param('hgroup')]);
-    # list of groups validated as real host groups and named host groups
+    # list of groups validated as real host groups and named host groups
     my @hgrplist = List::MoreUtils::uniq
                    grep { exists setting('host_group_displaynames')->{$_} }
                    grep { exists setting('host_groups')->{$_} }
                    grep { defined } @{ $hgroup };
 
-    # list of locations selected by user and passed in param
+    # list of locations selected by user and passed in param
     my $lgroup = (ref [] eq ref param('lgroup') ? param('lgroup') : [param('lgroup')]);
     my @lgrplist = List::MoreUtils::uniq grep { defined } @{ $lgroup };
 
@@ -76,7 +76,7 @@ ajax '/ajax/data/device/netmappositions' => require_login sub {
     }
 };
 
-# copied from SNMP::Info to avoid introducing dependency to web frontend
+# copied from SNMP::Info to avoid introducing dependency to web frontend
 sub munge_highspeed {
     my $speed = shift;
     my $fmt   = "%d Mbps";
@@ -147,15 +147,15 @@ ajax '/ajax/data/device/netmap' => require_login sub {
     $mapshow = 'neighbors' if $mapshow !~ m/^(?:all|neighbors)$/;
     $mapshow = 'all' unless $qdev->in_storage;
 
-    # list of groups selected by user and passed in param
+    # list of groups selected by user and passed in param
     my $hgroup = (ref [] eq ref param('hgroup') ? param('hgroup') : [param('hgroup')]);
-    # list of groups validated as real host groups and named host groups
+    # list of groups validated as real host groups and named host groups
     my @hgrplist = List::MoreUtils::uniq
                    grep { exists setting('host_group_displaynames')->{$_} }
                    grep { exists setting('host_groups')->{$_} }
                    grep { defined } @{ $hgroup };
 
-    # list of locations selected by user and passed in param
+    # list of locations selected by user and passed in param
     my $lgroup = (ref [] eq ref param('lgroup') ? param('lgroup') : [param('lgroup')]);
     my @lgrplist = List::MoreUtils::uniq grep { defined } @{ $lgroup };
 
@@ -217,21 +217,21 @@ ajax '/ajax/data/device/netmap' => require_login sub {
     }
 
     DEVICE: while (my $device = $devices->next) {
-      # if in neighbors mode then use %ok_dev to filter
+      # if in neighbors mode then use %ok_dev to filter
       next DEVICE if ($device->ip ne $qdev->ip)
         and ($mapshow eq 'neighbors')
         and (not $ok_dev{$device->ip}); # showing only neighbors but no link
 
-      # if location picked then filter
+      # if location picked then filter
       next DEVICE if ((scalar @lgrplist) and ((!defined $device->location)
         or (0 == scalar grep {$_ eq $device->location} @lgrplist)));
 
-      # if host groups picked then use ACLs to filter
+      # if host groups picked then use ACLs to filter
       my $first_hgrp =
         first { check_acl_only($device, setting('host_groups')->{$_}) } @hgrplist;
       next DEVICE if ((scalar @hgrplist) and (not $first_hgrp));
 
-      # now reset first_hgroup to be the group matching the device, if any
+      # now reset first_hgroup to be the group matching the device, if any
       $first_hgrp = first { check_acl_only($device, setting('host_groups')->{$_}) }
                           keys %{ setting('host_group_displaynames') || {} };
 
@@ -273,7 +273,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
         if $qdev and $qdev->in_storage and $device->ip eq $qdev->ip;
     }
 
-    # to help get a sensible range of node sizes
+    # to help get a sensible range of node sizes
     $metadata{'numsizes'} = scalar keys %logvals;
 
     content_type('application/json');
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
index e7382921..942d61dc 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
@@ -99,11 +99,11 @@ get '/ajax/content/device/ports' => require_login sub {
         $set = $set->search({-or => \@combi});
     }
 
-    # so far only the basic device_port data
-    # now begin to join tables depending on the selected columns/options
+    # so far only the basic device_port data
+    # now begin to join tables depending on the selected columns/options
 
     # get vlans on the port
-    # leave this query dormant (lazy) unless c_vmember is set or vlan filtering
+    # leave this query dormant (lazy) unless c_vmember is set or vlan filtering
     my $vlans = $set->search({}, {
       select => [
         'port',
@@ -117,7 +117,7 @@ get '/ajax/content/device/ports' => require_login sub {
     if (param('c_vmember') or ($prefer eq 'vlan') or (not $prefer and $f =~ m/^\d+$/)) {
         $vlans = { map {(
           $_->port => {
-            # DBIC smart enough to work out this should be an arrayref :)
+            # DBIC smart enough to work out this should be an arrayref :)
             vlan_set   => $_->get_column('vlan_set'),
             vlan_count => $_->get_column('vlan_count'),
           },
diff --git a/lib/App/Netdisco/Worker/Loader.pm b/lib/App/Netdisco/Worker/Loader.pm
index f8a94d1e..ea9981f3 100644
--- a/lib/App/Netdisco/Worker/Loader.pm
+++ b/lib/App/Netdisco/Worker/Loader.pm
@@ -23,7 +23,7 @@ sub load_workers {
   my @core_plugins = @{ setting('worker_plugins') || [] };
   my @user_plugins = @{ setting('extra_worker_plugins') || [] };
 
-  # load worker plugins for our action
+  # load worker plugins for our action
   foreach my $plugin (@user_plugins, @core_plugins) {
     $plugin =~ s/^X::/+App::NetdiscoX::Worker::Plugin::/;
     $plugin = 'App::Netdisco::Worker::Plugin::'. $plugin
@@ -35,7 +35,7 @@ sub load_workers {
     Module::Load::load $plugin;
   }
 
-  # now vars->{workers} is populated, we set the dispatch order
+  # now vars->{workers} is populated, we set the dispatch order
   my $workers = vars->{'workers'}->{$action} || {};
   #use DDP; p vars->{'workers'};
 
diff --git a/lib/App/Netdisco/Worker/Plugin.pm b/lib/App/Netdisco/Worker/Plugin.pm
index 40a6a208..840da37f 100644
--- a/lib/App/Netdisco/Worker/Plugin.pm
+++ b/lib/App/Netdisco/Worker/Plugin.pm
@@ -31,15 +31,15 @@ register 'register_worker' => sub {
 
   my $worker = sub {
     my $job = shift or die 'missing job param';
-    # use DDP; p $workerconf;
+    # use DDP; p $workerconf;
 
     debug sprintf '-> run worker %s/%s/%s',
       @$workerconf{qw/phase namespace priority/};
 
     return if $job->is_cancelled;
 
-    # check to see if this namespace has already passed at higher priority
-    # and also update job's record of namespace and priority
+    # check to see if this namespace has already passed at higher priority
+    # and also update job's record of namespace and priority
     return $job->add_status( Status->info('skip: namespace passed at higher priority') )
       if $job->namespace_passed($workerconf);
 
@@ -53,7 +53,7 @@ register 'register_worker' => sub {
     my @newuserconf = ();
     my @userconf = @{ dclone (setting('device_auth') || []) };
 
-    # worker might be vendor/platform specific
+    # worker might be vendor/platform specific
     if (ref $job->device) {
       my $no   = (exists $workerconf->{no}   ? $workerconf->{no}   : undef);
       my $only = (exists $workerconf->{only} ? $workerconf->{only} : undef);
@@ -62,33 +62,33 @@ register 'register_worker' => sub {
         if ($no and check_acl_no($job->device, $no))
            or ($only and not check_acl_only($job->device, $only));
 
-      # reduce device_auth by driver and action filters
+      # reduce device_auth by driver and action filters
       foreach my $stanza (@userconf) {
         next if exists $stanza->{driver} and exists $workerconf->{driver}
           and (($stanza->{driver} || '') ne ($workerconf->{driver} || ''));
 
-        # filter here rather than in Runner as runner does not know namespace
+        # filter here rather than in Runner as runner does not know namespace
         next if exists $stanza->{action}
           and not _find_matchaction($workerconf, lc($stanza->{action}));
 
         push @newuserconf, dclone $stanza;
       }
 
-      # per-device action but no device creds available
+      # per-device action but no device creds available
       return $job->add_status( Status->info('skip: driver or action not applicable') )
         if 0 == scalar @newuserconf && $job->action ne "delete";
     }
 
-    # back up and restore device_auth
+    # back up and restore device_auth
     my $guard = guard { set(device_auth => \@userconf) };
     set(device_auth => \@newuserconf);
-    # use DDP; p @newuserconf;
+    # use DDP; p @newuserconf;
 
-    # run worker
+    # run worker
     $code->($job, $workerconf);
   };
 
-  # store the built worker as Worker.pm will build the dispatch order later on
+  # store the built worker as Worker.pm will build the dispatch order later on
   push @{ vars->{'workers'}->{$workerconf->{action}}
               ->{$workerconf->{phase}}
               ->{$workerconf->{namespace}}
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
index 72bbb4cf..2c3f4189 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm
@@ -19,9 +19,9 @@ register_worker({ phase => 'check' }, sub {
   return Status->info("arpnip skipped: $device is not arpnipable")
     unless is_arpnipable_now($device);
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'} = { $device->get_columns };
-  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
+  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
 
   return Status->done('arpnip is able to run');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
index f7595d08..afd7463f 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
@@ -34,7 +34,7 @@ sub gather_subnets {
   my @subnets = ();
 
   my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
-    or return (); # already checked!
+    or return (); # already checked!
 
   my $ip_netmask = $snmp->ip_netmask;
   foreach my $entry (keys %$ip_netmask) {
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover.pm b/lib/App/Netdisco/Worker/Plugin/Discover.pm
index 5934b8b3..0f1eec52 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover.pm
@@ -16,7 +16,7 @@ register_worker({ phase => 'check' }, sub {
   return Status->error("discover failed: no device param (need -d ?)")
     if $device->ip eq '0.0.0.0';
 
-  # runner has already called get_device to promote $job->device
+  # runner has already called get_device to promote $job->device
   return $job->cancel("fresh discover cancelled: $device already known")
     if $device->in_storage
        and ($job->subaction eq 'with-nodes' and not $job->username);
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
index a20aa0c1..e01f38f1 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
@@ -43,7 +43,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
         next unless ref {} eq ref $map;
 
         foreach my $key (sort keys %$map) {
-          # lhs matches device, rhs matches device_ip
+          # lhs matches device, rhs matches device_ip
           if (check_acl_only($device, $key)
                 and check_acl_only($alias, $map->{$key})) {
 
@@ -64,7 +64,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
           }
         }
       }
-    } # ALIAS
+    } # ALIAS
   }
 
   return if $new_ip eq $old_ip;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
index 122b0bd3..c0bbf6ae 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
@@ -104,7 +104,7 @@ sub store_neighbors {
   my @to_discover = ();
 
   my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
-    or return (); # already checked!
+    or return (); # already checked!
 
   # first allow any manually configured topology to be set
   # and do this before we cache the rows in vars->{'device_ports'}
@@ -127,14 +127,14 @@ sub store_neighbors {
     { map {($_->port => $_)} $device->ports->reset->all };
   my $device_ports = vars->{'device_ports'};
 
-  # v4 and v6 neighbor tables
+  # v4 and v6 neighbor tables
   my $c_ip = ($snmp->c_ip || {});
   my %c_ipv6 = %{ ($snmp->can('hasLLDP') and $snmp->hasLLDP)
     ? ($snmp->lldp_ipv6 || {}) : {} };
 
-  # remove keys with undef values, as c_ip does
+  # remove keys with undef values, as c_ip does
   delete @c_ipv6{ grep { not defined $c_ipv6{$_} } keys %c_ipv6 };
-  # now combine them, v6 wins
+  # now combine them, v6 wins
   $c_ip = { %$c_ip, %c_ipv6 };
 
   foreach my $entry (sort (List::MoreUtils::uniq( keys %$c_ip ))) {
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
index ff90da55..e7dc6ab1 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
@@ -71,11 +71,11 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
       }
   }
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'} = { $device->get_columns };
-  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
+  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
 
-  # support for new_device Hook
+  # support for new_device Hook
   vars->{'new_device'} = 1 if not $device->in_storage;
 
   schema('netdisco')->txn_do(sub {
@@ -156,7 +156,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
   push @$resolved_aliases, { alias => $device->ip, dns => $device->dns }
     if 0 == scalar grep {$_->{alias} eq $device->ip} @aliases;
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'}->{'device_ips'} = $resolved_aliases;
 
   schema('netdisco')->txn_do(sub {
@@ -308,7 +308,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
       $interfaces{$master}->{is_master} = 'true';
   }
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'}->{'ports'} = [values %interfaces];
 
   schema('netdisco')->resultset('DevicePort')->txn_do_locked(sub {
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
index d718cc2e..2e6518db 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
@@ -124,7 +124,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
       };
   }
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'}->{'vlans'} = \@devicevlans;
 
   schema('netdisco')->txn_do(sub {
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
index 17528b6e..3333dfd8 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
@@ -12,7 +12,7 @@ register_worker({ phase => 'main' }, sub {
   my $device = $job->device;
 
   # if requested, and the device has not yet been
-  # arpniped/macsucked, queue those jobs now
+  # arpniped/macsucked, queue those jobs now
   return unless $device->in_storage and $job->subaction eq 'with-nodes';
 
   if (!defined $device->last_macsuck and $device->has_layer(2)) {
diff --git a/lib/App/Netdisco/Worker/Plugin/Expire.pm b/lib/App/Netdisco/Worker/Plugin/Expire.pm
index 3ca35685..34e93485 100644
--- a/lib/App/Netdisco/Worker/Plugin/Expire.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Expire.pm
@@ -56,7 +56,7 @@ register_worker({ phase => 'main' }, sub {
       });
   }
 
-  # also have to clean up node_ip that have no correspoding node
+  # also have to clean up node_ip that have no correspoding node
   schema('netdisco')->resultset('NodeIp')->search({
     mac => { -in => schema('netdisco')->resultset('NodeIp')->search(
       { port => undef },
@@ -82,7 +82,7 @@ register_worker({ phase => 'main' }, sub {
       });
   }
 
-  # now update stats
+  # now update stats
   update_stats();
 
   return Status->done('Checked expiry and updated stats');
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
index 26d8bac9..a243f77e 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm
@@ -19,9 +19,9 @@ register_worker({ phase => 'check' }, sub {
   return Status->info("macsuck skipped: $device is not macsuckable")
     unless is_macsuckable_now($device);
 
-  # support for Hooks
+  # support for Hooks
   vars->{'hook_data'} = { $device->get_columns };
-  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
+  delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
 
   return Status->done('Macsuck is able to run.');
 });
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
index d1c1a9f9..01dcadcd 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
@@ -153,7 +153,7 @@ sub get_vlan_list {
   my $device = shift;
 
   my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
-    or return (); # already checked!
+    or return (); # already checked!
 
   return () unless $snmp->cisco_comm_indexing;
 
@@ -270,7 +270,7 @@ sub walk_fwtable {
   my $cache = {};
 
   my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
-    or return $cache; # already checked!
+    or return $cache; # already checked!
 
   my $fw_mac   = $snmp->fw_mac || {};
   my $fw_port  = $snmp->fw_port || {};
diff --git a/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm b/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm
index 53292bda..59bcb9ae 100644
--- a/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm
+++ b/lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm
@@ -156,8 +156,8 @@ C<rancid>. All keys are optional:
  rancid:
    rancid_cvsroot:  '$ENV{NETDISCO_HOME}/rancid' # default
    rancid_conf:     '/etc/rancid'                # default
-   down_age:        '1 day'                      # default
-   delimiter:       ';'                          # default
+   down_age:        '1 day'                      # default
+   delimiter:       ';'                          # default
    default_group:   'default'                    # default 
    groups:
      groupname1:    'host_group1_acl'
diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm
index d7f67f6c..a1f5be32 100644
--- a/lib/App/Netdisco/Worker/Runner.pm
+++ b/lib/App/Netdisco/Worker/Runner.pm
@@ -19,7 +19,7 @@ use namespace::clean;
 with 'App::Netdisco::Worker::Loader';
 has 'job' => ( is => 'rw' );
 
-# mixin code to run workers loaded via plugins
+# mixin code to run workers loaded via plugins
 sub run {
   my ($self, $job) = @_;
 
@@ -31,13 +31,13 @@ sub run {
   $job->device( get_device($job->device) );
   $self->load_workers();
 
-  # finalise job status when we exit
+  # finalise job status when we exit
   my $statusguard = guard { $job->finalise_status };
 
   my @newuserconf = ();
   my @userconf = @{ dclone (setting('device_auth') || []) };
 
-  # reduce device_auth by only/no
+  # reduce device_auth by only/no
   if (ref $job->device) {
     foreach my $stanza (@userconf) {
       my $no   = (exists $stanza->{no}   ? $stanza->{no}   : undef);
@@ -49,25 +49,25 @@ sub run {
       push @newuserconf, dclone $stanza;
     }
 
-    # per-device action but no device creds available
+    # per-device action but no device creds available
     return $job->add_status( Status->defer('deferred job with no device creds') )
       if 0 == scalar @newuserconf && $job->action ne "delete";
   }
 
-  # back up and restore device_auth
+  # back up and restore device_auth
   my $configguard = guard { set(device_auth => \@userconf) };
   set(device_auth => \@newuserconf);
 
   my $runner = sub {
     my ($self, $job) = @_;
-    # roll everything back if we're testing
+    # roll everything back if we're testing
     my $txn_guard = $ENV{ND2_DB_ROLLBACK}
       ? schema('netdisco')->storage->txn_scope_guard : undef;
 
-    # run check phase and if there are workers then one MUST be successful
+    # run check phase and if there are workers then one MUST be successful
     $self->run_workers('workers_check');
 
-    # run other phases
+    # run other phases
     if ($job->check_passed) {
       $self->run_workers("workers_${_}") for qw/early main user store late/;
     }
diff --git a/share/config.yml b/share/config.yml
index 478216e3..d528a33f 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -338,7 +338,7 @@ workers:
   retry_after: '7 days'
   queue: PostgreSQL
 
-# 50 minutes
+# 50 minutes
 jobs_stale_after: 3000
 jobs_qdepth: 50
 
diff --git a/share/environments/deployment.yml b/share/environments/deployment.yml
index 5a8c81f9..adfb927d 100644
--- a/share/environments/deployment.yml
+++ b/share/environments/deployment.yml
@@ -54,8 +54,8 @@ device_auth:
 #discover_phones: false
 
 # this is the schedule for automatically keeping netdisco up-to-date;
-# these are good defaults, so only uncomment if needing to change.
-# (or set "schedule: null" if you wish to disable the scheduler)
+# these are good defaults, so only uncomment if needing to change.
+# (or set "schedule: null" if you wish to disable the scheduler)
 # ````````````````````````````````````````````````````````````````````
 #schedule:
 #  discoverall:
diff --git a/xt/20-checkacl.t b/xt/20-checkacl.t
index 32c33758..23f07c2a 100644
--- a/xt/20-checkacl.t
+++ b/xt/20-checkacl.t
@@ -15,101 +15,101 @@ BEGIN {
 use Dancer qw/:script !pass/;
 
 my @conf = (
-  # +ve match       -ve match
+  # +ve match       -ve match
   'localhost',     '!www.example.com', # 0, 1
-  '127.0.0.1',     '!192.0.2.1',       # 2, 3
-  '::1',           '!2001:db8::1',     # 4, 5
-  '127.0.0.0/29',  '!192.0.2.0/24',    # 6, 7
-  '::1/128',       '!2001:db8::/32',   # 8, 9
+  '127.0.0.1',     '!192.0.2.1',       # 2, 3
+  '::1',           '!2001:db8::1',     # 4, 5
+  '127.0.0.0/29',  '!192.0.2.0/24',    # 6, 7
+  '::1/128',       '!2001:db8::/32',   # 8, 9
 
   '127.0.0.1-10',  '!192.0.2.1-10',    # 10,11
-  '::1-10',        '!2001:db8::1-10',  # 12,13
+  '::1-10',        '!2001:db8::1-10',  # 12,13
 
-  qr/^localhost$/, qr/^www.example.com$/,    # 14,15
-  qr/(?!:www.example.com)/, '!127.0.0.0/29', # 16,17
+  qr/^localhost$/, qr/^www.example.com$/,    # 14,15
+  qr/(?!:www.example.com)/, '!127.0.0.0/29', # 16,17
   '!127.0.0.1-10', qr/(?!:localhost)/,       # 18,19
 
-  'op:and',    # 20
-  'group:groupreftest',  # 21
-  '!group:groupreftest', # 22
+  'op:and',    # 20
+  'group:groupreftest',  # 21
+  '!group:groupreftest', # 22
 );
 
-# name, ipv4, ipv6, v4 prefix, v6 prefix
+# name, ipv4, ipv6, v4 prefix, v6 prefix
 ok(check_acl('localhost',[$conf[0]]), 'same name');
 ok(check_acl('127.0.0.1',[$conf[2]]), 'same ipv4');
 ok(check_acl('::1',[$conf[4]]), 'same ipv6');
 ok(check_acl('127.0.0.0/29',[$conf[6]]), 'same v4 prefix');
 ok(check_acl('::1/128',[$conf[8]]), 'same v6 prefix');
 
-# failed name, ipv4, ipv6, v4 prefix, v6 prefix
+# failed name, ipv4, ipv6, v4 prefix, v6 prefix
 is(check_acl('www.microsoft.com',[$conf[0]]),  0, 'failed name');
 is(check_acl('172.20.0.1',[$conf[2]]),         0, 'failed ipv4');
 is(check_acl('2001:db8::5',[$conf[4]]),        0, 'failed ipv6');
 is(check_acl('172.16.1.3/29',[$conf[6]]),      0, 'failed v4 prefix');
 is(check_acl('2001:db8:f00d::/64',[$conf[8]]), 0, 'failed v6 prefix');
 
-# negated name, ipv4, ipv6, v4 prefix, v6 prefix
+# negated name, ipv4, ipv6, v4 prefix, v6 prefix
 ok(check_acl('localhost',[$conf[1]]), 'not same name');
 ok(check_acl('127.0.0.1',[$conf[3]]), 'not same ipv4');
 ok(check_acl('::1',[$conf[5]]), 'not same ipv6');
 ok(check_acl('127.0.0.0/29',[$conf[7]]), 'not same v4 prefix');
 ok(check_acl('::1/128',[$conf[9]]), 'not same v6 prefix');
 
-# v4 range, v6 range
+# v4 range, v6 range
 ok(check_acl('127.0.0.1',[$conf[10]]), 'in v4 range');
 ok(check_acl('::1',[$conf[12]]), 'in v6 range');
 
-# failed v4 range, v6 range
+# failed v4 range, v6 range
 is(check_acl('172.20.0.1',[$conf[10]]), 0, 'failed v4 range');
 is(check_acl('2001:db8::5',[$conf[12]]), 0, 'failed v6 range');
 
-# negated v4 range, v6 range
+# negated v4 range, v6 range
 ok(check_acl('127.0.0.1',[$conf[11]]), 'not in v4 range');
 ok(check_acl('::1',[$conf[13]]), 'not in v6 range');
 
-# hostname regexp
+# hostname regexp
 # FIXME ok(check_acl('localhost',[$conf[14]]), 'name regexp');
 # FIXME ok(check_acl('127.0.0.1',[$conf[14]]), 'IP regexp');
 is(check_acl('www.google.com',[$conf[14]]), 0, 'failed regexp');
 
-# OR of prefix, range, regexp, property (2 of, 3 of, 4 of)
+# OR of prefix, range, regexp, property (2 of, 3 of, 4 of)
 ok(check_acl('127.0.0.1',[@conf[8,0]]), 'OR: prefix, name');
 ok(check_acl('127.0.0.1',[@conf[8,12,0]]), 'OR: prefix, range, name');
 ok(check_acl('127.0.0.1',[@conf[8,12,15,0]]), 'OR: prefix, range, regexp, name');
 
-# OR of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
+# OR of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
 ok(check_acl('127.0.0.1',[@conf[17,0]]), 'OR: !prefix, name');
 ok(check_acl('127.0.0.1',[@conf[17,18,0]]), 'OR: !prefix, !range, name');
 ok(check_acl('127.0.0.1',[@conf[17,18,19,0]]), 'OR: !prefix, !range, !regexp, name');
 
-# AND of prefix, range, regexp, property (2 of, 3 of, 4 of)
+# AND of prefix, range, regexp, property (2 of, 3 of, 4 of)
 ok(check_acl('127.0.0.1',[@conf[6,0,20]]), 'AND: prefix, name');
 ok(check_acl('127.0.0.1',[@conf[6,10,0,20]]), 'AND: prefix, range, name');
 # FIXME ok(check_acl('127.0.0.1',[@conf[6,10,14,0,20]]), 'AND: prefix, range, regexp, name');
 
-# failed AND on prefix, range, regexp
+# failed AND on prefix, range, regexp
 is(check_acl('127.0.0.1',[@conf[8,10,14,0,20]]), 0, 'failed AND: prefix!, range, regexp, name');
 is(check_acl('127.0.0.1',[@conf[6,12,14,0,20]]), 0, 'failed AND: prefix, range!, regexp, name');
 is(check_acl('127.0.0.1',[@conf[6,10,15,0,20]]), 0, 'failed AND: prefix, range, regexp!, name');
 
-# AND of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
+# AND of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
 ok(check_acl('127.0.0.1',[@conf[9,0,20]]), 'AND: !prefix, name');
 ok(check_acl('127.0.0.1',[@conf[7,11,0,20]]), 'AND: !prefix, !range, name');
 ok(check_acl('127.0.0.1',[@conf[9,13,16,0,20]]), 'AND: !prefix, !range, !regexp, name');
 
-# group ref
+# group ref
 is(check_acl('192.0.2.1',[$conf[22]]), 1, '!missing group ref');
 is(check_acl('192.0.2.1',[$conf[21]]), 0, 'failed missing group ref');
 setting('host_groups')->{'groupreftest'} = ['192.0.2.1'];
 is(check_acl('192.0.2.1',[$conf[21]]), 1, 'group ref');
 is(check_acl('192.0.2.1',[$conf[22]]), 0, 'failed !missing group ref');
 
-# scalar promoted to list
+# scalar promoted to list
 ok(check_acl('localhost',$conf[0]), 'scalar promoted');
 ok(check_acl('localhost',$conf[1]), 'not scalar promoted');
 is(check_acl('www.microsoft.com',$conf[0]),  0, 'failed scalar promoted');
 
-# device property
-# negated device property
+# device property
+# negated device property
 
 done_testing;
diff --git a/xt/30-backend-workers.t b/xt/30-backend-workers.t
index 4fa0e445..21a6b555 100644
--- a/xt/30-backend-workers.t
+++ b/xt/30-backend-workers.t
@@ -28,10 +28,10 @@ Dancer::Logger->init('console', $CONFIG);
   with 'App::Netdisco::Worker::Runner';
 }
 
-# clear user device_auth and set our own
+# clear user device_auth and set our own
 config->{'device_auth'} = [{driver => 'snmp'}, {driver => 'cli'}];
 
-# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 my $j1 = do_job('TestOne');
 is($j1->status, 'done', 'status is done');
@@ -95,12 +95,12 @@ is($j8->log, 'OK: SNMP driver is successful.',
 
 done_testing;
 
-# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 sub do_job {
   my $pkg = shift;
 
-  # include local plugins
+  # include local plugins
   config->{'extra_worker_plugins'} = ["X::${pkg}"];
 
   my $job = App::Netdisco::Backend::Job->new({
diff --git a/xt/lib/App/NetdiscoX/Worker/Plugin/TestFive.pm b/xt/lib/App/NetdiscoX/Worker/Plugin/TestFive.pm
index 6c89926a..502ffd54 100644
--- a/xt/lib/App/NetdiscoX/Worker/Plugin/TestFive.pm
+++ b/xt/lib/App/NetdiscoX/Worker/Plugin/TestFive.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-# info 'test: add to an action';
+# info 'test: add to an action';
 
 register_worker({ phase => 'main', driver => 'snmp' }, sub {
   return Status->error('NOT OK: additional worker at SNMP level.');
diff --git a/xt/lib/App/NetdiscoX/Worker/Plugin/TestFour.pm b/xt/lib/App/NetdiscoX/Worker/Plugin/TestFour.pm
index 2ea142fe..64c2ef03 100644
--- a/xt/lib/App/NetdiscoX/Worker/Plugin/TestFour.pm
+++ b/xt/lib/App/NetdiscoX/Worker/Plugin/TestFour.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-# info 'test: override an action';
+# info 'test: override an action';
 
 register_worker({ phase => 'main', driver => 'snmp' }, sub {
   return Status->done('NOT OK: SNMP driver should NOT be run.');
diff --git a/xt/lib/App/NetdiscoX/Worker/Plugin/TestOne.pm b/xt/lib/App/NetdiscoX/Worker/Plugin/TestOne.pm
index 0dfeabfd..1f576a11 100644
--- a/xt/lib/App/NetdiscoX/Worker/Plugin/TestOne.pm
+++ b/xt/lib/App/NetdiscoX/Worker/Plugin/TestOne.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-# info 'test: workers are run in decreasing priority until done';
+# info 'test: workers are run in decreasing priority until done';
 
 register_worker({ phase => 'main', driver => 'cli' }, sub {
   return Status->noop('NOT OK: CLI driver is not the winner here.');
diff --git a/xt/lib/App/NetdiscoX/Worker/Plugin/TestThree.pm b/xt/lib/App/NetdiscoX/Worker/Plugin/TestThree.pm
index 0cda2cd0..a966033a 100644
--- a/xt/lib/App/NetdiscoX/Worker/Plugin/TestThree.pm
+++ b/xt/lib/App/NetdiscoX/Worker/Plugin/TestThree.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-# info 'test: respect user config filtering the driver, action and namespace';
+# info 'test: respect user config filtering the driver, action and namespace';
 
 register_worker({ phase => 'main', driver => 'cli' }, sub {
   return Status->done('NOT OK: CLI driver should NOT be run.');
diff --git a/xt/lib/App/NetdiscoX/Worker/Plugin/TestTwo.pm b/xt/lib/App/NetdiscoX/Worker/Plugin/TestTwo.pm
index 79be4133..010c7b45 100644
--- a/xt/lib/App/NetdiscoX/Worker/Plugin/TestTwo.pm
+++ b/xt/lib/App/NetdiscoX/Worker/Plugin/TestTwo.pm
@@ -4,7 +4,7 @@ use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
 
-# info 'test: lower priority driver not run if higher is successful';
+# info 'test: lower priority driver not run if higher is successful';
 
 register_worker({ phase => 'main', driver => 'snmp' }, sub {
   return Status->done('NOT OK: SNMP driver should NOT be run.');