Minor cleanups and renaming in filter tracks
Merge pull request #1 from keir/master

Minor cleanups and renaming in filter tracks