Syntax cleaning up