whitespace and comment cleanup