FIXUP - remove unnecessary var assignment and switch from collect to map.