Cleanup of font rendering code