Optimization: use list-comprehension instead of map/lambda