clean up iterator syntax