Whitespace and comments cleaning