Refactoring of sound system