Whitespace/comment cleanup