refactoring and new font