reduced complexity of command line client

4 files changed