Support for artist slideshow, code cleanup