Broadcast refactoring; styling