diff --git a/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java b/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java
index 9cd475b..43727c7 100644
--- a/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java
+++ b/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java
@@ -82,8 +82,7 @@ protected void customInit(final ContextRefreshedEvent event) {
 			logger.info("TokenSecurityFilter in not active");
 		}
 		
-		if ( arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER) ) {
-			
+		if (arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER)) {
 			arrowheadService.updateCoreServiceURIs(CoreSystem.EVENTHANDLER);	
 			
 			publishInitStartedEvent();
diff --git a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java
index 09466a6..39f5c9c 100644
--- a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java
+++ b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java
@@ -91,8 +91,7 @@ protected void customInit(final ContextRefreshedEvent event) {
 
 		}
 
-
-		if ( arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER)) {
+		if (arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER)) {
 			arrowheadService.updateCoreServiceURIs(CoreSystem.EVENTHANDLER);
 			subscribeToPresetEvents();
 		}