refactor(client): minor cleanup