Update doc-comments & small optimization