Refactor Sound Control