Refactor code
Fix bug when an user end the call