syntax and style updates