Swipe Gesture costomization  + Cleanup