small cleanup (using list comprehensions instead of filter)