Inline documentation fixes
Revert "Inline documentation fixes"

This reverts commit ac34b161f01a93557231914bd603c9b51408190a,
done on the wrong branch