Refactor - use list comprehension