Some simplifications in the chat-app