whitespace cleanup and comment removal