Comment and whitespace changes