Syntax and style updates