whitespace and comment changes