refactored out more methods from Feed class and did some renaming