Minor changes to the comments.

Minor changes to the comments and one small refactoring.