Fix fail to build, cleanup Client class initailizer

Signed-off-by: Neutron Soutmun <neo.neutron@gmail.com>