diff --git a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
index 7f9a009..8159b57 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
@@ -112,7 +112,7 @@
         PtreeNode node = top;
         PtreeNode matched = null;
 
-        if (node != null)
+        if (node != null) {
 
             while (node != null
                     && node.keyBits <= key_bits
@@ -125,6 +125,7 @@
                     node = node.left;
                 }
             }
+        }
 
         if (matched != null) {
             return addReference(matched);
@@ -273,11 +274,13 @@
         PtreeNode add = new PtreeNode(null, commonLen, maxKeyOctets);
 
         int j;
-        for (j = 0; j < i; j++)
+        for (j = 0; j < i; j++) {
             add.key[j] = node.key[j];
+        }
 
-        if (boundary != 0)
+        if (boundary != 0) {
             add.key[j] = (byte) (node.key[j] & maskBits[add.keyBits % 8]);
+        }
 
         return add;
     }
