Cleaning up broadcast code