Refactor raster