Syntax improve