Code updates per Code Review comments.