More code review updates