Font class cleanup