Map use replaced by list comprehension