Comment, white space cleanup. No functional changes.