Style, comment, and whitespace modifications