further code review updates.