Song class Refectoring