last round of syntax cleaning