Continue refactoring the Feed\Reader component