Final code review changes.