Few improvements to docblocks