Clean up of playback code a bit