codestyle modifications,
revised clientstop