rework after font cleaning