XX-11294 - fix style errors.