Code cleanup of broadcast call