Refactoring

Removed some useless code and comments. Tweaked FeedWorker logic.