diff --git a/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java b/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
index 81549e6..7dbc7f1 100644
--- a/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
+++ b/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
@@ -147,11 +147,9 @@ public void onScroll(AbsListView view, int firstVisibleItem,
         }
 
         public void checkAndHandleFirstVisibleCellChange() {
-            if (mCurrentFirstVisibleItem != mPreviousFirstVisibleItem) {
-                if (mCellIsMobile && mMobileItemId != INVALID_ID) {
-                    updateNeighborViewsForId(mMobileItemId);
-                    handleCellSwitch();
-                }
+            if (mCurrentFirstVisibleItem != mPreviousFirstVisibleItem && (mCellIsMobile && mMobileItemId != INVALID_ID)) {
+                updateNeighborViewsForId(mMobileItemId);
+                handleCellSwitch();
             }
         }
 
@@ -160,11 +158,9 @@ public void checkAndHandleLastVisibleCellChange() {
                     + mCurrentVisibleItemCount;
             int previousLastVisibleItem = mPreviousFirstVisibleItem
                     + mPreviousVisibleItemCount;
-            if (currentLastVisibleItem != previousLastVisibleItem) {
-                if (mCellIsMobile && mMobileItemId != INVALID_ID) {
-                    updateNeighborViewsForId(mMobileItemId);
-                    handleCellSwitch();
-                }
+            if (currentLastVisibleItem != previousLastVisibleItem && (mCellIsMobile && mMobileItemId != INVALID_ID)) {
+                updateNeighborViewsForId(mMobileItemId);
+                handleCellSwitch();
             }
         }
 
@@ -268,20 +264,16 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
             case MotionEvent.ACTION_UP:
                 touchEventsEnded();
 
-                if (mHoverCell != null) {
-                    if (mDropListener != null) {
-                        mDropListener.onActionDrop();
-                    }
+                if (mHoverCell != null && mDropListener != null) {
+                    mDropListener.onActionDrop();
                 }
                 break;
 
             case MotionEvent.ACTION_CANCEL:
                 touchEventsCancelled();
 
-                if (mHoverCell != null) {
-                    if (mDropListener != null) {
-                        mDropListener.onActionDrop();
-                    }
+                if (mHoverCell != null && mDropListener != null) {
+                    mDropListener.onActionDrop();
                 }
                 break;
 
@@ -312,10 +304,9 @@ public void setOnDragListener(OnDragListener dragListener) {
 
     public void startEditMode(int position) {
         requestDisallowInterceptTouchEvent(true);
-        if (isPostHoneycomb())
-            if (position != -1) {
-                startDragAtPosition(position);
-            }
+        if (isPostHoneycomb() && position != -1) {
+            startDragAtPosition(position);
+        }
         mIsEditMode = true;
     }