client restructured to C++-style