Updates based on code review comments.