whitespace and comment fixes