diff --git a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/communication/zookeeper/WorkloadDistributor.java b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/communication/zookeeper/WorkloadDistributor.java
index ce7d78d777b165393905eedcb1adbe71b51f417f..454073850439ce0bb053d1c739819417117721a6 100644
--- a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/communication/zookeeper/WorkloadDistributor.java
+++ b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/communication/zookeeper/WorkloadDistributor.java
@@ -71,8 +71,8 @@ public class WorkloadDistributor {
     try {
       this.client.blockUntilConnected();
     } catch (final InterruptedException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      LOGGER.error("", e);
+      throw new IllegalStateException();
     }
 
     this.counter =
diff --git a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/KafkaWorkloadGeneratorBuilder.java b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/KafkaWorkloadGeneratorBuilder.java
index 7a435fca69f50c485c1e46531cf006119ca4cfe1..afb232f7158f1f5cd9a6c8b7203fa8bb464205bb 100644
--- a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/KafkaWorkloadGeneratorBuilder.java
+++ b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/KafkaWorkloadGeneratorBuilder.java
@@ -9,7 +9,7 @@ import theodolite.commons.workloadgeneration.functions.BeforeAction;
 import theodolite.commons.workloadgeneration.functions.MessageGenerator;
 import theodolite.commons.workloadgeneration.misc.ZooKeeper;
 
-public class KafkaWorkloadGeneratorBuilder<T extends IMonitoringRecord> {
+public final class KafkaWorkloadGeneratorBuilder<T extends IMonitoringRecord> {
 
   private int instances;
 
diff --git a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/misc/ZooKeeper.java b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/misc/ZooKeeper.java
index 3e6393b0d04a6c450cdefc6221dcbf57cb7f57d9..9f8ac92280f2f5e060e6b5339fa4831ac88b4fe0 100644
--- a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/misc/ZooKeeper.java
+++ b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/misc/ZooKeeper.java
@@ -15,7 +15,6 @@ public class ZooKeeper {
    * @param port of zookeeper.
    */
   public ZooKeeper(final String host, final int port) {
-    super();
     this.host = host;
     this.port = port;
   }