Refactoring of filters and Method names