Tidy up playlist logic