Now using NodeInstance class to hold node instance parameters.
Minor - cleanup.