working swipe mechanism + little cleanup