diff --git a/jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java b/jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
index d35295ebe..daf23b599 100644
--- a/jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
+++ b/jplag/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
@@ -47,10 +47,8 @@ public static void createAndSaveReport(JPlagResult result, String path) {
 
     private static File createDirectory(String path, String name) {
         File directory = new File(path.concat("/").concat(name));
-        if (!directory.exists()) {
-            if (!directory.mkdirs()) {
-                logger.error("Failed to create dir.");
-            }
+        if (!directory.exists() && !directory.mkdirs()) {
+            logger.error("Failed to create dir.");
         }
         return directory;
     }
diff --git a/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ComparisonReportMapper.java b/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ComparisonReportMapper.java
index 73d488161..9f4301d85 100644
--- a/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ComparisonReportMapper.java
+++ b/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/ComparisonReportMapper.java
@@ -1,7 +1,6 @@
 package de.jplag.reporting.reportobject.mapper;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import de.jplag.*;
 import de.jplag.reporting.jsonfactory.FileWriter;
@@ -34,11 +33,10 @@ private void writeComparisons(JPlagResult jPlagResult, String path, List<JPlagCo
 
     private List<Match> convertMatchesToReportMatches(JPlagResult result, JPlagComparison comparison) {
         return comparison.getMatches().stream()
-                .map(match -> convertMatchToReportMatch(comparison, match, result.getOptions().getLanguage().usesIndex()))
-                .collect(Collectors.toList());
+                .map(match -> convertMatchToReportMatch(comparison, match, result.getOptions().getLanguage().usesIndex())).toList();
     }
 
-    private Match convertMatchToReportMatch(JPlagComparison comparison, de.jplag.Match match, Boolean usesIndex) {
+    private Match convertMatchToReportMatch(JPlagComparison comparison, de.jplag.Match match, boolean usesIndex) {
         TokenList tokensFirst = comparison.getFirstSubmission().getTokenList();
         TokenList tokensSecond = comparison.getSecondSubmission().getTokenList();
         Token startTokenFirst = tokensFirst.getToken(match.getStartOfFirst());
diff --git a/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/MetricMapper.java b/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/MetricMapper.java
index 7b31ac23e..c761a9a59 100644
--- a/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/MetricMapper.java
+++ b/jplag/src/main/java/de/jplag/reporting/reportobject/mapper/MetricMapper.java
@@ -40,7 +40,7 @@ private static List<TopComparison> getTopComparisons(List<JPlagComparison> compa
         return comparisons.stream().sorted(Comparator.comparing(similarityExtractor).reversed())
                 .map(comparison -> new TopComparison(comparison.getFirstSubmission().getName(), comparison.getSecondSubmission().getName(),
                         similarityExtractor.apply(comparison)))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static List<TopComparison> getTopComparisons(List<JPlagComparison> comparisons) {