improve doc and naming