Refactoring chat
Refactoring chat