Syntax cleaning