Improve whitespace formatting