Improve doc-blocks