diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
index 85cf3179..8e7ad585 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
@@ -41,7 +41,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
     $device->ip, scalar @$v6;
 
   $device->update({last_arpnip => \$now});
-  return Status->done('Ended arpnip for '. $device->ip);
+  return Status->done("Ended arpnip for $device");
 });
 
 # get an arp table (v4 or v6)
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
index 824b84fc..f4a70087 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
@@ -30,7 +30,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
   debug sprintf ' [%s] arpnip - processed %s Subnet entries',
     $device->ip, scalar @subnets;
 
-  return Status->done('Ended arpnip for '. $device->ip);
+  return Status->done("Ended arpnip for $device");
 });
 
 # gathers device subnets
diff --git a/lib/App/Netdisco/Worker/Plugin/Delete.pm b/lib/App/Netdisco/Worker/Plugin/Delete.pm
index cbdba621..d5d473a8 100644
--- a/lib/App/Netdisco/Worker/Plugin/Delete.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Delete.pm
@@ -13,7 +13,7 @@ register_worker({ stage => 'check' }, sub {
 
   $port = ($port ? 1 : 0);
   delete_device($device, $port, $extra);
-  return Status->done(sprintf "Deleted device %s.", $device->ip);
+  return Status->done("Deleted device: $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
index 539ca4eb..71f25e0d 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
@@ -59,7 +59,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
     } # ALIAS
   }
 
-  return Status->done('Ended discover for '. $device->ip)
+  return Status->done("Ended discover for $device")
     if $new_ip eq $old_ip;
 
   schema('netdisco')->txn_do(sub {
@@ -76,7 +76,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       $old_ip, $device->ip, ($device->dns || '');
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
index 02411ce0..47331d9a 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
@@ -90,7 +90,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       $device->ip, scalar @modules;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
index cd0f56de..5f8984f3 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Interfaces.pm
@@ -145,7 +145,7 @@ register_worker({ stage => 'first', driver => 'snmp' }, sub {
       $device->ip, scalar values %interfaces;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
index f62d67b4..8dd34cf6 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
@@ -61,7 +61,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       });
   }
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 =head2 store_neighbors( $device, $snmp )
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm b/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
index e3273377..4881531a 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
@@ -76,7 +76,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       $device->ip, scalar @portpower;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
index a70c5038..7af15fe4 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
@@ -99,7 +99,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
       $device->ip, scalar @aliases;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
index 1dd1af12..3464d880 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
@@ -89,7 +89,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       $device->ip, scalar @portvlans;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
index c535872a..1988b3ea 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
@@ -80,7 +80,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
       $device->ip, scalar @channels;
   });
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
index 71d200f3..8b190a21 100644
--- a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
@@ -33,7 +33,7 @@ register_worker({ stage => 'second' }, sub {
     }
   }
 
-  return Status->done('Ended discover for '. $device->ip);
+  return Status->done("Ended discover for $device");
 });
 
 true;
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
index 3e262016..ced47e43 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
@@ -94,7 +94,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
     $device->ip, $archived;
 
   $device->update({last_macsuck => \$now});
-  return Status->done('Ended macsuck for '. $device->ip);
+  return Status->done("Ended macsuck for $device");
 });
 
 =head2 store_node( $ip, $vlan, $port, $mac, $now? )
diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
index bb638d9b..87542901 100644
--- a/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
@@ -21,7 +21,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
   my $now = 'to_timestamp('. (join '.', gettimeofday) .')';
 
   my $cd11_txrate = $snmp->cd11_txrate;
-  return Status->done('Ended macsuck for '. $device->ip)
+  return Status->done("Ended macsuck for $device")
     unless $cd11_txrate and scalar keys %$cd11_txrate;
 
   if (setting('store_wireless_clients')) {
@@ -31,7 +31,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
   else {
     debug sprintf ' [%s] macsuck - dot11 info available but skipped due to config',
       $device->ip;
-    return Status->done('Ended macsuck for '. $device->ip);
+    return Status->done("Ended macsuck for $device");
   }
 
   my $cd11_rateset = $snmp->cd11_rateset();
@@ -83,7 +83,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
     });
   }
 
-  return Status->done('Ended macsuck for '. $device->ip);
+  return Status->done("Ended macsuck for $device");
 });
 
 true;