Cs fixes
Improved doc block
Re(added) closing tag
Merge pull request #4645 from tersmitten/cs-fixes

Cs fixes