Cleaned up carousel code