DDF-463 Refactored code to move out each filter, etc.
DDF-463 Continuation of refactoring.