Refactor to use one NodeFigure class