typography refactoring