Docblocks improved