minor cleanup on the font code