After code review updates.