Refactoring of the code: CircularSegment -> AnnularSector