diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 76f8aca..04d8385 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -542,14 +542,11 @@
                 request.ops().forEach(
                         op -> {
                             switch (op.operator()) {
-
                                 case ADD:
-                                    post(new FlowRuleEvent(RULE_ADD_REQUESTED,
-                                                           op.target()));
+                                    post(new FlowRuleEvent(RULE_ADD_REQUESTED, op.target()));
                                     break;
                                 case REMOVE:
-                                    post(new FlowRuleEvent(RULE_REMOVE_REQUESTED,
-                                                           op.target()));
+                                    post(new FlowRuleEvent(RULE_REMOVE_REQUESTED, op.target()));
                                     break;
                                 case MODIFY:
                                     //TODO: do something here when the time comes.
@@ -561,10 +558,7 @@
                 );
 
                 DeviceId deviceId = event.deviceId();
-
-                FlowRuleBatchOperation batchOperation =
-                        request.asBatchOperation(deviceId);
-
+                FlowRuleBatchOperation batchOperation = request.asBatchOperation(deviceId);
                 FlowRuleProvider flowRuleProvider = getProvider(deviceId);
                 if (flowRuleProvider != null) {
                     flowRuleProvider.executeBatch(batchOperation);
@@ -630,8 +624,7 @@
         }
 
         private void process(Set<FlowRuleOperation> ops) {
-            Multimap<DeviceId, FlowRuleBatchEntry> perDeviceBatches =
-                    ArrayListMultimap.create();
+            Multimap<DeviceId, FlowRuleBatchEntry> perDeviceBatches = ArrayListMultimap.create();
 
             for (FlowRuleOperation flowRuleOperation : ops) {
                 FlowRuleBatchEntry fbe =
@@ -640,7 +633,6 @@
                 perDeviceBatches.put(flowRuleOperation.rule().deviceId(), fbe);
             }
 
-
             for (DeviceId deviceId : perDeviceBatches.keySet()) {
                 long id = idGenerator.getNewId();
                 final FlowRuleBatchOperation b = new FlowRuleBatchOperation(perDeviceBatches.get(deviceId),
@@ -657,8 +649,6 @@
             }
         }
 
-
-
         synchronized void fail(DeviceId devId, Set<? extends FlowRule> failures) {
             hasFailed = true;
             pendingDevices.remove(devId);
@@ -674,7 +664,6 @@
                 context.onError(failedOpsBuilder.build());
             }
         }
-
     }
 
     @Override
