incoming call handler refactoring