Adds whitespace and (more) consistent formatting