Small code review updates