Replace filter with list comprehensions #86