Minor cosmetic cleanup