Mass cleanup of docblocks/code/comments
Merge pull request #4627 from colemanw/docblocks

Mass cleanup of docblocks/code/comments