Refactoring and Filter