PEP8 clean-up
Replace map/filter on lambda with list comprehension