Whitespace fix for better merge with upstream

Whitespace fix for better merge with upstream. And also avoid noisy warnings about trailing spaces etc