CB-7129 Spellcheck and minor clean up