refactor(client): minor cleanup

A few minor things that were not included in #47