Syntax improvment