Cosmetic cleanup to SPX29302