Project: Chatclient: code cleanup