Improve whitespace and alignment