se-162 final code review comments.