Bit of cleanup. (use Array.map)