FIR, IIR, code cleanup