Whitespace and style changes