Map def added & list comprehensions