[enh] Improve client readability