cosmetic cleanup before patch submission 2