Use list comprehension instead of map