CShapeLabel refactoring