#1 more code review updates