Changed from lambda to list comprehension