minor refactor to audio environment