refactoring (mostly fonts)