FilterFactory: code cleanup