Cleaned up mess in swipe view