Code refactoring.
Use named classes for filters.