Code cleanup, add unique node count.