code cleanup
Add live cases for random songs and albums.