working playing music and cleaning up code