Refactoring G2D