Updated and clean-up the CarouselItem class