Cleaning up comments
Merge pull request #4808 from danmcp/master

Merged by openshift-bot
Better comments
Merge pull request #4809 from danmcp/master

Merged by openshift-bot