Preparation for audio calls, refactoring