cleaned up carousel class & added more