Cleaned up some comments to make diff easier for ingy to read during pull request.
Merge branch 'CleanUpCommentsFix' into dev