A little of refactoring and filters