Improve doc further