Clean up various whitepace and comments.