Add better encapsulation in FigureEllipse
plus few minor changess