Realizing my mistakes while refactoring

Broadcast by