Simplify font class.
Merge branch 'font_simiplify'