CDI-286 tidy up wording