Clean up some comments/whitespace