Make filters more DRY