Shuffle some code and structure in Node implementation.