diff --git a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java b/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
index ac682199a3d3da73f0bbd9ef84e20f791c60709c..48a4a8cb912dd45f515161c753e0302cbc5a8685 100644
--- a/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
+++ b/client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
@@ -29,7 +29,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Collectors;
@@ -104,7 +107,6 @@ public final class ClientFactory {
         LOGGER.info("Reading metadata schema from {} ", config.getMetadataSchemaPath());
         final String metadataSchema = readPath(config.getMetadataSchemaPath());
 
-        // TODO read SET-Event Token schema
         return SubscriberClient.builder(subscriber, privateKey, metadataSchema);
     }
 
@@ -112,10 +114,9 @@ public final class ClientFactory {
         final CryptoService cryptoService = getCryptoService();
         final ValidationService validator = getValidatorService(config);
         final RestTemplate restTemplate = getRestTemplate(config);
-
         final OAuthService authService = getSubscriberConfiguredAuthService(config, restTemplate);
-        final EventLogService eventLogService = getEventLogService(config,restTemplate, authService);
-        final SubmissionService submissionService = getSubmissionService(config,restTemplate, authService);
+        final EventLogService eventLogService = getEventLogService(config, restTemplate, authService);
+        final SubmissionService submissionService = getSubmissionService(config, restTemplate, authService);
         final SecurityEventService setService = getSecurityEventTokenService(config);
         return new SubmissionSubscriber(submissionService, eventLogService, cryptoService, validator, setService);
     }
@@ -125,9 +126,9 @@ public final class ClientFactory {
         final RestTemplate restTemplate = getRestTemplate(config);
         final ValidationService validator = getValidatorService(config);
         final OAuthService authService = getSenderConfiguredAuthService(config, restTemplate);
-        final EventLogService eventLogService = getEventLogService(config,restTemplate, authService);
-        final SubmissionService submissionService = getSubmissionService(config,restTemplate, authService);
-        final DestinationService destinationService = getDestinationApiService(config,restTemplate, authService);
+        final EventLogService eventLogService = getEventLogService(config, restTemplate, authService);
+        final SubmissionService submissionService = getSubmissionService(config, restTemplate, authService);
+        final DestinationService destinationService = getDestinationApiService(config, restTemplate, authService);
         final SecurityEventService setService = getSecurityEventTokenService(config);
         return new SubmissionSender(destinationService, submissionService, eventLogService, cryptoService, validator, setService);
     }