Correct doc blocks according to cs guidelines.
Remove superfluous empty lines.
Merge pull request #3866 from dereuromark/master-cs-guidelines

Correct doc blocks according to cs guidelines