Small whitespace + commenting changes