Spotify, first implementation
Spotify, first implementation
minor cleanup