Syntax refactoring