A little more cosmetic cleanup