Refactor SoundManager