diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
index 323fb1d4e..3a17fe223 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/context/SuiteAggregationCounter.java
@@ -19,7 +19,7 @@ public class SuiteAggregationCounter {
 
   public static final String NAME_KEY = "suiteAggregationCounter";
 
-  private final int suitesToAggregate;
+  private int suitesToAggregate;
 
   public SuiteAggregationCounter() {
     this.suitesToAggregate = 0;
@@ -29,7 +29,7 @@ public int getSuitesToAggregate() {
     return suitesToAggregate;
   }
 
-  public int addSuitesToAggregate(int suitesToAggregate) {
-    return this.suitesToAggregate + suitesToAggregate;
+  public void addSuitesToAggregate(int suitesToAggregate) {
+    this.suitesToAggregate += suitesToAggregate;
   }
 }
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/GetMetadataArtifactsProcessor.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/GetMetadataArtifactsProcessor.java
index 3236ee617..ed2156c18 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/GetMetadataArtifactsProcessor.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/GetMetadataArtifactsProcessor.java
@@ -77,7 +77,7 @@ public void process(Exchange exchange) throws Exception {
     ReferencedArtifactsMessageBody body = new ReferencedArtifactsMessageBody(
         messageBody.getData().getName(),
         messageBody.getDbKey());
-    if (messageBody.shouldBeKeeped()) {
+    if (messageBody.shouldBeKept()) {
       body.setArtifactsToKeep(metatadaArtifacts);
     }
 
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveArtifactsProcessor.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveArtifactsProcessor.java
index 8abf0c31e..effe11745 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveArtifactsProcessor.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveArtifactsProcessor.java
@@ -66,7 +66,7 @@ public void process(Exchange exchange) throws Exception {
     }
   }
 
-  public static Set<String> getArtifactsIdsToRemove(ArtifactsDAO artifactsDAO,
+  static Set<String> getArtifactsIdsToRemove(ArtifactsDAO artifactsDAO,
       ReferencedArtifactsMessageBody messageBody) {
     Set<String> artifactsToRemove = artifactsDAO.getArtifactsIds(messageBody.getDbKey());
     artifactsToRemove.removeAll(messageBody.getArtifactsToKeep());
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/exchange/SuiteMessageBody.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/exchange/SuiteMessageBody.java
index 107af9dd3..409d24432 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/exchange/SuiteMessageBody.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/exchange/SuiteMessageBody.java
@@ -32,7 +32,7 @@ public SuiteMessageBody(Suite data, DBKey dbKey, boolean toRemove) {
     this.toRemove = toRemove;
   }
 
-  public boolean shouldBeKeeped() {
+  public boolean shouldBeKept() {
     return !toRemove;
   }
 
diff --git a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/MetadataCleanerRouteBuilder.java b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/MetadataCleanerRouteBuilder.java
index 0a4e5918f..44b49c163 100644
--- a/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/MetadataCleanerRouteBuilder.java
+++ b/core/cleaner/src/main/java/com/cognifide/aet/cleaner/route/MetadataCleanerRouteBuilder.java
@@ -72,7 +72,7 @@ public void configure() throws Exception {
         .process(suitesRemovePredicateProcessor)
         .split(body())
         .choice()
-        .when(body().method("shouldBeKeeped").isEqualTo(false)).to(direct("removeMetadata"))
+        .when(body().method("shouldBeKept").isEqualTo(false)).to(direct("removeMetadata"))
         .otherwise().to(direct("getMetadataArtifacts"))
         .endChoice();