code cleanup, font upgrade