Refactored code to easily transferred between feeds