angshu | atomfeed refactoring