[DF-1970] Refactoring sound