Fix unwanted spacing using raster pattern, cleanup