font change + cleanup