Refactor StuffFilter