Whitespace and comment reformatting