Tidy up the chat example