diff --git a/src/main/java/org/polypheny/simpleclient/cli/DumpCommand.java b/src/main/java/org/polypheny/simpleclient/cli/DumpCommand.java
index 4a870b93..5072e158 100644
--- a/src/main/java/org/polypheny/simpleclient/cli/DumpCommand.java
+++ b/src/main/java/org/polypheny/simpleclient/cli/DumpCommand.java
@@ -44,7 +44,7 @@
 
 
 @Slf4j
-@Command(name = "dump", description = "Dump tupels of an entity to a file.")
+@Command(name = "dump", description = "Dump tuples of an entity to a file.")
 public class DumpCommand implements CliRunnable {
 
     @SuppressWarnings("SpringAutowiredFieldsWarningInspection")
diff --git a/src/main/java/org/polypheny/simpleclient/cli/Mode.java b/src/main/java/org/polypheny/simpleclient/cli/Mode.java
index b50bf1b8..165ea56f 100644
--- a/src/main/java/org/polypheny/simpleclient/cli/Mode.java
+++ b/src/main/java/org/polypheny/simpleclient/cli/Mode.java
@@ -25,5 +25,5 @@
 package org.polypheny.simpleclient.cli;
 
 public enum Mode {
-    POLYPHENY, NATIVE, SURREALDB;
+    POLYPHENY, NATIVE, SURREALDB
 }
diff --git a/src/main/java/org/polypheny/simpleclient/executor/OltpBenchExecutor.java b/src/main/java/org/polypheny/simpleclient/executor/OltpBenchExecutor.java
index 5d02414d..d3a6963c 100644
--- a/src/main/java/org/polypheny/simpleclient/executor/OltpBenchExecutor.java
+++ b/src/main/java/org/polypheny/simpleclient/executor/OltpBenchExecutor.java
@@ -87,7 +87,7 @@ public void reset() throws ExecutorException {
     @Override
     public long executeQueryAndGetNumber( Query query ) throws ExecutorException {
         throw new ExecutorException( "Unsupported Operation" );
-    };
+    }
 
 
     @Override
diff --git a/src/main/java/org/polypheny/simpleclient/executor/OltpBenchPolyphenyDbExecutor.java b/src/main/java/org/polypheny/simpleclient/executor/OltpBenchPolyphenyDbExecutor.java
index 2e16558a..6539d168 100644
--- a/src/main/java/org/polypheny/simpleclient/executor/OltpBenchPolyphenyDbExecutor.java
+++ b/src/main/java/org/polypheny/simpleclient/executor/OltpBenchPolyphenyDbExecutor.java
@@ -24,6 +24,7 @@
 
 package org.polypheny.simpleclient.executor;
 
+import java.io.File;
 import lombok.extern.slf4j.Slf4j;
 import org.polypheny.control.client.PolyphenyControlConnector;
 import org.polypheny.simpleclient.executor.PolyphenyDbJdbcExecutor.PolyphenyDbJdbcExecutorFactory;
@@ -31,8 +32,6 @@
 import org.polypheny.simpleclient.scenario.AbstractConfig;
 import org.polypheny.simpleclient.scenario.oltpbench.AbstractOltpBenchConfig;
 
-import java.io.File;
-
 
 @Slf4j
 public class OltpBenchPolyphenyDbExecutor extends OltpBenchExecutor implements PolyphenyDbExecutor {
diff --git a/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbJdbcExecutor.java b/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbJdbcExecutor.java
index 7b217207..c62f647b 100644
--- a/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbJdbcExecutor.java
+++ b/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbJdbcExecutor.java
@@ -24,13 +24,12 @@
 
 package org.polypheny.simpleclient.executor;
 
-import lombok.extern.slf4j.Slf4j;
-import org.polypheny.simpleclient.main.CsvWriter;
-import org.polypheny.simpleclient.query.RawQuery;
-
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
+import lombok.extern.slf4j.Slf4j;
+import org.polypheny.simpleclient.main.CsvWriter;
+import org.polypheny.simpleclient.query.RawQuery;
 
 
 @Slf4j
diff --git a/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbRestExecutor.java b/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbRestExecutor.java
index 35445b2f..84e8c40f 100644
--- a/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbRestExecutor.java
+++ b/src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbRestExecutor.java
@@ -25,6 +25,11 @@
 package org.polypheny.simpleclient.executor;
 
 import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import kong.unirest.HttpRequest;
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
@@ -39,12 +44,6 @@
 import org.polypheny.simpleclient.query.RawQuery;
 import org.polypheny.simpleclient.scenario.AbstractConfig;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
 
 @Slf4j
 public class PolyphenyDbRestExecutor implements PolyphenyDbExecutor {
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/EvaluationThread.java b/src/main/java/org/polypheny/simpleclient/scenario/EvaluationThread.java
index 714ada8e..08798434 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/EvaluationThread.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/EvaluationThread.java
@@ -37,7 +37,6 @@
 import org.polypheny.simpleclient.executor.Executor;
 import org.polypheny.simpleclient.executor.ExecutorException;
 import org.polypheny.simpleclient.query.QueryListEntry;
-import org.polypheny.simpleclient.scenario.graph.GraphBench;
 import org.polypheny.simpleclient.scenario.graph.GraphBench.EvaluationThreadMonitor;
 
 @Getter
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/coms/Coms.java b/src/main/java/org/polypheny/simpleclient/scenario/coms/Coms.java
index 0af5dfdd..1f6c911f 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/coms/Coms.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/coms/Coms.java
@@ -62,7 +62,7 @@
 public class Coms extends Scenario {
 
     public static final String NAMESPACE = "coms";
-    public static final double EPSILLON = 0.000001;
+    public static final double EPSILON = 0.000001;
 
     private final Random random;
     private final ComsConfig config;
@@ -256,7 +256,7 @@ private final void startEvaluation( ProgressReporter progressReporter, CsvWriter
         int i = 0;
         float amount = 0;
         for ( int t : threadDistribution ) {
-            if ( (amount + (part * t) > (1 - EPSILLON)) && (1 - amount > (part * t) / 2) ) {
+            if ( (amount + (part * t) > (1 - EPSILON)) && (1 - amount > (part * t) / 2) ) {
                 // execute in new Thread, "significantly" bigger than 1
                 organized.add( queryLists[i] );
                 amount += (part * t);
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/coms/simulation/NetworkGenerator.java b/src/main/java/org/polypheny/simpleclient/scenario/coms/simulation/NetworkGenerator.java
index 193897c2..71e9c82a 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/coms/simulation/NetworkGenerator.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/coms/simulation/NetworkGenerator.java
@@ -78,8 +78,6 @@ public class NetworkGenerator {
      * Network architecture relies on a low amount of main architecture
      * with a low connectivity.
      * Depending on size of users, switches and APs are deployed.
-     *
-     * @param config
      */
     public NetworkGenerator( ComsConfig config ) {
         this.random = new Random( config.seed );
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/gavel/DataGenerator.java b/src/main/java/org/polypheny/simpleclient/scenario/gavel/DataGenerator.java
index 64671870..3669ba89 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/gavel/DataGenerator.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/gavel/DataGenerator.java
@@ -173,9 +173,9 @@ void generateAuctions( int start, int end ) throws ExecutorException {
             LocalDateTime dt;
             LocalDateTime dtLast = startDate;
 
-            // Bids should be in a temporal order. In order to avoid the case where it randomly pics the end date we calculate
-            // an offset of seconds we need to add to the end data in every iteration. This leeds to a somehow even distribution of the
-            // bits over time.
+            // Bids should be in a temporal order. In order to avoid the case where it randomly picks the end date we calculate
+            // an offset of seconds we need to add to the end data in every iteration. This leeds to a somehow even distribution
+            // of the bits over time.
             long difference = ChronoUnit.SECONDS.between( startDate, endDate );
             long offset = difference / numberOfBids;
 
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/gavel/queryBuilder/InsertBid.java b/src/main/java/org/polypheny/simpleclient/scenario/gavel/queryBuilder/InsertBid.java
index e9842223..3fdb90ff 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/gavel/queryBuilder/InsertBid.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/gavel/queryBuilder/InsertBid.java
@@ -105,7 +105,7 @@ public String getSqlRowExpression() {
                     + amount + ","
                     + "timestamp '" + date.format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm:ss" ) ) + "',"
                     + userId + ","
-                    + auctionId // This could gets a bug if e.g. parallelized
+                    + auctionId // This could become a bug if e.g. parallelized
                     + ")";
         }
 
diff --git a/src/main/java/org/polypheny/simpleclient/scenario/graph/GraphBench.java b/src/main/java/org/polypheny/simpleclient/scenario/graph/GraphBench.java
index 2b429a46..9698efa2 100644
--- a/src/main/java/org/polypheny/simpleclient/scenario/graph/GraphBench.java
+++ b/src/main/java/org/polypheny/simpleclient/scenario/graph/GraphBench.java
@@ -75,7 +75,6 @@ public class GraphBench extends Scenario {
 
     private final GraphBenchConfig config;
 
-    ;
     private long executeRuntime;
     private final Map<Integer, String> queryTypes;