[communications] [minor] Code cleanup so it can be extended by custom script