Pull request changes
Placeholder commit
Changes from code review, mostly refactoring for readability.
Merge branch 'mbst-8930-refactor-radioplayer' into stage