cleanup
clean up fonts
refactoring