Refactor of Hocr Transform in progress