Refactor Rasterizer