callId refactoring