Refactor ElChat::Client