Cleanup phpdoc comments
Merge pull request #4635 from colemanw/comments

Cleanup phpdoc comments