(Softfilter plugs) Identing cleanups