Refactoring feed validation