white space and comment cleanup