more refactorings
prune dead code
rename raw_feed to feed, extract method