(360) Clean up font code somewhat