(Menu) Refactor flicker filter code