Updated and clean-up the Carousel class