Refined Music class a little bit