Revert "Docblock fixes"

This reverts commit a49e15fd609afa0c3d1e0e6b4b730671b34530b8.
Revert "Revert "Docblock fixes""

This reverts commit bb1d66b722f7e91fbe3d24db214835ca553032e0.