CR: fix style, spelling