Broadcaster: Some more formatting / renaming
Formatting