strip down Client
Merge pull request #5 from cfralick/feature/revise-client

Strip down client