diff --git a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/Hardware.java b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/Hardware.java
index fb9ca50aa..932797046 100644
--- a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/Hardware.java
+++ b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/Hardware.java
@@ -60,7 +60,7 @@ public static int getNumberCPUCores() {
      * Returns the total size of the disk. Assumes that it's a UNIX style filesystem. Will not work
      * in Windows.
      *
-     * @return
+     * @return total disk size in bytes
      */
     public static long getSizeOfDisk() {
         try {
diff --git a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/MantisAgent.java b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/MantisAgent.java
index 83f3ed1ca..83b8f4d79 100644
--- a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/MantisAgent.java
+++ b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/MantisAgent.java
@@ -28,12 +28,7 @@ public class MantisAgent implements Service {
     private CountDownLatch blockUntilShutdown = new CountDownLatch(1);
 
     public MantisAgent() {
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-                shutdown();
-            }
-        };
+        Thread t = new Thread(this::shutdown);
         t.setDaemon(true);
         // shutdown hook
         Runtime.getRuntime().addShutdownHook(t);
diff --git a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/TaskExecutor.java b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/TaskExecutor.java
index 8f2cc779a..56e4647d5 100644
--- a/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/TaskExecutor.java
+++ b/mantis-server/mantis-server-agent/src/main/java/io/mantisrx/server/agent/TaskExecutor.java
@@ -643,7 +643,7 @@ public void onTaskCancelled(RuntimeTask task, @Nullable Throwable throwable) {
     }
 
     private static ListenerCallQueue.Event<Listener> getTaskStartingEvent(RuntimeTask task) {
-        return new ListenerCallQueue.Event<Listener>() {
+        return new ListenerCallQueue.Event<>() {
             @Override
             public void call(Listener listener) {
                 listener.onTaskStarting(task);
@@ -657,7 +657,7 @@ public String toString() {
     }
 
     private static ListenerCallQueue.Event<Listener> getTaskCancellingEvent(RuntimeTask task) {
-        return new ListenerCallQueue.Event<Listener>() {
+        return new ListenerCallQueue.Event<>() {
             @Override
             public void call(Listener listener) {
                 listener.onTaskCancelling(task);
@@ -671,7 +671,7 @@ public String toString() {
     }
 
     private static ListenerCallQueue.Event<Listener> getTaskFailedEvent(RuntimeTask task, Throwable throwable) {
-        return new ListenerCallQueue.Event<Listener>() {
+        return new ListenerCallQueue.Event<>() {
             @Override
             public void call(Listener listener) {
                 listener.onTaskFailed(task, throwable);
@@ -685,7 +685,7 @@ public String toString() {
     }
 
     private static ListenerCallQueue.Event<Listener> getTaskCancelledEvent(RuntimeTask task, @Nullable Throwable throwable) {
-        return new ListenerCallQueue.Event<Listener>() {
+        return new ListenerCallQueue.Event<>() {
             @Override
             public void call(Listener listener) {
                 listener.onTaskCancelled(task, throwable);