Dynamic Node Entry in Ns3 -- code cleanup