clean up whitespace and comments