#10 Refactor ValueFilter