Simplify implementation
More renaming
Reformat (no functional changes)
Callback manually when feed first set up