more refractoring to sound storage and management