some long overdue cosmetic work