Refactoring
Fix error with typeface function