(mac) code cleanup and format in join/selector combinational tasks