diff --git a/common/src/main/java/net/adoptopenjdk/icedteaweb/ProcessUtils.java b/common/src/main/java/net/adoptopenjdk/icedteaweb/ProcessUtils.java
index f62e36dcc..5cc6518e7 100644
--- a/common/src/main/java/net/adoptopenjdk/icedteaweb/ProcessUtils.java
+++ b/common/src/main/java/net/adoptopenjdk/icedteaweb/ProcessUtils.java
@@ -55,15 +55,21 @@ public static void waitForSafely(final Process process) {
         while (!pTerminated) {
             try {
                 process.waitFor();
-            } catch (final InterruptedException e) {
-                LOG.error(IcedTeaWebConstants.DEFAULT_ERROR_MESSAGE, e);
-            }
-            try {
-                process.exitValue();
                 pTerminated = true;
-            } catch (final IllegalThreadStateException e) {
-                LOG.error(IcedTeaWebConstants.DEFAULT_ERROR_MESSAGE, e);
+            } catch (final InterruptedException e) {
+                logInterruptedException(e);
             }
         }
     }
+
+    /**
+     * Logs the given InterruptedException to the error log using the default error message.
+     *
+     * @param e the InterruptedException object that occurred and will be logged
+     * @return This method does not have a return value as it logs the InterruptedException.
+     */
+    private static void logInterruptedException(InterruptedException e) {
+        LOG.error(IcedTeaWebConstants.DEFAULT_ERROR_MESSAGE, e);
+    }
+
 }
diff --git a/common/src/main/java/net/adoptopenjdk/icedteaweb/jnlp/version/SimpleRange.java b/common/src/main/java/net/adoptopenjdk/icedteaweb/jnlp/version/SimpleRange.java
index ccb4c3d84..885e3af1e 100644
--- a/common/src/main/java/net/adoptopenjdk/icedteaweb/jnlp/version/SimpleRange.java
+++ b/common/src/main/java/net/adoptopenjdk/icedteaweb/jnlp/version/SimpleRange.java
@@ -44,6 +44,7 @@
  */
 class SimpleRange {
 
+    private static final String REGEXP_MODIFIER_END = REGEXP_MODIFIER + "$";
     private final VersionId versionId;
     private final VersionModifier modifier;
 
@@ -109,7 +110,7 @@ private static VersionModifier extractModifier(final String simpleRange) {
     }
 
     private static VersionId extractVersionId(final String simpleRange) {
-        final String exactId = simpleRange.replaceAll(REGEXP_MODIFIER + "$", "");
+        final String exactId = simpleRange.replaceAll(REGEXP_MODIFIER_END, "");
         return VersionId.fromString(exactId);
     }
 
diff --git a/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/BaseLogger.java b/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/BaseLogger.java
index 481abf763..f31f4ca03 100644
--- a/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/BaseLogger.java
+++ b/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/BaseLogger.java
@@ -8,11 +8,13 @@
  */
 public abstract class BaseLogger implements Logger {
 
-    protected String expand(final String msg, final Object[] args) {
-        return doExpand(msg, args);
+    protected static String doExpand(final String msg, final Object[] args) {
+        return new StringFormatter().doExpand(msg, args);
     }
+}
 
-    static String doExpand(final String msg, final Object[] args) {
+class StringFormatter {
+    String doExpand(final String msg, final Object[] args) {
         if (msg == null) {
             return "null";
         }
diff --git a/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/SystemOutLoggerFactory.java b/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/SystemOutLoggerFactory.java
index 15de0144c..b027d85e4 100644
--- a/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/SystemOutLoggerFactory.java
+++ b/common/src/main/java/net/adoptopenjdk/icedteaweb/logging/SystemOutLoggerFactory.java
@@ -47,7 +47,7 @@ public void debug(final String msg) {
 
         @Override
         public void debug(final String msg, final Object... arguments) {
-            log(DEBUG, expand(msg, arguments), null);
+            log(DEBUG, doExpand(msg, arguments), null);
         }
 
         @Override
@@ -62,7 +62,7 @@ public void info(final String msg) {
 
         @Override
         public void info(final String msg, final Object... arguments) {
-            log(INFO, expand(msg, arguments), null);
+            log(INFO, doExpand(msg, arguments), null);
         }
 
         @Override
@@ -77,7 +77,7 @@ public void warn(final String msg) {
 
         @Override
         public void warn(final String msg, final Object... arguments) {
-            log(WARNING, expand(msg, arguments), null);
+            log(WARNING, doExpand(msg, arguments), null);
         }
 
         @Override
@@ -92,7 +92,7 @@ public void error(final String msg) {
 
         @Override
         public void error(final String msg, final Object... arguments) {
-            log(ERROR, expand(msg, arguments), null);
+            log(ERROR, doExpand(msg, arguments), null);
         }
 
         @Override
diff --git a/common/src/main/java/net/adoptopenjdk/icedteaweb/validator/DirectoryCheckResults.java b/common/src/main/java/net/adoptopenjdk/icedteaweb/validator/DirectoryCheckResults.java
index 22bf1385b..116bc0fa2 100644
--- a/common/src/main/java/net/adoptopenjdk/icedteaweb/validator/DirectoryCheckResults.java
+++ b/common/src/main/java/net/adoptopenjdk/icedteaweb/validator/DirectoryCheckResults.java
@@ -27,14 +27,14 @@ public DirectoryCheckResults(final List<DirectoryCheckResult> results) {
      * @return sum of passed checks, 0-3 per result
      */
     public int getPasses() {
-        return results.stream().mapToInt(r -> r.getPasses()).sum();
+        return results.stream().mapToInt(result -> result.getPasses()).sum();
     }
 
     /**
      * @return sum of failed checks, 0-3 per results
      */
     public int getFailures() {
-        return results.stream().mapToInt(r -> r.getFailures()).sum();
+        return results.stream().mapToInt(result -> result.getFailures()).sum();
     }
 
     /**
@@ -60,9 +60,9 @@ public String toString() {
 
     private static String resultsToString(final List<DirectoryCheckResult> results) {
         final StringBuilder sb = new StringBuilder();
-        for (final DirectoryCheckResult r : results) {
-            if (r.getFailures() > 0) {
-                sb.append(r.getMessage());
+        for (final DirectoryCheckResult result : results) {
+            if (result.getFailures() > 0) {
+                sb.append(result.getMessage());
             }
         }
         return sb.toString();