Refactoring filters to not require ImageFactory