refactoring and audio