Refactored filter_* funcs to use list comprehension

Much cleaner this way.