Improve the carousel helper