Cleaning and minor changes to Carousel