Refactor filter taps