refactor font