Fixing some comments and cleaning some whitespace.