Updated client to cleaner example