Docblock improvements