Well, not quite, some syntax cleaning.