Improved the whitespace