Starting the Typography refactoring