#2247 - Whitespace cleanup