Code cleanup around font settings