Completed fjw -> basic filter
Refactored higher order functions to remove redundant line.