- Minor updates from the code review.