Cleaned up carousel some more