Refactor Word filters