ENG-5072: review cosmetic changes.