clean up some font handling