ONLY whitespace, comment, and code style changes