ChatClient: Perform code cleaning.

Signed-off-by: JordySipkema <jordysipkema@gmail.com>