a little cleaning up of play music functionality