Refactor call & answer methods