Syntax refactor