CliServer / CLiClient clean coding / rewritting