diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV3.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV3.java
index 9272fe5..3eb6261 100644
--- a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV3.java
+++ b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV3.java
@@ -82,10 +82,8 @@
                     switch (i.type()) {
                         case L2MODIFICATION:
                             L2ModificationInstruction l2i = (L2ModificationInstruction) i;
-                            if (l2i instanceof L2ModificationInstruction.ModVlanIdInstruction ||
-                                    l2i instanceof L2ModificationInstruction.ModEtherInstruction) {
-                                return true;
-                            }
+                            return l2i instanceof L2ModificationInstruction.ModVlanIdInstruction ||
+                                    l2i instanceof L2ModificationInstruction.ModEtherInstruction;
                         case OUTPUT:
                             return true;
                         default:
diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV39.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV39.java
index 776937b..9a684f5 100644
--- a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV39.java
+++ b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaPipelineV39.java
@@ -234,12 +234,10 @@
                     switch (i.type()) {
                         case L2MODIFICATION:
                             L2ModificationInstruction l2i = (L2ModificationInstruction) i;
-                            if (l2i.subtype() == VLAN_ID ||
+                            return l2i.subtype() == VLAN_ID ||
                                     l2i.subtype() == VLAN_POP ||
                                     l2i.subtype() == ETH_DST ||
-                                    l2i.subtype() == ETH_SRC) {
-                                return true;
-                            }
+                                    l2i.subtype() == ETH_SRC;
                         case OUTPUT:
                             return true;
                         default: