diff --git a/core/src/main/java/edu/umd/cs/piccolo/PNode.java b/core/src/main/java/edu/umd/cs/piccolo/PNode.java
index a9d9a97..d5c3783 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/PNode.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/PNode.java
@@ -2678,10 +2678,8 @@
 
             boolean thisPickable = getPickable() && pickPath.acceptsNode(this);
 
-            if (thisPickable) {
-                if (pick(pickPath)) {
-                    return true;
-                }
+            if (thisPickable && pick(pickPath)) {
+                return true;                
             }
 
             if (getChildrenPickable()) {
@@ -2693,10 +2691,8 @@
                 }
             }
 
-            if (thisPickable) {
-                if (pickAfterChildren(pickPath)) {
-                    return true;
-                }
+            if (thisPickable && pickAfterChildren(pickPath)) {
+                return true;                
             }
 
             pickPath.popTransform(transform);
diff --git a/core/src/main/java/edu/umd/cs/piccolo/event/PDragSequenceEventHandler.java b/core/src/main/java/edu/umd/cs/piccolo/event/PDragSequenceEventHandler.java
index 1293efc..5c97660 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/event/PDragSequenceEventHandler.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/event/PDragSequenceEventHandler.java
@@ -208,10 +208,8 @@
         }
 
         getMousePressedCanvasPoint().setLocation(e.getCanvasPosition());
-        if (!isDragging()) {
-            if (shouldStartDragInteraction(e)) {
-                startDrag(e);
-            }
+        if (!isDragging() && shouldStartDragInteraction(e)) {
+            startDrag(e);            
         }
     }