Whitespacing and addressing comments