Refactor onCallHandler
Merge pull request #1 from sightcall/Refactor

Refactor onCallHandler