[Toolkit.Audio]  Minor Refactoring