refactor code
Merge branch 'refactor-audio-manager' into develop