Refactor LPF