Moved initialization of the control points to constructGeometry. Ready for change of interface in Geometry class.