Refactored repetition of filters away.
Merge pull request #1 from jussi-kalliokoski/filter-repetition-refactor

Refactored repetition of filters away.