clean up code e.g., using list comprehension