diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/runner/BaseOptimizationRunner.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/runner/BaseOptimizationRunner.java
index 3f6a887a3..65c2de0dc 100644
--- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/runner/BaseOptimizationRunner.java
+++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/optimize/runner/BaseOptimizationRunner.java
@@ -330,8 +330,7 @@ public abstract class BaseOptimizationRunner implements IOptimizationRunner {
 
     @Override
     public List<CandidateInfo> getCandidateStatus() {
-        List<CandidateInfo> list = new ArrayList<>(currentStatus.values());
-        return list;
+        return new ArrayList<>(currentStatus.values());
     }
 
     private boolean terminate() {
diff --git a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/util/LeafUtils.java b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/util/LeafUtils.java
index 2a86dc48f..2a4abe79d 100644
--- a/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/util/LeafUtils.java
+++ b/arbiter/arbiter-core/src/main/java/org/deeplearning4j/arbiter/util/LeafUtils.java
@@ -42,6 +42,7 @@ public class LeafUtils {
             for (ParameterSpace q : unique) {
                 if (p == q) {
                     found = true;
+                    break;
                 }
             }
             if (!found) {