Start tidying up the node stuff.