Clean up broadcast(...) method