Font cleanup

Font cleanup