Improve doc. according to comments