PY3: Change map to use list comprehension