I like map because it is more restricted form and you have fewer variables in code.  But I changed it anyway.