Some clean on work. Start to implement client side.