More consistency, less whitespace