diff --git a/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java b/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java
index 706cf79022b2485b349bfe7ae144145dda013d20..22048d6fa337ac3016e8a65502285169018911c4 100644
--- a/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java
@@ -84,7 +84,7 @@ public class KafkaStreamsBuilder {
         .set(StreamsConfig.NUM_STREAM_THREADS_CONFIG, this.numThreads, p -> p > 0)
         .set(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, this.commitIntervalMs, p -> p >= 0)
         .set(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, this.cacheMaxBytesBuff, p -> p >= 0)
-        .set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG")
+        // .set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG")
         .build();
     return new KafkaStreams(topologyBuilder.build(), properties);
   }
diff --git a/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java b/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java
index 5106ed2ad4fb01fc38143151bbd752f2b98b160d..02d0953a38b610887ceaa6bd4fa698df718bc597 100644
--- a/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java
@@ -12,95 +12,94 @@ import titan.ccp.common.kafka.streams.PropertiesBuilder;
  */
 public class KafkaStreamsBuilder {
 
-	private static final String APPLICATION_NAME = "titan-ccp-history";
-	private static final String APPLICATION_VERSION = "0.0.1";
+  private static final String APPLICATION_NAME = "titan-ccp-history";
+  private static final String APPLICATION_VERSION = "0.0.1";
 
-	// private static final Logger LOGGER =
-	// LoggerFactory.getLogger(KafkaStreamsBuilder.class);
+  // private static final Logger LOGGER =
+  // LoggerFactory.getLogger(KafkaStreamsBuilder.class);
 
-	private String bootstrapServers; // NOPMD
-	private String inputTopic; // NOPMD
-	private String outputTopic; // NOPMD
-	private Duration windowDuration; // NOPMD
-	private int numThreads = -1; // NOPMD
-	private int commitIntervalMs = -1; // NOPMD
-	private int cacheMaxBytesBuff = -1; // NOPMD
+  private String bootstrapServers; // NOPMD
+  private String inputTopic; // NOPMD
+  private String outputTopic; // NOPMD
+  private Duration windowDuration; // NOPMD
+  private int numThreads = -1; // NOPMD
+  private int commitIntervalMs = -1; // NOPMD
+  private int cacheMaxBytesBuff = -1; // NOPMD
 
-	public KafkaStreamsBuilder inputTopic(final String inputTopic) {
-		this.inputTopic = inputTopic;
-		return this;
-	}
+  public KafkaStreamsBuilder inputTopic(final String inputTopic) {
+    this.inputTopic = inputTopic;
+    return this;
+  }
 
-	public KafkaStreamsBuilder bootstrapServers(final String bootstrapServers) {
-		this.bootstrapServers = bootstrapServers;
-		return this;
-	}
+  public KafkaStreamsBuilder bootstrapServers(final String bootstrapServers) {
+    this.bootstrapServers = bootstrapServers;
+    return this;
+  }
 
-	public KafkaStreamsBuilder outputTopic(final String outputTopic) {
-		this.outputTopic = outputTopic;
-		return this;
-	}
+  public KafkaStreamsBuilder outputTopic(final String outputTopic) {
+    this.outputTopic = outputTopic;
+    return this;
+  }
 
-	public KafkaStreamsBuilder windowDuration(final Duration windowDuration) {
-		this.windowDuration = windowDuration;
-		return this;
-	}
+  public KafkaStreamsBuilder windowDuration(final Duration windowDuration) {
+    this.windowDuration = windowDuration;
+    return this;
+  }
 
-	/**
-	 * Sets the Kafka Streams property for the number of threads
-	 * (num.stream.threads). Can be minus one for using the default.
-	 */
-	public KafkaStreamsBuilder numThreads(final int numThreads) {
-		if (numThreads < -1 || numThreads == 0) {
-			throw new IllegalArgumentException("Number of threads must be greater 0 or -1.");
-		}
-		this.numThreads = numThreads;
-		return this;
-	}
+  /**
+   * Sets the Kafka Streams property for the number of threads (num.stream.threads). Can be minus
+   * one for using the default.
+   */
+  public KafkaStreamsBuilder numThreads(final int numThreads) {
+    if (numThreads < -1 || numThreads == 0) {
+      throw new IllegalArgumentException("Number of threads must be greater 0 or -1.");
+    }
+    this.numThreads = numThreads;
+    return this;
+  }
 
-	/**
-	 * Sets the Kafka Streams property for the frequency with which to save the
-	 * position (offsets in source topics) of tasks (commit.interval.ms). Must be
-	 * zero for processing all record, for example, when processing bulks of
-	 * records. Can be minus one for using the default.
-	 */
-	public KafkaStreamsBuilder commitIntervalMs(final int commitIntervalMs) {
-		if (commitIntervalMs < -1) {
-			throw new IllegalArgumentException("Commit interval must be greater or equal -1.");
-		}
-		this.commitIntervalMs = commitIntervalMs;
-		return this;
-	}
+  /**
+   * Sets the Kafka Streams property for the frequency with which to save the position (offsets in
+   * source topics) of tasks (commit.interval.ms). Must be zero for processing all record, for
+   * example, when processing bulks of records. Can be minus one for using the default.
+   */
+  public KafkaStreamsBuilder commitIntervalMs(final int commitIntervalMs) {
+    if (commitIntervalMs < -1) {
+      throw new IllegalArgumentException("Commit interval must be greater or equal -1.");
+    }
+    this.commitIntervalMs = commitIntervalMs;
+    return this;
+  }
 
-	/**
-	 * Sets the Kafka Streams property for maximum number of memory bytes to be used
-	 * for record caches across all threads (cache.max.bytes.buffering). Must be
-	 * zero for processing all record, for example, when processing bulks of
-	 * records. Can be minus one for using the default.
-	 */
-	public KafkaStreamsBuilder cacheMaxBytesBuffering(final int cacheMaxBytesBuffering) {
-		if (cacheMaxBytesBuffering < -1) {
-			throw new IllegalArgumentException("Cache max bytes buffering must be greater or equal -1.");
-		}
-		this.cacheMaxBytesBuff = cacheMaxBytesBuffering;
-		return this;
-	}
+  /**
+   * Sets the Kafka Streams property for maximum number of memory bytes to be used for record caches
+   * across all threads (cache.max.bytes.buffering). Must be zero for processing all record, for
+   * example, when processing bulks of records. Can be minus one for using the default.
+   */
+  public KafkaStreamsBuilder cacheMaxBytesBuffering(final int cacheMaxBytesBuffering) {
+    if (cacheMaxBytesBuffering < -1) {
+      throw new IllegalArgumentException("Cache max bytes buffering must be greater or equal -1.");
+    }
+    this.cacheMaxBytesBuff = cacheMaxBytesBuffering;
+    return this;
+  }
 
-	/**
-	 * Builds the {@link KafkaStreams} instance.
-	 */
-	public KafkaStreams build() {
-		Objects.requireNonNull(this.inputTopic, "Input topic has not been set.");
-		// TODO log parameters
-		final TopologyBuilder topologyBuilder = new TopologyBuilder(this.inputTopic, this.outputTopic,
-				this.windowDuration);
-		final Properties properties = PropertiesBuilder.bootstrapServers(this.bootstrapServers)
-				.applicationId(APPLICATION_NAME + '-' + APPLICATION_VERSION) // TODO as parameter
-				.set(StreamsConfig.NUM_STREAM_THREADS_CONFIG, this.numThreads, p -> p > 0)
-				.set(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, this.commitIntervalMs, p -> p >= 0)
-				.set(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, this.cacheMaxBytesBuff, p -> p >= 0)
-				.set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG").build();
-		return new KafkaStreams(topologyBuilder.build(), properties);
-	}
+  /**
+   * Builds the {@link KafkaStreams} instance.
+   */
+  public KafkaStreams build() {
+    Objects.requireNonNull(this.inputTopic, "Input topic has not been set.");
+    // TODO log parameters
+    final TopologyBuilder topologyBuilder = new TopologyBuilder(this.inputTopic, this.outputTopic,
+        this.windowDuration);
+    final Properties properties = PropertiesBuilder.bootstrapServers(this.bootstrapServers)
+        .applicationId(APPLICATION_NAME + '-' + APPLICATION_VERSION) // TODO as parameter
+        .set(StreamsConfig.NUM_STREAM_THREADS_CONFIG, this.numThreads, p -> p > 0)
+        .set(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, this.commitIntervalMs, p -> p >= 0)
+        .set(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, this.cacheMaxBytesBuff, p -> p >= 0)
+        // .set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG")
+        .build();
+    return new KafkaStreams(topologyBuilder.build(), properties);
+  }
 
 }
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java b/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java
index 5cef5ffd446665faebb456ea9f836938ea2a5557..c351eac687431b87f20e4b8ab6fc90fa57558778 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java
@@ -109,7 +109,8 @@ public class KafkaStreamsBuilder {
         .set(StreamsConfig.NUM_STREAM_THREADS_CONFIG, this.numThreads, p -> p > 0)
         .set(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, this.commitIntervalMs, p -> p >= 0)
         .set(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, this.cacheMaxBytesBuff, p -> p >= 0)
-        .set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG").build();
+        // .set(StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG, "DEBUG")
+        .build();
     return new KafkaStreams(topologyBuilder.build(), properties);
   }