Comment/whitespace cleanup.