General cleanup of comments/whitespace