Improve whitespace output