Finishing SoundFilter refactoring