Improvements to Node class constructor