diff --git a/src/main/java/org/apache/sling/discovery/oak/SlingIdCleanupTask.java b/src/main/java/org/apache/sling/discovery/oak/SlingIdCleanupTask.java
index 2233164..3316cbc 100644
--- a/src/main/java/org/apache/sling/discovery/oak/SlingIdCleanupTask.java
+++ b/src/main/java/org/apache/sling/discovery/oak/SlingIdCleanupTask.java
@@ -239,8 +239,7 @@
         if (config == null) {
             return;
         }
-        config(config.slingid_cleanup_initial_delay(),
-                config.slingid_cleanup_interval(),
+        config(config.slingid_cleanup_initial_delay(), config.slingid_cleanup_interval(),
                 config.slingid_cleanup_batchsize(),
                 config.slingid_cleanup_min_creation_age());
     }
@@ -503,8 +502,9 @@
     }
 
     private Set<String> getActiveSlingIds(final TopologyView localCurrentView) {
-        return localCurrentView.getLocalInstance().getClusterView()
-                .getInstances().stream().map(InstanceDescription::getSlingId).collect(Collectors.toSet());
+        return localCurrentView.getLocalInstance().getClusterView().getInstances()
+                .stream().map(InstanceDescription::getSlingId)
+                .collect(Collectors.toSet());
     }
 
     private boolean topologyChanged(TopologyView localCurrentView) {
