diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPopNsh.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPopNsh.java
index 2e319f3..608697f 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPopNsh.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPopNsh.java
@@ -55,12 +55,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof NiciraPopNsh) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof NiciraPopNsh;
     }
 }
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPushNsh.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPushNsh.java
index 8d3a96d..2c60da8 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPushNsh.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraPushNsh.java
@@ -56,12 +56,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof NiciraPushNsh) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof NiciraPushNsh;
     }
 }
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopCw.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopCw.java
index 1dd185e..78a39d6 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopCw.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopCw.java
@@ -57,13 +57,7 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof Ofdpa3PopCw) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof Ofdpa3PopCw;
     }
 
     @Override
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopL2Header.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopL2Header.java
index 03afdae..28d837c 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopL2Header.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PopL2Header.java
@@ -57,13 +57,7 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof Ofdpa3PopL2Header) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof Ofdpa3PopL2Header;
     }
 
     @Override
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushCw.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushCw.java
index b3d999c..ff7dec1 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushCw.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushCw.java
@@ -57,13 +57,7 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof Ofdpa3PushCw) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof Ofdpa3PushCw;
     }
 
     @Override
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushL2Header.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushL2Header.java
index ac09a82..323e448 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushL2Header.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3PushL2Header.java
@@ -57,13 +57,7 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof Ofdpa3PushL2Header) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof Ofdpa3PushL2Header;
     }
 
     @Override