some syntax improvement