First round of updates from code review