Slight code tidy up and add some debug statements.
Slight code tidy up and add some debug statements.

lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch