diff --git a/src/main/java/emissary/pickup/WorkSpace.java b/src/main/java/emissary/pickup/WorkSpace.java
index cdc0cb3435..c42eac03d6 100755
--- a/src/main/java/emissary/pickup/WorkSpace.java
+++ b/src/main/java/emissary/pickup/WorkSpace.java
@@ -697,7 +697,7 @@ protected void removePickUp(final String remoteKey) {
                     i.remove(); // remove from pending
                     wb.setSentTo(null); // clear in progress indicator
                     this.retryCount++;
-                    if (wb.incrementErrorCount() <= this.MAX_BUNDLE_RETRIES) {
+                    if (wb.incrementErrorCount() <= MAX_BUNDLE_RETRIES) {
                         logger.debug("Removing pending bundle {} from pending pool, re-adding to outbound with errorCount={}", wb.getBundleId(),
                                 wb.getErrorCount());
                         addOutboundBundle(wb); // send to outbound again
@@ -830,7 +830,7 @@ public boolean workCompleted(final String remoteName, final String bundleId, fin
             logger.info("Unknown bundle completed: {}", bundleId);
         } else if (!itWorked) {
             item.setSentTo(null); // clear in progress indicator
-            if (item.incrementErrorCount() > this.MAX_BUNDLE_RETRIES) {
+            if (item.incrementErrorCount() > MAX_BUNDLE_RETRIES) {
                 logger.error("Bundle {} has too many errors, permanently discarded", item);
             } else {
                 addOutboundBundle(item); // send to outbound again
@@ -1083,7 +1083,7 @@ public void run() {
                 }
 
                 try {
-                    Thread.sleep(WorkSpace.this.NOTIFIER_PAUSE_TIME);
+                    Thread.sleep(NOTIFIER_PAUSE_TIME);
                     rotatePickUps();
                 } catch (InterruptedException ignore) {
                     Thread.currentThread().interrupt();
@@ -1342,7 +1342,7 @@ protected void pauseCollector() {
             final MemoryMXBean mbean = ManagementFactory.getMemoryMXBean();
             MemoryUsage heap = mbean.getHeapMemoryUsage();
             int count = 0;
-            while ((((double) heap.getUsed() / (double) heap.getCommitted()) > WorkSpace.this.MEM_THRESHOLD) && (getOutboundQueueSize() > 500)) {
+            while ((((double) heap.getUsed() / (double) heap.getCommitted()) > MEM_THRESHOLD) && (getOutboundQueueSize() > 500)) {
                 logger.debug("Collection memory threshold exceeded {}", heap);
                 try {
                     Thread.sleep(intv);
@@ -1356,7 +1356,7 @@ protected void pauseCollector() {
             if (count > 0 && logger.isDebugEnabled()) {
                 logger.debug(
                         "Paused collector {} times for {}s waiting for memory usage to go below threshold {} resuming at {}, queueSize was/is={}/{}",
-                        count, (intv / 1000), WorkSpace.this.MEM_THRESHOLD, heap, initialQueueSize, getOutboundQueueSize());
+                        count, (intv / 1000), MEM_THRESHOLD, heap, initialQueueSize, getOutboundQueueSize());
             }
         }
     }