Minor code cleanup and comment fixes.
Merge remote-tracking branch 'origin/master'