refacoty list comprehensions