whitespace and syntax changes