Sound class refectoring