cleaned up the Music class a little bit