Refactoring GraphicsBatch