refactor(client): minor cleanup
Merge pull request #48 from vicb/0527-cleanup

refactor(client): minor cleanup