Whitespace changes to improve formatting