syntax and style changes