Refactor makeCall