Refactoring in GraphicFactory