Updated comments for some classes.
Fixed whitespace and indentation.
Merge remote-tracking branch 'github/master'