change to list comprehension style