Very cosmetic cleanup