diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/sourcecontext/SourceContextPlugin.java b/src/main/java/com/google/cloud/tools/gradle/appengine/sourcecontext/SourceContextPlugin.java
index 28bc5147..37f37eeb 100644
--- a/src/main/java/com/google/cloud/tools/gradle/appengine/sourcecontext/SourceContextPlugin.java
+++ b/src/main/java/com/google/cloud/tools/gradle/appengine/sourcecontext/SourceContextPlugin.java
@@ -97,16 +97,18 @@ private void createSourceContextTask() {
   }
 
   // inject source-context into the META-INF directory of a jar or war
-  private void configureArchiveTask(String taskName) {
+  private void configureArchiveTask(String archiveTaskName) {
     try {
       TaskContainer tasks = project.getTasks();
-      TaskProvider<AbstractArchiveTask> archiveTask =
-          tasks.withType(AbstractArchiveTask.class).named(taskName);
-      archiveTask.configure(
-          task -> {
-            task.dependsOn(tasks.named("_createSourceContext"));
-            task.from(extension.getOutputDirectory(), copySpec -> copySpec.into("WEB-INF/classes"));
-          });
+      tasks
+          .withType(AbstractArchiveTask.class)
+          .named(archiveTaskName)
+          .configure(
+              task -> {
+                task.dependsOn(tasks.named("_createSourceContext"));
+                task.from(
+                    extension.getOutputDirectory(), copySpec -> copySpec.into("WEB-INF/classes"));
+              });
 
     } catch (UnknownTaskException ex) {
       // Do nothing if the task doesn't exist.
diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java b/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java
index f778d407..7db9bdac 100644
--- a/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java
+++ b/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java
@@ -147,23 +147,22 @@ private void createExplodeWarTask() {
         tasks.register(
             EXPLODE_WAR_TASK_NAME,
             ExplodeWarTask.class,
-            explodeWarTask -> {
-              explodeWarTask.setExplodedAppDirectory(explodedWarDir);
-              explodeWarTask.dependsOn(WarPlugin.WAR_TASK_NAME);
-              explodeWarTask.setGroup(APP_ENGINE_STANDARD_TASK_GROUP);
-              explodeWarTask.setDescription("Explode a war into a directory");
+            task -> {
+              task.setExplodedAppDirectory(explodedWarDir);
+              task.dependsOn(WarPlugin.WAR_TASK_NAME);
+              task.setGroup(APP_ENGINE_STANDARD_TASK_GROUP);
+              task.setDescription("Explode a war into a directory");
             });
 
     project.afterEvaluate(
-        project -> {
-          explodeWar.configure(
-              task ->
-                  task.setWarFile(
-                      tasks
-                          .withType(War.class)
-                          .getByName((WarPlugin.WAR_TASK_NAME))
-                          .getArchivePath()));
-        });
+        project ->
+            explodeWar.configure(
+                task ->
+                    task.setWarFile(
+                        tasks
+                            .withType(War.class)
+                            .getByName((WarPlugin.WAR_TASK_NAME))
+                            .getArchivePath())));
 
     tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(explodeWar));
   }
@@ -174,21 +173,20 @@ private void createStageTask() {
         tasks.register(
             STAGE_TASK_NAME,
             StageStandardTask.class,
-            stageTask -> {
-              stageTask.setGroup(APP_ENGINE_STANDARD_TASK_GROUP);
-              stageTask.setDescription(
+            task -> {
+              task.setGroup(APP_ENGINE_STANDARD_TASK_GROUP);
+              task.setDescription(
                   "Stage an App Engine standard environment application for deployment");
-              stageTask.dependsOn(BasePlugin.ASSEMBLE_TASK_NAME);
+              task.dependsOn(BasePlugin.ASSEMBLE_TASK_NAME);
             });
 
     project.afterEvaluate(
-        project -> {
-          stage.configure(
-              task -> {
-                task.setAppCfg(cloudSdkOperations.getAppcfg());
-                task.setStageStandardExtension(stageExtension);
-              });
-        });
+        project ->
+            stage.configure(
+                task -> {
+                  task.setAppCfg(cloudSdkOperations.getAppcfg());
+                  task.setStageStandardExtension(stageExtension);
+                }));
 
     // All deployment tasks depend on the stage task.
     Arrays.asList(