*8491* code review changes (minor edits)