Convert to list comprehension