diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java
index 97febd3ce3..3fc25a95b2 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java
@@ -86,7 +86,10 @@ private static TypeStore createStaticTypes() {
 
   @Override
   protected Statement createMethodDescriptorVariableDecl(
-      Service service, Method protoMethod, VariableExpr methodDescriptorVarExpr, Map<String, Message> messageTypes) {
+      Service service,
+      Method protoMethod,
+      VariableExpr methodDescriptorVarExpr,
+      Map<String, Message> messageTypes) {
     MethodInvocationExpr methodDescriptorMaker =
         MethodInvocationExpr.builder()
             .setMethodName("newBuilder")
diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java
index b1e2bd4531..191c1d15fa 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java
@@ -124,7 +124,7 @@ protected MethodDefinition createOperationCallableMethod(TypeStore typeStore) {
     List<VariableExpr> arguments = method.arguments();
     Variable httpJsonCallSettingsVar = arguments.get(0).variable();
     Variable callSettingsVar = arguments.get(1).variable();
-    Variable clientContextVar  = arguments.get(2).variable();
+    Variable clientContextVar = arguments.get(2).variable();
     Variable operationsStub = arguments.get(3).variable();
     // Generate innerCallable
     VariableExpr innerCallableVarExpr =
diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java
index 1ad1c3b99f..66fdfb2b4e 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java
@@ -53,7 +53,6 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.collect.ImmutableList;
-import com.google.longrunning.Operation;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -97,7 +96,10 @@ private static TypeStore createStaticTypes() {
 
   @Override
   protected Statement createMethodDescriptorVariableDecl(
-      Service service, Method protoMethod, VariableExpr methodDescriptorVarExpr, Map<String, Message> messageTypes) {
+      Service service,
+      Method protoMethod,
+      VariableExpr methodDescriptorVarExpr,
+      Map<String, Message> messageTypes) {
     MethodInvocationExpr expr =
         MethodInvocationExpr.builder()
             .setMethodName("newBuilder")
@@ -122,16 +124,18 @@ protected Statement createMethodDescriptorVariableDecl(
         methodMaker.apply("setRequestFormatter", getRequestFormatterExpr(protoMethod)).apply(expr);
     expr = methodMaker.apply("setResponseParser", setResponseParserExpr(protoMethod)).apply(expr);
 
-    //System.out.println(protoMethod.outputType().reference().simpleName());
-    if(protoMethod.outputType().reference().simpleName().equals("Operation")) {
+    // System.out.println(protoMethod.outputType().reference().simpleName());
+    if (protoMethod.outputType().reference().simpleName().equals("Operation")) {
       expr =
           methodMaker
-              .apply("setOperationSnapshotFactory",
+              .apply(
+                  "setOperationSnapshotFactory",
                   setOperationSnapshotFactoryExpr(protoMethod, messageTypes))
               .apply(expr);
       expr =
           methodMaker
-              .apply("setPollingRequestFactory",
+              .apply(
+                  "setPollingRequestFactory",
                   setPollingRequestFactoryExpr(protoMethod, messageTypes))
               .apply(expr);
     }
@@ -376,7 +380,8 @@ private List<Expr> setResponseParserExpr(Method protoMethod) {
     return Collections.singletonList(expr);
   }
 
-  private List<Expr> setOperationSnapshotFactoryExpr(Method protoMethod, Map<String, Message> messageTypes) {
+  private List<Expr> setOperationSnapshotFactoryExpr(
+      Method protoMethod, Map<String, Message> messageTypes) {
 
     BiFunction<String, List<Expr>, Function<MethodInvocationExpr, MethodInvocationExpr>>
         methodMaker = getMethodMaker();
@@ -539,7 +544,8 @@ private List<Expr> setOperationSnapshotFactoryExpr(Method protoMethod, Map<Strin
             .build());
   }
 
-  private List<Expr> setPollingRequestFactoryExpr(Method protoMethod, Map<String, Message> messageTypes) {
+  private List<Expr> setPollingRequestFactoryExpr(
+      Method protoMethod, Map<String, Message> messageTypes) {
 
     BiFunction<String, List<Expr>, Function<MethodInvocationExpr, MethodInvocationExpr>>
         methodMaker = getMethodMaker();