whitespace and style changes