sound refactoring