Adjustments to whitespace and comments