Refactored filters removed implicit arguments and scoped