refactor one to one chat