Refactor Sounds classes