Comments and white space cleanup.