Whitespace and comment cleanup