More tidying up of node creation