Code cleaning. Playback queue changes.