refactoring

2021-01-17 Refactoring Filters