Updated and clean-up the CarouselSpinner and the CarouselAdapter classes