WallFilter refactor