Tidy comments/whitespace