More cleanup of OCR spacing