diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/task/Task.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/task/Task.java
index 4cfa7cfa9..b185d89d4 100644
--- a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/task/Task.java
+++ b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/task/Task.java
@@ -27,9 +27,9 @@
 /** @author shevek */
 public interface Task<T> {
 
-  public static interface Condition {
+  interface Condition {
 
-    static class AlwaysTrue implements Condition {
+    class AlwaysTrue implements Condition {
 
       private static final AlwaysTrue instance = new AlwaysTrue();
 
@@ -41,21 +41,21 @@ public boolean evaluate(@Nonnull TaskSetState state) {
       private AlwaysTrue() {}
     }
 
-    public static final Condition @ArrayLen(0) [] EMPTY_ARRAY = new Condition[0];
+    Condition @ArrayLen(0) [] EMPTY_ARRAY = new Condition[0];
 
     static Condition alwaysTrue() {
       return AlwaysTrue.instance;
     }
 
-    public boolean evaluate(@Nonnull TaskSetState state);
+    boolean evaluate(@Nonnull TaskSetState state);
 
     @Nonnull
-    public default String toSkipReason() {
+    default String toSkipReason() {
       return "[" + this + "] was not true";
     }
   }
 
-  public static class StateCondition implements Condition {
+  class StateCondition implements Condition {
 
     private final Task<?> task;
     private final TaskState taskState;
@@ -87,7 +87,7 @@ public String toString() {
     }
   }
 
-  public static class AndCondition implements Condition {
+  class AndCondition implements Condition {
 
     private final List<Condition> conditions;
 
@@ -103,7 +103,7 @@ public boolean evaluate(TaskSetState state) {
 
     @Override
     public String toSkipReason() {
-      return "all of " + Lists.transform(conditions, t -> t.toSkipReason());
+      return "all of " + Lists.transform(conditions, Condition::toSkipReason);
     }
 
     @Override
@@ -113,7 +113,7 @@ public String toString() {
   }
 
   @Nonnull
-  public default String getName() {
+  default String getName() {
     return getTargetPath();
   }
 
@@ -123,19 +123,19 @@ default TaskCategory getCategory() {
   }
 
   @Nonnull
-  public String getTargetPath();
+  String getTargetPath();
 
   @Nonnull
-  public default Condition[] getConditions() {
+  default Condition[] getConditions() {
     return Condition.EMPTY_ARRAY;
   }
 
   @CheckForNull
-  public T run(@Nonnull TaskRunContext context) throws Exception;
+  T run(@Nonnull TaskRunContext context) throws Exception;
 
   // returns true if tasks handles the exception.
   // so it's not sent to user's screen
-  public default boolean handleException(Exception Fe) {
+  default boolean handleException(Exception e) {
     return false;
   }
 }