style changes and whitespace