refine code and doc notations