Carousel refactoring