carousel revision
code cleanup