Changed comments, and whitespace.