some refactoring, beginning of new Typeface classes