New, improved version
Swiper cleanup