diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
index 75db5a6..5b60976 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
@@ -193,30 +193,32 @@
             OpenstackNode osNode = event.subject();
             switch (event.type()) {
                 case OPENSTACK_NODE_COMPLETE:
-                    eventExecutor.execute(() -> {
-
-                        if (!isRelevantHelper()) {
-                            return;
-                        }
-
-                        setIcmpReplyRules(osNode.intgBridge(), true);
-                    });
+                    eventExecutor.execute(() -> processNodeCompletion(osNode));
                     break;
                 case OPENSTACK_NODE_INCOMPLETE:
-                    eventExecutor.execute(() -> {
-
-                        if (!isRelevantHelper()) {
-                            return;
-                        }
-
-                        setIcmpReplyRules(osNode.intgBridge(), false);
-                    });
+                    eventExecutor.execute(() -> processNodeInCompletion(osNode));
                     break;
                 default:
                     break;
             }
         }
 
+        private void processNodeCompletion(OpenstackNode osNode) {
+            if (!isRelevantHelper()) {
+                return;
+            }
+
+            setIcmpReplyRules(osNode.intgBridge(), true);
+        }
+
+        private void processNodeInCompletion(OpenstackNode osNode) {
+            if (!isRelevantHelper()) {
+                return;
+            }
+
+            setIcmpReplyRules(osNode.intgBridge(), false);
+        }
+
         private void setIcmpReplyRules(DeviceId deviceId, boolean install) {
             // Sends ICMP response to controller for SNATing ingress traffic
             TrafficSelector selector = DefaultTrafficSelector.builder()
@@ -289,9 +291,7 @@
             switch (icmp.getIcmpType()) {
                 case TYPE_ECHO_REQUEST:
                     if (handleEchoRequest(context.inPacket().receivedFrom().deviceId(),
-                            ethernet.getSourceMAC(),
-                            ipPacket,
-                            icmp)) {
+                            ethernet.getSourceMAC(), ipPacket, icmp)) {
                         context.block();
                     }
                     break;