Refactor onCallHandler

Refactor if condition in onCallHandler