Some minor cosmetic cleanup