Make more comments more accurate and meet styling guide.
Merge pull request #589 from cfailde/comments

Make more comments more accurate and meet styling guide.