More font clean up to simplify the implementation