more typography refeactoring